From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paolo Bonzini Subject: Re: [PATCH] KVM : Fix read/write to IA32_FEATURE_CONTROL MSR in nested virt Date: Thu, 04 Jul 2013 09:00:09 +0200 Message-ID: <51D51D79.8050000@redhat.com> References: <1372858868-24755-1-git-send-email-yzt356@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org, gleb@redhat.com, jan.kiszka@web.de To: Arthur Chunqi Li Return-path: Received: from mail-wg0-f42.google.com ([74.125.82.42]:34983 "EHLO mail-wg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755148Ab3GDHAT (ORCPT ); Thu, 4 Jul 2013 03:00:19 -0400 Received: by mail-wg0-f42.google.com with SMTP id z11so6141664wgg.3 for ; Thu, 04 Jul 2013 00:00:17 -0700 (PDT) In-Reply-To: <1372858868-24755-1-git-send-email-yzt356@gmail.com> Sender: kvm-owner@vger.kernel.org List-ID: Il 03/07/2013 15:41, Arthur Chunqi Li ha scritto: > Fix read/write to IA32_FEATURE_CONTROL MSR in nested environment. > Simply return 0x5 when read and generate #GP(0) when write. > Delete handling codes in vmx_set_vmx_msr() and generate #GP(0) in > handle_wrmsr(). > > Signed-off-by: Arthur Chunqi Li > --- > arch/x86/kvm/vmx.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c > index 260a919..e125f94 100644 > --- a/arch/x86/kvm/vmx.c > +++ b/arch/x86/kvm/vmx.c > @@ -2277,7 +2277,7 @@ static int vmx_get_vmx_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata) > > switch (msr_index) { > case MSR_IA32_FEATURE_CONTROL: > - *pdata = 0; > + *pdata = 0x5; > break; This is not in the MSR_IA32_VMX_BASIC..MSR_IA32_VMX_TRUE_ENTRY_CTLS range, so you must check nested_vmx_allowed and return 0 if it is false. Otherwise looks good. Paolo > case MSR_IA32_VMX_BASIC: > /* > @@ -2356,9 +2356,6 @@ static int vmx_set_vmx_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data) > if (!nested_vmx_allowed(vcpu)) > return 0; > > - if (msr_index == MSR_IA32_FEATURE_CONTROL) > - /* TODO: the right thing. */ > - return 1; > /* > * No need to treat VMX capability MSRs specially: If we don't handle > * them, handle_wrmsr will #GP(0), which is correct (they are readonly) >