History

Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86/pti update from Thomas Gleixner: "Just a single change from the anti-performance departement: - Add a new PR_SPEC_DISABLE_NOEXEC option which allows to apply the speculation protections on a process without inheriting the state on exec. This remedies a situation where a Java-launcher has speculation protections enabled because that's the default for JVMs which causes the launched regular harmless processes to inherit the protection state which results in unintended performance degradation" * 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/speculation: Add PR_SPEC_DISABLE_NOEXEC

Linus Torvalds committed 7 years ago

Commit edaed162 parents 78f8601 71368af6 files · +46 −12Browse files

Showing the changes to include/uapi/linux (1 of 6 files). Show all

Unified · Split

include/uapi/linux/prctl.h+1−0
@@ -219,6 +219,7 @@ struct prctl_mm_map { · 218 unmodified lines
219219 # define PR_SPEC_ENABLE (1UL << 1)
220220 # define PR_SPEC_DISABLE (1UL << 2)
221221 # define PR_SPEC_FORCE_DISABLE (1UL << 3)
222+# define PR_SPEC_DISABLE_NOEXEC (1UL << 4)
222223
223224 /* Reset arm64 pointer authentication keys */
224225 #define PR_PAC_RESET_KEYS 54