mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
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 unhelpful, 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: 689ad48ce9 ('x86/spec-ctrl: Wire up the Native-BHI software sequences')
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
master commit: 049ab0b2c9
master date: 2024-04-25 16:35:56 +0200
This commit is contained in:
Roger Pau Monné authored and Jan Beulich committed
1 parent
eb7059767c
commit
0b0c7dca70
1 file changed
+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",
|
||||
|
||||