Commit f8bcb061 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools headers UAPI: Sync files changed by landlock, quotactl_path and mount_settattr new syscalls 



To pick the changes in these csets:

  a49f4f81 ("arch: Wire up Landlock syscalls")
  2a186721 ("fs: add mount_setattr()")
  fa8b9007 ("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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent a00b7e39

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

+10 −1
Original line number Diff line number Diff line
@@ -863,9 +863,18 @@ __SYSCALL(__NR_process_madvise, sys_process_madvise) 
__SC_COMP(__NR_epoll_pwait2, sys_epoll_pwait2, compat_sys_epoll_pwait2)

#define __NR_mount_setattr 442

__SYSCALL(__NR_mount_setattr, sys_mount_setattr)

#define __NR_quotactl_path 443

__SYSCALL(__NR_quotactl_path, sys_quotactl_path)



#define __NR_landlock_create_ruleset 444

__SYSCALL(__NR_landlock_create_ruleset, sys_landlock_create_ruleset)

#define __NR_landlock_add_rule 445

__SYSCALL(__NR_landlock_add_rule, sys_landlock_add_rule)

#define __NR_landlock_restrict_self 446

__SYSCALL(__NR_landlock_restrict_self, sys_landlock_restrict_self)



#undef __NR_syscalls

#define __NR_syscalls 443

#define __NR_syscalls 447



/*

 * 32 bit systems traditionally used different

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

+5 −0
Original line number Diff line number Diff line
@@ -356,3 +356,8 @@ 
439	n64	faccessat2			sys_faccessat2

440	n64	process_madvise			sys_process_madvise

441	n64	epoll_pwait2			sys_epoll_pwait2

442	n64	mount_setattr			sys_mount_setattr

443	n64	quotactl_path			sys_quotactl_path

444	n64	landlock_create_ruleset		sys_landlock_create_ruleset

445	n64	landlock_add_rule		sys_landlock_add_rule

446	n64	landlock_restrict_self		sys_landlock_restrict_self

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

+4 −0
Original line number Diff line number Diff line
@@ -522,3 +522,7 @@ 
440	common	process_madvise			sys_process_madvise

441	common	epoll_pwait2			sys_epoll_pwait2		compat_sys_epoll_pwait2

442	common	mount_setattr			sys_mount_setattr

443	common	quotactl_path			sys_quotactl_path

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

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

+4 −0
Original line number Diff line number Diff line
@@ -445,3 +445,7 @@ 
440  common	process_madvise		sys_process_madvise		sys_process_madvise

441  common	epoll_pwait2		sys_epoll_pwait2		compat_sys_epoll_pwait2

442  common	mount_setattr		sys_mount_setattr		sys_mount_setattr

443  common	quotactl_path		sys_quotactl_path		sys_quotactl_path

444  common	landlock_create_ruleset	sys_landlock_create_ruleset	sys_landlock_create_ruleset

445  common	landlock_add_rule	sys_landlock_add_rule		sys_landlock_add_rule

446  common	landlock_restrict_self	sys_landlock_restrict_self	sys_landlock_restrict_self

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

+4 −0
Original line number Diff line number Diff line
@@ -364,6 +364,10 @@ 
440	common	process_madvise		sys_process_madvise

441	common	epoll_pwait2		sys_epoll_pwait2

442	common	mount_setattr		sys_mount_setattr

443	common	quotactl_path		sys_quotactl_path

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



#

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