Skip to content

Commit 64f4535

Browse files
committed
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: 59ab844 ("compat: remove some compat entry points") dce4910 ("mm: wire up syscall process_mrelease") b48c723 ("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: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent bb91de4 commit 64f4535

5 files changed

Lines changed: 27 additions & 18 deletions

File tree

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -673,15 +673,15 @@ __SYSCALL(__NR_madvise, sys_madvise)
673673
#define __NR_remap_file_pages 234
674674
__SYSCALL(__NR_remap_file_pages, sys_remap_file_pages)
675675
#define __NR_mbind 235
676-
__SC_COMP(__NR_mbind, sys_mbind, compat_sys_mbind)
676+
__SYSCALL(__NR_mbind, sys_mbind)
677677
#define __NR_get_mempolicy 236
678-
__SC_COMP(__NR_get_mempolicy, sys_get_mempolicy, compat_sys_get_mempolicy)
678+
__SYSCALL(__NR_get_mempolicy, sys_get_mempolicy)
679679
#define __NR_set_mempolicy 237
680-
__SC_COMP(__NR_set_mempolicy, sys_set_mempolicy, compat_sys_set_mempolicy)
680+
__SYSCALL(__NR_set_mempolicy, sys_set_mempolicy)
681681
#define __NR_migrate_pages 238
682-
__SC_COMP(__NR_migrate_pages, sys_migrate_pages, compat_sys_migrate_pages)
682+
__SYSCALL(__NR_migrate_pages, sys_migrate_pages)
683683
#define __NR_move_pages 239
684-
__SC_COMP(__NR_move_pages, sys_move_pages, compat_sys_move_pages)
684+
__SYSCALL(__NR_move_pages, sys_move_pages)
685685
#endif
686686

687687
#define __NR_rt_tgsigqueueinfo 240
@@ -877,9 +877,11 @@ __SYSCALL(__NR_landlock_restrict_self, sys_landlock_restrict_self)
877877
#define __NR_memfd_secret 447
878878
__SYSCALL(__NR_memfd_secret, sys_memfd_secret)
879879
#endif
880+
#define __NR_process_mrelease 448
881+
__SYSCALL(__NR_process_mrelease, sys_process_mrelease)
880882

881883
#undef __NR_syscalls
882-
#define __NR_syscalls 448
884+
#define __NR_syscalls 449
883885

884886
/*
885887
* 32 bit systems traditionally used different

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,3 +361,5 @@
361361
444 n64 landlock_create_ruleset sys_landlock_create_ruleset
362362
445 n64 landlock_add_rule sys_landlock_add_rule
363363
446 n64 landlock_restrict_self sys_landlock_restrict_self
364+
# 447 reserved for memfd_secret
365+
448 n64 process_mrelease sys_process_mrelease

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -330,10 +330,10 @@
330330
256 64 sys_debug_setcontext sys_ni_syscall
331331
256 spu sys_debug_setcontext sys_ni_syscall
332332
# 257 reserved for vserver
333-
258 nospu migrate_pages sys_migrate_pages compat_sys_migrate_pages
334-
259 nospu mbind sys_mbind compat_sys_mbind
335-
260 nospu get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy
336-
261 nospu set_mempolicy sys_set_mempolicy compat_sys_set_mempolicy
333+
258 nospu migrate_pages sys_migrate_pages
334+
259 nospu mbind sys_mbind
335+
260 nospu get_mempolicy sys_get_mempolicy
336+
261 nospu set_mempolicy sys_set_mempolicy
337337
262 nospu mq_open sys_mq_open compat_sys_mq_open
338338
263 nospu mq_unlink sys_mq_unlink
339339
264 32 mq_timedsend sys_mq_timedsend_time32
@@ -381,7 +381,7 @@
381381
298 common faccessat sys_faccessat
382382
299 common get_robust_list sys_get_robust_list compat_sys_get_robust_list
383383
300 common set_robust_list sys_set_robust_list compat_sys_set_robust_list
384-
301 common move_pages sys_move_pages compat_sys_move_pages
384+
301 common move_pages sys_move_pages
385385
302 common getcpu sys_getcpu
386386
303 nospu epoll_pwait sys_epoll_pwait compat_sys_epoll_pwait
387387
304 32 utimensat sys_utimensat_time32
@@ -526,3 +526,5 @@
526526
444 common landlock_create_ruleset sys_landlock_create_ruleset
527527
445 common landlock_add_rule sys_landlock_add_rule
528528
446 common landlock_restrict_self sys_landlock_restrict_self
529+
# 447 reserved for memfd_secret
530+
448 common process_mrelease sys_process_mrelease

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
131 common quotactl sys_quotactl sys_quotactl
123123
132 common getpgid sys_getpgid sys_getpgid
124124
133 common fchdir sys_fchdir sys_fchdir
125-
134 common bdflush - -
125+
134 common bdflush sys_ni_syscall sys_ni_syscall
126126
135 common sysfs sys_sysfs sys_sysfs
127127
136 common personality sys_s390_personality sys_s390_personality
128128
137 common afs_syscall - -
@@ -274,9 +274,9 @@
274274
265 common statfs64 sys_statfs64 compat_sys_statfs64
275275
266 common fstatfs64 sys_fstatfs64 compat_sys_fstatfs64
276276
267 common remap_file_pages sys_remap_file_pages sys_remap_file_pages
277-
268 common mbind sys_mbind compat_sys_mbind
278-
269 common get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy
279-
270 common set_mempolicy sys_set_mempolicy compat_sys_set_mempolicy
277+
268 common mbind sys_mbind sys_mbind
278+
269 common get_mempolicy sys_get_mempolicy sys_get_mempolicy
279+
270 common set_mempolicy sys_set_mempolicy sys_set_mempolicy
280280
271 common mq_open sys_mq_open compat_sys_mq_open
281281
272 common mq_unlink sys_mq_unlink sys_mq_unlink
282282
273 common mq_timedsend sys_mq_timedsend sys_mq_timedsend_time32
@@ -293,7 +293,7 @@
293293
284 common inotify_init sys_inotify_init sys_inotify_init
294294
285 common inotify_add_watch sys_inotify_add_watch sys_inotify_add_watch
295295
286 common inotify_rm_watch sys_inotify_rm_watch sys_inotify_rm_watch
296-
287 common migrate_pages sys_migrate_pages compat_sys_migrate_pages
296+
287 common migrate_pages sys_migrate_pages sys_migrate_pages
297297
288 common openat sys_openat compat_sys_openat
298298
289 common mkdirat sys_mkdirat sys_mkdirat
299299
290 common mknodat sys_mknodat sys_mknodat
@@ -317,7 +317,7 @@
317317
307 common sync_file_range sys_sync_file_range compat_sys_s390_sync_file_range
318318
308 common tee sys_tee sys_tee
319319
309 common vmsplice sys_vmsplice sys_vmsplice
320-
310 common move_pages sys_move_pages compat_sys_move_pages
320+
310 common move_pages sys_move_pages sys_move_pages
321321
311 common getcpu sys_getcpu sys_getcpu
322322
312 common epoll_pwait sys_epoll_pwait compat_sys_epoll_pwait
323323
313 common utimes sys_utimes sys_utimes_time32
@@ -449,3 +449,5 @@
449449
444 common landlock_create_ruleset sys_landlock_create_ruleset sys_landlock_create_ruleset
450450
445 common landlock_add_rule sys_landlock_add_rule sys_landlock_add_rule
451451
446 common landlock_restrict_self sys_landlock_restrict_self sys_landlock_restrict_self
452+
# 447 reserved for memfd_secret
453+
448 common process_mrelease sys_process_mrelease sys_process_mrelease

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,7 @@
369369
445 common landlock_add_rule sys_landlock_add_rule
370370
446 common landlock_restrict_self sys_landlock_restrict_self
371371
447 common memfd_secret sys_memfd_secret
372+
448 common process_mrelease sys_process_mrelease
372373

373374
#
374375
# Due to a historical design error, certain syscalls are numbered differently
@@ -397,7 +398,7 @@
397398
530 x32 set_robust_list compat_sys_set_robust_list
398399
531 x32 get_robust_list compat_sys_get_robust_list
399400
532 x32 vmsplice sys_vmsplice
400-
533 x32 move_pages compat_sys_move_pages
401+
533 x32 move_pages sys_move_pages
401402
534 x32 preadv compat_sys_preadv64
402403
535 x32 pwritev compat_sys_pwritev64
403404
536 x32 rt_tgsigqueueinfo compat_sys_rt_tgsigqueueinfo

0 commit comments

Comments
 (0)