MSR_IA32_ARCH_CAPABILITIES cleanups
v2 cover MSR_IA32_ARCH_CAPABILITIES cleanups
Do some cleanups about MSR_IA32_ARCH_CAPABILITIES in KVM e.g, fix stale comments, elimite open-coded MSR reads, track features that can be exposed to guests to avoid computing them runtime. They are found when reading the code.
No functional change intented.
Changes from v1 -> v2:
1. toggle ARCH_CAP_SKIP_VMENTRY_L1DFLUSH bit when l1tf mitigation state is changed by module param. [Xiaoyao, Sean]
2. add more cleanups (patch 2/3)
Chao Gao (3):
KVM: x86: Track supported ARCH_CAPABILITIES in kvm_caps
KVM: x86: Correct the name for skipping VMENTER l1d flush x86/cpu, KVM: Use helper function to read MSR_IA32_ARCH_CAPABILITIES
arch/x86/kernel/cpu/common.c | 1 + arch/x86/kvm/vmx/vmx.c | 44 +++++++++++++++++++++++------------- arch/x86/kvm/x86.c | 16 +++++-------- arch/x86/kvm/x86.h | 1 + 4 files changed, 36 insertions(+), 26 deletions(-)
base-commit: b9846a698c9aff4eb2214a06ac83638ad098f33f
Signature · 1 line
2.40.0
PATCH v2 1/3 KVM: x86: Track supported ARCH_CAPABILITIES in kvm_caps
to avoid computing the supported value at runtime every time.
Toggle the ARCH_CAP_SKIP_VMENTRY_L1DFLUSH bit when l1tf_vmx_mitigation is modified to achieve the same result as runtime computing.
Opportunistically, add a comment to document the problem of allowing changing the supported value of ARCH_CAPABILITIES and the reason why we don't fix it.
No functional change intended.
--- arch/x86/kvm/vmx/vmx.c | 25 +++++++++++++++++++++++-- arch/x86/kvm/x86.c | 7 ++++--- arch/x86/kvm/x86.h | 1 + 3 files changed, 28 insertions(+), 5 deletions(-)
arch/x86/kvm/vmx/vmx.c +23 -2
@@ -309,10 +309,31 @@ static int vmx_setup_l1d_flush(enum vmx_l1d_flush_state l1tf) l1tf_vmx_mitigation = l1tf; -if (l1tf !=VMENTER_L1D_FLUSH_NEVER ) +/* +* Update static keys and supported arch capabilities according to +* the new mitigation state. +* +* ARCH_CAP_SKIP_VMENTRY_L1DFLUSH is toggled because if we do cache +* flushes for L1 guests on (nested) vmlaunch/vmresume to L2, L1 +* guests can skip the flush and if we don't, then L1 guests need +* to do a flush. +* +* Toggling ARCH_CAP_SKIP_VMENTRY_L1DFLUSH may present inconsistent +* model to the guest, e.g., if userspace isn't careful, a VM can +* have vCPUs with different values for ARCH_CAPABILITIES. But +* there is almost no chance to fix the issue. Because, to present +* a consistent model, KVM essentially needs to disallow changing +* the module param after VMs/vCPUs have been created, but that +* would prevent userspace from toggling the param while VMs are +* running, e.g., in response to a new vulnerability. +*/ +if (l1tf !=VMENTER_L1D_FLUSH_NEVER ) {static_branch_enable (&vmx_l1d_should_flush); -else + kvm_caps.supported_arch_cap |=ARCH_CAP_SKIP_VMENTRY_L1DFLUSH ; + }else {static_branch_disable (&vmx_l1d_should_flush); + kvm_caps.supported_arch_cap &= ~ARCH_CAP_SKIP_VMENTRY_L1DFLUSH ; + }if (l1tf ==VMENTER_L1D_FLUSH_COND )static_branch_enable (&vmx_l1d_flush_cond);
arch/x86/kvm/x86.c +4 -3
@@ -1672,7 +1672,7 @@ static int kvm_get_msr_feature(struct kvm_msr_entry *msr) {switch (msr->index) {case MSR_IA32_ARCH_CAPABILITIES : - msr->data =kvm_get_arch_capabilities (); + msr->data = kvm_caps.supported_arch_cap;break ;case MSR_IA32_PERF_CAPABILITIES : msr->data = kvm_caps.supported_perf_cap;
@@ -7156,7 +7156,7 @@ static void kvm_probe_msr_to_save(u32 msr_index)return ;break ;case MSR_IA32_TSX_CTRL : -if (!(kvm_get_arch_capabilities () &ARCH_CAP_TSX_CTRL_MSR )) +if (!(kvm_caps.supported_arch_cap &ARCH_CAP_TSX_CTRL_MSR ))return ;break ;default :
@@ -9532,6 +9532,7 @@ static int __kvm_x86_vendor_init(struct kvm_x86_init_ops *ops) kvm_caps.max_guest_tsc_khz = max; } kvm_caps.default_tsc_scaling_ratio =1ULL << kvm_caps.tsc_scaling_ratio_frac_bits; + kvm_caps.supported_arch_cap =kvm_get_arch_capabilities ();kvm_init_msr_lists ();return 0 ;
@@ -11895,7 +11896,7 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)if (r) goto free_guest_fpu; - vcpu->arch.arch_capabilities =kvm_get_arch_capabilities (); + vcpu->arch.arch_capabilities = kvm_caps.supported_arch_cap; vcpu->arch.msr_platform_info =MSR_PLATFORM_INFO_CPUID_FAULT ;kvm_xen_init_vcpu (vcpu);kvm_vcpu_mtrr_init (vcpu);
arch/x86/kvm/x86.h +1 -0
@@ -29,6 +29,7 @@ struct kvm_caps {u64 supported_xcr0;u64 supported_xss;u64 supported_perf_cap; +u64 supported_arch_cap; };void kvm_spurious_fault (void );
Signature · 1 line
2.40.0
Re: [PATCH v2 1/3] KVM: x86: Track supported ARCH_CAPABILITIES in kvm_caps
Quoted 4 lines · Chao Gao
to avoid computing the supported value at runtime every time.
Toggle the
ARCH_CAP_SKIP_VMENTRY_L1DFLUSHbit whenl1tf_vmx_mitigationis modified to achieve the same result as runtime computing.
It's not the same result.
In kvm_get_arch_capabilities(), host's value is honored. I.e., when host supports ARCH_CAP_SKIP_VMENTRY_L1DFLUSH, l1tf_vmx_mitigation doesn't make any difference to the result.
Quoted 104 lines
Opportunistically, add a comment to document the problem of allowing changing the supported value of
ARCH_CAPABILITIESand the reason why we don't fix it.No functional change intended.
Signed-off-by Chao Gao <[email protected]>--- arch/x86/kvm/vmx/vmx.c | 25 +++++++++++++++++++++++-- arch/x86/kvm/x86.c | 7 ++++--- arch/x86/kvm/x86.h | 1 + 3 files changed, 28 insertions(+), 5 deletions(-)arch/x86/kvm/vmx/vmx.c +23
-2@@ -309,10 +309,31 @@ static int vmx_setup_l1d_flush(enum vmx_l1d_flush_state l1tf) l1tf_vmx_mitigation = l1tf; -if (l1tf !=VMENTER_L1D_FLUSH_NEVER ) +/* +* Update static keys and supported arch capabilities according to +* the new mitigation state. +* +* ARCH_CAP_SKIP_VMENTRY_L1DFLUSH is toggled because if we do cache +* flushes for L1 guests on (nested) vmlaunch/vmresume to L2, L1 +* guests can skip the flush and if we don't, then L1 guests need +* to do a flush. +* +* Toggling ARCH_CAP_SKIP_VMENTRY_L1DFLUSH may present inconsistent +* model to the guest, e.g., if userspace isn't careful, a VM can +* have vCPUs with different values for ARCH_CAPABILITIES. But +* there is almost no chance to fix the issue. Because, to present +* a consistent model, KVM essentially needs to disallow changing +* the module param after VMs/vCPUs have been created, but that +* would prevent userspace from toggling the param while VMs are +* running, e.g., in response to a new vulnerability. +*/ +if (l1tf !=VMENTER_L1D_FLUSH_NEVER ) {static_branch_enable (&vmx_l1d_should_flush); -else + kvm_caps.supported_arch_cap |=ARCH_CAP_SKIP_VMENTRY_L1DFLUSH ; + }else {static_branch_disable (&vmx_l1d_should_flush); + kvm_caps.supported_arch_cap &= ~ARCH_CAP_SKIP_VMENTRY_L1DFLUSH ; + }if (l1tf ==VMENTER_L1D_FLUSH_COND )static_branch_enable (&vmx_l1d_flush_cond);arch/x86/kvm/x86.c +4
-3@@ -1672,7 +1672,7 @@ static int kvm_get_msr_feature(struct kvm_msr_entry *msr) {switch (msr->index) {case MSR_IA32_ARCH_CAPABILITIES : - msr->data =kvm_get_arch_capabilities (); + msr->data = kvm_caps.supported_arch_cap;break ;case MSR_IA32_PERF_CAPABILITIES : msr->data = kvm_caps.supported_perf_cap;@@ -7156,7 +7156,7 @@ static void kvm_probe_msr_to_save(u32 msr_index)return ;break ;case MSR_IA32_TSX_CTRL : -if (!(kvm_get_arch_capabilities () &ARCH_CAP_TSX_CTRL_MSR )) +if (!(kvm_caps.supported_arch_cap &ARCH_CAP_TSX_CTRL_MSR ))return ;break ;default :@@ -9532,6 +9532,7 @@ static int __kvm_x86_vendor_init(struct kvm_x86_init_ops *ops) kvm_caps.max_guest_tsc_khz = max; } kvm_caps.default_tsc_scaling_ratio =1ULL << kvm_caps.tsc_scaling_ratio_frac_bits; + kvm_caps.supported_arch_cap =kvm_get_arch_capabilities ();kvm_init_msr_lists ();return 0 ;@@ -11895,7 +11896,7 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)if (r) goto free_guest_fpu; - vcpu->arch.arch_capabilities =kvm_get_arch_capabilities (); + vcpu->arch.arch_capabilities = kvm_caps.supported_arch_cap; vcpu->arch.msr_platform_info =MSR_PLATFORM_INFO_CPUID_FAULT ;kvm_xen_init_vcpu (vcpu);kvm_vcpu_mtrr_init (vcpu);arch/x86/kvm/x86.h +1
-0@@ -29,6 +29,7 @@ struct kvm_caps {u64 supported_xcr0;u64 supported_xss;u64 supported_perf_cap; +u64 supported_arch_cap; };void kvm_spurious_fault (void );
Re: [PATCH v2 1/3] KVM: x86: Track supported ARCH_CAPABILITIES in kvm_caps
Quoted 7 lines · Xiaoyao Li
Quoted 4 lines · Chao Gao
to avoid computing the supported value at runtime every time.
Toggle the
ARCH_CAP_SKIP_VMENTRY_L1DFLUSHbit whenl1tf_vmx_mitigationis modified to achieve the same result as runtime computing.It's not the same result.
it is because ...
Quoted 4 lines
In
kvm_get_arch_capabilities(), host's value is honored. I.e., when host supportsARCH_CAP_SKIP_VMENTRY_L1DFLUSH,l1tf_vmx_mitigationdoesn't make any difference to the result.
... l1tf_vmx_mitigation should be VMENTER_L1D_FLUSH_NOT_REQUIRED in this case. l1tf_vmx_mitigation cannot be VMENTER_L1D_FLUSH_NEVER.
Quoted 100 lines
Quoted 99 lines
Opportunistically, add a comment to document the problem of allowing changing the supported value of
ARCH_CAPABILITIESand the reason why we don't fix it.No functional change intended.
Signed-off-by Chao Gao <[email protected]>--- arch/x86/kvm/vmx/vmx.c | 25 +++++++++++++++++++++++-- arch/x86/kvm/x86.c | 7 ++++--- arch/x86/kvm/x86.h | 1 + 3 files changed, 28 insertions(+), 5 deletions(-)arch/x86/kvm/vmx/vmx.c +23
-2@@ -309,10 +309,31 @@ static int vmx_setup_l1d_flush(enum vmx_l1d_flush_state l1tf) l1tf_vmx_mitigation = l1tf; -if (l1tf !=VMENTER_L1D_FLUSH_NEVER ) +/* +* Update static keys and supported arch capabilities according to +* the new mitigation state. +* +* ARCH_CAP_SKIP_VMENTRY_L1DFLUSH is toggled because if we do cache +* flushes for L1 guests on (nested) vmlaunch/vmresume to L2, L1 +* guests can skip the flush and if we don't, then L1 guests need +* to do a flush. +* +* Toggling ARCH_CAP_SKIP_VMENTRY_L1DFLUSH may present inconsistent +* model to the guest, e.g., if userspace isn't careful, a VM can +* have vCPUs with different values for ARCH_CAPABILITIES. But +* there is almost no chance to fix the issue. Because, to present +* a consistent model, KVM essentially needs to disallow changing +* the module param after VMs/vCPUs have been created, but that +* would prevent userspace from toggling the param while VMs are +* running, e.g., in response to a new vulnerability. +*/ +if (l1tf !=VMENTER_L1D_FLUSH_NEVER ) {static_branch_enable (&vmx_l1d_should_flush); -else + kvm_caps.supported_arch_cap |=ARCH_CAP_SKIP_VMENTRY_L1DFLUSH ; + }else {static_branch_disable (&vmx_l1d_should_flush); + kvm_caps.supported_arch_cap &= ~ARCH_CAP_SKIP_VMENTRY_L1DFLUSH ; + }if (l1tf ==VMENTER_L1D_FLUSH_COND )static_branch_enable (&vmx_l1d_flush_cond);arch/x86/kvm/x86.c +4
-3@@ -1672,7 +1672,7 @@ static int kvm_get_msr_feature(struct kvm_msr_entry *msr) {switch (msr->index) {case MSR_IA32_ARCH_CAPABILITIES : - msr->data =kvm_get_arch_capabilities (); + msr->data = kvm_caps.supported_arch_cap;break ;case MSR_IA32_PERF_CAPABILITIES : msr->data = kvm_caps.supported_perf_cap;@@ -7156,7 +7156,7 @@ static void kvm_probe_msr_to_save(u32 msr_index)return ;break ;case MSR_IA32_TSX_CTRL : -if (!(kvm_get_arch_capabilities () &ARCH_CAP_TSX_CTRL_MSR )) +if (!(kvm_caps.supported_arch_cap &ARCH_CAP_TSX_CTRL_MSR ))return ;break ;default :@@ -9532,6 +9532,7 @@ static int __kvm_x86_vendor_init(struct kvm_x86_init_ops *ops) kvm_caps.max_guest_tsc_khz = max; } kvm_caps.default_tsc_scaling_ratio =1ULL << kvm_caps.tsc_scaling_ratio_frac_bits; + kvm_caps.supported_arch_cap =kvm_get_arch_capabilities ();kvm_init_msr_lists ();return 0 ;@@ -11895,7 +11896,7 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)if (r) goto free_guest_fpu; - vcpu->arch.arch_capabilities =kvm_get_arch_capabilities (); + vcpu->arch.arch_capabilities = kvm_caps.supported_arch_cap; vcpu->arch.msr_platform_info =MSR_PLATFORM_INFO_CPUID_FAULT ;kvm_xen_init_vcpu (vcpu);kvm_vcpu_mtrr_init (vcpu);arch/x86/kvm/x86.h +1
-0@@ -29,6 +29,7 @@ struct kvm_caps {u64 supported_xcr0;u64 supported_xss;u64 supported_perf_cap; +u64 supported_arch_cap; };void kvm_spurious_fault (void );
Xiaoyao Li
Reviewed-byRe: [PATCH v2 1/3] KVM: x86: Track supported ARCH_CAPABILITIES in kvm_caps
Quoted 12 lines · Chao Gao
Quoted 7 lines · Xiaoyao Li
Quoted 4 lines · Chao Gao
to avoid computing the supported value at runtime every time.
Toggle the
ARCH_CAP_SKIP_VMENTRY_L1DFLUSHbit whenl1tf_vmx_mitigationis modified to achieve the same result as runtime computing.It's not the same result.
it is because ...
Quoted 1 line
Quoted 6 lines
Quoted 3 lines
In
kvm_get_arch_capabilities(), host's value is honored. I.e., when host supportsARCH_CAP_SKIP_VMENTRY_L1DFLUSH,l1tf_vmx_mitigationdoesn't make any difference to the result....
l1tf_vmx_mitigationshould beVMENTER_L1D_FLUSH_NOT_REQUIREDin this case.l1tf_vmx_mitigationcannot beVMENTER_L1D_FLUSH_NEVER.
yes. you are right. Maybe we can clarify it in the changelog
anyway,
Quoted 100 lines
Quoted 100 lines
Quoted 99 lines
Opportunistically, add a comment to document the problem of allowing changing the supported value of
ARCH_CAPABILITIESand the reason why we don't fix it.No functional change intended.
Signed-off-by Chao Gao <[email protected]>--- arch/x86/kvm/vmx/vmx.c | 25 +++++++++++++++++++++++-- arch/x86/kvm/x86.c | 7 ++++--- arch/x86/kvm/x86.h | 1 + 3 files changed, 28 insertions(+), 5 deletions(-)arch/x86/kvm/vmx/vmx.c +23
-2@@ -309,10 +309,31 @@ static int vmx_setup_l1d_flush(enum vmx_l1d_flush_state l1tf) l1tf_vmx_mitigation = l1tf; -if (l1tf !=VMENTER_L1D_FLUSH_NEVER ) +/* +* Update static keys and supported arch capabilities according to +* the new mitigation state. +* +* ARCH_CAP_SKIP_VMENTRY_L1DFLUSH is toggled because if we do cache +* flushes for L1 guests on (nested) vmlaunch/vmresume to L2, L1 +* guests can skip the flush and if we don't, then L1 guests need +* to do a flush. +* +* Toggling ARCH_CAP_SKIP_VMENTRY_L1DFLUSH may present inconsistent +* model to the guest, e.g., if userspace isn't careful, a VM can +* have vCPUs with different values for ARCH_CAPABILITIES. But +* there is almost no chance to fix the issue. Because, to present +* a consistent model, KVM essentially needs to disallow changing +* the module param after VMs/vCPUs have been created, but that +* would prevent userspace from toggling the param while VMs are +* running, e.g., in response to a new vulnerability. +*/ +if (l1tf !=VMENTER_L1D_FLUSH_NEVER ) {static_branch_enable (&vmx_l1d_should_flush); -else + kvm_caps.supported_arch_cap |=ARCH_CAP_SKIP_VMENTRY_L1DFLUSH ; + }else {static_branch_disable (&vmx_l1d_should_flush); + kvm_caps.supported_arch_cap &= ~ARCH_CAP_SKIP_VMENTRY_L1DFLUSH ; + }if (l1tf ==VMENTER_L1D_FLUSH_COND )static_branch_enable (&vmx_l1d_flush_cond);arch/x86/kvm/x86.c +4
-3@@ -1672,7 +1672,7 @@ static int kvm_get_msr_feature(struct kvm_msr_entry *msr) {switch (msr->index) {case MSR_IA32_ARCH_CAPABILITIES : - msr->data =kvm_get_arch_capabilities (); + msr->data = kvm_caps.supported_arch_cap;break ;case MSR_IA32_PERF_CAPABILITIES : msr->data = kvm_caps.supported_perf_cap;@@ -7156,7 +7156,7 @@ static void kvm_probe_msr_to_save(u32 msr_index)return ;break ;case MSR_IA32_TSX_CTRL : -if (!(kvm_get_arch_capabilities () &ARCH_CAP_TSX_CTRL_MSR )) +if (!(kvm_caps.supported_arch_cap &ARCH_CAP_TSX_CTRL_MSR ))return ;break ;default :@@ -9532,6 +9532,7 @@ static int __kvm_x86_vendor_init(struct kvm_x86_init_ops *ops) kvm_caps.max_guest_tsc_khz = max; } kvm_caps.default_tsc_scaling_ratio =1ULL << kvm_caps.tsc_scaling_ratio_frac_bits; + kvm_caps.supported_arch_cap =kvm_get_arch_capabilities ();kvm_init_msr_lists ();return 0 ;@@ -11895,7 +11896,7 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)if (r) goto free_guest_fpu; - vcpu->arch.arch_capabilities =kvm_get_arch_capabilities (); + vcpu->arch.arch_capabilities = kvm_caps.supported_arch_cap; vcpu->arch.msr_platform_info =MSR_PLATFORM_INFO_CPUID_FAULT ;kvm_xen_init_vcpu (vcpu);kvm_vcpu_mtrr_init (vcpu);arch/x86/kvm/x86.h +1
-0@@ -29,6 +29,7 @@ struct kvm_caps {u64 supported_xcr0;u64 supported_xss;u64 supported_perf_cap; +u64 supported_arch_cap; };void kvm_spurious_fault (void );
Sean Christopherson
maintainerRe: [PATCH v2 1/3] KVM: x86: Track supported ARCH_CAPABILITIES in kvm_caps
In reply to Chao GaoQuoted 22 lines · Chao Gao
(quoted diff) +2
-1@@ -9532,6 +9532,7 @@ static int __kvm_x86_vendor_init(struct kvm_x86_init_ops *ops) kvm_caps.max_guest_tsc_khz = max; } kvm_caps.default_tsc_scaling_ratio = 1ULL << kvm_caps.tsc_scaling_ratio_frac_bits; + kvm_caps.supported_arch_cap = kvm_get_arch_capabilities(); kvm_init_msr_lists(); return 0;@@ -11895,7 +11896,7 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) if (r) goto free_guest_fpu; - vcpu->arch.arch_capabilities = kvm_get_arch_capabilities(); + vcpu->arch.arch_capabilities = kvm_caps.supported_arch_cap; vcpu->arch.msr_platform_info = MSR_PLATFORM_INFO_CPUID_FAULT; kvm_xen_init_vcpu(vcpu); kvm_vcpu_mtrr_init(vcpu);arch/x86/kvm/x86.h +0
-0
arch/x86/kvm/x86.h struct kvm_caps { · line 32
Quoted 4 lines
arch/x86/kvm/x86.h +1
-0@@ -29,6 +29,7 @@ struct kvm_caps {u64 supported_xcr0;u64 supported_xss;u64 supported_perf_cap; +u64 supported_arch_cap;
Hrm, I take back my earlier vote about using a dynamic snapshot.
"supported" isn't quite right. KVM always "supports" advertising SKIP_VMENTRY_L1DFLUSH to the guest. And KVM really does treat the MSR like a CPUID leaf, in that KVM doesn't sanity check the value coming in from userspace. Whether or not that's a good idea is debatable, but it is was it is. The value is more like KVM's current default.
Looking at all the uses of both the default/supported value, and the host MSR, I think it makes more sense to snapshot the host value than it does to snapshot and update the default/supported value. The default value is used only when a vCPU is created and when userspace does a system-scoped KVM_GET_MSRS, i.e. avoiding the RDMSR is nice, but making the read super fast isn't necessary, e.g. the overhead of the boot_cpu_has() and boot_cpu_has_bug() checks is negligible.
And if KVM snapshots the MSR, the other usage of the host value can be cleaned up too.
I'm leaning towards doing this instead of patches [1/3] and [3/3]:
From: Sean Christopherson <[email protected]>
Date: Tue, 6 Jun 2023 09:20:31 -0700
Subject: [PATCH 1/2] KVM: x86: Snapshot host's MSR_IA32_ARCH_CAPABILITIES
--- arch/x86/kvm/vmx/vmx.c | 22 ++++++---------------- arch/x86/kvm/x86.c | 13 +++++++------ arch/x86/kvm/x86.h | 1 + 3 files changed, 14 insertions(+), 22 deletions(-)
arch/x86/kvm/vmx/vmx.c +6 -16
@@ -255,14 +255,9 @@ static int vmx_setup_l1d_flush(enum vmx_l1d_flush_state l1tf)return 0 ; } -if (boot_cpu_has (X86_FEATURE_ARCH_CAPABILITIES )) { -u64 msr; - -rdmsrl (MSR_IA32_ARCH_CAPABILITIES , msr); -if (msr &ARCH_CAP_SKIP_VMENTRY_L1DFLUSH ) { - l1tf_vmx_mitigation =VMENTER_L1D_FLUSH_NOT_REQUIRED ; -return 0 ; - } +if (host_arch_capabilities &ARCH_CAP_SKIP_VMENTRY_L1DFLUSH ) { + l1tf_vmx_mitigation =VMENTER_L1D_FLUSH_NOT_REQUIRED ; +return 0 ; }/* If set to auto use the default l1tf mitigation method */
@@ -373,15 +368,10 @@ static int vmentry_l1d_flush_get(char *s, const struct kernel_param *kp)static void vmx_setup_fb_clear_ctrl (void ) { -u64 msr; - -if (boot_cpu_has (X86_FEATURE_ARCH_CAPABILITIES ) && +if ((host_arch_capabilities &ARCH_CAP_FB_CLEAR_CTRL ) && !boot_cpu_has_bug (X86_BUG_MDS ) && - !boot_cpu_has_bug (X86_BUG_TAA )) { -rdmsrl (MSR_IA32_ARCH_CAPABILITIES , msr); -if (msr &ARCH_CAP_FB_CLEAR_CTRL ) - vmx_fb_clear_ctrl_available = true; - } + !boot_cpu_has_bug (X86_BUG_TAA )) + vmx_fb_clear_ctrl_available = true; } static __always_inline void vmx_disable_fb_clear(struct vcpu_vmx *vmx)
arch/x86/kvm/x86.c +7 -6
@@ -237,6 +237,9 @@ EXPORT_SYMBOL_GPL(enable_apicv);u64 __read_mostly host_xss;EXPORT_SYMBOL_GPL (host_xss); +u64 __read_mostly host_arch_capabilities; +EXPORT_SYMBOL_GPL (host_arch_capabilities); +const struct _kvm_stats_desc kvm_vm_stats_desc[] = {KVM_GENERIC_VM_STATS (),STATS_DESC_COUNTER (VM , mmu_shadow_zapped),
@@ -1612,12 +1615,7 @@ static bool kvm_is_immutable_feature_msr(u32 msr)static u64 kvm_get_arch_capabilities (void ) { -u64 data =0 ; - -if (boot_cpu_has (X86_FEATURE_ARCH_CAPABILITIES )) { -rdmsrl (MSR_IA32_ARCH_CAPABILITIES , data); - data &=KVM_SUPPORTED_ARCH_CAP ; - } +u64 data = host_arch_capabilities &KVM_SUPPORTED_ARCH_CAP ;/* * If nx_huge_pages is enabled, KVM's shadow paging will ensure that
@@ -9492,6 +9490,9 @@ static int __kvm_x86_vendor_init(struct kvm_x86_init_ops *ops)kvm_init_pmu_capability (ops->pmu_ops); +if (boot_cpu_has (X86_FEATURE_ARCH_CAPABILITIES )) +rdmsrl (MSR_IA32_ARCH_CAPABILITIES , host_arch_capabilities); + r = ops->hardware_setup ();if (r !=0 ) goto out_mmu_exit;
arch/x86/kvm/x86.h +1 -0
@@ -323,6 +323,7 @@ fastpath_t handle_fastpath_set_msr_irqoff(struct kvm_vcpu *vcpu);extern u64 host_xcr0;extern u64 host_xss; +extern u64 host_arch_capabilities;extern struct kvm_caps kvm_caps;
base-commit: 02f1b0b736606f9870595b3089d9c124f9da8be9
Signature · 12 lines
2.41.0.rc2.161.g9c6817b8e7-goog From bd4b41fea5d5fa0347c5ef1ffb73dbdf783b23d0 Mon Sep 17 00:00:00 2001 From: Sean Christopherson <[email protected]> Date: Tue, 6 Jun 2023 09:25:55 -0700 Subject: [PATCH 2/2] KVM: VMX: Drop unnecessary vmx_fb_clear_ctrl_available "cache" Signed-off-by: Sean Christopherson <[email protected]> --- arch/x86/kvm/vmx/vmx.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)
arch/x86/kvm/vmx/vmx.c +3 -14
@@ -237,9 +237,6 @@ static const struct {#define L1D_CACHE_ORDER 4static void *vmx_l1d_flush_pages; -/* Control for disabling CPU Fill buffer clear */ -static bool __read_mostly vmx_fb_clear_ctrl_available; -static int vmx_setup_l1d_flush (enum vmx_l1d_flush_state l1tf) {struct page *page;
@@ -366,14 +363,6 @@ static int vmentry_l1d_flush_get(char *s, const struct kernel_param *kp)return sprintf (s,"%s\n" , vmentry_l1d_param[l1tf_vmx_mitigation].option); } -static void vmx_setup_fb_clear_ctrl (void ) -{ -if ((host_arch_capabilities &ARCH_CAP_FB_CLEAR_CTRL ) && - !boot_cpu_has_bug (X86_BUG_MDS ) && - !boot_cpu_has_bug (X86_BUG_TAA )) - vmx_fb_clear_ctrl_available = true; -} - static __always_inline void vmx_disable_fb_clear(struct vcpu_vmx *vmx) {u64 msr;
@@ -399,7 +388,9 @@ static __always_inline void vmx_enable_fb_clear(struct vcpu_vmx *vmx)static void vmx_update_fb_clear_dis (struct kvm_vcpu *vcpu,struct vcpu_vmx *vmx) { - vmx->disable_fb_clear = vmx_fb_clear_ctrl_available; + vmx->disable_fb_clear = (host_arch_capabilities &ARCH_CAP_FB_CLEAR_CTRL ) && + !boot_cpu_has_bug (X86_BUG_MDS ) && + !boot_cpu_has_bug (X86_BUG_TAA );/* * If guest will not execute VERW, there is no need to set FB_CLEAR_DIS
@@ -8580,8 +8571,6 @@ static int __init vmx_init(void)if (r) goto err_l1d_flush; -vmx_setup_fb_clear_ctrl (); -for_each_possible_cpu (cpu) {INIT_LIST_HEAD (&per_cpu (loaded_vmcss_on_cpu, cpu));
PATCH v2 2/3 KVM: x86: Correct the name for skipping VMENTER l1d flush
In reply to Chao GaoThere is no VMENTER_L1D_FLUSH_NESTED_VM. It should be ARCH_CAP_SKIP_VMENTRY_L1DFLUSH.
--- arch/x86/kvm/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/x86.c +1 -1
@@ -1631,7 +1631,7 @@ static u64 kvm_get_arch_capabilities(void)* If we're doing cache flushes (either "always" or "cond") * we will do one whenever the guest does a vmlaunch/vmresume. * If an outer hypervisor is doing the cache flush for us -* (VMENTER_L1D_FLUSH_NESTED_VM), we can safely pass that +* (ARCH_CAP_SKIP_VMENTRY_L1DFLUSH), we can safely pass that * capability to the guest too, and if EPT is disabled we're not * vulnerable. Overall, only VMENTER_L1D_FLUSH_NEVER will * require a nested hypervisor to do a flush of its own.
Signature · 1 line
2.40.0
Re: [PATCH v2 2/3] KVM: x86: Correct the name for skipping VMENTER l1d flush
Quoted 2 lines · Chao Gao
There is no
VMENTER_L1D_FLUSH_NESTED_VM. It should beARCH_CAP_SKIP_VMENTRY_L1DFLUSH.
Quoted 18 lines
Signed-off-by Chao Gao <[email protected]>--- arch/x86/kvm/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/x86/kvm/x86.c +1
-1@@ -1631,7 +1631,7 @@ static u64 kvm_get_arch_capabilities(void)* If we're doing cache flushes (either "always" or "cond") * we will do one whenever the guest does a vmlaunch/vmresume. * If an outer hypervisor is doing the cache flush for us -* (VMENTER_L1D_FLUSH_NESTED_VM), we can safely pass that +* (ARCH_CAP_SKIP_VMENTRY_L1DFLUSH), we can safely pass that * capability to the guest too, and if EPT is disabled we're not * vulnerable. Overall, only VMENTER_L1D_FLUSH_NEVER will * require a nested hypervisor to do a flush of its own.
PATCH v2 3/3 x86/cpu, KVM: Use helper function to read MSR_IA32_ARCH_CAPABILITIES
In reply to Chao GaoKVM open-codes x86_read_arch_cap_msr() in a few places. Eliminate them by exposing the helper function and using it directly.
No functional change intended.
--- arch/x86/kernel/cpu/common.c | 1 + arch/x86/kvm/vmx/vmx.c | 19 +++++-------------- arch/x86/kvm/x86.c | 7 +------ 3 files changed, 7 insertions(+), 20 deletions(-)
arch/x86/kernel/cpu/common.c +1 -0
@@ -1315,6 +1315,7 @@ u64 x86_read_arch_cap_msr(void)return ia32_cap; } +EXPORT_SYMBOL_GPL (x86_read_arch_cap_msr);static bool arch_cap_mmio_immune (u64 ia32_cap) {
arch/x86/kvm/vmx/vmx.c +5 -14
@@ -255,14 +255,9 @@ static int vmx_setup_l1d_flush(enum vmx_l1d_flush_state l1tf)return 0 ; } -if (boot_cpu_has (X86_FEATURE_ARCH_CAPABILITIES )) { -u64 msr; - -rdmsrl (MSR_IA32_ARCH_CAPABILITIES , msr); -if (msr &ARCH_CAP_SKIP_VMENTRY_L1DFLUSH ) { - l1tf_vmx_mitigation =VMENTER_L1D_FLUSH_NOT_REQUIRED ; -return 0 ; - } +if (x86_read_arch_cap_msr () &ARCH_CAP_SKIP_VMENTRY_L1DFLUSH ) { + l1tf_vmx_mitigation =VMENTER_L1D_FLUSH_NOT_REQUIRED ; +return 0 ; }/* If set to auto use the default l1tf mitigation method */
@@ -394,13 +389,9 @@ static int vmentry_l1d_flush_get(char *s, const struct kernel_param *kp)static void vmx_setup_fb_clear_ctrl (void ) { -u64 msr; - -if (boot_cpu_has (X86_FEATURE_ARCH_CAPABILITIES ) && - !boot_cpu_has_bug (X86_BUG_MDS ) && +if (!boot_cpu_has_bug (X86_BUG_MDS ) && !boot_cpu_has_bug (X86_BUG_TAA )) { -rdmsrl (MSR_IA32_ARCH_CAPABILITIES , msr); -if (msr &ARCH_CAP_FB_CLEAR_CTRL ) +if (x86_read_arch_cap_msr () &ARCH_CAP_FB_CLEAR_CTRL ) vmx_fb_clear_ctrl_available = true; } }
arch/x86/kvm/x86.c +1 -6
@@ -1612,12 +1612,7 @@ static bool kvm_is_immutable_feature_msr(u32 msr)static u64 kvm_get_arch_capabilities (void ) { -u64 data =0 ; - -if (boot_cpu_has (X86_FEATURE_ARCH_CAPABILITIES )) { -rdmsrl (MSR_IA32_ARCH_CAPABILITIES , data); - data &=KVM_SUPPORTED_ARCH_CAP ; - } +u64 data =x86_read_arch_cap_msr () &KVM_SUPPORTED_ARCH_CAP ;/* * If nx_huge_pages is enabled, KVM's shadow paging will ensure that
Signature · 1 line
2.40.0
Re: [PATCH v2 3/3] x86/cpu, KVM: Use helper function to read MSR_IA32_ARCH_CAPABILITIES
Quoted 5 lines · Chao Gao
KVM open-codes
x86_read_arch_cap_msr()in a few places. Eliminate them by exposing the helper function and using it directly.No functional change intended.
Quoted 75 lines
Signed-off-by Chao Gao <[email protected]>--- arch/x86/kernel/cpu/common.c | 1 + arch/x86/kvm/vmx/vmx.c | 19 +++++-------------- arch/x86/kvm/x86.c | 7 +------ 3 files changed, 7 insertions(+), 20 deletions(-)arch/x86/kernel/cpu/common.c +1
-0@@ -1315,6 +1315,7 @@ u64 x86_read_arch_cap_msr(void)return ia32_cap; } +EXPORT_SYMBOL_GPL (x86_read_arch_cap_msr);static bool arch_cap_mmio_immune (u64 ia32_cap) {arch/x86/kvm/vmx/vmx.c +5
-14@@ -255,14 +255,9 @@ static int vmx_setup_l1d_flush(enum vmx_l1d_flush_state l1tf)return 0 ; } -if (boot_cpu_has (X86_FEATURE_ARCH_CAPABILITIES )) { -u64 msr; - -rdmsrl (MSR_IA32_ARCH_CAPABILITIES , msr); -if (msr &ARCH_CAP_SKIP_VMENTRY_L1DFLUSH ) { - l1tf_vmx_mitigation =VMENTER_L1D_FLUSH_NOT_REQUIRED ; -return 0 ; - } +if (x86_read_arch_cap_msr () &ARCH_CAP_SKIP_VMENTRY_L1DFLUSH ) { + l1tf_vmx_mitigation =VMENTER_L1D_FLUSH_NOT_REQUIRED ; +return 0 ; }/* If set to auto use the default l1tf mitigation method */ @@ -394,13 +389,9 @@ static int vmentry_l1d_flush_get(char *s, const struct kernel_param *kp)static void vmx_setup_fb_clear_ctrl (void ) { -u64 msr; - -if (boot_cpu_has (X86_FEATURE_ARCH_CAPABILITIES ) && - !boot_cpu_has_bug (X86_BUG_MDS ) && +if (!boot_cpu_has_bug (X86_BUG_MDS ) && !boot_cpu_has_bug (X86_BUG_TAA )) { -rdmsrl (MSR_IA32_ARCH_CAPABILITIES , msr); -if (msr &ARCH_CAP_FB_CLEAR_CTRL ) +if (x86_read_arch_cap_msr () &ARCH_CAP_FB_CLEAR_CTRL ) vmx_fb_clear_ctrl_available = true; } }arch/x86/kvm/x86.c +1
-6@@ -1612,12 +1612,7 @@ static bool kvm_is_immutable_feature_msr(u32 msr)static u64 kvm_get_arch_capabilities (void ) { -u64 data =0 ; - -if (boot_cpu_has (X86_FEATURE_ARCH_CAPABILITIES )) { -rdmsrl (MSR_IA32_ARCH_CAPABILITIES , data); - data &=KVM_SUPPORTED_ARCH_CAP ; - } +u64 data =x86_read_arch_cap_msr () &KVM_SUPPORTED_ARCH_CAP ;/* * If nx_huge_pages is enabled, KVM's shadow paging will ensure that
Sean Christopherson
maintainerQuoted 4 lines · Chao Gao
Do some cleanups about
MSR_IA32_ARCH_CAPABILITIESin KVM e.g, fix stale comments, elimite open-coded MSR reads, track features that can be exposed to guests to avoid computing them runtime. They are found when reading the code.
Quoted 8 lines
No functional change intented.
Changes from v1 -> v2:
1. toggleARCH_CAP_SKIP_VMENTRY_L1DFLUSHbit when l1tf mitigation state is changed by module param. [Xiaoyao, Sean]
2. add more cleanups (patch 2/3)[...]
Applied [2/3] to kvm-x86 misc, no need for that one to wait for the dust to settle on the "supported" snapshot. Thanks!
[2/3] KVM: x86: Correct the name for skipping VMENTER l1d flush
https://github.com/kvm-x86/linux/commit/02f1b0b73660
--
https://github.com/kvm-x86/linux/tree/next
https://github.com/kvm-x86/linux/tree/fixes