History

Merge tag 'perf-urgent-for-mingo-4.17-20180602' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent fixes from Carvalho de Melo: - Update prctl and cpufeatures.h tools/ copies with the kernel sources originals, which makes 'perf trace' know about the new prctl options for speculation control and silences the build warnings (Arnaldo Carvalho de Melo) - Update insn.h in Intel-PT instruction decoder with its original from from the kernel sources, to silence build warnings, no effect on the actual tools this time around (Arnaldo Carvalho de Melo)

Ingo Molnar committed 8 years ago

Commit 4e9ae0d2 parents 874cd33 0b3a1834 files · +45 −7Browse files

Showing the changes to tools/include/uapi (1 of 4 files). Show all

Unified · Split

tools/include/uapi/linux/prctl.h+12−0
@@ -207,4 +207,16 @@ struct prctl_mm_map { · 206 unmodified lines
207207 # define PR_SVE_VL_LEN_MASK 0xffff
208208 # define PR_SVE_VL_INHERIT (1 << 17) /* inherit across exec */
209209
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+
210222 #endif /* _LINUX_PRCTL_H */