* [PATCH] KVM: VMX: Heed the 'msr' argument in msr_write_intercepted()
@ 2022-08-10 21:30 Jim Mattson
2022-08-10 21:50 ` Sean Christopherson
2022-08-12 7:57 ` Paolo Bonzini
0 siblings, 2 replies; 3+ messages in thread
From: Jim Mattson @ 2022-08-10 21:30 UTC (permalink / raw)
To: kvm, pbonzini; +Cc: Jim Mattson, Sean Christopherson
Regardless of the 'msr' argument passed to the VMX version of
msr_write_intercepted(), the function always checks to see if a
specific MSR (IA32_SPEC_CTRL) is intercepted for write. This behavior
seems unintentional and unexpected.
Modify the function so that it checks to see if the provided 'msr'
index is intercepted for write.
Fixes: 67f4b9969c30 ("KVM: nVMX: Handle dynamic MSR intercept toggling")
Cc: Sean Christopherson <seanjc@google.com>
Signed-off-by: Jim Mattson <jmattson@google.com>
---
arch/x86/kvm/vmx/vmx.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index d7f8331d6f7e..c9b49a09e6b5 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -843,8 +843,7 @@ static bool msr_write_intercepted(struct vcpu_vmx *vmx, u32 msr)
if (!(exec_controls_get(vmx) & CPU_BASED_USE_MSR_BITMAPS))
return true;
- return vmx_test_msr_bitmap_write(vmx->loaded_vmcs->msr_bitmap,
- MSR_IA32_SPEC_CTRL);
+ return vmx_test_msr_bitmap_write(vmx->loaded_vmcs->msr_bitmap, msr);
}
unsigned int __vmx_vcpu_run_flags(struct vcpu_vmx *vmx)
--
2.37.1.559.g78731f0fdb-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] KVM: VMX: Heed the 'msr' argument in msr_write_intercepted()
2022-08-10 21:30 [PATCH] KVM: VMX: Heed the 'msr' argument in msr_write_intercepted() Jim Mattson
@ 2022-08-10 21:50 ` Sean Christopherson
2022-08-12 7:57 ` Paolo Bonzini
1 sibling, 0 replies; 3+ messages in thread
From: Sean Christopherson @ 2022-08-10 21:50 UTC (permalink / raw)
To: Jim Mattson; +Cc: kvm, pbonzini
On Wed, Aug 10, 2022, Jim Mattson wrote:
> Regardless of the 'msr' argument passed to the VMX version of
> msr_write_intercepted(), the function always checks to see if a
> specific MSR (IA32_SPEC_CTRL) is intercepted for write. This behavior
> seems unintentional and unexpected.
>
> Modify the function so that it checks to see if the provided 'msr'
> index is intercepted for write.
>
> Fixes: 67f4b9969c30 ("KVM: nVMX: Handle dynamic MSR intercept toggling")
> Cc: Sean Christopherson <seanjc@google.com>
> Signed-off-by: Jim Mattson <jmattson@google.com>
> ---
I could have sworn this got fixed already. Or maybe Aaron just pointed it out
off-list?
Reviewed-by: Sean Christopherson <seanjc@google.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] KVM: VMX: Heed the 'msr' argument in msr_write_intercepted()
2022-08-10 21:30 [PATCH] KVM: VMX: Heed the 'msr' argument in msr_write_intercepted() Jim Mattson
2022-08-10 21:50 ` Sean Christopherson
@ 2022-08-12 7:57 ` Paolo Bonzini
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2022-08-12 7:57 UTC (permalink / raw)
To: linux-kernel, kvm, Jim Mattson; +Cc: Sean Christopherson
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-08-12 7:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-10 21:30 [PATCH] KVM: VMX: Heed the 'msr' argument in msr_write_intercepted() Jim Mattson
2022-08-10 21:50 ` Sean Christopherson
2022-08-12 7:57 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox