tools headers UAPI: Sync linux/prctl.h with the kernel sources to pick FUTEX knob
Arnaldo Carvalho de Melo
maintainerPATCH 1/1 tools headers UAPI: Sync linux/prctl.h with the kernel sources to pick FUTEX knob
tldr; Just FYI, I'm carrying this on the perf tools tree.
Full explanation:
There used to be no copies, with tools/ code using kernel headers directly. From time to time tools/perf/ broke due to legitimate kernel hacking. At some point Linus complained about such direct usage. Then we adopted the current model.
See further details at:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/include/uapi/README
To pick the changes in:
63e8595c060a1fef ("futex: Allow to make the private hash immutable") 80367ad01d93ac78 ("futex: Add basic infrastructure for local task local hash")
That adds a FUTEX knob:
$ tools/perf/trace/beauty/prctl_option.sh > before
$ cp include/uapi/linux/prctl.h tools/perf/trace/beauty/include/uapi/linux/prctl.h
$ tools/perf/trace/beauty/prctl_option.sh > after
$ diff -u before after
--- before 2025-06-09 14:50:45.162579336 -0300
+++ after 2025-06-09 14:50:52.797660024 -0300
@@ -72,6 +72,7 @@
[75] = "SET_SHADOW_STACK_STATUS",
[76] = "LOCK_SHADOW_STACK_STATUS",
[77] = "TIMER_CREATE_RESTORE_IDS",
+ [78] = "FUTEX_HASH",
};
static const char *prctl_set_mm_options[] = {
[1] = "START_CODE",
$That now will be used to decode the syscall option and also to compose filters, for instance:
[root@five ~]# perf trace -e syscalls:sys_enter_prctl --filter option==SET_NAME
0.000 Isolated Servi/3474327 syscalls:sys_enter_prctl(option: SET_NAME, arg2: 0x7f23f13b7aee)
0.032 DOM Worker/3474327 syscalls:sys_enter_prctl(option: SET_NAME, arg2: 0x7f23deb25670)
7.920 :3474328/3474328 syscalls:sys_enter_prctl(option: SET_NAME, arg2: 0x7f23e24fbb10)
7.935 StreamT~s #374/3474328 syscalls:sys_enter_prctl(option: SET_NAME, arg2: 0x7f23e24fb970)
8.400 Isolated Servi/3474329 syscalls:sys_enter_prctl(option: SET_NAME, arg2: 0x7f23e24bab10)
8.418 StreamT~s #374/3474329 syscalls:sys_enter_prctl(option: SET_NAME, arg2: 0x7f23e24ba970)
^C[root@five ~]#This addresses this perf build warning:
Warning: Kernel ABI header differences:
diff -u tools/include/uapi/linux/prctl.h include/uapi/linux/prctl.h
--- tools/perf/trace/beauty/include/uapi/linux/prctl.h | 7 +++++++ 1 file changed, 7 insertions(+)
tools/perf/trace/beauty/include/uapi/linux/prctl.h +7 -0
@@ -364,4 +364,11 @@ struct prctl_mm_map {# define PR_TIMER_CREATE_RESTORE_IDS_ON 1# define PR_TIMER_CREATE_RESTORE_IDS_GET 2 +/* FUTEX hash management */ +#define PR_FUTEX_HASH 78 +# define PR_FUTEX_HASH_SET_SLOTS 1 +# define FH_FLAG_IMMUTABLE (1ULL << 0) +# define PR_FUTEX_HASH_GET_SLOTS 2 +# define PR_FUTEX_HASH_GET_IMMUTABLE 3 +#endif /* _LINUX_PRCTL_H */
Signature · 1 line
2.49.0
Quoted 1 line · Arnaldo Carvalho de Melo
tldr; Just FYI, I'm carrying this on the perf tools tree.
Thank you.
Quoted 3 lines
$ tools/perf/trace/beauty/prctl_option.sh > before $ cp include/uapi/linux/prctl.h tools/perf/trace/beauty/include/uapi/linux/prctl.h $ tools/perf/trace/beauty/prctl_option.sh > after
Ah. I missed that copy of prctl.h
…
Quoted 4 lines
This addresses this perf build warning:
Warning: Kernel ABI header differences:
diff -utools/include/uapi/linux/prctl.hinclude/uapi/linux/prctl.h
But I did cover this one.
Sebastian
Arnaldo Carvalho de Melo
maintainerQuoted 11 lines · Sebastian Andrzej Siewior
Quoted 1 line · Arnaldo Carvalho de Melo
tldr; Just FYI, I'm carrying this on the perf tools tree.
Thank you.
Quoted 3 lines
$ tools/perf/trace/beauty/prctl_option.sh > before $ cp include/uapi/linux/prctl.h tools/perf/trace/beauty/include/uapi/linux/prctl.h $ tools/perf/trace/beauty/prctl_option.sh > afterAh. I missed that copy of
prctl.h
Quoted 7 lines
…
Quoted 4 lines
This addresses this perf build warning:
Warning: Kernel ABI header differences:
diff -utools/include/uapi/linux/prctl.hinclude/uapi/linux/prctl.hBut I did cover this one.
I fixed up the warning message being addressed, the attempt was at having what used in perf just in tools/perf/trace/beauty/include/uapi/linux/prctl.h, i.e. just for scrapping, not for building things with it.
But then:
commit c142850fbc956058ff2f2987d3d11eb2c628f710
Author: John Hubbard <[email protected]> Date: Mon Jun 17 19:24:21 2024 -0700
selftests/mm: kvm, mdwe fixes to avoid requiring "make headers"
this adds another copy there.
I think we should then remove the tools/perf/trace/beauty/include/uapi/linux/prctl.h one and make tools/perf/check_headers.sh to go back to check tools/include/uapi/linux/prctl.h.
But then, as mentioned in tools/include/uapi/README, its better for people updating the kernel original files not to update the copy, as it may break tools/ code if it, for instance, starts including some other header, etc.
tools people should notice the warning from tools/perf/check_headers.sh (that now probably should be moved to tools/ as these copies are not used just by perf...) and check how to update it.
- Arnaldo