Provide options to enable spectre_v2 userspace-userspace protection
Subsystems (4)
cover Provide options to enable spectre_v2 userspace-userspace protection
This patchset provides an option to apply IBPB and STIBP mitigation to only non-dumpable processes.
Jiri's patch to harden spectre_v2 makes IBPB and STIBP available for general spectre v2 app to app mitigation. IBPB will be issued for switching to an app that's not ptraceable by the previous app and STIBP will be always turned on.
However, leaving STIBP on all the time is expensive for certain applications that have frequent indirect branches. One such application is perlbench in the SpecInt Rate 2006 test suite which shows a 21% reduction in throughput. Other application like bzip2 in the same test suite with minimal indirct branches have
only a 0.7% reduction in throughput. IBPB will also impose overhead during context switches.
App to app exploit is in general difficult
due to address space layout randomization in apps and
the need to know an app's address space layout ahead of time. Users may not wish to incur app to app performance overhead from IBPB and STIBP for general non security sensitive apps and use these mitigations only for non-dumpable apps.
The first patch provides a lite option for spectre_v2 app to app mitigation where IBPB is only issued for security sensitive non-dumpable app. The second patch extends this option where STIBP is only issued for non-dumpable app.
The changes apply to intel cpus affected by spectre_v2. Tom, can you update the STIBP changes for AMD cpus on __speculative_store_bypass_update and x86_virt_spec_ctrl to update the SPEC_CTRL msr for AMD cpu?
Thanks.
Tim
Tim Chen (2):
x86/speculation: Option to select app to app mitigation for spectre_v2 x86/speculation: Provide application property based STIBP protection
Documentation/admin-guide/kernel-parameters.txt | 11 +++ arch/x86/include/asm/msr-index.h | 3 +- arch/x86/include/asm/nospec-branch.h | 9 ++ arch/x86/include/asm/spec-ctrl.h | 12 +++ arch/x86/include/asm/thread_info.h | 4 +- arch/x86/kernel/cpu/bugs.c | 105 ++++++++++++++++++++++-- arch/x86/kernel/process.c | 9 +- arch/x86/mm/tlb.c | 41 ++++++++- 8 files changed, 179 insertions(+), 15 deletions(-)
Signature · 1 line
2.9.4
PATCH 1/2 x86/speculation: Option to select app to app mitigation for spectre_v2
Jiri Kosina's patch makes IBPB and STIBP available for general spectre v2 app to app mitigation. IBPB will be issued for switching to an app that's not ptraceable by the previous app and STIBP will be always turned on.
However, app to app exploit is in general difficult
due to address space layout randomization in apps and
the need to know an app's address space layout ahead of time. Users may not wish to incur app to app performance overhead from IBPB and STIBP for general non security sensitive apps.
This patch provides a lite option for spectre_v2 app to app mitigation where IBPB is only issued for security sensitive non-dumpable app.
The strict option will keep system at high security level where IBPB and STIBP are used to defend all apps against spectre_v2 app to app attack.
--- Documentation/admin-guide/kernel-parameters.txt | 11 +++ arch/x86/include/asm/nospec-branch.h | 9 +++ arch/x86/kernel/cpu/bugs.c | 95 +++++++++++++++++++++++-- arch/x86/mm/tlb.c | 19 +++-- 4 files changed, 126 insertions(+), 8 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +11 -0
@@ -4186,6 +4186,17 @@ Not specifying this option is equivalent to spectre_v2=auto. + spectre_v2_app2app= + [X86] Control app to app mitigation of Spectre variant 2 + (indirect branch speculation) vulnerability. + + lite - only turn on mitigation for non-dumpable processes + strict - protect against attacks for all user processes + auto - let kernel decide lite or strict mode + + Not specifying this option is equivalent to + spectre_v2_app2app=auto. + spec_store_bypass_disable= [HW] Control Speculative Store Bypass (SSB) Disable mitigation (Speculative Store Bypass vulnerability)
arch/x86/include/asm/nospec-branch.h +9 -0
@@ -3,6 +3,7 @@#ifndef _ASM_X86_NOSPEC_BRANCH_H_#define _ASM_X86_NOSPEC_BRANCH_H_ +#include <linux/static_key.h> #include <asm/alternative.h> #include <asm/alternative-asm.h> #include <asm/cpufeatures.h>
@@ -217,6 +218,12 @@ enum spectre_v2_mitigation { SPECTRE_V2_IBRS_ENHANCED, }; +enum spectre_v2_app2app_mitigation { +SPECTRE_V2_APP2APP_NONE , +SPECTRE_V2_APP2APP_LITE , +SPECTRE_V2_APP2APP_STRICT , +}; +/* The Speculative Store Bypass disable variants */ enum ssb_mitigation {SPEC_STORE_BYPASS_NONE ,
@@ -228,6 +235,8 @@ enum ssb_mitigation {extern char __indirect_thunk_start[];extern char __indirect_thunk_end[]; +DECLARE_STATIC_KEY_FALSE (spectre_v2_app_lite); +/* * On VMEXIT we must ensure that no RSB predictions learned in the guest * can be followed in the host, by overwriting the RSB completely. Both
arch/x86/kernel/cpu/bugs.c +91 -4
156 lines not on this page · raw message
arch/x86/mm/tlb.c +15 -4
@@ -184,14 +184,25 @@ static void sync_current_stack_to_mm(struct mm_struct *mm)static bool ibpb_needed (struct task_struct *tsk,u64 last_ctx_id) {/* -* Check if the current (previous) task has access to the memory -* of the @tsk (next) task. If access is denied, make sure to +* For lite protection mode, we only protect the non-dumpable +* processes. +* +* Otherwise check if the current (previous) task has access to the memory +* of the @tsk (next) task for strict app to app protection. +* If access is denied, make sure to * issue a IBPB to stop user->user Spectre-v2 attacks. * * Note: __ptrace_may_access() returns 0 or -ERRNO. */ -return (tsk && tsk->mm && tsk->mm->context.ctx_id != last_ctx_id && -__ptrace_may_access (tsk,PTRACE_MODE_IBPB )); + +/* skip IBPB if no context changes */ +if (!tsk || !tsk->mm || tsk->mm->context.ctx_id != last_ctx_id) +return false; + +if (static_branch_unlikely (&spectre_v2_app_lite)) +return (get_dumpable (tsk->mm) !=SUID_DUMP_USER ); +else +return (__ptrace_may_access (tsk,PTRACE_MODE_IBPB )); } void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next,
Signature · 1 line
2.9.4
PATCH 2/2 x86/speculation: Provide application property based STIBP protection
In reply to Tim ChenThis patch provides an application property based spectre_v2 protection with STIBP against attack from another app from a sibling hyper-thread. For security sensitive non-dumpable app, STIBP will be turned on before switching to it for Intel processors vulnerable to spectre_v2.
--- arch/x86/include/asm/msr-index.h | 3 ++- arch/x86/include/asm/spec-ctrl.h | 12 ++++++++++++ arch/x86/include/asm/thread_info.h | 4 +++- arch/x86/kernel/cpu/bugs.c | 12 ++++++++++-- arch/x86/kernel/process.c | 9 +++++---- arch/x86/mm/tlb.c | 22 ++++++++++++++++++++++ 6 files changed, 54 insertions(+), 8 deletions(-)
arch/x86/include/asm/msr-index.h +2 -1
@@ -41,7 +41,8 @@#define MSR_IA32_SPEC_CTRL 0x00000048/* Speculation Control */ #define SPEC_CTRL_IBRS (1 << 0)/* Indirect Branch Restricted Speculation */ -#define SPEC_CTRL_STIBP (1 << 1)/* Single Thread Indirect Branch Predictors */ +#define SPEC_CTRL_STIBP_SHIFT 1/* Single Thread Indirect Branch Predictor bit */ +#define SPEC_CTRL_STIBP (1 << SPEC_CTRL_STIBP_SHIFT)/* Single Thread Indirect Branch Predictors */ #define SPEC_CTRL_SSBD_SHIFT 2/* Speculative Store Bypass Disable bit */ #define SPEC_CTRL_SSBD (1 << SPEC_CTRL_SSBD_SHIFT)/* Speculative Store Bypass Disable */
arch/x86/include/asm/spec-ctrl.h +12 -0
@@ -53,12 +53,24 @@ static inline u64 ssbd_tif_to_spec_ctrl(u64 tifn)return (tifn & _TIF_SSBD) >> (TIF_SSBD -SPEC_CTRL_SSBD_SHIFT ); } +static inline u64 stibp_tif_to_spec_ctrl (u64 tifn) +{ +BUILD_BUG_ON (TIF_STIBP <SPEC_CTRL_STIBP_SHIFT ); +return (tifn & _TIF_STIBP) >> (TIF_STIBP -SPEC_CTRL_STIBP_SHIFT ); +} +static inline unsigned long ssbd_spec_ctrl_to_tif (u64 spec_ctrl) {BUILD_BUG_ON (TIF_SSBD <SPEC_CTRL_SSBD_SHIFT );return (spec_ctrl &SPEC_CTRL_SSBD ) << (TIF_SSBD -SPEC_CTRL_SSBD_SHIFT ); } +static inline unsigned long stibp_spec_ctrl_to_tif (u64 spec_ctrl) +{ +BUILD_BUG_ON (TIF_STIBP <SPEC_CTRL_STIBP_SHIFT ); +return (spec_ctrl &SPEC_CTRL_STIBP ) << (TIF_STIBP -SPEC_CTRL_STIBP_SHIFT ); +} +static inline u64 ssbd_tif_to_amd_ls_cfg (u64 tifn) {return (tifn & _TIF_SSBD) ? x86_amd_ls_cfg_ssbd_mask :0ULL ;
arch/x86/include/asm/thread_info.h +3 -1
@@ -83,6 +83,7 @@ struct thread_info {#define TIF_SYSCALL_EMU 6/* syscall emulation active */ #define TIF_SYSCALL_AUDIT 7/* syscall auditing active */ #define TIF_SECCOMP 8/* secure computing */ +#define TIF_STIBP 9/* Single threaded indirect branch predict */ #define TIF_USER_RETURN_NOTIFY 11/* notify kernel of userspace return */ #define TIF_UPROBE 12/* breakpointed or singlestepping */ #define TIF_PATCH_PENDING 13/* pending live patching update */
@@ -110,6 +111,7 @@ struct thread_info {#define _TIF_SYSCALL_EMU (1 << TIF_SYSCALL_EMU)#define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT)#define _TIF_SECCOMP (1 << TIF_SECCOMP) +#define _TIF_STIBP (1 << TIF_STIBP)#define _TIF_USER_RETURN_NOTIFY (1 << TIF_USER_RETURN_NOTIFY)#define _TIF_UPROBE (1 << TIF_UPROBE)#define _TIF_PATCH_PENDING (1 << TIF_PATCH_PENDING)
@@ -146,7 +148,7 @@ struct thread_info {/* flags to check in __switch_to() */ #define _TIF_WORK_CTXSW \ - (_TIF_IO_BITMAP|_TIF_NOCPUID|_TIF_NOTSC|_TIF_BLOCKSTEP|_TIF_SSBD) + (_TIF_IO_BITMAP|_TIF_NOCPUID|_TIF_NOTSC|_TIF_BLOCKSTEP|_TIF_SSBD|_TIF_STIBP)#define _TIF_WORK_CTXSW_PREV (_TIF_WORK_CTXSW|_TIF_USER_RETURN_NOTIFY)#define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
arch/x86/kernel/cpu/bugs.c +10 -2
@@ -187,6 +187,9 @@ x86_virt_spec_ctrl(u64 guest_spec_ctrl, u64 guest_virt_spec_ctrl, bool setguest) static_cpu_has(X86_FEATURE_AMD_SSBD)) hostval |=ssbd_tif_to_spec_ctrl (ti->flags); +if (static_branch_unlikely (&spectre_v2_app_lite)) + hostval |=stibp_tif_to_spec_ctrl (ti->flags); +if (hostval != guestval) { msrval = setguest ? guestval : hostval;wrmsrl (MSR_IA32_SPEC_CTRL , msrval);
@@ -383,6 +386,11 @@ static enum spectre_v2_mitigation_cmd __init spectre_v2_parse_cmdline(void)static bool stibp_needed (void ) { +/* +* Determine if we want to leave STIBP always on. +* For lite option, we enable STIBP based on a process's +* flag during context switch. +*/ if (static_branch_unlikely (&spectre_v2_app_lite))return false;
@@ -958,14 +966,14 @@ static ssize_t cpu_show_common(struct device *dev, struct device_attribute *attr ret =sprintf (buf,"%s%s%s%s%s%s\n" , spectre_v2_strings[spectre_v2_enabled],boot_cpu_has (X86_FEATURE_USE_IBPB ) ?", IBPB-lite" :"" ,boot_cpu_has (X86_FEATURE_USE_IBRS_FW ) ?", IBRS_FW" :"" , - (x86_spec_ctrl_base &SPEC_CTRL_STIBP ) ?", STIBP" :"" , +", STIBP-lite" ,boot_cpu_has (X86_FEATURE_RSB_CTXSW ) ?", RSB filling" :"" ,spectre_v2_module_string ()); else ret =sprintf (buf,"%s%s%s%s%s%s\n" , spectre_v2_strings[spectre_v2_enabled],boot_cpu_has (X86_FEATURE_USE_IBPB ) ?", IBPB-strict" :"" ,boot_cpu_has (X86_FEATURE_USE_IBRS_FW ) ?", IBRS_FW" :"" , - (x86_spec_ctrl_base &SPEC_CTRL_STIBP ) ?", STIBP" :"" , + (x86_spec_ctrl_base &SPEC_CTRL_STIBP ) ?", STIBP-strict" :"" ,boot_cpu_has (X86_FEATURE_RSB_CTXSW ) ?", RSB filling" :"" ,spectre_v2_module_string ());mutex_unlock (&spec_ctrl_mutex);
arch/x86/kernel/process.c +5 -4
@@ -395,9 +395,10 @@ static __always_inline void amd_set_ssb_virt_state(unsigned long tifn)wrmsrl (MSR_AMD64_VIRT_SPEC_CTRL ,ssbd_tif_to_spec_ctrl (tifn)); } -static __always_inline void intel_set_ssb_state(unsigned long tifn) +static __always_inline void intel_set_spec_ctrl_state(unsigned long tifn) { -u64 msr = x86_spec_ctrl_base |ssbd_tif_to_spec_ctrl (tifn); +u64 msr = x86_spec_ctrl_base |ssbd_tif_to_spec_ctrl (tifn) + |stibp_tif_to_spec_ctrl (tifn);wrmsrl (MSR_IA32_SPEC_CTRL , msr); }
@@ -409,7 +410,7 @@ static __always_inline void __speculative_store_bypass_update(unsigned long tifnelse if (static_cpu_has (X86_FEATURE_LS_CFG_SSBD ))amd_set_core_ssb_state (tifn);else -intel_set_ssb_state (tifn); +intel_set_spec_ctrl_state (tifn); }void speculative_store_bypass_update (unsigned long tif)
@@ -451,7 +452,7 @@ void __switch_to_xtra(struct task_struct *prev_p, struct task_struct *next_p,if ((tifp ^ tifn) & _TIF_NOCPUID)set_cpuid_faulting (!!(tifn & _TIF_NOCPUID)); -if ((tifp ^ tifn) & _TIF_SSBD) +if ((tifp ^ tifn) & (_TIF_SSBD | _TIF_STIBP))__speculative_store_bypass_update (tifn); }
arch/x86/mm/tlb.c +22 -0
@@ -205,6 +205,25 @@ static bool ibpb_needed(struct task_struct *tsk, u64 last_ctx_id)return (__ptrace_may_access (tsk,PTRACE_MODE_IBPB )); } +static void set_stibp (struct task_struct *tsk) +{ +/* +* For lite protection mode, we set STIBP only +* for non-dumpable processes. +*/ + +if (!static_branch_unlikely (&spectre_v2_app_lite)) +return ; + +if (!tsk || !tsk->mm) +return ; + +if (get_dumpable (tsk->mm) !=SUID_DUMP_USER ) +test_and_set_tsk_thread_flag (tsk,TIF_STIBP ); +else +test_and_clear_tsk_thread_flag (tsk,TIF_STIBP ); +} +void switch_mm_irqs_off (struct mm_struct *prev,struct mm_struct *next,struct task_struct *tsk) {
@@ -296,6 +315,9 @@ void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next, ibpb_needed(tsk, last_ctx_id))indirect_branch_prediction_barrier (); +if (static_cpu_has (X86_FEATURE_STIBP )) +set_stibp (tsk); +if (IS_ENABLED (CONFIG_VMAP_STACK )) {/* * If our current stack is in vmalloc space and isn't
Signature · 1 line
2.9.4
Peter Zijlstra
maintainerRe: [PATCH 2/2] x86/speculation: Provide application property based STIBP protection
arch/x86/mm/tlb.c static bool ibpb_needed(struct task_struct *tsk, u64 last_ctx_id) · line 225
Quoted 5 lines · Tim Chen
arch/x86/mm/tlb.c +5
-0+if (get_dumpable (tsk->mm) !=SUID_DUMP_USER ) +test_and_set_tsk_thread_flag (tsk,TIF_STIBP ); +else +test_and_clear_tsk_thread_flag (tsk,TIF_STIBP ); +}
s/test_and_//
Re: [PATCH 2/2] x86/speculation: Provide application property based STIBP protection
Quoted 9 lines · Peter Zijlstra
arch/x86/mm/tlb.c static bool ibpb_needed(struct task_struct *tsk, u64 last_ctx_id) · line 225
Quoted 5 lines · Tim Chen
arch/x86/mm/tlb.c +5
-0+if (get_dumpable (tsk->mm) !=SUID_DUMP_USER ) +test_and_set_tsk_thread_flag (tsk,TIF_STIBP ); +else +test_and_clear_tsk_thread_flag (tsk,TIF_STIBP ); +}s/test_and_//
Ah yes. Will update this.
Tim
Peter Zijlstra
maintainerRe: [PATCH 2/2] x86/speculation: Provide application property based STIBP protection
In reply to Tim ChenQuoted 5 lines · Tim Chen
This patch provides an application property based
spectre_v2protection with STIBP against attack from another app from a sibling hyper-thread. For security sensitive non-dumpable app, STIBP will be turned on before switching to it for Intel processors vulnerable tospectre_v2.
Why does that non dumpable thing make sense? Why not use the same prctl() we already use for SSBD?
Re: [PATCH 2/2] x86/speculation: Provide application property based STIBP protection
Quoted 10 lines · Peter Zijlstra
Quoted 5 lines · Tim Chen
This patch provides an application property based
spectre_v2protection with STIBP against attack from another app from a sibling hyper-thread. For security sensitive non-dumpable app, STIBP will be turned on before switching to it for Intel processors vulnerable tospectre_v2.Why does that non dumpable thing make sense? Why not use the same
prctl()we already use for SSBD?
Something like the following?
prctl(PR_GET_SPECULATION_CTRL, PR_SPEC_SPECTREV2_APP, 0, 0, 0); prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_SPECTREV2_APP, PR_SPEC_ENABLE, 0, 0); prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_SPECTREV2_APP, PR_SPEC_DISABLE, 0, 0); prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_SPECTREV2_APP, PR_SPEC_FORCE_DISABLE, 0, 0);
People may have already made changes to their app using non-dumpable to mitigate app-app attack. So I think we should still protect the non-dumpable processes so they don't have to change their application code.
Tim
Re: [PATCH 2/2] x86/speculation: Provide application property based STIBP protection
In reply to Tim ChenQuoted 5 lines · Tim Chen
This patch provides an application property based
spectre_v2protection with STIBP against attack from another app from a sibling hyper-thread. For security sensitive non-dumpable app, STIBP will be turned on before switching to it for Intel processors vulnerable tospectre_v2.
A general comment. I think in practice this will be similar to the speculative store buffer bypass (aka "variant 4") issue in terms of opt-in mitigation. Many users won't want to take the performance hit of having STIBP by default for peer threads. We should make sure that we don't force users into a mitigation but retain an option. Whether it's default-on or not can be debated, though I think the vendors lean toward having default-off with an opt-in, and customers will probably agree. So anyway, I encourage a pragmatic approach similar to that for SSBD.
Jon.
Signature · 1 line
Computer Architect | Sent with my Fedora powered laptop
Re: [PATCH 2/2] x86/speculation: Provide application property based STIBP protection
Quoted 6 lines · Jon Masters
Quoted 5 lines
This patch provides an application property based
spectre_v2protection with STIBP against attack from another app from a sibling hyper-thread. For security sensitive non-dumpable app, STIBP will be turned on before switching to it for Intel processors vulnerable tospectre_v2.
Quoted 8 lines
A general comment. I think in practice this will be similar to the speculative store buffer bypass (aka "variant 4") issue in terms of opt-in mitigation. Many users won't want to take the performance hit of having STIBP by default for peer threads. We should make sure that we don't force users into a mitigation but retain an option. Whether it's default-on or not can be debated, though I think the vendors lean toward having default-off with an opt-in, and customers will probably agree. So anyway, I encourage a pragmatic approach similar to that for SSBD.
Which is what Tim's patchset is implementing on top.
Thanks,
Signature · 2 lines
Jiri Kosina SUSE Labs
Re: [PATCH 2/2] x86/speculation: Provide application property based STIBP protection
Quick reply: I agree, I'm just supporting this :)
Signature · 1 line
Computer Architect
Quoted 27 lines · Jiri Kosina
Quoted 6 lines · Jon Masters
Quoted 5 lines
This patch provides an application property based
spectre_v2protection with STIBP against attack from another app from a sibling hyper-thread. For security sensitive non-dumpable app, STIBP will be turned on before switching to it for Intel processors vulnerable tospectre_v2.Quoted 8 lines
A general comment. I think in practice this will be similar to the speculative store buffer bypass (aka "variant 4") issue in terms of opt-in mitigation. Many users won't want to take the performance hit of having STIBP by default for peer threads. We should make sure that we don't force users into a mitigation but retain an option. Whether it's default-on or not can be debated, though I think the vendors lean toward having default-off with an opt-in, and customers will probably agree. So anyway, I encourage a pragmatic approach similar to that for SSBD.
Which is what Tim's patchset is implementing on top.
Thanks,
Signature · 2 lines
Jiri Kosina SUSE Labs
Quoted 28 lines · Tim Chen
This patchset provides an option to apply IBPB and STIBP mitigation to only non-dumpable processes.
Jiri's patch to harden
spectre_v2makes IBPB and STIBP available for general spectre v2 app to app mitigation. IBPB will be issued for switching to an app that's not ptraceable by the previous app and STIBP will be always turned on.However, leaving STIBP on all the time is expensive for certain applications that have frequent indirect branches. One such application is perlbench in the SpecInt Rate 2006 test suite which shows a 21% reduction in throughput. Other application like bzip2 in the same test suite with minimal indirct branches have
only a 0.7% reduction in throughput. IBPB will also impose overhead during context switches.App to app exploit is in general difficult
due to address space layout randomization in apps and
the need to know an app's address space layout ahead of time. Users may not wish to incur app to app performance overhead from IBPB and STIBP for general non security sensitive apps and use these mitigations only for non-dumpable apps.The first patch provides a lite option for
spectre_v2app to app mitigation where IBPB is only issued for security sensitive non-dumpable app. The second patch extends this option where STIBP is only issued for non-dumpable app.
Quoted 4 lines
The changes apply to intel cpus affected by
spectre_v2. Tom, can you update the STIBP changes for AMD cpus on__speculative_store_bypass_updateandx86_virt_spec_ctrlto update theSPEC_CTRLmsr for AMD cpu?
Hi Tim,
Let me think about this a bit, since it can get a bit tricky if I want to avoid multiple MSR writes when only one may have been needed (assuming SSBD is not using the SPEC_CTRL MSR).
Thanks,
Tom
Quoted 19 lines
Thanks.
Tim
Tim Chen (2):
x86/speculation: Option to select app to app mitigation forspectre_v2x86/speculation: Provide application property based STIBP protectionDocumentation/admin-guide/kernel-parameters.txt | 11 +++ arch/x86/include/asm/msr-index.h | 3 +- arch/x86/include/asm/nospec-branch.h | 9 ++ arch/x86/include/asm/spec-ctrl.h | 12 +++ arch/x86/include/asm/thread_info.h | 4 +- arch/x86/kernel/cpu/bugs.c | 105 ++++++++++++++++++++++-- arch/x86/kernel/process.c | 9 +- arch/x86/mm/tlb.c | 41 ++++++++- 8 files changed, 179 insertions(+), 15 deletions(-)
Quoted 34 lines · Thomas
Quoted 28 lines · Tim Chen
This patchset provides an option to apply IBPB and STIBP mitigation to only non-dumpable processes.
Jiri's patch to harden
spectre_v2makes IBPB and STIBP available for general spectre v2 app to app mitigation. IBPB will be issued for switching to an app that's not ptraceable by the previous app and STIBP will be always turned on.However, leaving STIBP on all the time is expensive for certain applications that have frequent indirect branches. One such application is perlbench in the SpecInt Rate 2006 test suite which shows a 21% reduction in throughput. Other application like bzip2 in the same test suite with minimal indirct branches have
only a 0.7% reduction in throughput. IBPB will also impose overhead during context switches.App to app exploit is in general difficult
due to address space layout randomization in apps and
the need to know an app's address space layout ahead of time. Users may not wish to incur app to app performance overhead from IBPB and STIBP for general non security sensitive apps and use these mitigations only for non-dumpable apps.The first patch provides a lite option for
spectre_v2app to app mitigation where IBPB is only issued for security sensitive non-dumpable app. The second patch extends this option where STIBP is only issued for non-dumpable app.Quoted 4 lines
The changes apply to intel cpus affected by
spectre_v2. Tom, can you update the STIBP changes for AMD cpus on__speculative_store_bypass_updateandx86_virt_spec_ctrlto update theSPEC_CTRLmsr for AMD cpu?
Quoted 5 lines
Hi Tim,
Let me think about this a bit, since it can get a bit tricky if I want to avoid multiple MSR writes when only one may have been needed (assuming SSBD is not using the
SPEC_CTRLMSR).
I think something along the lines of the following would work and prevent any extra MSR writes for AMD when SSBD is not using the SPEC_CTRL MSR. Let me know what you think (tglx, especially, since he was heavily involved in this part):
arch/x86/kernel/process.c +44 -12
@@ -397,26 +397,59 @@ static __always_inline void amd_set_ssb_virt_state(unsigned long tifn) static __always_inline void intel_set_spec_ctrl_state(unsigned long tifn) { -u64 msr = x86_spec_ctrl_base |ssbd_tif_to_spec_ctrl (tifn) - |stibp_tif_to_spec_ctrl (tifn); +u64 msr = x86_spec_ctrl_base; + +/* +* AMD we may have used a different method to update SSBD, so +* we need to be sure we are using the SPEC_CTRL MSR for SSBD. +*/ +if (static_cpu_has (X86_FEATURE_SSBD )) + x86_spec_ctrl_base |=ssbd_tif_to_spec_ctrl (tifn); + + x86_spec_ctrl_base |=stibp_tif_to_spec_ctrl (tifn);wrmsrl (MSR_IA32_SPEC_CTRL , msr); } -static __always_inline void __speculative_store_bypass_update(unsigned long tifn) +static __always_inline void __speculative_store_bypass_update(unsigned long tifp, +unsigned long tifn) { -if (static_cpu_has (X86_FEATURE_VIRT_SSBD )) -amd_set_ssb_virt_state (tifn); -else if (static_cpu_has (X86_FEATURE_LS_CFG_SSBD )) -amd_set_core_ssb_state (tifn); -else -intel_set_spec_ctrl_state (tifn); +bool stibp = !!((tifp ^ tifn) & _TIF_STIBP); +bool ssbd = !!((tifp ^ tifn) & _TIF_SSBD); + +if (!ssbd && !stibp) +return ; + +if (ssbd) { +/* +* For AMD, try these methods first. The ssbd variable will +* reflect if the SPEC_CTRL MSR method is needed. +*/ + ssbd = false; + +if (static_cpu_has (X86_FEATURE_VIRT_SSBD )) +amd_set_ssb_virt_state (tifn); +else if (static_cpu_has (X86_FEATURE_LS_CFG_SSBD )) +amd_set_core_ssb_state (tifn); +else + ssbd = true; + } + +/* Avoid a possible extra MSR write, recheck the flags */ +if (!ssbd && !stibp) +return ; + +intel_set_spec_ctrl_state (tifn); }void speculative_store_bypass_update (unsigned long tif) { +/* +* On this path we're forcing the update, so use ~tif as the +* previous flags. +*/ preempt_disable (); -__speculative_store_bypass_update (tif); +__speculative_store_bypass_update (~tif, tif);preempt_enable (); }
@@ -452,8 +485,7 @@ void __switch_to_xtra(struct task_struct *prev_p, struct task_struct *next_p,if ((tifp ^ tifn) & _TIF_NOCPUID)set_cpuid_faulting (!!(tifn & _TIF_NOCPUID)); -if ((tifp ^ tifn) & (_TIF_SSBD | _TIF_STIBP)) -__speculative_store_bypass_update (tifn); +__speculative_store_bypass_update (tifp, tifn); }/*
Thanks,
Tom
Quoted 23 lines
Thanks,
TomQuoted 19 lines
Thanks.
Tim
Tim Chen (2):
x86/speculation: Option to select app to app mitigation forspectre_v2x86/speculation: Provide application property based STIBP protectionDocumentation/admin-guide/kernel-parameters.txt | 11 +++ arch/x86/include/asm/msr-index.h | 3 +- arch/x86/include/asm/nospec-branch.h | 9 ++ arch/x86/include/asm/spec-ctrl.h | 12 +++ arch/x86/include/asm/thread_info.h | 4 +- arch/x86/kernel/cpu/bugs.c | 105 ++++++++++++++++++++++-- arch/x86/kernel/process.c | 9 +- arch/x86/mm/tlb.c | 41 ++++++++- 8 files changed, 179 insertions(+), 15 deletions(-)
arch/x86/kernel/process.c static __always_inline void amd_set_ssb_virt_state(unsigned long tifn) · line 412
Quoted 8 lines · Thomas
arch/x86/kernel/process.c +4
-0+if (static_cpu_has (X86_FEATURE_SSBD )) + x86_spec_ctrl_base |=ssbd_tif_to_spec_ctrl (tifn); + + x86_spec_ctrl_base |=stibp_tif_to_spec_ctrl (tifn);wrmsrl (MSR_IA32_SPEC_CTRL , msr); }
Should this part be s/x86_spec_ctrl_base/msr/ ?
Tim
Quoted 8 lines · Tim Chen
Quoted 5 lines · Thomas
arch/x86/kernel/process.c +4
-0+if (static_cpu_has (X86_FEATURE_SSBD )) + x86_spec_ctrl_base |=ssbd_tif_to_spec_ctrl (tifn); + + x86_spec_ctrl_base |=stibp_tif_to_spec_ctrl (tifn);
Quoted 5 lines
Quoted 3 lines
wrmsrl(MSR_IA32_SPEC_CTRL, msr);
}Should this part be s/x86_spec_ctrl_base/msr/ ?
Yup, I messed up. Those should "msr |=", not x86_spec_ctrl_base.
Thanks,
Tom
Quoted 3 lines
Tim