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

tools headers UAPI: Sync files changed by new process_mrelease syscall and the... 


tools headers UAPI: Sync files changed by new process_mrelease syscall and the removal of some compat entry points

To pick the changes in these csets:

  59ab844e ("compat: remove some compat entry points")
  dce49103 ("mm: wire up syscall process_mrelease")
  b48c7236 ("exit/bdflush: Remove the deprecated bdflush system call")

That add support for this new syscall in tools such as 'perf trace'.

For instance, this is now possible:

  # perf trace -v -e process_mrelease
  event qualifier tracepoint filter: (common_pid != 19351 && common_pid != 9112) && (id == 448)
  ^C#

That is the filter expression attached to the raw_syscalls:sys_{enter,exit}
tracepoints.

  $ grep process_mrelease tools/perf/arch/x86/entry/syscalls/syscall_64.tbl
  448    common  process_mrelease            sys_process_mrelease
  $

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: Arnd Bergmann <arnd@arndb.de>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent bb91de44

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

+8 −6
Original line number Diff line number Diff line
@@ -673,15 +673,15 @@ __SYSCALL(__NR_madvise, sys_madvise) 
#define __NR_remap_file_pages 234

__SYSCALL(__NR_remap_file_pages, sys_remap_file_pages)

#define __NR_mbind 235

__SC_COMP(__NR_mbind, sys_mbind, compat_sys_mbind)

__SYSCALL(__NR_mbind, sys_mbind)

#define __NR_get_mempolicy 236

__SC_COMP(__NR_get_mempolicy, sys_get_mempolicy, compat_sys_get_mempolicy)

__SYSCALL(__NR_get_mempolicy, sys_get_mempolicy)

#define __NR_set_mempolicy 237

__SC_COMP(__NR_set_mempolicy, sys_set_mempolicy, compat_sys_set_mempolicy)

__SYSCALL(__NR_set_mempolicy, sys_set_mempolicy)

#define __NR_migrate_pages 238

__SC_COMP(__NR_migrate_pages, sys_migrate_pages, compat_sys_migrate_pages)

__SYSCALL(__NR_migrate_pages, sys_migrate_pages)

#define __NR_move_pages 239

__SC_COMP(__NR_move_pages, sys_move_pages, compat_sys_move_pages)

__SYSCALL(__NR_move_pages, sys_move_pages)

#endif



#define __NR_rt_tgsigqueueinfo 240
@@ -877,9 +877,11 @@ __SYSCALL(__NR_landlock_restrict_self, sys_landlock_restrict_self) 
#define __NR_memfd_secret 447

__SYSCALL(__NR_memfd_secret, sys_memfd_secret)

#endif

#define __NR_process_mrelease 448

__SYSCALL(__NR_process_mrelease, sys_process_mrelease)



#undef __NR_syscalls

#define __NR_syscalls 448

#define __NR_syscalls 449



/*

 * 32 bit systems traditionally used different

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

+2 −0
Original line number Diff line number Diff line
@@ -361,3 +361,5 @@ 
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

# 447 reserved for memfd_secret

448	n64	process_mrelease		sys_process_mrelease

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

+7 −5
Original line number Diff line number Diff line
@@ -330,10 +330,10 @@ 
256	64	sys_debug_setcontext		sys_ni_syscall

256	spu	sys_debug_setcontext		sys_ni_syscall

# 257 reserved for vserver

258	nospu	migrate_pages			sys_migrate_pages		compat_sys_migrate_pages

259	nospu	mbind				sys_mbind			compat_sys_mbind

260	nospu	get_mempolicy			sys_get_mempolicy		compat_sys_get_mempolicy

261	nospu	set_mempolicy			sys_set_mempolicy		compat_sys_set_mempolicy

258	nospu	migrate_pages			sys_migrate_pages

259	nospu	mbind				sys_mbind

260	nospu	get_mempolicy			sys_get_mempolicy

261	nospu	set_mempolicy			sys_set_mempolicy

262	nospu	mq_open				sys_mq_open			compat_sys_mq_open

263	nospu	mq_unlink			sys_mq_unlink

264	32	mq_timedsend			sys_mq_timedsend_time32
@@ -381,7 +381,7 @@ 
298	common	faccessat			sys_faccessat

299	common	get_robust_list			sys_get_robust_list		compat_sys_get_robust_list

300	common	set_robust_list			sys_set_robust_list		compat_sys_set_robust_list

301	common	move_pages			sys_move_pages			compat_sys_move_pages

301	common	move_pages			sys_move_pages

302	common	getcpu				sys_getcpu

303	nospu	epoll_pwait			sys_epoll_pwait			compat_sys_epoll_pwait

304	32	utimensat			sys_utimensat_time32
@@ -526,3 +526,5 @@ 
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

# 447 reserved for memfd_secret

448	common	process_mrelease		sys_process_mrelease

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

+8 −6
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ 
131  common	quotactl		sys_quotactl			sys_quotactl

132  common	getpgid			sys_getpgid			sys_getpgid

133  common	fchdir			sys_fchdir			sys_fchdir

134  common	bdflush			-				-

134  common	bdflush			sys_ni_syscall			sys_ni_syscall

135  common	sysfs			sys_sysfs			sys_sysfs

136  common	personality		sys_s390_personality		sys_s390_personality

137  common	afs_syscall		-				-
@@ -274,9 +274,9 @@ 
265  common	statfs64		sys_statfs64			compat_sys_statfs64

266  common	fstatfs64		sys_fstatfs64			compat_sys_fstatfs64

267  common	remap_file_pages	sys_remap_file_pages		sys_remap_file_pages

268  common	mbind			sys_mbind			compat_sys_mbind

269  common	get_mempolicy		sys_get_mempolicy		compat_sys_get_mempolicy

270  common	set_mempolicy		sys_set_mempolicy		compat_sys_set_mempolicy

268  common	mbind			sys_mbind			sys_mbind

269  common	get_mempolicy		sys_get_mempolicy		sys_get_mempolicy

270  common	set_mempolicy		sys_set_mempolicy		sys_set_mempolicy

271  common	mq_open			sys_mq_open			compat_sys_mq_open

272  common	mq_unlink		sys_mq_unlink			sys_mq_unlink

273  common	mq_timedsend		sys_mq_timedsend		sys_mq_timedsend_time32
@@ -293,7 +293,7 @@ 
284  common	inotify_init		sys_inotify_init		sys_inotify_init

285  common	inotify_add_watch	sys_inotify_add_watch		sys_inotify_add_watch

286  common	inotify_rm_watch	sys_inotify_rm_watch		sys_inotify_rm_watch

287  common	migrate_pages		sys_migrate_pages		compat_sys_migrate_pages

287  common	migrate_pages		sys_migrate_pages		sys_migrate_pages

288  common	openat			sys_openat			compat_sys_openat

289  common	mkdirat			sys_mkdirat			sys_mkdirat

290  common	mknodat			sys_mknodat			sys_mknodat
@@ -317,7 +317,7 @@ 
307  common	sync_file_range		sys_sync_file_range		compat_sys_s390_sync_file_range

308  common	tee			sys_tee				sys_tee

309  common	vmsplice		sys_vmsplice			sys_vmsplice

310  common	move_pages		sys_move_pages			compat_sys_move_pages

310  common	move_pages		sys_move_pages			sys_move_pages

311  common	getcpu			sys_getcpu			sys_getcpu

312  common	epoll_pwait		sys_epoll_pwait			compat_sys_epoll_pwait

313  common	utimes			sys_utimes			sys_utimes_time32
@@ -449,3 +449,5 @@ 
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

# 447 reserved for memfd_secret

448  common	process_mrelease	sys_process_mrelease		sys_process_mrelease

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

+2 −1
Original line number Diff line number Diff line
@@ -369,6 +369,7 @@ 
445	common	landlock_add_rule	sys_landlock_add_rule

446	common	landlock_restrict_self	sys_landlock_restrict_self

447	common	memfd_secret		sys_memfd_secret

448	common	process_mrelease	sys_process_mrelease



#

# Due to a historical design error, certain syscalls are numbered differently
@@ -397,7 +398,7 @@ 
530	x32	set_robust_list		compat_sys_set_robust_list

531	x32	get_robust_list		compat_sys_get_robust_list

532	x32	vmsplice		sys_vmsplice

533	x32	move_pages		compat_sys_move_pages

533	x32	move_pages		sys_move_pages

534	x32	preadv			compat_sys_preadv64

535	x32	pwritev			compat_sys_pwritev64

536	x32	rt_tgsigqueueinfo	compat_sys_rt_tgsigqueueinfo