To pick up changes from: $ git log --oneline -2 -i include/uapi/linux/prctl.h 356e4bfff2c5 prctl: Add force disable speculation b617cfc85816 prctl: Add speculation control prctls $ tools/perf/trace/beauty/prctl_option.sh > before.c $ cp include/uapi/linux/prctl.h tools/include/uapi/linux/prctl.h $ tools/perf/trace/beauty/prctl_option.sh > after.c $ diff -u before.c after.c --- before.c 2018-06-01 10:39:53.834073962 -0300 +++ after.c 2018-06-01 10:42:11.307985394 -0300 @@ -35,6 +35,8 @@ [42] = "GET_THP_DISABLE", [45] = "SET_FP_MODE", [46] = "GET_FP_MODE", + [52] = "GET_SPECULATION_CTRL", + [53] = "SET_SPECULATION_CTRL", }; static const char *prctl_set_mm_options[] = { [1] = "START_CODE", $ This will be used by 'perf trace' to show these strings when beautifying the prctl syscall args. At some point we'll be able to say something like: 'perf trace --all-cpus -e prctl(option=*SPEC*)' To filter by arg by name. This silences this warning when building tools/perf: Warning: Kernel ABI header at 'tools/include/uapi/linux/prctl.h' differs from latest version at 'include/uapi/linux/prctl.h'
Showing the changes to tools/include/uapi/linux (1 of 1 file). Show all
Unified · Split
| @@ -207,4 +207,16 @@ struct prctl_mm_map { · 206 unmodified lines | |||
| 207 | # define PR_SVE_VL_LEN_MASK 0xffff | 207 | # define PR_SVE_VL_LEN_MASK 0xffff |
| 208 | # define PR_SVE_VL_INHERIT (1 << 17) /* inherit across exec */ | 208 | # define PR_SVE_VL_INHERIT (1 << 17) /* inherit across exec */ |
| 209 | 209 | ||
| 210 | /* Per task speculation control */ | ||
| 211 | #define PR_GET_SPECULATION_CTRL 52 | ||
| 212 | #define PR_SET_SPECULATION_CTRL 53 | ||
| 213 | /* Speculation control variants */ | ||
| 214 | # define PR_SPEC_STORE_BYPASS 0 | ||
| 215 | /* Return and control values for PR_SET/GET_SPECULATION_CTRL */ | ||
| 216 | # define PR_SPEC_NOT_AFFECTED 0 | ||
| 217 | # define PR_SPEC_PRCTL (1UL << 0) | ||
| 218 | # define PR_SPEC_ENABLE (1UL << 1) | ||
| 219 | # define PR_SPEC_DISABLE (1UL << 2) | ||
| 220 | # define PR_SPEC_FORCE_DISABLE (1UL << 3) | ||
| 221 | |||
| 210 | #endif /* _LINUX_PRCTL_H */ | 222 | #endif /* _LINUX_PRCTL_H */ |