Unify MSR intercepts in x86
cover Unify MSR intercepts in x86
The goal of this series is to unify MSR intercepts into common code between VMX and SVM.
The high level structure of this series is to:
1. Modify SVM MSR intercepts to adopt how VMX does it.
2. Hoist the newly updated SVM MSR intercept implementation to common x86 code.
3. Hoist the VMX MSR intercept implementation to common x86 code.
Aaron Lewis (8):
KVM: SVM: Invert the polarity of the "shadow" MSR interception bitmaps
KVM: SVM: Track MSRPM as "unsigned long", not "u32"
KVM: x86: SVM: Adopt VMX style MSR intercepts in SVM
KVM: SVM: Don't "NULL terminate" the list of possible passthrough MSRs
KVM: x86: Track possible passthrough MSRs in kvm_x86_ops
KVM: x86: Move ownership of passthrough MSR "shadow" to common x86
KVM: x86: Hoist SVM MSR intercepts to common x86 code
KVM: x86: Hoist VMX MSR intercepts to common x86 code
Anish Ghulati (2):
KVM: SVM: Disable intercepts for all direct access MSRs on MSR filter changes
KVM: SVM: Delete old SVM MSR management code
Sean Christopherson (5):
KVM: x86: Use non-atomic bit ops to manipulate "shadow" MSR intercepts
KVM: SVM: Use non-atomic bit ops to manipulate MSR interception bitmaps
KVM: SVM: Pass through GHCB MSR if and only if VM is SEV-ES
KVM: SVM: Drop "always" flag from list of possible passthrough MSRs
KVM: VMX: Make list of possible passthrough MSRs "const"
arch/x86/include/asm/kvm-x86-ops.h | 5 +- arch/x86/include/asm/kvm_host.h | 18 ++ arch/x86/kvm/svm/sev.c | 11 +- arch/x86/kvm/svm/svm.c | 300 ++++++++++++----------------- arch/x86/kvm/svm/svm.h | 30 +-- arch/x86/kvm/vmx/main.c | 30 +++ arch/x86/kvm/vmx/vmx.c | 144 +++----------- arch/x86/kvm/vmx/vmx.h | 11 +- arch/x86/kvm/x86.c | 129 ++++++++++++- arch/x86/kvm/x86.h | 3 + 10 files changed, 358 insertions(+), 323 deletions(-)
Signature · 1 line
2.47.0.338.g60cca15819-goog
PATCH 1/15 KVM: x86: Use non-atomic bit ops to manipulate "shadow" MSR intercepts
From: Sean Christopherson <[email protected]>
--- arch/x86/kvm/svm/svm.c | 8 ++++---- arch/x86/kvm/vmx/vmx.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)
arch/x86/kvm/svm/svm.c +4 -4
@@ -781,14 +781,14 @@ static void set_shadow_msr_intercept(struct kvm_vcpu *vcpu, u32 msr, int read,/* Set the shadow bitmaps to the desired intercept states */ if (read) -set_bit (slot, svm->shadow_msr_intercept.read); +__set_bit (slot, svm->shadow_msr_intercept.read);else -clear_bit (slot, svm->shadow_msr_intercept.read); +__clear_bit (slot, svm->shadow_msr_intercept.read);if (write) -set_bit (slot, svm->shadow_msr_intercept.write); +__set_bit (slot, svm->shadow_msr_intercept.write);else -clear_bit (slot, svm->shadow_msr_intercept.write); +__clear_bit (slot, svm->shadow_msr_intercept.write); }static bool valid_msr_intercept (u32 index)
arch/x86/kvm/vmx/vmx.c +4 -4
@@ -4015,9 +4015,9 @@ void vmx_disable_intercept_for_msr(struct kvm_vcpu *vcpu, u32 msr, int type) idx =vmx_get_passthrough_msr_slot (msr);if (idx >=0 ) {if (type &MSR_TYPE_R ) -clear_bit (idx, vmx->shadow_msr_intercept.read); +__clear_bit (idx, vmx->shadow_msr_intercept.read);if (type &MSR_TYPE_W ) -clear_bit (idx, vmx->shadow_msr_intercept.write); +__clear_bit (idx, vmx->shadow_msr_intercept.write); } if ((type & MSR_TYPE_R) &&
@@ -4057,9 +4057,9 @@ void vmx_enable_intercept_for_msr(struct kvm_vcpu *vcpu, u32 msr, int type) idx =vmx_get_passthrough_msr_slot (msr);if (idx >=0 ) {if (type &MSR_TYPE_R ) -set_bit (idx, vmx->shadow_msr_intercept.read); +__set_bit (idx, vmx->shadow_msr_intercept.read);if (type &MSR_TYPE_W ) -set_bit (idx, vmx->shadow_msr_intercept.write); +__set_bit (idx, vmx->shadow_msr_intercept.write); }if (type &MSR_TYPE_R )
Signature · 1 line
2.47.0.338.g60cca15819-goog
Sean Christopherson
maintainerRe: [PATCH 01/15] KVM: x86: Use non-atomic bit ops to manipulate "shadow" MSR intercepts
Quoted 1 line · Aaron Lewis
From: Sean Christopherson <[email protected]>
Heh, I'll write changelogs for the patches I authored.
Quoted 1 line
Signed-off-by Sean Christopherson <[email protected]>
When sending patches authored by someone else, you need to provide your SoB.
PATCH 2/15 KVM: SVM: Use non-atomic bit ops to manipulate MSR interception bitmaps
In reply to Aaron LewisFrom: Sean Christopherson <[email protected]>
--- arch/x86/kvm/svm/svm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/svm/svm.c +2 -2
@@ -852,8 +852,8 @@ static void set_msr_interception_bitmap(struct kvm_vcpu *vcpu, u32 *msrpm,BUG_ON (offset ==MSR_INVALID ); - read ?clear_bit (bit_read, &tmp) :set_bit (bit_read, &tmp); - write ?clear_bit (bit_write, &tmp) :set_bit (bit_write, &tmp); + read ?__clear_bit (bit_read, &tmp) :__set_bit (bit_read, &tmp); + write ?__clear_bit (bit_write, &tmp) :__set_bit (bit_write, &tmp); msrpm[offset] = tmp;
Signature · 1 line
2.47.0.338.g60cca15819-goog
PATCH 3/15 KVM: SVM: Invert the polarity of the "shadow" MSR interception bitmaps
In reply to Aaron LewisNote, a "FIXME" tag was added to svm_msr_filter_changed(). This will be addressed later in the series after the VMX style MSR intercepts are added to SVM.
--- arch/x86/kvm/svm/svm.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
arch/x86/kvm/svm/svm.c +11 -6
@@ -781,14 +781,14 @@ static void set_shadow_msr_intercept(struct kvm_vcpu *vcpu, u32 msr, int read,/* Set the shadow bitmaps to the desired intercept states */ if (read) -__set_bit (slot, svm->shadow_msr_intercept.read); -else __clear_bit (slot, svm->shadow_msr_intercept.read); +else +__set_bit (slot, svm->shadow_msr_intercept.read);if (write) -__set_bit (slot, svm->shadow_msr_intercept.write); -else __clear_bit (slot, svm->shadow_msr_intercept.write); +else +__set_bit (slot, svm->shadow_msr_intercept.write); }static bool valid_msr_intercept (u32 index)
@@ -934,9 +934,10 @@ static void svm_msr_filter_changed(struct kvm_vcpu *vcpu)*/ for (i =0 ; direct_access_msrs[i].index !=MSR_INVALID ; i++) {u32 msr = direct_access_msrs[i].index; -u32 read =test_bit (i, svm->shadow_msr_intercept.read); -u32 write =test_bit (i, svm->shadow_msr_intercept.write); +u32 read = !test_bit (i, svm->shadow_msr_intercept.read); +u32 write = !test_bit (i, svm->shadow_msr_intercept.write); +/* FIXME: Align the polarity of the bitmaps and params. */ set_msr_interception_bitmap (vcpu, svm->msrpm, msr, read, write); } }
@@ -1453,6 +1454,10 @@ static int svm_vcpu_create(struct kvm_vcpu *vcpu)if (err) goto error_free_vmsa_page; +/* All MSRs start out in the "intercepted" state. */ +bitmap_fill (svm->shadow_msr_intercept.read,MAX_DIRECT_ACCESS_MSRS ); +bitmap_fill (svm->shadow_msr_intercept.write,MAX_DIRECT_ACCESS_MSRS ); + svm->msrpm =svm_vcpu_alloc_msrpm ();if (!svm->msrpm) { err = -ENOMEM ;
Signature · 1 line
2.47.0.338.g60cca15819-goog
Sean Christopherson
maintainerRe: [PATCH 03/15] KVM: SVM: Invert the polarity of the "shadow" MSR interception bitmaps
On Wed, Nov 27, 2024, Aaron Lewis wrote:
I'll write a changelog for this too.
Quoted 1 line
Note, a "FIXME" tag was added to
svm_msr_filter_changed(). This will
Write changelogs in imperative mood, i.e. state what the patch is doing as a command. Don't describe what will have happened after the patch is applied. Using imperative mood allows for using indicative mood to describe what was already there, and/or what happened in the past.
Quoted 5 lines
be addressed later in the series after the VMX style MSR intercepts are added to SVM.
Signed-off-by Sean Christopherson <[email protected]>Co-developed-by Aaron Lewis <[email protected]>
Your SoB is needed here too. See "When to use Acked-by:, Cc:, and Co-developed-by:" in Documentation/process/submitting-patches.rst.
Re: [PATCH 03/15] KVM: SVM: Invert the polarity of the "shadow" MSR interception bitmaps
Quoted 11 lines · Sean Christopherson
On Wed, Nov 27, 2024, Aaron Lewis wrote:
I'll write a changelog for this too.
Quoted 1 line
Note, a "FIXME" tag was added to
svm_msr_filter_changed(). This willWrite changelogs in imperative mood, i.e. state what the patch is doing as a command. Don't describe what will have happened after the patch is applied. Using imperative mood allows for using indicative mood to describe what was already there, and/or what happened in the past.
Quoted 8 lines
Quoted 5 lines
be addressed later in the series after the VMX style MSR intercepts are added to SVM.
Signed-off-by Sean Christopherson <[email protected]>Co-developed-by Aaron Lewis <[email protected]>Your SoB is needed here too. See "When to use Acked-by:, Cc:, and Co-developed-by:" in
Documentation/process/submitting-patches.rst.
And actually, since the From: is Aaron's name, Sean needs to be listed as the Co-developed-by: (with his Signed-off-by:) and not Aaron.
Thanks,
Tom
Quoted 1 line
PATCH 4/15 KVM: SVM: Track MSRPM as "unsigned long", not "u32"
In reply to Aaron LewisUse "unsigned long" instead of "u32" to track MSRPM to match the bitmap API.
--- arch/x86/kvm/svm/svm.c | 18 +++++++++--------- arch/x86/kvm/svm/svm.h | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-)
arch/x86/kvm/svm/svm.c +9 -9
@@ -276,8 +276,8 @@ u32 svm_msrpm_offset(u32 msr) offset = (msr - msrpm_ranges[i]) /4 ;/* 4 msrs per u8 */ offset += (i *MSRS_RANGE_SIZE );/* add range offset */ -/* Now we have the u8 offset - but need the u32 offset */ -return offset /4 ; +/* Now we have the u8 offset - but need the ulong offset */ +return offset /sizeof (unsigned long ); }/* MSR not in any range */
@@ -799,9 +799,9 @@ static bool valid_msr_intercept(u32 index)static bool msr_write_intercepted (struct kvm_vcpu *vcpu,u32 msr) {u8 bit_write; +unsigned long *msrpm;unsigned long tmp;u32 offset; -u32 *msrpm;/* * For non-nested case:
@@ -824,7 +824,7 @@ static bool msr_write_intercepted(struct kvm_vcpu *vcpu, u32 msr)return test_bit (bit_write, &tmp); } -static void set_msr_interception_bitmap (struct kvm_vcpu *vcpu,u32 *msrpm, +static void set_msr_interception_bitmap (struct kvm_vcpu *vcpu,unsigned long *msrpm,u32 msr,int read,int write) {struct vcpu_svm *svm =to_svm (vcpu);
@@ -861,18 +861,18 @@ static void set_msr_interception_bitmap(struct kvm_vcpu *vcpu, u32 *msrpm, svm->nested.force_msr_bitmap_recalc = true; } -void set_msr_interception (struct kvm_vcpu *vcpu,u32 *msrpm,u32 msr, +void set_msr_interception (struct kvm_vcpu *vcpu,unsigned long *msrpm,u32 msr,int read,int write) {set_shadow_msr_intercept (vcpu, msr, read, write);set_msr_interception_bitmap (vcpu, msrpm, msr, read, write); } -u32 *svm_vcpu_alloc_msrpm (void ) +unsigned long *svm_vcpu_alloc_msrpm (void ) {unsigned int order =get_order (MSRPM_SIZE );struct page *pages =alloc_pages (GFP_KERNEL_ACCOUNT , order); -u32 *msrpm; +unsigned long *msrpm;if (!pages)return NULL ;
@@ -883,7 +883,7 @@ u32 *svm_vcpu_alloc_msrpm(void)return msrpm; } -void svm_vcpu_init_msrpm (struct kvm_vcpu *vcpu,u32 *msrpm) +void svm_vcpu_init_msrpm (struct kvm_vcpu *vcpu,unsigned long *msrpm) {int i;
@@ -917,7 +917,7 @@ void svm_set_x2apic_msr_interception(struct vcpu_svm *svm, bool intercept) svm->x2avic_msrs_intercepted = intercept; } -void svm_vcpu_free_msrpm (u32 *msrpm) +void svm_vcpu_free_msrpm (unsigned long *msrpm) {__free_pages (virt_to_page (msrpm),get_order (MSRPM_SIZE )); }
arch/x86/kvm/svm/svm.h +6 -6
@@ -185,7 +185,7 @@ struct svm_nested_state {u64 last_vmcb12_gpa;/* These are the merged vectors */ -u32 *msrpm; +unsigned long *msrpm;/* A VMRUN has started but has not yet been performed, so * we cannot inject a nested vmexit yet. */
@@ -266,7 +266,7 @@ struct vcpu_svm {*/ u64 virt_spec_ctrl; -u32 *msrpm; +unsigned long *msrpm;ulong nmi_iret_rip;
@@ -596,9 +596,9 @@ static inline bool is_vnmi_enabled(struct vcpu_svm *svm)extern bool dump_invalid_vmcb;u32 svm_msrpm_offset (u32 msr); -u32 *svm_vcpu_alloc_msrpm (void ); -void svm_vcpu_init_msrpm (struct kvm_vcpu *vcpu,u32 *msrpm); -void svm_vcpu_free_msrpm (u32 *msrpm); +unsigned long *svm_vcpu_alloc_msrpm (void ); +void svm_vcpu_init_msrpm (struct kvm_vcpu *vcpu,unsigned long *msrpm); +void svm_vcpu_free_msrpm (unsigned long *msrpm);void svm_copy_lbrs (struct vmcb *to_vmcb,struct vmcb *from_vmcb);void svm_enable_lbrv (struct kvm_vcpu *vcpu);void svm_update_lbrv (struct kvm_vcpu *vcpu);
@@ -612,7 +612,7 @@ bool svm_nmi_blocked(struct kvm_vcpu *vcpu);bool svm_interrupt_blocked (struct kvm_vcpu *vcpu);void svm_set_gif (struct vcpu_svm *svm,bool value);int svm_invoke_exit_handler (struct kvm_vcpu *vcpu,u64 exit_code); -void set_msr_interception (struct kvm_vcpu *vcpu,u32 *msrpm,u32 msr, +void set_msr_interception (struct kvm_vcpu *vcpu,unsigned long *msrpm,u32 msr,int read,int write);void svm_set_x2apic_msr_interception (struct vcpu_svm *svm,bool disable); void svm_complete_interrupt_delivery(struct kvm_vcpu *vcpu, int delivery_mode,
Signature · 1 line
2.47.0.338.g60cca15819-goog
PATCH 5/15 KVM: x86: SVM: Adopt VMX style MSR intercepts in SVM
In reply to Aaron LewisVMX MSR interception is done via three functions:
vmx_disable_intercept_for_msr(vcpu, msr, type) vmx_enable_intercept_for_msr(vcpu, msr, type) vmx_set_intercept_for_msr(vcpu, msr, type, value)
While SVM uses
set_msr_interception(vcpu, msrpm, msr, read, write)
The SVM code is not very intuitive (using 0 for enable and 1 for disable), and forces both read and write changes with each call which is not always required.
Add helpers functions to SVM to match VMX:
svm_disable_intercept_for_msr(vcpu, msr, type) svm_enable_intercept_for_msr(vcpu, msr, type) svm_set_intercept_for_msr(vcpu, msr, type, enable_intercept)
Additionally, update calls to set_msr_interception() to use the new functions. This update is only made to calls that toggle interception for both read and write.
Keep the old paths for now, they will be deleted once all code is converted to the new helpers.
Opportunistically, the function svm_get_msr_bitmap_entries() is added to abstract the MSR bitmap from the intercept functions. This will be needed later in the series when this code is hoisted to common code.
No functional change.
--- arch/x86/kvm/svm/sev.c | 11 ++-- arch/x86/kvm/svm/svm.c | 144 ++++++++++++++++++++++++++++++++++------- arch/x86/kvm/svm/svm.h | 12 ++++ 3 files changed, 138 insertions(+), 29 deletions(-)
arch/x86/kvm/svm/sev.c +6 -5
@@ -4448,7 +4448,8 @@ static void sev_es_vcpu_after_set_cpuid(struct vcpu_svm *svm)bool v_tsc_aux =guest_cpuid_has (vcpu,X86_FEATURE_RDTSCP ) ||guest_cpuid_has (vcpu,X86_FEATURE_RDPID ); -set_msr_interception (vcpu, svm->msrpm,MSR_TSC_AUX , v_tsc_aux, v_tsc_aux); +if (v_tsc_aux) +svm_disable_intercept_for_msr (vcpu,MSR_TSC_AUX ,MSR_TYPE_RW ); }/*
@@ -4466,9 +4467,9 @@ static void sev_es_vcpu_after_set_cpuid(struct vcpu_svm *svm)*/ if (guest_can_use (vcpu,X86_FEATURE_XSAVES ) &&guest_cpuid_has (vcpu,X86_FEATURE_XSAVES )) -set_msr_interception (vcpu, svm->msrpm,MSR_IA32_XSS ,1 ,1 ); +svm_disable_intercept_for_msr (vcpu,MSR_IA32_XSS ,MSR_TYPE_RW );else -set_msr_interception (vcpu, svm->msrpm,MSR_IA32_XSS ,0 ,0 ); +svm_enable_intercept_for_msr (vcpu,MSR_IA32_XSS ,MSR_TYPE_RW ); }void sev_vcpu_after_set_cpuid (struct vcpu_svm *svm)
@@ -4540,8 +4541,8 @@ static void sev_es_init_vmcb(struct vcpu_svm *svm)svm_clr_intercept (svm,INTERCEPT_XSETBV );/* Clear intercepts on selected MSRs */ -set_msr_interception (vcpu, svm->msrpm,MSR_EFER ,1 ,1 ); -set_msr_interception (vcpu, svm->msrpm,MSR_IA32_CR_PAT ,1 ,1 ); +svm_disable_intercept_for_msr (vcpu,MSR_EFER ,MSR_TYPE_RW ); +svm_disable_intercept_for_msr (vcpu,MSR_IA32_CR_PAT ,MSR_TYPE_RW ); }void sev_init_vmcb (struct vcpu_svm *svm)
arch/x86/kvm/svm/svm.c +120 -24
207 lines not on this page · raw message
arch/x86/kvm/svm/svm.h +12 -0
@@ -618,6 +618,18 @@ void svm_set_x2apic_msr_interception(struct vcpu_svm *svm, bool disable);void svm_complete_interrupt_delivery (struct kvm_vcpu *vcpu,int delivery_mode,int trig_mode,int vec); +void svm_enable_intercept_for_msr (struct kvm_vcpu *vcpu,u32 msr,int type); +void svm_disable_intercept_for_msr (struct kvm_vcpu *vcpu,u32 msr,int type); + +static inline void svm_set_intercept_for_msr (struct kvm_vcpu *vcpu,u32 msr, +int type,bool enable_intercept) +{ +if (enable_intercept) +svm_enable_intercept_for_msr (vcpu, msr, type); +else +svm_disable_intercept_for_msr (vcpu, msr, type); +} +/* nested.c */ #define NESTED_EXIT_HOST 0/* Exit handled on host level */
Signature · 1 line
2.47.0.338.g60cca15819-goog
Sean Christopherson
maintainerRe: [PATCH 05/15] KVM: x86: SVM: Adopt VMX style MSR intercepts in SVM
Quoted 27 lines · Aaron Lewis
VMX MSR interception is done via three functions:
vmx_disable_intercept_for_msr(vcpu, msr, type)vmx_enable_intercept_for_msr(vcpu, msr, type)vmx_set_intercept_for_msr(vcpu, msr, type, value)While SVM uses
set_msr_interception(vcpu, msrpm, msr, read, write)The SVM code is not very intuitive (using 0 for enable and 1 for disable), and forces both read and write changes with each call which is not always required.
Add helpers functions to SVM to match VMX:
svm_disable_intercept_for_msr(vcpu, msr, type)svm_enable_intercept_for_msr(vcpu, msr, type)svm_set_intercept_for_msr(vcpu, msr, type, enable_intercept)Additionally, update calls to
set_msr_interception()to use the new functions. This update is only made to calls that toggle interception for both read and write.Keep the old paths for now, they will be deleted once all code is converted to the new helpers.
Quoted 8 lines
Opportunistically, the function
svm_get_msr_bitmap_entries()is added to abstract the MSR bitmap from the intercept functions. This will be needed later in the series when this code is hoisted to common code.No functional change.
Suggested-by Sean Christopherson <[email protected]>Co-Developed-by Anish Ghulati <[email protected]>
Needs Anish's SoB.
Quoted 1 line
Signed-off-by Aaron Lewis <[email protected]>
PATCH 6/15 KVM: SVM: Disable intercepts for all direct access MSRs on MSR filter changes
In reply to Aaron LewisFrom: Anish Ghulati <[email protected]>
For all direct access MSRs, disable the MSR interception explicitly. svm_disable_intercept_for_msr() checks the new MSR filter and ensures that KVM enables interception if userspace wants to filter the MSR.
This change is similar to the VMX change:
d895f28ed6da ("KVM: VMX: Skip filter updates for MSRs that KVM is already intercepting")
Adopting in SVM to align the implementations.
--- arch/x86/kvm/svm/svm.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
arch/x86/kvm/svm/svm.c +11 -7
@@ -1025,17 +1025,21 @@ static void svm_msr_filter_changed(struct kvm_vcpu *vcpu)u32 i;/* -* Set intercept permissions for all direct access MSRs again. They -* will automatically get filtered through the MSR filter, so we are -* back in sync after this. +* Redo intercept permissions for MSRs that KVM is passing through to +* the guest. Disabling interception will check the new MSR filter and +* ensure that KVM enables interception if usersepace wants to filter +* the MSR. MSRs that KVM is already intercepting don't need to be +* refreshed since KVM is going to intercept them regardless of what +* userspace wants. */ for (i =0 ; direct_access_msrs[i].index !=MSR_INVALID ; i++) {u32 msr = direct_access_msrs[i].index; -u32 read = !test_bit (i, svm->shadow_msr_intercept.read); -u32 write = !test_bit (i, svm->shadow_msr_intercept.write); -/* FIXME: Align the polarity of the bitmaps and params. */ -set_msr_interception_bitmap (vcpu, svm->msrpm, msr, read, write); +if (!test_bit (i, svm->shadow_msr_intercept.read)) +svm_disable_intercept_for_msr (vcpu, msr,MSR_TYPE_R ); + +if (!test_bit (i, svm->shadow_msr_intercept.write)) +svm_disable_intercept_for_msr (vcpu, msr,MSR_TYPE_W ); } }
Signature · 1 line
2.47.0.338.g60cca15819-goog
Sean Christopherson
maintainerRe: [PATCH 06/15] KVM: SVM: Disable intercepts for all direct access MSRs on MSR filter changes
Quoted 10 lines · Aaron Lewis
From: Anish Ghulati <[email protected]>
For all direct access MSRs, disable the MSR interception explicitly.
svm_disable_intercept_for_msr()checks the new MSR filter and ensures that KVM enables interception if userspace wants to filter the MSR.This change is similar to the VMX change:
d895f28ed6da("KVM: VMX: Skip filter updates for MSRs that KVM is already intercepting")Adopting in SVM to align the implementations.
Wording and mood are all funky.
Give SVM the same treatment as was given VMX in commit d895f28ed6da ("KVM:
VMX: Skip filter updates for MSRs that KVM is already intercepting"), and explicitly disable MSR interception when reacting to an MSR filter change. There is no need to change anything for MSRs KVM is already intercepting, and svm_disable_intercept_for_msr() performs the necessary filter checks.
Quoted 4 lines
Suggested-by Sean Christopherson <[email protected]>Co-developed-by Aaron Lewis <[email protected]>Signed-off-by Anish Ghulati <[email protected]>
See the docs again. The order is wrong, and your SoB is missing.
PATCH 7/15 KVM: SVM: Delete old SVM MSR management code
In reply to Aaron LewisFrom: Anish Ghulati <[email protected]>
Delete the old SVM code to manage MSR interception. There are no more calls to these functions:
set_msr_interception_bitmap()
set_msr_interception()
set_shadow_msr_intercept()
valid_msr_intercept()
--- arch/x86/kvm/svm/svm.c | 70 ------------------------------------------ arch/x86/kvm/svm/svm.h | 2 -- 2 files changed, 72 deletions(-)
arch/x86/kvm/svm/svm.c +0 -70
@@ -770,32 +770,6 @@ static int direct_access_msr_slot(u32 msr)return -ENOENT ; } -static void set_shadow_msr_intercept (struct kvm_vcpu *vcpu,u32 msr,int read, -int write) -{ -struct vcpu_svm *svm =to_svm (vcpu); -int slot =direct_access_msr_slot (msr); - -if (slot == -ENOENT ) -return ; - -/* Set the shadow bitmaps to the desired intercept states */ -if (read) -__clear_bit (slot, svm->shadow_msr_intercept.read); -else -__set_bit (slot, svm->shadow_msr_intercept.read); - -if (write) -__clear_bit (slot, svm->shadow_msr_intercept.write); -else -__set_bit (slot, svm->shadow_msr_intercept.write); -} - -static bool valid_msr_intercept (u32 index) -{ -return direct_access_msr_slot (index) != -ENOENT ; -} -static bool msr_write_intercepted (struct kvm_vcpu *vcpu,u32 msr) {u8 bit_write;
@@ -824,50 +798,6 @@ static bool msr_write_intercepted(struct kvm_vcpu *vcpu, u32 msr)return test_bit (bit_write, &tmp); } -static void set_msr_interception_bitmap (struct kvm_vcpu *vcpu,unsigned long *msrpm, -u32 msr,int read,int write) -{ -struct vcpu_svm *svm =to_svm (vcpu); -u8 bit_read, bit_write; -unsigned long tmp; -u32 offset; - -/* -* If this warning triggers extend the direct_access_msrs list at the -* beginning of the file -*/ -WARN_ON (!valid_msr_intercept (msr)); - -/* Enforce non allowed MSRs to trap */ -if (read && !kvm_msr_allowed (vcpu, msr,KVM_MSR_FILTER_READ )) - read =0 ; - -if (write && !kvm_msr_allowed (vcpu, msr,KVM_MSR_FILTER_WRITE )) - write =0 ; - - offset =svm_msrpm_offset (msr); - bit_read =2 * (msr &0x0f ); - bit_write =2 * (msr &0x0f ) +1 ; - tmp = msrpm[offset]; - -BUG_ON (offset ==MSR_INVALID ); - - read ?__clear_bit (bit_read, &tmp) :__set_bit (bit_read, &tmp); - write ?__clear_bit (bit_write, &tmp) :__set_bit (bit_write, &tmp); - - msrpm[offset] = tmp; - -svm_hv_vmcb_dirty_nested_enlightenments (vcpu); - svm->nested.force_msr_bitmap_recalc = true; -} - -void set_msr_interception (struct kvm_vcpu *vcpu,unsigned long *msrpm,u32 msr, -int read,int write) -{ -set_shadow_msr_intercept (vcpu, msr, read, write); -set_msr_interception_bitmap (vcpu, msrpm, msr, read, write); -} -static void svm_get_msr_bitmap_entries (struct kvm_vcpu *vcpu,u32 msr,unsigned long **read_map,u8 *read_bit,unsigned long **write_map,u8 *write_bit)
arch/x86/kvm/svm/svm.h +0 -2
@@ -612,8 +612,6 @@ bool svm_nmi_blocked(struct kvm_vcpu *vcpu);bool svm_interrupt_blocked (struct kvm_vcpu *vcpu);void svm_set_gif (struct vcpu_svm *svm,bool value);int svm_invoke_exit_handler (struct kvm_vcpu *vcpu,u64 exit_code); -void set_msr_interception (struct kvm_vcpu *vcpu,unsigned long *msrpm,u32 msr, -int read,int write);void svm_set_x2apic_msr_interception (struct vcpu_svm *svm,bool disable);void svm_complete_interrupt_delivery (struct kvm_vcpu *vcpu,int delivery_mode,int trig_mode,int vec);
Signature · 1 line
2.47.0.338.g60cca15819-goog
PATCH 8/15 KVM: SVM: Pass through GHCB MSR if and only if VM is SEV-ES
In reply to Aaron LewisFrom: Sean Christopherson <[email protected]>
--- arch/x86/kvm/svm/svm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/x86/kvm/svm/svm.c +4 -1
@@ -108,7 +108,7 @@ static const struct svm_direct_access_msrs { { .index = MSR_IA32_XSS, .always = false }, { .index = MSR_EFER, .always = false }, { .index = MSR_IA32_CR_PAT, .always = false }, - { .index = MSR_AMD64_SEV_ES_GHCB, .always = true }, + { .index = MSR_AMD64_SEV_ES_GHCB, .always = false }, { .index = MSR_TSC_AUX, .always = false }, { .index = X2APIC_MSR(APIC_ID), .always = false }, { .index = X2APIC_MSR(APIC_LVR), .always = false },
@@ -919,6 +919,9 @@ void svm_vcpu_init_msrpm(struct kvm_vcpu *vcpu, unsigned long *msrpm)svm_disable_intercept_for_msr (vcpu, direct_access_msrs[i].index,MSR_TYPE_RW ); } + +if (sev_es_guest (vcpu->kvm)) +svm_disable_intercept_for_msr (vcpu,MSR_AMD64_SEV_ES_GHCB ,MSR_TYPE_RW ); }void svm_set_x2apic_msr_interception (struct vcpu_svm *svm,bool intercept)
Signature · 1 line
2.47.0.338.g60cca15819-goog
Re: [PATCH 08/15] KVM: SVM: Pass through GHCB MSR if and only if VM is SEV-ES
Quoted 21 lines · Aaron Lewis
From: Sean Christopherson <[email protected]>
Signed-off-by Sean Christopherson <[email protected]>--- arch/x86/kvm/svm/svm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)arch/x86/kvm/svm/svm.c +1
-1@@ -108,7 +108,7 @@ static const struct svm_direct_access_msrs { { .index = MSR_IA32_XSS, .always = false }, { .index = MSR_EFER, .always = false }, { .index = MSR_IA32_CR_PAT, .always = false }, - { .index = MSR_AMD64_SEV_ES_GHCB, .always = true }, + { .index = MSR_AMD64_SEV_ES_GHCB, .always = false }, { .index = MSR_TSC_AUX, .always = false }, { .index = X2APIC_MSR(APIC_ID), .always = false }, { .index = X2APIC_MSR(APIC_LVR), .always = false },
arch/x86/kvm/svm/svm.c void svm_vcpu_init_msrpm(struct kvm_vcpu *vcpu, unsigned long *msrpm) · line 924
Quoted 6 lines
arch/x86/kvm/svm/svm.c +3
-0@@ -919,6 +919,9 @@ void svm_vcpu_init_msrpm(struct kvm_vcpu *vcpu, unsigned long *msrpm)svm_disable_intercept_for_msr (vcpu, direct_access_msrs[i].index,MSR_TYPE_RW ); } + +if (sev_es_guest (vcpu->kvm)) +svm_disable_intercept_for_msr (vcpu,MSR_AMD64_SEV_ES_GHCB ,MSR_TYPE_RW );
It would probably be better to put this in sev_es_init_vmcb() with the other MSRs that are removed from interception.
Thanks,
Tom
Quoted 3 lines
arch/x86/kvm/svm/svm.c +0
-0}void svm_set_x2apic_msr_interception (struct vcpu_svm *svm,bool intercept)
PATCH 9/15 KVM: SVM: Drop "always" flag from list of possible passthrough MSRs
In reply to Aaron LewisFrom: Sean Christopherson <[email protected]>
--- arch/x86/kvm/svm/svm.c | 134 ++++++++++++++++++++--------------------- 1 file changed, 67 insertions(+), 67 deletions(-)
arch/x86/kvm/svm/svm.c +67 -67
@@ -81,51 +81,48 @@ static DEFINE_PER_CPU(u64, current_tsc_ratio);#define X2APIC_MSR (x) (APIC_BASE_MSR + (x >> 4)) -static const struct svm_direct_access_msrs { -u32 index;/* Index of the MSR */ -bool always;/* True if intercept is initially cleared */ -} direct_access_msrs[MAX_DIRECT_ACCESS_MSRS ] = { - { .index =MSR_STAR , .always = true }, - { .index =MSR_IA32_SYSENTER_CS , .always = true }, - { .index =MSR_IA32_SYSENTER_EIP , .always = false }, - { .index =MSR_IA32_SYSENTER_ESP , .always = false }, +static const u32 direct_access_msrs[MAX_DIRECT_ACCESS_MSRS ] = { +MSR_STAR , +MSR_IA32_SYSENTER_CS , +MSR_IA32_SYSENTER_EIP , +MSR_IA32_SYSENTER_ESP , #ifdef CONFIG_X86_64 - { .index =MSR_GS_BASE , .always = true }, - { .index =MSR_FS_BASE , .always = true }, - { .index =MSR_KERNEL_GS_BASE , .always = true }, - { .index =MSR_LSTAR , .always = true }, - { .index =MSR_CSTAR , .always = true }, - { .index =MSR_SYSCALL_MASK , .always = true }, +MSR_GS_BASE , +MSR_FS_BASE , +MSR_KERNEL_GS_BASE , +MSR_LSTAR , +MSR_CSTAR , +MSR_SYSCALL_MASK , #endif - { .index =MSR_IA32_SPEC_CTRL , .always = false }, - { .index =MSR_IA32_PRED_CMD , .always = false }, - { .index =MSR_IA32_FLUSH_CMD , .always = false }, - { .index =MSR_IA32_DEBUGCTLMSR , .always = false }, - { .index =MSR_IA32_LASTBRANCHFROMIP , .always = false }, - { .index =MSR_IA32_LASTBRANCHTOIP , .always = false }, - { .index =MSR_IA32_LASTINTFROMIP , .always = false }, - { .index =MSR_IA32_LASTINTTOIP , .always = false }, - { .index =MSR_IA32_XSS , .always = false }, - { .index =MSR_EFER , .always = false }, - { .index =MSR_IA32_CR_PAT , .always = false }, - { .index =MSR_AMD64_SEV_ES_GHCB , .always = false }, - { .index =MSR_TSC_AUX , .always = false }, - { .index =X2APIC_MSR (APIC_ID ), .always = false }, - { .index =X2APIC_MSR (APIC_LVR ), .always = false }, - { .index =X2APIC_MSR (APIC_TASKPRI ), .always = false }, - { .index =X2APIC_MSR (APIC_ARBPRI ), .always = false }, - { .index =X2APIC_MSR (APIC_PROCPRI ), .always = false }, - { .index =X2APIC_MSR (APIC_EOI ), .always = false }, - { .index =X2APIC_MSR (APIC_RRR ), .always = false }, - { .index =X2APIC_MSR (APIC_LDR ), .always = false }, - { .index =X2APIC_MSR (APIC_DFR ), .always = false }, - { .index =X2APIC_MSR (APIC_SPIV ), .always = false }, - { .index =X2APIC_MSR (APIC_ISR ), .always = false }, - { .index =X2APIC_MSR (APIC_TMR ), .always = false }, - { .index =X2APIC_MSR (APIC_IRR ), .always = false }, - { .index =X2APIC_MSR (APIC_ESR ), .always = false }, - { .index =X2APIC_MSR (APIC_ICR ), .always = false }, - { .index =X2APIC_MSR (APIC_ICR2 ), .always = false }, +MSR_IA32_SPEC_CTRL , +MSR_IA32_PRED_CMD , +MSR_IA32_FLUSH_CMD , +MSR_IA32_DEBUGCTLMSR , +MSR_IA32_LASTBRANCHFROMIP , +MSR_IA32_LASTBRANCHTOIP , +MSR_IA32_LASTINTFROMIP , +MSR_IA32_LASTINTTOIP , +MSR_IA32_XSS , +MSR_EFER , +MSR_IA32_CR_PAT , +MSR_AMD64_SEV_ES_GHCB , +MSR_TSC_AUX , +X2APIC_MSR (APIC_ID ), +X2APIC_MSR (APIC_LVR ), +X2APIC_MSR (APIC_TASKPRI ), +X2APIC_MSR (APIC_ARBPRI ), +X2APIC_MSR (APIC_PROCPRI ), +X2APIC_MSR (APIC_EOI ), +X2APIC_MSR (APIC_RRR ), +X2APIC_MSR (APIC_LDR ), +X2APIC_MSR (APIC_DFR ), +X2APIC_MSR (APIC_SPIV ), +X2APIC_MSR (APIC_ISR ), +X2APIC_MSR (APIC_TMR ), +X2APIC_MSR (APIC_IRR ), +X2APIC_MSR (APIC_ESR ), +X2APIC_MSR (APIC_ICR ), +X2APIC_MSR (APIC_ICR2 ),/* * Note:
@@ -134,15 +131,15 @@ static const struct svm_direct_access_msrs {* the AVIC hardware would generate GP fault. Therefore, always * intercept the MSR 0x832, and do not setup direct_access_msr. */ - { .index = X2APIC_MSR(APIC_LVTTHMR), .always = false }, - { .index = X2APIC_MSR(APIC_LVTPC), .always = false }, - { .index = X2APIC_MSR(APIC_LVT0), .always = false }, - { .index = X2APIC_MSR(APIC_LVT1), .always = false }, - { .index = X2APIC_MSR(APIC_LVTERR), .always = false }, - { .index = X2APIC_MSR(APIC_TMICT), .always = false }, - { .index = X2APIC_MSR(APIC_TMCCT), .always = false }, - { .index = X2APIC_MSR(APIC_TDCR), .always = false }, - { .index = MSR_INVALID, .always = false }, +X2APIC_MSR (APIC_LVTTHMR ), +X2APIC_MSR (APIC_LVTPC ), +X2APIC_MSR (APIC_LVT0 ), +X2APIC_MSR (APIC_LVT1 ), +X2APIC_MSR (APIC_LVTERR ), +X2APIC_MSR (APIC_TMICT ), +X2APIC_MSR (APIC_TMCCT ), +X2APIC_MSR (APIC_TDCR ), + MSR_INVALID, };/*
@@ -763,9 +760,10 @@ static int direct_access_msr_slot(u32 msr) {u32 i; -for (i =0 ; direct_access_msrs[i].index !=MSR_INVALID ; i++) -if (direct_access_msrs[i].index == msr) +for (i =0 ; direct_access_msrs[i] !=MSR_INVALID ; i++) { +if (direct_access_msrs[i] == msr)return i; + }return -ENOENT ; }
@@ -911,15 +909,17 @@ unsigned long *svm_vcpu_alloc_msrpm(void)void svm_vcpu_init_msrpm (struct kvm_vcpu *vcpu,unsigned long *msrpm) { -int i; - -for (i =0 ; direct_access_msrs[i].index !=MSR_INVALID ; i++) { -if (!direct_access_msrs[i].always) -continue ; -svm_disable_intercept_for_msr (vcpu, direct_access_msrs[i].index, -MSR_TYPE_RW ); - } +svm_disable_intercept_for_msr (vcpu,MSR_STAR ,MSR_TYPE_RW ); +svm_disable_intercept_for_msr (vcpu,MSR_IA32_SYSENTER_CS ,MSR_TYPE_RW ); +#ifdef CONFIG_X86_64 +svm_disable_intercept_for_msr (vcpu,MSR_GS_BASE ,MSR_TYPE_RW ); +svm_disable_intercept_for_msr (vcpu,MSR_FS_BASE ,MSR_TYPE_RW ); +svm_disable_intercept_for_msr (vcpu,MSR_KERNEL_GS_BASE ,MSR_TYPE_RW ); +svm_disable_intercept_for_msr (vcpu,MSR_LSTAR ,MSR_TYPE_RW ); +svm_disable_intercept_for_msr (vcpu,MSR_CSTAR ,MSR_TYPE_RW ); +svm_disable_intercept_for_msr (vcpu,MSR_SYSCALL_MASK ,MSR_TYPE_RW ); +#endif if (sev_es_guest (vcpu->kvm))svm_disable_intercept_for_msr (vcpu,MSR_AMD64_SEV_ES_GHCB ,MSR_TYPE_RW ); }
@@ -935,7 +935,7 @@ void svm_set_x2apic_msr_interception(struct vcpu_svm *svm, bool intercept)return ;for (i =0 ; i <MAX_DIRECT_ACCESS_MSRS ; i++) { -int index = direct_access_msrs[i].index; +int index = direct_access_msrs[i];if ((index <APIC_BASE_MSR ) || (index >APIC_BASE_MSR +0xff ))
@@ -965,8 +965,8 @@ static void svm_msr_filter_changed(struct kvm_vcpu *vcpu)* refreshed since KVM is going to intercept them regardless of what * userspace wants. */ -for (i =0 ; direct_access_msrs[i].index !=MSR_INVALID ; i++) { -u32 msr = direct_access_msrs[i].index; +for (i =0 ; direct_access_msrs[i] !=MSR_INVALID ; i++) { +u32 msr = direct_access_msrs[i];if (!test_bit (i, svm->shadow_msr_intercept.read))svm_disable_intercept_for_msr (vcpu, msr,MSR_TYPE_R );
@@ -1009,10 +1009,10 @@ static void init_msrpm_offsets(void)memset (msrpm_offsets,0xff ,sizeof (msrpm_offsets)); -for (i =0 ; direct_access_msrs[i].index !=MSR_INVALID ; i++) { +for (i =0 ; direct_access_msrs[i] !=MSR_INVALID ; i++) {u32 offset; - offset =svm_msrpm_offset (direct_access_msrs[i].index); + offset =svm_msrpm_offset (direct_access_msrs[i]);BUG_ON (offset ==MSR_INVALID );add_msr_offset (offset);
Signature · 1 line
2.47.0.338.g60cca15819-goog
Re: [PATCH 09/15] KVM: SVM: Drop "always" flag from list of possible passthrough MSRs
Quoted 115 lines · Aaron Lewis
From: Sean Christopherson <[email protected]>
Signed-off-by Sean Christopherson <[email protected]>--- arch/x86/kvm/svm/svm.c | 134 ++++++++++++++++++++--------------------- 1 file changed, 67 insertions(+), 67 deletions(-)arch/x86/kvm/svm/svm.c +40
-51@@ -81,51 +81,48 @@ static DEFINE_PER_CPU(u64, current_tsc_ratio);#define X2APIC_MSR (x) (APIC_BASE_MSR + (x >> 4)) -static const struct svm_direct_access_msrs { -u32 index;/* Index of the MSR */ -bool always;/* True if intercept is initially cleared */ -} direct_access_msrs[MAX_DIRECT_ACCESS_MSRS ] = { - { .index =MSR_STAR , .always = true }, - { .index =MSR_IA32_SYSENTER_CS , .always = true }, - { .index =MSR_IA32_SYSENTER_EIP , .always = false }, - { .index =MSR_IA32_SYSENTER_ESP , .always = false }, +static const u32 direct_access_msrs[MAX_DIRECT_ACCESS_MSRS ] = { +MSR_STAR , +MSR_IA32_SYSENTER_CS , +MSR_IA32_SYSENTER_EIP , +MSR_IA32_SYSENTER_ESP , #ifdef CONFIG_X86_64 - { .index =MSR_GS_BASE , .always = true }, - { .index =MSR_FS_BASE , .always = true }, - { .index =MSR_KERNEL_GS_BASE , .always = true }, - { .index =MSR_LSTAR , .always = true }, - { .index =MSR_CSTAR , .always = true }, - { .index =MSR_SYSCALL_MASK , .always = true }, +MSR_GS_BASE , +MSR_FS_BASE , +MSR_KERNEL_GS_BASE , +MSR_LSTAR , +MSR_CSTAR , +MSR_SYSCALL_MASK , #endif - { .index =MSR_IA32_SPEC_CTRL , .always = false }, - { .index =MSR_IA32_PRED_CMD , .always = false }, - { .index =MSR_IA32_FLUSH_CMD , .always = false }, - { .index =MSR_IA32_DEBUGCTLMSR , .always = false }, - { .index =MSR_IA32_LASTBRANCHFROMIP , .always = false }, - { .index =MSR_IA32_LASTBRANCHTOIP , .always = false }, - { .index =MSR_IA32_LASTINTFROMIP , .always = false }, - { .index =MSR_IA32_LASTINTTOIP , .always = false }, - { .index =MSR_IA32_XSS , .always = false }, - { .index =MSR_EFER , .always = false }, - { .index =MSR_IA32_CR_PAT , .always = false }, - { .index =MSR_AMD64_SEV_ES_GHCB , .always = false }, - { .index =MSR_TSC_AUX , .always = false }, - { .index =X2APIC_MSR (APIC_ID ), .always = false }, - { .index =X2APIC_MSR (APIC_LVR ), .always = false }, - { .index =X2APIC_MSR (APIC_TASKPRI ), .always = false }, - { .index =X2APIC_MSR (APIC_ARBPRI ), .always = false }, - { .index =X2APIC_MSR (APIC_PROCPRI ), .always = false }, - { .index =X2APIC_MSR (APIC_EOI ), .always = false }, - { .index =X2APIC_MSR (APIC_RRR ), .always = false }, - { .index =X2APIC_MSR (APIC_LDR ), .always = false }, - { .index =X2APIC_MSR (APIC_DFR ), .always = false }, - { .index =X2APIC_MSR (APIC_SPIV ), .always = false }, - { .index =X2APIC_MSR (APIC_ISR ), .always = false }, - { .index =X2APIC_MSR (APIC_TMR ), .always = false }, - { .index =X2APIC_MSR (APIC_IRR ), .always = false }, - { .index =X2APIC_MSR (APIC_ESR ), .always = false }, - { .index =X2APIC_MSR (APIC_ICR ), .always = false }, - { .index =X2APIC_MSR (APIC_ICR2 ), .always = false }, +MSR_IA32_SPEC_CTRL , +MSR_IA32_PRED_CMD , +MSR_IA32_FLUSH_CMD , +MSR_IA32_DEBUGCTLMSR , +MSR_IA32_LASTBRANCHFROMIP , +MSR_IA32_LASTBRANCHTOIP , +MSR_IA32_LASTINTFROMIP , +MSR_IA32_LASTINTTOIP , +MSR_IA32_XSS , +MSR_EFER , +MSR_IA32_CR_PAT , +MSR_AMD64_SEV_ES_GHCB , +MSR_TSC_AUX , +X2APIC_MSR (APIC_ID ), +X2APIC_MSR (APIC_LVR ), +X2APIC_MSR (APIC_TASKPRI ), +X2APIC_MSR (APIC_ARBPRI ), +X2APIC_MSR (APIC_PROCPRI ), +X2APIC_MSR (APIC_EOI ), +X2APIC_MSR (APIC_RRR ), +X2APIC_MSR (APIC_LDR ), +X2APIC_MSR (APIC_DFR ), +X2APIC_MSR (APIC_SPIV ), +X2APIC_MSR (APIC_ISR ), +X2APIC_MSR (APIC_TMR ), +X2APIC_MSR (APIC_IRR ), +X2APIC_MSR (APIC_ESR ), +X2APIC_MSR (APIC_ICR ), +X2APIC_MSR (APIC_ICR2 ),/* * Note: @@ -134,15 +131,15 @@ static const struct svm_direct_access_msrs {* the AVIC hardware would generate GP fault. Therefore, always * intercept the MSR 0x832, and do not setup direct_access_msr. */ - { .index = X2APIC_MSR(APIC_LVTTHMR), .always = false }, - { .index = X2APIC_MSR(APIC_LVTPC), .always = false }, - { .index = X2APIC_MSR(APIC_LVT0), .always = false }, - { .index = X2APIC_MSR(APIC_LVT1), .always = false }, - { .index = X2APIC_MSR(APIC_LVTERR), .always = false }, - { .index = X2APIC_MSR(APIC_TMICT), .always = false }, - { .index = X2APIC_MSR(APIC_TMCCT), .always = false }, - { .index = X2APIC_MSR(APIC_TDCR), .always = false },
arch/x86/kvm/svm/svm.c static const struct svm_direct_access_msrs { · line 142
Quoted 10 lines
arch/x86/kvm/svm/svm.c +9
-1- { .index = MSR_INVALID, .always = false }, +X2APIC_MSR (APIC_LVTTHMR ), +X2APIC_MSR (APIC_LVTPC ), +X2APIC_MSR (APIC_LVT0 ), +X2APIC_MSR (APIC_LVT1 ), +X2APIC_MSR (APIC_LVTERR ), +X2APIC_MSR (APIC_TMICT ), +X2APIC_MSR (APIC_TMCCT ), +X2APIC_MSR (APIC_TDCR ), + MSR_INVALID,
By adding this there are two things being done in this patch. I think it would be easier to see the changes related specifically to the "always" flag being removed if the MSR_INVALID addition was a separate patch.
Thanks,
Tom
Quoted 75 lines
arch/x86/kvm/svm/svm.c +18
-15};/* @@ -763,9 +760,10 @@ static int direct_access_msr_slot(u32 msr) {u32 i; -for (i =0 ; direct_access_msrs[i].index !=MSR_INVALID ; i++) -if (direct_access_msrs[i].index == msr) +for (i =0 ; direct_access_msrs[i] !=MSR_INVALID ; i++) { +if (direct_access_msrs[i] == msr)return i; + }return -ENOENT ; }@@ -911,15 +909,17 @@ unsigned long *svm_vcpu_alloc_msrpm(void)void svm_vcpu_init_msrpm (struct kvm_vcpu *vcpu,unsigned long *msrpm) { -int i; - -for (i =0 ; direct_access_msrs[i].index !=MSR_INVALID ; i++) { -if (!direct_access_msrs[i].always) -continue ; -svm_disable_intercept_for_msr (vcpu, direct_access_msrs[i].index, -MSR_TYPE_RW ); - } +svm_disable_intercept_for_msr (vcpu,MSR_STAR ,MSR_TYPE_RW ); +svm_disable_intercept_for_msr (vcpu,MSR_IA32_SYSENTER_CS ,MSR_TYPE_RW ); +#ifdef CONFIG_X86_64 +svm_disable_intercept_for_msr (vcpu,MSR_GS_BASE ,MSR_TYPE_RW ); +svm_disable_intercept_for_msr (vcpu,MSR_FS_BASE ,MSR_TYPE_RW ); +svm_disable_intercept_for_msr (vcpu,MSR_KERNEL_GS_BASE ,MSR_TYPE_RW ); +svm_disable_intercept_for_msr (vcpu,MSR_LSTAR ,MSR_TYPE_RW ); +svm_disable_intercept_for_msr (vcpu,MSR_CSTAR ,MSR_TYPE_RW ); +svm_disable_intercept_for_msr (vcpu,MSR_SYSCALL_MASK ,MSR_TYPE_RW ); +#endif if (sev_es_guest (vcpu->kvm))svm_disable_intercept_for_msr (vcpu,MSR_AMD64_SEV_ES_GHCB ,MSR_TYPE_RW ); }@@ -935,7 +935,7 @@ void svm_set_x2apic_msr_interception(struct vcpu_svm *svm, bool intercept)return ;for (i =0 ; i <MAX_DIRECT_ACCESS_MSRS ; i++) { -int index = direct_access_msrs[i].index; +int index = direct_access_msrs[i];if ((index <APIC_BASE_MSR ) || (index >APIC_BASE_MSR +0xff ))@@ -965,8 +965,8 @@ static void svm_msr_filter_changed(struct kvm_vcpu *vcpu)* refreshed since KVM is going to intercept them regardless of what * userspace wants. */ -for (i =0 ; direct_access_msrs[i].index !=MSR_INVALID ; i++) { -u32 msr = direct_access_msrs[i].index; +for (i =0 ; direct_access_msrs[i] !=MSR_INVALID ; i++) { +u32 msr = direct_access_msrs[i];if (!test_bit (i, svm->shadow_msr_intercept.read))svm_disable_intercept_for_msr (vcpu, msr,MSR_TYPE_R );@@ -1009,10 +1009,10 @@ static void init_msrpm_offsets(void)memset (msrpm_offsets,0xff ,sizeof (msrpm_offsets)); -for (i =0 ; direct_access_msrs[i].index !=MSR_INVALID ; i++) { +for (i =0 ; direct_access_msrs[i] !=MSR_INVALID ; i++) {u32 offset; - offset =svm_msrpm_offset (direct_access_msrs[i].index); + offset =svm_msrpm_offset (direct_access_msrs[i]);BUG_ON (offset ==MSR_INVALID );add_msr_offset (offset);
PATCH 10/15 KVM: SVM: Don't "NULL terminate" the list of possible passthrough MSRs
In reply to Aaron Lewis--- arch/x86/kvm/svm/svm.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
arch/x86/kvm/svm/svm.c +5 -6
@@ -81,7 +81,7 @@ static DEFINE_PER_CPU(u64, current_tsc_ratio);#define X2APIC_MSR (x) (APIC_BASE_MSR + (x >> 4)) -static const u32 direct_access_msrs[MAX_DIRECT_ACCESS_MSRS ] = { +static const u32 direct_access_msrs[] = {MSR_STAR ,MSR_IA32_SYSENTER_CS ,MSR_IA32_SYSENTER_EIP ,
@@ -139,7 +139,6 @@ static const u32 direct_access_msrs[MAX_DIRECT_ACCESS_MSRS] = {X2APIC_MSR (APIC_TMICT ),X2APIC_MSR (APIC_TMCCT ), X2APIC_MSR(APIC_TDCR), - MSR_INVALID, };/*
@@ -760,7 +759,7 @@ static int direct_access_msr_slot(u32 msr) {u32 i; -for (i =0 ; direct_access_msrs[i] !=MSR_INVALID ; i++) { +for (i =0 ; i <ARRAY_SIZE (direct_access_msrs); i++) {if (direct_access_msrs[i] == msr)return i; }
@@ -934,7 +933,7 @@ void svm_set_x2apic_msr_interception(struct vcpu_svm *svm, bool intercept)if (!x2avic_enabled)return ; -for (i =0 ; i <MAX_DIRECT_ACCESS_MSRS ; i++) { +for (i =0 ; i <ARRAY_SIZE (direct_access_msrs); i++) {int index = direct_access_msrs[i]; if ((index < APIC_BASE_MSR) ||
@@ -965,7 +964,7 @@ static void svm_msr_filter_changed(struct kvm_vcpu *vcpu)* refreshed since KVM is going to intercept them regardless of what * userspace wants. */ -for (i =0 ; direct_access_msrs[i] !=MSR_INVALID ; i++) { +for (i =0 ; i <ARRAY_SIZE (direct_access_msrs); i++) {u32 msr = direct_access_msrs[i];if (!test_bit (i, svm->shadow_msr_intercept.read))
@@ -1009,7 +1008,7 @@ static void init_msrpm_offsets(void)memset (msrpm_offsets,0xff ,sizeof (msrpm_offsets)); -for (i =0 ; direct_access_msrs[i] !=MSR_INVALID ; i++) { +for (i =0 ; i <ARRAY_SIZE (direct_access_msrs); i++) {u32 offset; offset =svm_msrpm_offset (direct_access_msrs[i]);
Signature · 1 line
2.47.0.338.g60cca15819-goog
Re: [PATCH 10/15] KVM: SVM: Don't "NULL terminate" the list of possible passthrough MSRs
Quoted 20 lines · Aaron Lewis
Signed-off-by Sean Christopherson <[email protected]>Co-developed-by Aaron Lewis <[email protected]>--- arch/x86/kvm/svm/svm.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)arch/x86/kvm/svm/svm.c +1
-1@@ -81,7 +81,7 @@ static DEFINE_PER_CPU(u64, current_tsc_ratio);#define X2APIC_MSR (x) (APIC_BASE_MSR + (x >> 4)) -static const u32 direct_access_msrs[MAX_DIRECT_ACCESS_MSRS ] = { +static const u32 direct_access_msrs[] = {MSR_STAR ,MSR_IA32_SYSENTER_CS ,MSR_IA32_SYSENTER_EIP ,
arch/x86/kvm/svm/svm.c static const u32 direct_access_msrs[MAX_DIRECT_ACCESS_MSRS] = { · line 142
Quoted 4 lines
arch/x86/kvm/svm/svm.c +0
-1@@ -139,7 +139,6 @@ static const u32 direct_access_msrs[MAX_DIRECT_ACCESS_MSRS] = {X2APIC_MSR (APIC_TMICT ),X2APIC_MSR (APIC_TMCCT ), X2APIC_MSR(APIC_TDCR), - MSR_INVALID,
Given my comment on the previous patch and then this patch, can't the MSR_INVALID addition just be removed all together?
Thanks,
Tom
Quoted 39 lines
arch/x86/kvm/svm/svm.c +4
-4};/* @@ -760,7 +759,7 @@ static int direct_access_msr_slot(u32 msr) {u32 i; -for (i =0 ; direct_access_msrs[i] !=MSR_INVALID ; i++) { +for (i =0 ; i <ARRAY_SIZE (direct_access_msrs); i++) {if (direct_access_msrs[i] == msr)return i; }@@ -934,7 +933,7 @@ void svm_set_x2apic_msr_interception(struct vcpu_svm *svm, bool intercept)if (!x2avic_enabled)return ; -for (i =0 ; i <MAX_DIRECT_ACCESS_MSRS ; i++) { +for (i =0 ; i <ARRAY_SIZE (direct_access_msrs); i++) {int index = direct_access_msrs[i]; if ((index < APIC_BASE_MSR) ||@@ -965,7 +964,7 @@ static void svm_msr_filter_changed(struct kvm_vcpu *vcpu)* refreshed since KVM is going to intercept them regardless of what * userspace wants. */ -for (i =0 ; direct_access_msrs[i] !=MSR_INVALID ; i++) { +for (i =0 ; i <ARRAY_SIZE (direct_access_msrs); i++) {u32 msr = direct_access_msrs[i];if (!test_bit (i, svm->shadow_msr_intercept.read))@@ -1009,7 +1008,7 @@ static void init_msrpm_offsets(void)memset (msrpm_offsets,0xff ,sizeof (msrpm_offsets)); -for (i =0 ; direct_access_msrs[i] !=MSR_INVALID ; i++) { +for (i =0 ; i <ARRAY_SIZE (direct_access_msrs); i++) {u32 offset; offset =svm_msrpm_offset (direct_access_msrs[i]);
PATCH 11/15 KVM: VMX: Make list of possible passthrough MSRs "const"
In reply to Aaron LewisFrom: Sean Christopherson <[email protected]>
--- arch/x86/kvm/vmx/vmx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/vmx/vmx.c +1 -1
@@ -167,7 +167,7 @@ module_param(allow_smaller_maxphyaddr, bool, S_IRUGO);* List of MSRs that can be directly passed to the guest. * In addition to these x2apic, PT and LBR MSRs are handled specially. */ -static u32 vmx_possible_passthrough_msrs[MAX_POSSIBLE_PASSTHROUGH_MSRS ] = { +static const u32 vmx_possible_passthrough_msrs[MAX_POSSIBLE_PASSTHROUGH_MSRS ] = {MSR_IA32_SPEC_CTRL ,MSR_IA32_PRED_CMD ,MSR_IA32_FLUSH_CMD ,
Signature · 1 line
2.47.0.338.g60cca15819-goog
PATCH 12/15 KVM: x86: Track possible passthrough MSRs in kvm_x86_ops
In reply to Aaron LewisMove the possible passthrough MSRs to kvm_x86_ops. Doing this allows them to be accessed from common x86 code.
In order to set the passthrough MSRs in kvm_x86_ops for VMX, "vmx_possible_passthrough_msrs" had to be relocated to main.c, and with that vmx_msr_filter_changed() had to be moved too because it uses "vmx_possible_passthrough_msrs".
--- arch/x86/include/asm/kvm_host.h | 3 ++ arch/x86/kvm/svm/svm.c | 18 ++------- arch/x86/kvm/vmx/main.c | 58 ++++++++++++++++++++++++++++ arch/x86/kvm/vmx/vmx.c | 67 ++------------------------------- arch/x86/kvm/x86.c | 13 +++++++ arch/x86/kvm/x86.h | 1 + 6 files changed, 83 insertions(+), 77 deletions(-)
arch/x86/include/asm/kvm_host.h +3 -0
@@ -1817,6 +1817,9 @@ struct kvm_x86_ops {int (*enable_l2_tlb_flush)(struct kvm_vcpu *vcpu);void (*migrate_timers)(struct kvm_vcpu *vcpu); + +const u32 *const possible_passthrough_msrs; +const u32 nr_possible_passthrough_msrs;void (*msr_filter_changed)(struct kvm_vcpu *vcpu);int (*complete_emulated_msr)(struct kvm_vcpu *vcpu,int err);
arch/x86/kvm/svm/svm.c +4 -14
@@ -755,18 +755,6 @@ static void clr_dr_intercepts(struct vcpu_svm *svm)recalc_intercepts (svm); } -static int direct_access_msr_slot (u32 msr) -{ -u32 i; - -for (i =0 ; i <ARRAY_SIZE (direct_access_msrs); i++) { -if (direct_access_msrs[i] == msr) -return i; - } - -return -ENOENT ; -} -static bool msr_write_intercepted (struct kvm_vcpu *vcpu,u32 msr) {u8 bit_write;
@@ -832,7 +820,7 @@ void svm_disable_intercept_for_msr(struct kvm_vcpu *vcpu, u32 msr, int type)struct vcpu_svm *svm =to_svm (vcpu);int slot; - slot =direct_access_msr_slot (msr); + slot =kvm_passthrough_msr_slot (msr);WARN_ON (slot == -ENOENT );if (slot >=0 ) {/* Set the shadow bitmaps to the desired intercept states */
@@ -871,7 +859,7 @@ void svm_enable_intercept_for_msr(struct kvm_vcpu *vcpu, u32 msr, int type)struct vcpu_svm *svm =to_svm (vcpu);int slot; - slot =direct_access_msr_slot (msr); + slot =kvm_passthrough_msr_slot (msr);WARN_ON (slot == -ENOENT );if (slot >=0 ) {/* Set the shadow bitmaps to the desired intercept states */
@@ -5165,6 +5153,8 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { .apic_init_signal_blocked = svm_apic_init_signal_blocked, + .possible_passthrough_msrs = direct_access_msrs, + .nr_possible_passthrough_msrs = ARRAY_SIZE(direct_access_msrs), .msr_filter_changed = svm_msr_filter_changed, .complete_emulated_msr = svm_complete_emulated_msr,
arch/x86/kvm/vmx/main.c +58 -0
70 lines not on this page · raw message
arch/x86/kvm/vmx/vmx.c +4 -63
92 lines not on this page · raw message
arch/x86/kvm/x86.c +13 -0
@@ -1806,6 +1806,19 @@ bool kvm_msr_allowed(struct kvm_vcpu *vcpu, u32 index, u32 type) }EXPORT_SYMBOL_GPL (kvm_msr_allowed); +int kvm_passthrough_msr_slot (u32 msr) +{ +u32 i; + +for (i =0 ; i < kvm_x86_ops.nr_possible_passthrough_msrs; i++) { +if (kvm_x86_ops.possible_passthrough_msrs[i] == msr) +return i; + } + +return -ENOENT ; +} +EXPORT_SYMBOL_GPL (kvm_passthrough_msr_slot); +/* * Write @data into the MSR specified by @index. Select MSR specific fault * checks are bypassed if @host_initiated is %true.
arch/x86/kvm/x86.h +1 -0
@@ -555,6 +555,7 @@ int kvm_handle_memory_failure(struct kvm_vcpu *vcpu, int r, struct x86_exception *e);int kvm_handle_invpcid (struct kvm_vcpu *vcpu,unsigned long type,gva_t gva);bool kvm_msr_allowed (struct kvm_vcpu *vcpu,u32 index,u32 type); +int kvm_passthrough_msr_slot (u32 msr);enum kvm_msr_access {MSR_TYPE_R =BIT (0 ),
Signature · 1 line
2.47.0.338.g60cca15819-goog
Sean Christopherson
maintainerRe: [PATCH 12/15] KVM: x86: Track possible passthrough MSRs in kvm_x86_ops
+Xin, Boris, and Dapeng
Quoted 2 lines · Aaron Lewis
Move the possible passthrough MSRs to
kvm_x86_ops. Doing this allows them to be accessed from common x86 code.
...
Quoted 13 lines
arch/x86/include/asm/kvm_host.h +3
-0@@ -1817,6 +1817,9 @@ struct kvm_x86_ops {int (*enable_l2_tlb_flush)(struct kvm_vcpu *vcpu);void (*migrate_timers)(struct kvm_vcpu *vcpu); + +const u32 *const possible_passthrough_msrs; +const u32 nr_possible_passthrough_msrs;void (*msr_filter_changed)(struct kvm_vcpu *vcpu);int (*complete_emulated_msr)(struct kvm_vcpu *vcpu,int err);
...
Quoted 14 lines
arch/x86/include/asm/kvm_host.h +14
-0+/* +* List of MSRs that can be directly passed to the guest. +* In addition to these x2apic, PT and LBR MSRs are handled specially. +*/ +static const u32 vmx_possible_passthrough_msrs[] = { +MSR_IA32_SPEC_CTRL , +MSR_IA32_PRED_CMD , +MSR_IA32_FLUSH_CMD , +MSR_IA32_TSC , +#ifdef CONFIG_X86_64 +MSR_FS_BASE , +MSR_GS_BASE , +MSR_KERNEL_GS_BASE , + MSR_IA32_XFD,
arch/x86/include/asm/kvm_host.h
Quoted 10 lines
arch/x86/include/asm/kvm_host.h +10
-0+MSR_IA32_XFD_ERR , +#endif +MSR_IA32_SYSENTER_CS , +MSR_IA32_SYSENTER_ESP , +MSR_IA32_SYSENTER_EIP , +MSR_CORE_C1_RES , +MSR_CORE_C3_RESIDENCY , +MSR_CORE_C6_RESIDENCY , + MSR_CORE_C7_RESIDENCY, +};
Looking at this with fresh eyes, the "possible" passthrough MSR list, and SVM's direct_access_msrs, are confusing and flat out stupid. VMX's list isn't the set of "possible" passthrough MSRs, it's the set of MSRs for which KVM may disable interceptions without dedicated handling in .msr_filter_changed(). Ditto for SVM's list, but at least SVM's array uses a slightly less awful name.
Xin Li and Boris have been bikeshedding over the VMX array, and it's all a giant waste of time.
In all cases, KVM *already knows* which MSRs it wants to pass-through to the guest. In a few cases the logic isn't super intuitive, e.g. for SPEC_CTRL, but it's always fairly easy to understand what KVM wants to do.
Rather than expose the lists to common code, I think we should pivot after "KVM: SVM: Drop "always" flag from list of possible passthrough MSRs" and rip them out entirely.
The attached patch is compile-tested only (the nested interactions in particular need a bit of scrutiny) and needs to be chunked into multiple patches, but I don't see any obvious blockers, and the diffstats speak volumes:
arch/x86/include/asm/kvm-x86-ops.h | 2 +- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/lapic.h | 2 + arch/x86/kvm/svm/svm.c | 310 ++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------- arch/x86/kvm/svm/svm.h | 6 --- arch/x86/kvm/vmx/main.c | 2 +- arch/x86/kvm/vmx/vmx.c | 179 ++++++++++++++++++--------------------------------------------------------- arch/x86/kvm/vmx/vmx.h | 9 ---- arch/x86/kvm/vmx/x86_ops.h | 2 +- arch/x86/kvm/x86.c | 10 ++++- 10 files changed, 147 insertions(+), 377 deletions(-)
[*] https://lore.kernel.org/all/[email protected]
From 83928fe0ccd81ac46d48b62ec31580e725998436 Mon Sep 17 00:00:00 2001
From: Sean Christopherson <[email protected]>
Date: Wed, 27 Nov 2024 13:54:37 -0800
Subject: [PATCH] tmp
--- arch/x86/include/asm/kvm-x86-ops.h | 2 +- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/lapic.h | 2 + arch/x86/kvm/svm/svm.c | 310 +++++++++-------------------- arch/x86/kvm/svm/svm.h | 6 - arch/x86/kvm/vmx/main.c | 2 +- arch/x86/kvm/vmx/vmx.c | 179 ++++------------- arch/x86/kvm/vmx/vmx.h | 9 - arch/x86/kvm/vmx/x86_ops.h | 2 +- arch/x86/kvm/x86.c | 10 +- 10 files changed, 147 insertions(+), 377 deletions(-)
arch/x86/include/asm/kvm-x86-ops.h +1 -1
@@ -131,7 +131,7 @@ KVM_X86_OP(check_emulate_instruction) KVM_X86_OP(apic_init_signal_blocked) KVM_X86_OP_OPTIONAL(enable_l2_tlb_flush) KVM_X86_OP_OPTIONAL(migrate_timers) -KVM_X86_OP(msr_filter_changed) +KVM_X86_OP(refresh_msr_intercepts) KVM_X86_OP(complete_emulated_msr) KVM_X86_OP(vcpu_deliver_sipi_vector) KVM_X86_OP_OPTIONAL_RET0(vcpu_get_apicv_inhibit_reasons);
arch/x86/include/asm/kvm_host.h +1 -1
@@ -1819,7 +1819,7 @@ struct kvm_x86_ops {int (*enable_l2_tlb_flush)(struct kvm_vcpu *vcpu);void (*migrate_timers)(struct kvm_vcpu *vcpu); -void (*msr_filter_changed)(struct kvm_vcpu *vcpu); +void (*refresh_msr_intercepts)(struct kvm_vcpu *vcpu);int (*complete_emulated_msr)(struct kvm_vcpu *vcpu,int err);void (*vcpu_deliver_sipi_vector)(struct kvm_vcpu *vcpu,u8 vector);
arch/x86/kvm/lapic.h +2 -0
@@ -21,6 +21,8 @@#define APIC_BROADCAST 0xFF#define X2APIC_BROADCAST 0xFFFFFFFFul +#define X2APIC_MSR (r) (APIC_BASE_MSR + ((r) >> 4)) +enum lapic_mode {LAPIC_MODE_DISABLED =0 ,LAPIC_MODE_INVALID =X2APIC_ENABLE ,
arch/x86/kvm/svm/svm.c +90 -220
436 lines not on this page · raw message
arch/x86/kvm/svm/svm.h +0 -6
@@ -313,12 +313,6 @@ struct vcpu_svm {struct list_head ir_list;spinlock_t ir_list_lock; -/* Save desired MSR intercept (read: pass-through) state */ -struct { - DECLARE_BITMAP(read, MAX_DIRECT_ACCESS_MSRS); - DECLARE_BITMAP(write, MAX_DIRECT_ACCESS_MSRS); - } shadow_msr_intercept; -struct vcpu_sev_es_state sev_es;bool guest_state_loaded;
arch/x86/kvm/vmx/main.c +1 -1
@@ -152,7 +152,7 @@ struct kvm_x86_ops vt_x86_ops __initdata = { .apic_init_signal_blocked = vmx_apic_init_signal_blocked, .migrate_timers = vmx_migrate_timers, - .msr_filter_changed = vmx_msr_filter_changed, + .refresh_msr_intercepts = vmx_refresh_msr_intercepts, .complete_emulated_msr = kvm_complete_insn_gp, .vcpu_deliver_sipi_vector = kvm_vcpu_deliver_sipi_vector,
arch/x86/kvm/vmx/vmx.c +42 -137
248 lines not on this page · raw message
arch/x86/kvm/vmx/vmx.h +0 -9
@@ -17,8 +17,6 @@#include "run_flags.h" #include "../mmu.h" -#define X2APIC_MSR (r) (APIC_BASE_MSR + ((r) >> 4)) -#ifdef CONFIG_X86_64 #define MAX_NR_USER_RETURN_MSRS 7#else
@@ -353,13 +351,6 @@ struct vcpu_vmx {struct pt_desc pt_desc;struct lbr_desc lbr_desc; -/* Save desired MSR intercept (read: pass-through) state */ -#define MAX_POSSIBLE_PASSTHROUGH_MSRS 16 -struct { - DECLARE_BITMAP(read, MAX_POSSIBLE_PASSTHROUGH_MSRS); - DECLARE_BITMAP(write, MAX_POSSIBLE_PASSTHROUGH_MSRS); - } shadow_msr_intercept; -/* ve_info must be page aligned. */ struct vmx_ve_information *ve_info; };
arch/x86/kvm/vmx/x86_ops.h +1 -1
@@ -54,7 +54,7 @@ void vmx_deliver_interrupt(struct kvm_lapic *apic, int delivery_mode, int trig_mode, int vector);void vmx_vcpu_after_set_cpuid (struct kvm_vcpu *vcpu);bool vmx_has_emulated_msr (struct kvm *kvm,u32 index); -void vmx_msr_filter_changed (struct kvm_vcpu *vcpu); +void vmx_refresh_msr_intercepts (struct kvm_vcpu *vcpu);void vmx_prepare_switch_to_guest (struct kvm_vcpu *vcpu);void vmx_update_exception_bitmap (struct kvm_vcpu *vcpu);int vmx_get_feature_msr (u32 msr,u64 *data);
arch/x86/kvm/x86.c +9 -1
@@ -10840,8 +10840,16 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)kvm_vcpu_update_apicv (vcpu);if (kvm_check_request (KVM_REQ_APF_READY , vcpu))kvm_check_async_pf_completion (vcpu); + +/* +* Refresh intercept permissions for MSRs that KVM is passing +* through to the guest, as userspace may want to trap accesses. +* Disabling interception will check the new MSR filter and +* ensure that KVM enables interception if usersepace wants to +* filter the MSR. +*/ if (kvm_check_request (KVM_REQ_MSR_FILTER_CHANGED , vcpu)) -kvm_x86_call (msr_filter_changed)(vcpu); +kvm_x86_call (refresh_msr_intercepts)(vcpu);if (kvm_check_request (KVM_REQ_UPDATE_CPU_DIRTY_LOGGING , vcpu))kvm_x86_call (update_cpu_dirty_logging)(vcpu);
base-commit: c109f5c273abb98684209280d4b07d596ee6a54a
Signature · 1 line
2.47.0.338.g60cca15819-goog
Borislav Petkov
maintainerRe: [PATCH 12/15] KVM: x86: Track possible passthrough MSRs in kvm_x86_ops
Quoted 3 lines · Sean Christopherson
The attached patch is compile-tested only (the nested interactions in particular need a bit of scrutiny) and needs to be chunked into multiple patches, but I don't see any obvious blockers, and the diffstats speak volumes:
I'd like to apply this and take a closer look but I don't know what it goes against. Btw, you could point me to some documentation explaining which branches in the kvm tree people should use to base off work ontop.
In any case, the overall idea makes sense to me - SVM and VMX both know which MSRs should be intercepted and so on.
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteSean Christopherson
maintainerRe: [PATCH 12/15] KVM: x86: Track possible passthrough MSRs in kvm_x86_ops
Quoted 7 lines · Borislav Petkov
Quoted 3 lines · Sean Christopherson
The attached patch is compile-tested only (the nested interactions in particular need a bit of scrutiny) and needs to be chunked into multiple patches, but I don't see any obvious blockers, and the diffstats speak volumes:
I'd like to apply this and take a closer look but I don't know what it goes against.
It applies cleanly on my tree (github.com/kvm-x86/linux.git next) or Paolo's
(git://git.kernel.org/pub/scm/virt/kvm/kvm.git next).
Quoted 2 lines
Btw, you could point me to some documentation explaining which branches in the kvm tree people should use to base off work ontop.
For KVM x86, from Documentation/process/maintainer-kvm-x86.rst:
Base Tree/Branch
~~~~~~~~~~~~~~~~
Fixes that target the current release, a.k.a. mainline, should be based on ``git://git.kernel.org/pub/scm/virt/kvm/kvm.git master``. Note, fixes do not automatically warrant inclusion in the current release. There is no singular rule, but typically only fixes for bugs that are urgent, critical, and/or were introduced in the current release should target the current release.
Everything else should be based on ``kvm-x86/next``, i.e. there is no need to select a specific topic branch as the base. If there are conflicts and/or dependencies across topic branches, it is the maintainer's job to sort them out.
The only exception to using ``kvm-x86/next`` as the base is if a patch/series is a multi-arch series, i.e. has non-trivial modifications to common KVM code and/or has more than superficial changes to other architectures' code. Multi- arch patch/series should instead be based on a common, stable point in KVM's history, e.g. the release candidate upon which ``kvm-x86 next`` is based. If you're unsure whether a patch/series is truly multi-arch, err on the side of caution and treat it as multi-arch, i.e. use a common base.
where kvm-x86 is the aforementioned github.com/kvm-x86/linux.git.
Borislav Petkov
maintainerRe: [PATCH 12/15] KVM: x86: Track possible passthrough MSRs in kvm_x86_ops
Quoted 1 line · Sean Christopherson
For KVM x86, from
Documentation/process/maintainer-kvm-x86.rst:
Thanks, I've been looking for this text! :-)
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteBorislav Petkov
maintainerRe: [PATCH 12/15] KVM: x86: Track possible passthrough MSRs in kvm_x86_ops
In reply to Sean ChristophersonQuoted 1 line · Sean Christopherson
It applies cleanly on my tree (github.com/kvm-x86/linux.git next)
Could it be that you changed things in the meantime?
(Very similar result on Paolo's next branch.)
$ git log -1 commit c55f6b8a2441b20ef12e4b35d4888a22299ddc90 (HEAD -> refs/heads/kvm-next, tag: refs/tags/kvm-x86-next-2024.11.04, refs/remotes/kvm-x86/next) Merge: f29af315c943 bc17fccb37c8 Author: Sean Christopherson <[email protected]> Date: Tue Nov 5 05:13:01 2024 +0000
Merge branch 'vmx'
* vmx:
KVM: VMX: Remove the unused variable "gpa" in __invept()
$ patch -p1 --dry-run -i /tmp/0001-tmp.patch checking file arch/x86/include/asm/kvm-x86-ops.h checking file arch/x86/include/asm/kvm_host.h Hunk #1 succeeded at 1817 (offset -2 lines). checking file arch/x86/kvm/lapic.h checking file arch/x86/kvm/svm/svm.c Reversed (or previously applied) patch detected! Assume -R? [n] n Apply anyway? [n] y Hunk #1 FAILED at 79. Hunk #2 FAILED at 756. Hunk #3 FAILED at 831. Hunk #4 FAILED at 870. Hunk #5 FAILED at 907. Hunk #6 succeeded at 894 with fuzz 1 (offset -30 lines). Hunk #7 FAILED at 1002. Hunk #8 FAILED at 1020. Hunk #9 FAILED at 1103. Hunk #10 FAILED at 1121. Hunk #11 FAILED at 1309. Hunk #12 FAILED at 1330. Hunk #13 FAILED at 1456. Hunk #14 succeeded at 1455 (offset -35 lines). Hunk #15 succeeded at 1479 (offset -35 lines). Hunk #16 FAILED at 1555. Hunk #17 succeeded at 3220 (offset -40 lines). Hunk #18 FAILED at 4531. Hunk #19 succeeded at 5194 (offset -38 lines). Hunk #20 succeeded at 5352 (offset -38 lines). 14 out of 20 hunks FAILED checking file arch/x86/kvm/svm/svm.h checking file arch/x86/kvm/vmx/main.c checking file arch/x86/kvm/vmx/vmx.c Hunk #2 succeeded at 642 (offset -2 lines). Hunk #3 FAILED at 3943. Hunk #4 FAILED at 3985. Hunk #5 succeeded at 4086 (offset -1 lines). Hunk #6 succeeded at 7532 (offset 6 lines). Hunk #7 succeeded at 7812 (offset 6 lines). Hunk #8 succeeded at 7827 (offset 6 lines). 2 out of 8 hunks FAILED checking file arch/x86/kvm/vmx/vmx.h checking file arch/x86/kvm/vmx/x86_ops.h checking file arch/x86/kvm/x86.c Hunk #1 succeeded at 10837 (offset -3 lines).
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteSean Christopherson
maintainerRe: [PATCH 12/15] KVM: x86: Track possible passthrough MSRs in kvm_x86_ops
Quoted 4 lines · Borislav Petkov
Quoted 1 line · Sean Christopherson
It applies cleanly on my tree (github.com/kvm-x86/linux.git next)
Could it be that you changed things in the meantime?
Nope, I double checked that I'm using the same base.
Quoted 10 lines
(Very similar result on Paolo's next branch.)
$ git log -1 commit c55f6b8a2441b20ef12e4b35d4888a22299ddc90 (HEAD -> refs/heads/kvm-next, tag: refs/tags/kvm-x86-next-2024.11.04, refs/remotes/kvm-x86/next) Merge: f29af315c943 bc17fccb37c8 Author: Sean Christopherson <[email protected]> Date: Tue Nov 5 05:13:01 2024 +0000Merge branch 'vmx'
Quoted 7 lines
* vmx:
KVM: VMX: Remove the unused variable "gpa" in__invept()$ patch -p1 --dry-run -i /tmp/0001-tmp.patch checking file arch/x86/include/asm/kvm-x86-ops.h checking file arch/x86/include/asm/kvm_host.h
Are you trying to apply this patch directly on kvm/next | kvm-x86/next? This is patch 12 of 15.
Quoted 47 lines
Hunk #1 succeeded at 1817 (offset -2 lines).
checking filearch/x86/kvm/lapic.h
checking filearch/x86/kvm/svm/svm.c
Reversed (or previously applied) patch detected! Assume -R? [n] n Apply anyway? [n] y
Hunk #1 FAILED at 79.
Hunk #2 FAILED at 756.
Hunk #3 FAILED at 831.
Hunk #4 FAILED at 870.
Hunk #5 FAILED at 907.
Hunk #6 succeeded at 894 with fuzz 1 (offset -30 lines). Hunk #7 FAILED at 1002.
Hunk #8 FAILED at 1020.
Hunk #9 FAILED at 1103.
Hunk #10 FAILED at 1121.
Hunk #11 FAILED at 1309.
Hunk #12 FAILED at 1330.
Hunk #13 FAILED at 1456.
Hunk #14 succeeded at 1455 (offset -35 lines).
Hunk #15 succeeded at 1479 (offset -35 lines).
Hunk #16 FAILED at 1555.
Hunk #17 succeeded at 3220 (offset -40 lines).
Hunk #18 FAILED at 4531.
Hunk #19 succeeded at 5194 (offset -38 lines).
Hunk #20 succeeded at 5352 (offset -38 lines).
14 out of 20 hunks FAILED
checking filearch/x86/kvm/svm/svm.h
checking filearch/x86/kvm/vmx/main.c
checking filearch/x86/kvm/vmx/vmx.c
Hunk #2 succeeded at 642 (offset -2 lines).
Hunk #3 FAILED at 3943.
Hunk #4 FAILED at 3985.
Hunk #5 succeeded at 4086 (offset -1 lines).
Hunk #6 succeeded at 7532 (offset 6 lines).
Hunk #7 succeeded at 7812 (offset 6 lines).
Hunk #8 succeeded at 7827 (offset 6 lines).
2 out of 8 hunks FAILED
checking filearch/x86/kvm/vmx/vmx.h
checking filearch/x86/kvm/vmx/x86_ops.h
checking filearch/x86/kvm/x86.c
Hunk #1 succeeded at 10837 (offset -3 lines).Signature · 4 lines
Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette
Borislav Petkov
maintainerRe: [PATCH 12/15] KVM: x86: Track possible passthrough MSRs in kvm_x86_ops
Quoted 2 lines · Sean Christopherson
Are you trying to apply this patch directly on kvm/next | kvm-x86/next? This is patch 12 of 15.
Oh, that's why. I thought it is a single, standalone patch, being called 0001-tmp. :-)
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquettePATCH 13/15 KVM: x86: Move ownership of passthrough MSR "shadow" to common x86
In reply to Aaron Lewis--- arch/x86/include/asm/kvm-x86-ops.h | 3 ++- arch/x86/include/asm/kvm_host.h | 11 +++++++++ arch/x86/kvm/svm/svm.c | 38 ++++-------------------------- arch/x86/kvm/svm/svm.h | 6 ----- arch/x86/kvm/vmx/main.c | 32 +------------------------ arch/x86/kvm/vmx/vmx.c | 22 ++++++++++------- arch/x86/kvm/vmx/vmx.h | 7 ------ arch/x86/kvm/x86.c | 37 ++++++++++++++++++++++++++++- 8 files changed, 69 insertions(+), 87 deletions(-)
arch/x86/include/asm/kvm-x86-ops.h +2 -1
@@ -131,7 +131,8 @@ KVM_X86_OP(check_emulate_instruction) KVM_X86_OP(apic_init_signal_blocked) KVM_X86_OP_OPTIONAL(enable_l2_tlb_flush) KVM_X86_OP_OPTIONAL(migrate_timers) -KVM_X86_OP(msr_filter_changed) +KVM_X86_OP_OPTIONAL(msr_filter_changed) +KVM_X86_OP(disable_intercept_for_msr) KVM_X86_OP(complete_emulated_msr) KVM_X86_OP(vcpu_deliver_sipi_vector) KVM_X86_OP_OPTIONAL_RET0(vcpu_get_apicv_inhibit_reasons);
arch/x86/include/asm/kvm_host.h +11 -0
@@ -777,6 +777,16 @@ struct kvm_vcpu_arch {u64 arch_capabilities;u64 perf_capabilities; +/* +* KVM's "shadow" of the MSR intercepts, i.e. bitmaps that track KVM's +* desired behavior irrespective of userspace MSR filtering. +*/ +#define KVM_MAX_POSSIBLE_PASSTHROUGH_MSRS 64 +struct { + DECLARE_BITMAP(read, KVM_MAX_POSSIBLE_PASSTHROUGH_MSRS); + DECLARE_BITMAP(write, KVM_MAX_POSSIBLE_PASSTHROUGH_MSRS); + } shadow_msr_intercept; +/* * Paging state of the vcpu *
@@ -1820,6 +1830,7 @@ struct kvm_x86_ops {const u32 *const possible_passthrough_msrs;const u32 nr_possible_passthrough_msrs; +void (*disable_intercept_for_msr)(struct kvm_vcpu *vcpu,u32 msr,int type);void (*msr_filter_changed)(struct kvm_vcpu *vcpu);int (*complete_emulated_msr)(struct kvm_vcpu *vcpu,int err);
arch/x86/kvm/svm/svm.c +5 -33
@@ -825,9 +825,9 @@ void svm_disable_intercept_for_msr(struct kvm_vcpu *vcpu, u32 msr, int type)if (slot >=0 ) {/* Set the shadow bitmaps to the desired intercept states */ if (type &MSR_TYPE_R ) -__clear_bit (slot, svm->shadow_msr_intercept.read); +__clear_bit (slot, vcpu->arch.shadow_msr_intercept.read);if (type &MSR_TYPE_W ) -__clear_bit (slot, svm->shadow_msr_intercept.write); +__clear_bit (slot, vcpu->arch.shadow_msr_intercept.write); }/*
@@ -864,9 +864,9 @@ void svm_enable_intercept_for_msr(struct kvm_vcpu *vcpu, u32 msr, int type)if (slot >=0 ) {/* Set the shadow bitmaps to the desired intercept states */ if (type &MSR_TYPE_R ) -__set_bit (slot, svm->shadow_msr_intercept.read); +__set_bit (slot, vcpu->arch.shadow_msr_intercept.read);if (type &MSR_TYPE_W ) -__set_bit (slot, svm->shadow_msr_intercept.write); +__set_bit (slot, vcpu->arch.shadow_msr_intercept.write); }if (type &MSR_TYPE_R )
@@ -939,30 +939,6 @@ void svm_vcpu_free_msrpm(unsigned long *msrpm)__free_pages (virt_to_page (msrpm),get_order (MSRPM_SIZE )); } -static void svm_msr_filter_changed (struct kvm_vcpu *vcpu) -{ -struct vcpu_svm *svm =to_svm (vcpu); -u32 i; - -/* -* Redo intercept permissions for MSRs that KVM is passing through to -* the guest. Disabling interception will check the new MSR filter and -* ensure that KVM enables interception if usersepace wants to filter -* the MSR. MSRs that KVM is already intercepting don't need to be -* refreshed since KVM is going to intercept them regardless of what -* userspace wants. -*/ -for (i =0 ; i <ARRAY_SIZE (direct_access_msrs); i++) { -u32 msr = direct_access_msrs[i]; - -if (!test_bit (i, svm->shadow_msr_intercept.read)) -svm_disable_intercept_for_msr (vcpu, msr,MSR_TYPE_R ); - -if (!test_bit (i, svm->shadow_msr_intercept.write)) -svm_disable_intercept_for_msr (vcpu, msr,MSR_TYPE_W ); - } -} -static void add_msr_offset (u32 offset) {int i;
@@ -1475,10 +1451,6 @@ static int svm_vcpu_create(struct kvm_vcpu *vcpu)if (err) goto error_free_vmsa_page; -/* All MSRs start out in the "intercepted" state. */ -bitmap_fill (svm->shadow_msr_intercept.read,MAX_DIRECT_ACCESS_MSRS ); -bitmap_fill (svm->shadow_msr_intercept.write,MAX_DIRECT_ACCESS_MSRS ); - svm->msrpm =svm_vcpu_alloc_msrpm ();if (!svm->msrpm) { err = -ENOMEM ;
@@ -5155,7 +5127,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { .possible_passthrough_msrs = direct_access_msrs, .nr_possible_passthrough_msrs = ARRAY_SIZE(direct_access_msrs), - .msr_filter_changed = svm_msr_filter_changed, + .disable_intercept_for_msr = svm_disable_intercept_for_msr, .complete_emulated_msr = svm_complete_emulated_msr, .vcpu_deliver_sipi_vector = svm_vcpu_deliver_sipi_vector,
arch/x86/kvm/svm/svm.h +0 -6
@@ -313,12 +313,6 @@ struct vcpu_svm {struct list_head ir_list;spinlock_t ir_list_lock; -/* Save desired MSR intercept (read: pass-through) state */ -struct { - DECLARE_BITMAP(read, MAX_DIRECT_ACCESS_MSRS); - DECLARE_BITMAP(write, MAX_DIRECT_ACCESS_MSRS); - } shadow_msr_intercept; -struct vcpu_sev_es_state sev_es;bool guest_state_loaded;
arch/x86/kvm/vmx/main.c +1 -31
@@ -32,37 +32,6 @@ static const u32 vmx_possible_passthrough_msrs[] = { MSR_CORE_C7_RESIDENCY, }; -void vmx_msr_filter_changed (struct kvm_vcpu *vcpu) -{ -struct vcpu_vmx *vmx =to_vmx (vcpu); -u32 i; - -if (!cpu_has_vmx_msr_bitmap ()) -return ; - -/* -* Redo intercept permissions for MSRs that KVM is passing through to -* the guest. Disabling interception will check the new MSR filter and -* ensure that KVM enables interception if usersepace wants to filter -* the MSR. MSRs that KVM is already intercepting don't need to be -* refreshed since KVM is going to intercept them regardless of what -* userspace wants. -*/ -for (i =0 ; i <ARRAY_SIZE (vmx_possible_passthrough_msrs); i++) { -u32 msr = vmx_possible_passthrough_msrs[i]; - -if (!test_bit (i, vmx->shadow_msr_intercept.read)) -vmx_disable_intercept_for_msr (vcpu, msr,MSR_TYPE_R ); - -if (!test_bit (i, vmx->shadow_msr_intercept.write)) -vmx_disable_intercept_for_msr (vcpu, msr,MSR_TYPE_W ); - } - -/* PT MSRs can be passed through iff PT is exposed to the guest. */ -if (vmx_pt_mode_is_host_guest ()) -pt_update_intercept_for_msr (vcpu); -} -#define VMX_REQUIRED_APICV_INHIBITS \ (BIT(APICV_INHIBIT_REASON_DISABLED) | \ BIT(APICV_INHIBIT_REASON_ABSENT) | \
@@ -210,6 +179,7 @@ struct kvm_x86_ops vt_x86_ops __initdata = { .possible_passthrough_msrs = vmx_possible_passthrough_msrs, .nr_possible_passthrough_msrs = ARRAY_SIZE(vmx_possible_passthrough_msrs), + .disable_intercept_for_msr = vmx_disable_intercept_for_msr, .msr_filter_changed = vmx_msr_filter_changed, .complete_emulated_msr = kvm_complete_insn_gp,
arch/x86/kvm/vmx/vmx.c +14 -8
@@ -3987,9 +3987,9 @@ void vmx_disable_intercept_for_msr(struct kvm_vcpu *vcpu, u32 msr, int type) idx =vmx_get_passthrough_msr_slot (msr);if (idx >=0 ) {if (type &MSR_TYPE_R ) -__clear_bit (idx, vmx->shadow_msr_intercept.read); +__clear_bit (idx, vcpu->arch.shadow_msr_intercept.read);if (type &MSR_TYPE_W ) -__clear_bit (idx, vmx->shadow_msr_intercept.write); +__clear_bit (idx, vcpu->arch.shadow_msr_intercept.write); } if ((type & MSR_TYPE_R) &&
@@ -4029,9 +4029,9 @@ void vmx_enable_intercept_for_msr(struct kvm_vcpu *vcpu, u32 msr, int type) idx =vmx_get_passthrough_msr_slot (msr);if (idx >=0 ) {if (type &MSR_TYPE_R ) -__set_bit (idx, vmx->shadow_msr_intercept.read); +__set_bit (idx, vcpu->arch.shadow_msr_intercept.read);if (type &MSR_TYPE_W ) -__set_bit (idx, vmx->shadow_msr_intercept.write); +__set_bit (idx, vcpu->arch.shadow_msr_intercept.write); }if (type &MSR_TYPE_R )
@@ -4117,6 +4117,16 @@ void pt_update_intercept_for_msr(struct kvm_vcpu *vcpu) } } +void vmx_msr_filter_changed (struct kvm_vcpu *vcpu) +{ +if (!cpu_has_vmx_msr_bitmap ()) +return ; + +/* PT MSRs can be passed through iff PT is exposed to the guest. */ +if (vmx_pt_mode_is_host_guest ()) +pt_update_intercept_for_msr (vcpu); +} +static inline void kvm_vcpu_trigger_posted_interrupt (struct kvm_vcpu *vcpu,int pi_vec) {
@@ -7513,10 +7523,6 @@ int vmx_vcpu_create(struct kvm_vcpu *vcpu) evmcs->hv_enlightenments_control.msr_bitmap =1 ; } -/* The MSR bitmap starts with all ones */ -bitmap_fill (vmx->shadow_msr_intercept.read,MAX_POSSIBLE_PASSTHROUGH_MSRS ); -bitmap_fill (vmx->shadow_msr_intercept.write,MAX_POSSIBLE_PASSTHROUGH_MSRS ); -vmx_disable_intercept_for_msr (vcpu,MSR_IA32_TSC ,MSR_TYPE_R );#ifdef CONFIG_X86_64 vmx_disable_intercept_for_msr (vcpu,MSR_FS_BASE ,MSR_TYPE_RW );
arch/x86/kvm/vmx/vmx.h +0 -7
@@ -353,13 +353,6 @@ struct vcpu_vmx {struct pt_desc pt_desc;struct lbr_desc lbr_desc; -/* Save desired MSR intercept (read: pass-through) state */ -#define MAX_POSSIBLE_PASSTHROUGH_MSRS 16 -struct { - DECLARE_BITMAP(read, MAX_POSSIBLE_PASSTHROUGH_MSRS); - DECLARE_BITMAP(write, MAX_POSSIBLE_PASSTHROUGH_MSRS); - } shadow_msr_intercept; -/* ve_info must be page aligned. */ struct vmx_ve_information *ve_info; };
arch/x86/kvm/x86.c +36 -1
@@ -1819,6 +1819,31 @@ int kvm_passthrough_msr_slot(u32 msr) }EXPORT_SYMBOL_GPL (kvm_passthrough_msr_slot); +static void kvm_msr_filter_changed (struct kvm_vcpu *vcpu) +{ +u32 msr, i; + +/* +* Redo intercept permissions for MSRs that KVM is passing through to +* the guest. Disabling interception will check the new MSR filter and +* ensure that KVM enables interception if usersepace wants to filter +* the MSR. MSRs that KVM is already intercepting don't need to be +* refreshed since KVM is going to intercept them regardless of what +* userspace wants. +*/ +for (i =0 ; i < kvm_x86_ops.nr_possible_passthrough_msrs; i++) { + msr = kvm_x86_ops.possible_passthrough_msrs[i]; + +if (!test_bit (i, vcpu->arch.shadow_msr_intercept.read)) +static_call (kvm_x86_disable_intercept_for_msr)(vcpu, msr,MSR_TYPE_R ); + +if (!test_bit (i, vcpu->arch.shadow_msr_intercept.write)) +static_call (kvm_x86_disable_intercept_for_msr)(vcpu, msr,MSR_TYPE_W ); + } + +static_call_cond (kvm_x86_msr_filter_changed)(vcpu); +} +/* * Write @data into the MSR specified by @index. Select MSR specific fault * checks are bypassed if @host_initiated is %true.
@@ -9747,6 +9772,10 @@ int kvm_x86_vendor_init(struct kvm_x86_init_ops *ops)if (boot_cpu_has (X86_FEATURE_ARCH_CAPABILITIES ))rdmsrl (MSR_IA32_ARCH_CAPABILITIES , kvm_host.arch_capabilities); +if (ops->runtime_ops->nr_possible_passthrough_msrs > +KVM_MAX_POSSIBLE_PASSTHROUGH_MSRS ) +return -E2BIG ; + r = ops->hardware_setup ();if (r !=0 ) goto out_mmu_exit;
@@ -10851,7 +10880,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)if (kvm_check_request (KVM_REQ_APF_READY , vcpu))kvm_check_async_pf_completion (vcpu);if (kvm_check_request (KVM_REQ_MSR_FILTER_CHANGED , vcpu)) -kvm_x86_call (msr_filter_changed)(vcpu); +kvm_msr_filter_changed (vcpu);if (kvm_check_request (KVM_REQ_UPDATE_CPU_DIRTY_LOGGING , vcpu))kvm_x86_call (update_cpu_dirty_logging)(vcpu);
@@ -12305,6 +12334,12 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) vcpu->arch.hv_root_tdp =INVALID_PAGE ;#endif +/* All MSRs start out in the "intercepted" state. */ +bitmap_fill (vcpu->arch.shadow_msr_intercept.read, +KVM_MAX_POSSIBLE_PASSTHROUGH_MSRS ); +bitmap_fill (vcpu->arch.shadow_msr_intercept.write, +KVM_MAX_POSSIBLE_PASSTHROUGH_MSRS ); + r =kvm_x86_call (vcpu_create)(vcpu);if (r) goto free_guest_fpu;
Signature · 1 line
2.47.0.338.g60cca15819-goog
PATCH 14/15 KVM: x86: Hoist SVM MSR intercepts to common x86 code
In reply to Aaron LewisNow that the SVM and VMX implementations for MSR intercepts are the same hoist the SVM implementation to common x86 code.
--- arch/x86/include/asm/kvm-x86-ops.h | 1 + arch/x86/include/asm/kvm_host.h | 3 ++ arch/x86/kvm/svm/svm.c | 73 ++--------------------------- arch/x86/kvm/x86.c | 75 ++++++++++++++++++++++++++++++ arch/x86/kvm/x86.h | 2 + 5 files changed, 86 insertions(+), 68 deletions(-)
arch/x86/include/asm/kvm-x86-ops.h +1 -0
@@ -132,6 +132,7 @@ KVM_X86_OP(apic_init_signal_blocked) KVM_X86_OP_OPTIONAL(enable_l2_tlb_flush) KVM_X86_OP_OPTIONAL(migrate_timers) KVM_X86_OP_OPTIONAL(msr_filter_changed) +KVM_X86_OP_OPTIONAL(get_msr_bitmap_entries) KVM_X86_OP(disable_intercept_for_msr) KVM_X86_OP(complete_emulated_msr) KVM_X86_OP(vcpu_deliver_sipi_vector)
arch/x86/include/asm/kvm_host.h +3 -0
@@ -1830,6 +1830,9 @@ struct kvm_x86_ops {const u32 *const possible_passthrough_msrs;const u32 nr_possible_passthrough_msrs; +void (*get_msr_bitmap_entries)(struct kvm_vcpu *vcpu,u32 msr, +unsigned long **read_map,u8 *read_bit, +unsigned long **write_map,u8 *write_bit);void (*disable_intercept_for_msr)(struct kvm_vcpu *vcpu,u32 msr,int type);void (*msr_filter_changed)(struct kvm_vcpu *vcpu);int (*complete_emulated_msr)(struct kvm_vcpu *vcpu,int err);
arch/x86/kvm/svm/svm.c +5 -68
95 lines not on this page · raw message
arch/x86/kvm/x86.c +75 -0
81 lines not on this page · raw message
arch/x86/kvm/x86.h +2 -0
@@ -556,6 +556,8 @@ int kvm_handle_memory_failure(struct kvm_vcpu *vcpu, int r,int kvm_handle_invpcid (struct kvm_vcpu *vcpu,unsigned long type,gva_t gva);bool kvm_msr_allowed (struct kvm_vcpu *vcpu,u32 index,u32 type);int kvm_passthrough_msr_slot (u32 msr); +void kvm_enable_intercept_for_msr (struct kvm_vcpu *vcpu,u32 msr,int type); +void kvm_disable_intercept_for_msr (struct kvm_vcpu *vcpu,u32 msr,int type);enum kvm_msr_access {MSR_TYPE_R =BIT (0 ),
Signature · 1 line
2.47.0.338.g60cca15819-goog
PATCH 15/15 KVM: x86: Hoist VMX MSR intercepts to common x86 code
In reply to Aaron LewisComplete the transition of unifying the MSR intercepts for x86 by hoisting the VMX implementation to common x86 code.
The only new addition to the common implementation over what SVM already contributed is the check for is_valid_passthrough_msr() which VMX uses to disallow MSRs from being used as possible passthrough MSRs. To distinguish between MSRs that are not valid from MSRs that are missing from the list kvm_passthrough_msr_slot() returns -EINVAL for MSRs that are not allowed to be in the list and -ENOENT for MSRs that it is expecting to be in the list, but aren't. For the latter case KVM warns.
--- arch/x86/include/asm/kvm-x86-ops.h | 1 + arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/svm/svm.c | 6 ++ arch/x86/kvm/vmx/main.c | 2 + arch/x86/kvm/vmx/vmx.c | 91 +++++++++--------------------- arch/x86/kvm/vmx/vmx.h | 4 ++ arch/x86/kvm/x86.c | 4 ++ 7 files changed, 45 insertions(+), 64 deletions(-)
arch/x86/include/asm/kvm-x86-ops.h +1 -0
@@ -134,6 +134,7 @@ KVM_X86_OP_OPTIONAL(migrate_timers) KVM_X86_OP_OPTIONAL(msr_filter_changed) KVM_X86_OP_OPTIONAL(get_msr_bitmap_entries) KVM_X86_OP(disable_intercept_for_msr) +KVM_X86_OP(is_valid_passthrough_msr) KVM_X86_OP(complete_emulated_msr) KVM_X86_OP(vcpu_deliver_sipi_vector) KVM_X86_OP_OPTIONAL_RET0(vcpu_get_apicv_inhibit_reasons);
arch/x86/include/asm/kvm_host.h +1 -0
@@ -1834,6 +1834,7 @@ struct kvm_x86_ops { unsigned long **read_map, u8 *read_bit, unsigned long **write_map, u8 *write_bit);void (*disable_intercept_for_msr)(struct kvm_vcpu *vcpu,u32 msr,int type); +bool (*is_valid_passthrough_msr)(u32 msr);void (*msr_filter_changed)(struct kvm_vcpu *vcpu);int (*complete_emulated_msr)(struct kvm_vcpu *vcpu,int err);
arch/x86/kvm/svm/svm.c +6 -0
@@ -799,6 +799,11 @@ static void svm_get_msr_bitmap_entries(struct kvm_vcpu *vcpu, u32 msr, *write_map = &svm->msrpm[offset]; } +static bool svm_is_valid_passthrough_msr (u32 msr) +{ +return true; +} +void svm_disable_intercept_for_msr (struct kvm_vcpu *vcpu,u32 msr,int type) {kvm_disable_intercept_for_msr (vcpu, msr, type);
@@ -5065,6 +5070,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { .nr_possible_passthrough_msrs = ARRAY_SIZE(direct_access_msrs), .get_msr_bitmap_entries = svm_get_msr_bitmap_entries, .disable_intercept_for_msr = svm_disable_intercept_for_msr, + .is_valid_passthrough_msr = svm_is_valid_passthrough_msr, .complete_emulated_msr = svm_complete_emulated_msr, .vcpu_deliver_sipi_vector = svm_vcpu_deliver_sipi_vector,
arch/x86/kvm/vmx/main.c +2 -0
@@ -179,7 +179,9 @@ struct kvm_x86_ops vt_x86_ops __initdata = { .possible_passthrough_msrs = vmx_possible_passthrough_msrs, .nr_possible_passthrough_msrs = ARRAY_SIZE(vmx_possible_passthrough_msrs), + .get_msr_bitmap_entries = vmx_get_msr_bitmap_entries, .disable_intercept_for_msr = vmx_disable_intercept_for_msr, + .is_valid_passthrough_msr = vmx_is_valid_passthrough_msr, .msr_filter_changed = vmx_msr_filter_changed, .complete_emulated_msr = kvm_complete_insn_gp,
arch/x86/kvm/vmx/vmx.c +27 -64
130 lines not on this page · raw message
arch/x86/kvm/vmx/vmx.h +4 -0
@@ -409,8 +409,12 @@ bool __vmx_vcpu_run(struct vcpu_vmx *vmx, unsigned long *regs,int vmx_find_loadstore_msr_slot (struct vmx_msrs *m,u32 msr);void vmx_ept_load_pdptrs (struct kvm_vcpu *vcpu); +void vmx_get_msr_bitmap_entries (struct kvm_vcpu *vcpu,u32 msr, +unsigned long **read_map,u8 *read_bit, +unsigned long **write_map,u8 *write_bit);void vmx_disable_intercept_for_msr (struct kvm_vcpu *vcpu,u32 msr,int type);void vmx_enable_intercept_for_msr (struct kvm_vcpu *vcpu,u32 msr,int type); +bool vmx_is_valid_passthrough_msr (u32 msr);u64 vmx_get_l2_tsc_offset (struct kvm_vcpu *vcpu);u64 vmx_get_l2_tsc_multiplier (struct kvm_vcpu *vcpu);
arch/x86/kvm/x86.c +4 -0
@@ -1810,6 +1810,10 @@ int kvm_passthrough_msr_slot(u32 msr) {u32 i; +if (!static_call (kvm_x86_is_valid_passthrough_msr)(msr)) { +return -EINVAL ; + } +for (i =0 ; i < kvm_x86_ops.nr_possible_passthrough_msrs; i++) {if (kvm_x86_ops.possible_passthrough_msrs[i] == msr)return i;
Signature · 1 line
2.47.0.338.g60cca15819-goog
Sean Christopherson
maintainerQuoted 29 lines · Aaron Lewis
The goal of this series is to unify MSR intercepts into common code between VMX and SVM.
The high level structure of this series is to:
1. Modify SVM MSR intercepts to adopt how VMX does it.
2. Hoist the newly updated SVM MSR intercept implementation to common x86 code.
3. Hoist the VMX MSR intercept implementation to common x86 code.Aaron Lewis (8):
KVM: SVM: Invert the polarity of the "shadow" MSR interception bitmaps
KVM: SVM: Track MSRPM as "unsigned long", not "u32"
KVM: x86: SVM: Adopt VMX style MSR intercepts in SVM
KVM: SVM: Don't "NULL terminate" the list of possible passthrough MSRs
KVM: x86: Track possible passthrough MSRs inkvm_x86_ops
KVM: x86: Move ownership of passthrough MSR "shadow" to common x86
KVM: x86: Hoist SVM MSR intercepts to common x86 code
KVM: x86: Hoist VMX MSR intercepts to common x86 codeAnish Ghulati (2):
KVM: SVM: Disable intercepts for all direct access MSRs on MSR filter changes
KVM: SVM: Delete old SVM MSR management codeSean Christopherson (5):
KVM: x86: Use non-atomic bit ops to manipulate "shadow" MSR intercepts
KVM: SVM: Use non-atomic bit ops to manipulate MSR interception bitmaps
KVM: SVM: Pass through GHCB MSR if and only if VM is SEV-ES
KVM: SVM: Drop "always" flag from list of possible passthrough MSRs
KVM: VMX: Make list of possible passthrough MSRs "const"
Quoted 14 lines
arch/x86/include/asm/kvm-x86-ops.h | 5 +- arch/x86/include/asm/kvm_host.h | 18 ++ arch/x86/kvm/svm/sev.c | 11 +- arch/x86/kvm/svm/svm.c | 300 ++++++++++++----------------- arch/x86/kvm/svm/svm.h | 30 +-- arch/x86/kvm/vmx/main.c | 30 +++ arch/x86/kvm/vmx/vmx.c | 144 +++----------- arch/x86/kvm/vmx/vmx.h | 11 +- arch/x86/kvm/x86.c | 129 ++++++++++++- arch/x86/kvm/x86.h | 3 + 10 files changed, 358 insertions(+), 323 deletions(-)Signature · 1 line
2.47.0.338.g60cca15819-goog
Please use git format-patch with --base, and in general read Documentation/process/maintainer-kvm-x86.rst and Documentation/process/maintainer-tip.rst