x86/spec: misc fixes for XSA-456
v2 cover x86/spec: misc fixes for XSA-456
Hello,
Fix patch fixing the printing of whether BHB-entry is used for PV or HVM, second patch refines a bit the logic to decide whether the lfence on entry can be elided for the entry points.
Thanks, Roger.
Roger Pau Monne (2):
x86/spec: fix reporting of BHB clearing usage from guest entry points x86/spec: adjust logic to logic that elides lfence
xen/arch/x86/include/asm/cpufeature.h | 3 --- xen/arch/x86/spec_ctrl.c | 14 +++++++------- 2 files changed, 7 insertions(+), 10 deletions(-)
Signature · 1 line
2.44.0
PATCH v2 1/2 x86/spec: fix reporting of BHB clearing usage from guest entry points
Reporting whether the BHB clearing on entry is done for the different domains types based on cpu_has_bhb_seq is incorrect, as that variable signals whether there's a BHB clearing sequence selected, but that alone doesn't imply that such sequence is used from the PV and/or HVM entry points.
Instead use opt_bhb_entry_{pv,hvm} which do signal whether BHB clearing is performed on entry from PV/HVM.
---
Changes since v1:
- Also fix usage of cpu_has_bhb_seq when deciding whether to print "None".
--- xen/arch/x86/spec_ctrl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
xen/arch/x86/spec_ctrl.c +4 -4
@@ -634,7 +634,7 @@ static void __init print_details(enum ind_thunk thunk) (boot_cpu_has (X86_FEATURE_SC_MSR_HVM ) ||boot_cpu_has (X86_FEATURE_SC_RSB_HVM ) ||boot_cpu_has (X86_FEATURE_IBPB_ENTRY_HVM ) || - cpu_has_bhb_seq || amd_virt_spec_ctrl || + opt_bhb_entry_hvm || amd_virt_spec_ctrl || opt_eager_fpu || opt_verw_hvm) ?"" :" None" , boot_cpu_has(X86_FEATURE_SC_MSR_HVM) ? " MSR_SPEC_CTRL" : "", (boot_cpu_has(X86_FEATURE_SC_MSR_HVM) ||
@@ -643,7 +643,7 @@ static void __init print_details(enum ind_thunk thunk) opt_eager_fpu ?" EAGER_FPU" :"" , opt_verw_hvm ?" VERW" :"" ,boot_cpu_has (X86_FEATURE_IBPB_ENTRY_HVM ) ?" IBPB-entry" :"" , - cpu_has_bhb_seq ? " BHB-entry" : ""); + opt_bhb_entry_hvm ? " BHB-entry" : "");#endif #ifdef CONFIG_PV
@@ -651,14 +651,14 @@ static void __init print_details(enum ind_thunk thunk) (boot_cpu_has (X86_FEATURE_SC_MSR_PV ) ||boot_cpu_has (X86_FEATURE_SC_RSB_PV ) ||boot_cpu_has (X86_FEATURE_IBPB_ENTRY_PV ) || - cpu_has_bhb_seq || + opt_bhb_entry_pv || opt_eager_fpu || opt_verw_pv) ?"" :" None" ,boot_cpu_has (X86_FEATURE_SC_MSR_PV ) ?" MSR_SPEC_CTRL" :"" ,boot_cpu_has (X86_FEATURE_SC_RSB_PV ) ?" RSB" :"" , opt_eager_fpu ?" EAGER_FPU" :"" , opt_verw_pv ?" VERW" :"" ,boot_cpu_has (X86_FEATURE_IBPB_ENTRY_PV ) ?" IBPB-entry" :"" , - cpu_has_bhb_seq ? " BHB-entry" : ""); + opt_bhb_entry_pv ? " BHB-entry" : ""); printk(" XPTI (64-bit PV only): Dom0 %s, DomU %s (with%s PCID)\n", opt_xpti_hwdom ? "enabled" : "disabled",
Signature · 1 line
2.44.0
Re: [PATCH v2 1/2] x86/spec: fix reporting of BHB clearing usage from guest entry points
Quoted 10 lines · Roger Pau Monne
Reporting whether the BHB clearing on entry is done for the different domains types based on
cpu_has_bhb_seqis incorrect, as that variable signals whether there's a BHB clearing sequence selected, but that alone doesn't imply that such sequence is used from the PV and/or HVM entry points.Instead use opt_bhb_entry_{pv,hvm} which do signal whether BHB clearing is performed on entry from PV/HVM.
Fixes 689ad48ce9cf ('x86/spec-ctrl: Wire up the Native-BHI software sequences')Signed-off-by Roger Pau Monné <[email protected]>
This looks correct to me, so:
But since Andrew indicated concerns, I won't mark it (locally) for being ready to go in.
Jan
Re: [PATCH v2 1/2] x86/spec: fix reporting of BHB clearing usage from guest entry points
In reply to Roger Pau MonneQuoted 2 lines · Roger Pau Monne
Reporting whether the BHB clearing on entry is done for the different domains types based on
cpu_has_bhb_seqis incorrect, as that variable signals whether
I'd prefer s/incorrect/unhelpful/ here.
As pointed out, it's currently like IBPB-entry in this regard, identifying whether the block is in place; not whether it's used by the condition.
Quoted 5 lines
there's a BHB clearing sequence selected, but that alone doesn't imply that such sequence is used from the PV and/or HVM entry points.
Instead use opt_bhb_entry_{pv,hvm} which do signal whether BHB clearing is performed on entry from PV/HVM.
I was going to ask for a note about dom0, but instead I need to make a correction to the cmdline docs. I'll do that in a separate patch.
Quoted 2 lines
Fixes 689ad48ce9cf ('x86/spec-ctrl: Wire up the Native-BHI software sequences')Signed-off-by Roger Pau Monné <[email protected]>
Can make the one tweak on commit.
PATCH v2 2/2 x86/spec: adjust logic to logic that elides lfence
In reply to Roger Pau MonneIt's currently too restrictive by just checking whether there's a BHB clearing sequence selected. It should instead check whether BHB clearing is used on entry from PV or HVM specifically.
Switch to use opt_bhb_entry_{pv,hvm} instead, and then remove cpu_has_bhb_seq since it no longer has any users.
---
Changes since v1:
- New in this version.
There (possibly) still a bit of overhead for dom0 if BHB clearing is not used for dom0, as Xen would still add the lfence if domUs require it.
--- xen/arch/x86/include/asm/cpufeature.h | 3 --- xen/arch/x86/spec_ctrl.c | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-)
xen/arch/x86/include/asm/cpufeature.h +0 -3
@@ -235,9 +235,6 @@ static inline bool boot_cpu_has(unsigned int feat)#define cpu_bug_fpu_ptrs boot_cpu_has(X86_BUG_FPU_PTRS)#define cpu_bug_null_seg boot_cpu_has(X86_BUG_NULL_SEG) -#define cpu_has_bhb_seq (boot_cpu_has(X86_SPEC_BHB_TSX) || \ - boot_cpu_has(X86_SPEC_BHB_LOOPS)) -enum _cache_type {CACHE_TYPE_NULL =0 ,CACHE_TYPE_DATA =1 ,
xen/arch/x86/spec_ctrl.c +3 -3
@@ -2328,7 +2328,7 @@ void __init init_speculation_mitigations(void)* unconditional WRMSR. If we do have it, or we're not using any * prior conditional block, then it's safe to drop the LFENCE. */ -if ( !cpu_has_bhb_seq && +if ( !opt_bhb_entry_pv && (boot_cpu_has (X86_FEATURE_SC_MSR_PV ) || !boot_cpu_has (X86_FEATURE_IBPB_ENTRY_PV )) )setup_force_cpu_cap (X86_SPEC_NO_LFENCE_ENTRY_PV );
@@ -2344,7 +2344,7 @@ void __init init_speculation_mitigations(void)* active in the block that is skipped when interrupting guest * context, then it's safe to drop the LFENCE. */ -if ( !cpu_has_bhb_seq && +if ( !opt_bhb_entry_pv && (boot_cpu_has (X86_FEATURE_SC_MSR_PV ) || (!boot_cpu_has (X86_FEATURE_IBPB_ENTRY_PV ) && !boot_cpu_has (X86_FEATURE_SC_RSB_PV ))) )
@@ -2356,7 +2356,7 @@ void __init init_speculation_mitigations(void)* A BHB sequence, if used, is the only conditional action, so if we * don't have it, we don't need the safety LFENCE. */ -if ( !cpu_has_bhb_seq ) +if ( !opt_bhb_entry_hvm )setup_force_cpu_cap (X86_SPEC_NO_LFENCE_ENTRY_VMX ); }
Signature · 1 line
2.44.0
Re: [PATCH v2 2/2] x86/spec: adjust logic to logic that elides lfence
Quoted 10 lines · Roger Pau Monne
It's currently too restrictive by just checking whether there's a BHB clearing sequence selected. It should instead check whether BHB clearing is used on entry from PV or HVM specifically.
Switch to use opt_bhb_entry_{pv,hvm} instead, and then remove
cpu_has_bhb_seqsince it no longer has any users.Reported-by Jan Beulich <[email protected]>Fixes 954c983abcee ('x86/spec-ctrl: Software BHB-clearing sequences')Signed-off-by Roger Pau Monné <[email protected]>
Except for the odd double "logic" in the title:
I can't really guess what is meant instead, so in order to possibly adjust while committing I'll need a hint. But committing will want to wait until Andrew has taken a look anyway, just like for patch 1.
Quoted 2 lines
There (possibly) still a bit of overhead for dom0 if BHB clearing is not used for dom0, as Xen would still add the lfence if domUs require it.
Right, but what do you do.
xen/arch/x86/include/asm/cpufeature.h static inline bool boot_cpu_has(unsigned int feat) · line 239
Quoted 8 lines
xen/arch/x86/include/asm/cpufeature.h +0
-2@@ -235,9 +235,6 @@ static inline bool boot_cpu_has(unsigned int feat)#define cpu_bug_fpu_ptrs boot_cpu_has(X86_BUG_FPU_PTRS)#define cpu_bug_null_seg boot_cpu_has(X86_BUG_NULL_SEG) -#define cpu_has_bhb_seq (boot_cpu_has(X86_SPEC_BHB_TSX) || \ - boot_cpu_has(X86_SPEC_BHB_LOOPS))
Might be worth also mentioning in the description that this construct was lacking use of X86_SPEC_BHB_LOOPS_LONG (might even warrant a 2nd Fixes:
tag).
Jan
Re: [PATCH v2 2/2] x86/spec: adjust logic to logic that elides lfence
Quoted 8 lines · Jan Beulich
Quoted 7 lines · Roger Pau Monne
It's currently too restrictive by just checking whether there's a BHB clearing sequence selected. It should instead check whether BHB clearing is used on entry from PV or HVM specifically.
Switch to use opt_bhb_entry_{pv,hvm} instead, and then remove
cpu_has_bhb_seqsince it no longer has any users.
Quoted 6 lines
Quoted 3 lines
Reported-by Jan Beulich <[email protected]>Fixes 954c983abcee ('x86/spec-ctrl: Software BHB-clearing sequences')Signed-off-by Roger Pau Monné <[email protected]>Except for the odd double "logic" in the title:
Reviewed-by Jan Beulich <[email protected]>
Thanks, title should be:
"adjust logic that elides lfence"
It was just a typo, I didn't intended to express anything additional.
Quoted 15 lines
I can't really guess what is meant instead, so in order to possibly adjust while committing I'll need a hint. But committing will want to wait until Andrew has taken a look anyway, just like for patch 1.
Quoted 2 lines
There (possibly) still a bit of overhead for dom0 if BHB clearing is not used for dom0, as Xen would still add the lfence if domUs require it.
Right, but what do you do.
Quoted 6 lines
xen/arch/x86/include/asm/cpufeature.h +0
-0@@ -235,9 +235,6 @@ static inline bool boot_cpu_has(unsigned int feat)#define cpu_bug_fpu_ptrs boot_cpu_has(X86_BUG_FPU_PTRS)#define cpu_bug_null_seg boot_cpu_has(X86_BUG_NULL_SEG)
Quoted 6 lines
xen/arch/x86/include/asm/cpufeature.h static inline bool boot_cpu_has(unsigned int feat) · line 239
Quoted 2 lines
xen/arch/x86/include/asm/cpufeature.h +0
-2-#define cpu_has_bhb_seq (boot_cpu_has(X86_SPEC_BHB_TSX) || \ - boot_cpu_has(X86_SPEC_BHB_LOOPS))Might be worth also mentioning in the description that this construct was lacking use of
X86_SPEC_BHB_LOOPS_LONG(might even warrant a 2nd Fixes:
tag).
Heh, no, X86_SPEC_BHB_LOOPS_LONG is added in addition toX86_SPEC_BHB_LOOPS. When using long loops we have bothX86_SPEC_BHB_LOOPS and X86_SPEC_BHB_LOOPS_LONG set (I know it's confusing, I was also confused the first time and asked Andrew the same question). See the fallthrough in bhi_calculations().
Thanks, Roger.
Re: [PATCH v2 2/2] x86/spec: adjust logic to logic that elides lfence
Quoted 15 lines · Roger Pau Monné
Quoted 7 lines · Jan Beulich
Quoted 6 lines · Roger Pau Monne
xen/arch/x86/include/asm/cpufeature.h +0
-0@@ -235,9 +235,6 @@ static inline bool boot_cpu_has(unsigned int feat)#define cpu_bug_fpu_ptrs boot_cpu_has(X86_BUG_FPU_PTRS)#define cpu_bug_null_seg boot_cpu_has(X86_BUG_NULL_SEG)Quoted 6 lines
xen/arch/x86/include/asm/cpufeature.h static inline bool boot_cpu_has(unsigned int feat) · line 239
Quoted 2 lines
xen/arch/x86/include/asm/cpufeature.h +0
-2-#define cpu_has_bhb_seq (boot_cpu_has(X86_SPEC_BHB_TSX) || \ - boot_cpu_has(X86_SPEC_BHB_LOOPS))Might be worth also mentioning in the description that this construct was lacking use of
X86_SPEC_BHB_LOOPS_LONG(might even warrant a 2nd Fixes:
tag).
Quoted 5 lines
Heh, no,
X86_SPEC_BHB_LOOPS_LONGis added in addition toX86_SPEC_BHB_LOOPS. When using long loops we have bothX86_SPEC_BHB_LOOPSandX86_SPEC_BHB_LOOPS_LONGset (I know it's confusing, I was also confused the first time and asked Andrew the same question). See the fallthrough inbhi_calculations().
Oh, I see.
Andrew: This is a very good example of the separating blank line being misleading when fall-through is intended.
Jan
Re: [PATCH v2 2/2] x86/spec: adjust logic to logic that elides lfence
In reply to Roger Pau MonneQuoted 10 lines · Roger Pau Monne
It's currently too restrictive by just checking whether there's a BHB clearing sequence selected. It should instead check whether BHB clearing is used on entry from PV or HVM specifically.
Switch to use opt_bhb_entry_{pv,hvm} instead, and then remove
cpu_has_bhb_seqsince it no longer has any users.Reported-by Jan Beulich <[email protected]>Fixes 954c983abcee ('x86/spec-ctrl: Software BHB-clearing sequences')Signed-off-by Roger Pau Monné <[email protected]>
Quoted 6 lines
---
Changes since v1:
- New in this version.There (possibly) still a bit of overhead for dom0 if BHB clearing is not used for dom0, as Xen would still add the lfence if domUs require it.
This is the note about dom0 that I made on the previous patch.
"protect dom0" only has any effect if the appropriate foo_pv or foo_hvm is also selected. It's not possible to express "protect dom0 but not domU of $TYPE".
This early on boot we have no idea whether dom0 is going to be PV or HVM. We could in principle figure it out by peeking at dom0's ELF notes, but that needs a lot of rearranging of __start_xen() to do safely.