Skip to content

Commit f8bcb06

Browse files
committed
tools headers UAPI: Sync files changed by landlock, quotactl_path and mount_settattr new syscalls
To pick the changes in these csets: a49f4f8 ("arch: Wire up Landlock syscalls") 2a18672 ("fs: add mount_setattr()") fa8b900 ("quota: wire up quotactl_path") That silences these perf build warnings and add support for those new syscalls in tools such as 'perf trace'. For instance, this is now possible: # ~acme/bin/perf trace -v -e landlock* event qualifier tracepoint filter: (common_pid != 129365 && common_pid != 3502) && (id == 444 || id == 445 || id == 446) ^C# That is tha filter expression attached to the raw_syscalls:sys_{enter,exit} tracepoints. $ grep landlock tools/perf/arch/x86/entry/syscalls/syscall_64.tbl 444 common landlock_create_ruleset sys_landlock_create_ruleset 445 common landlock_add_rule sys_landlock_add_rule 446 common landlock_restrict_self sys_landlock_restrict_self $ This addresses these perf build warnings: Warning: Kernel ABI header at 'tools/include/uapi/asm-generic/unistd.h' differs from latest version at 'include/uapi/asm-generic/unistd.h' diff -u tools/include/uapi/asm-generic/unistd.h include/uapi/asm-generic/unistd.h Warning: Kernel ABI header at 'tools/perf/arch/x86/entry/syscalls/syscall_64.tbl' differs from latest version at 'arch/x86/entry/syscalls/syscall_64.tbl' diff -u tools/perf/arch/x86/entry/syscalls/syscall_64.tbl arch/x86/entry/syscalls/syscall_64.tbl Warning: Kernel ABI header at 'tools/perf/arch/powerpc/entry/syscalls/syscall.tbl' differs from latest version at 'arch/powerpc/kernel/syscalls/syscall.tbl' diff -u tools/perf/arch/powerpc/entry/syscalls/syscall.tbl arch/powerpc/kernel/syscalls/syscall.tbl Warning: Kernel ABI header at 'tools/perf/arch/s390/entry/syscalls/syscall.tbl' differs from latest version at 'arch/s390/kernel/syscalls/syscall.tbl' diff -u tools/perf/arch/s390/entry/syscalls/syscall.tbl arch/s390/kernel/syscalls/syscall.tbl Warning: Kernel ABI header at 'tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl' differs from latest version at 'arch/mips/kernel/syscalls/syscall_n64.tbl' diff -u tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl arch/mips/kernel/syscalls/syscall_n64.tbl Cc: Christian Brauner <christian.brauner@ubuntu.com> Cc: James Morris <jamorris@linux.microsoft.com> Cc: Jan Kara <jack@suse.cz> Cc: Mickaël Salaün <mic@linux.microsoft.com> Cc: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent a00b7e3 commit f8bcb06

5 files changed

Lines changed: 27 additions & 1 deletion

File tree

tools/include/uapi/asm-generic/unistd.h

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -863,9 +863,18 @@ __SYSCALL(__NR_process_madvise, sys_process_madvise)
863863
__SC_COMP(__NR_epoll_pwait2, sys_epoll_pwait2, compat_sys_epoll_pwait2)
864864
#define __NR_mount_setattr 442
865865
__SYSCALL(__NR_mount_setattr, sys_mount_setattr)
866+
#define __NR_quotactl_path 443
867+
__SYSCALL(__NR_quotactl_path, sys_quotactl_path)
868+
869+
#define __NR_landlock_create_ruleset 444
870+
__SYSCALL(__NR_landlock_create_ruleset, sys_landlock_create_ruleset)
871+
#define __NR_landlock_add_rule 445
872+
__SYSCALL(__NR_landlock_add_rule, sys_landlock_add_rule)
873+
#define __NR_landlock_restrict_self 446
874+
__SYSCALL(__NR_landlock_restrict_self, sys_landlock_restrict_self)
866875

867876
#undef __NR_syscalls
868-
#define __NR_syscalls 443
877+
#define __NR_syscalls 447
869878

870879
/*
871880
* 32 bit systems traditionally used different

tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,3 +356,8 @@
356356
439 n64 faccessat2 sys_faccessat2
357357
440 n64 process_madvise sys_process_madvise
358358
441 n64 epoll_pwait2 sys_epoll_pwait2
359+
442 n64 mount_setattr sys_mount_setattr
360+
443 n64 quotactl_path sys_quotactl_path
361+
444 n64 landlock_create_ruleset sys_landlock_create_ruleset
362+
445 n64 landlock_add_rule sys_landlock_add_rule
363+
446 n64 landlock_restrict_self sys_landlock_restrict_self

tools/perf/arch/powerpc/entry/syscalls/syscall.tbl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,3 +522,7 @@
522522
440 common process_madvise sys_process_madvise
523523
441 common epoll_pwait2 sys_epoll_pwait2 compat_sys_epoll_pwait2
524524
442 common mount_setattr sys_mount_setattr
525+
443 common quotactl_path sys_quotactl_path
526+
444 common landlock_create_ruleset sys_landlock_create_ruleset
527+
445 common landlock_add_rule sys_landlock_add_rule
528+
446 common landlock_restrict_self sys_landlock_restrict_self

tools/perf/arch/s390/entry/syscalls/syscall.tbl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,3 +445,7 @@
445445
440 common process_madvise sys_process_madvise sys_process_madvise
446446
441 common epoll_pwait2 sys_epoll_pwait2 compat_sys_epoll_pwait2
447447
442 common mount_setattr sys_mount_setattr sys_mount_setattr
448+
443 common quotactl_path sys_quotactl_path sys_quotactl_path
449+
444 common landlock_create_ruleset sys_landlock_create_ruleset sys_landlock_create_ruleset
450+
445 common landlock_add_rule sys_landlock_add_rule sys_landlock_add_rule
451+
446 common landlock_restrict_self sys_landlock_restrict_self sys_landlock_restrict_self

tools/perf/arch/x86/entry/syscalls/syscall_64.tbl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,10 @@
364364
440 common process_madvise sys_process_madvise
365365
441 common epoll_pwait2 sys_epoll_pwait2
366366
442 common mount_setattr sys_mount_setattr
367+
443 common quotactl_path sys_quotactl_path
368+
444 common landlock_create_ruleset sys_landlock_create_ruleset
369+
445 common landlock_add_rule sys_landlock_add_rule
370+
446 common landlock_restrict_self sys_landlock_restrict_self
367371

368372
#
369373
# Due to a historical design error, certain syscalls are numbered differently

0 commit comments

Comments
 (0)