From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: Re: [PATCH] kvm: vmx: Fix entry nubmer check for add_atomic_switch_msr() Date: Fri, 15 Feb 2019 11:46:45 -0500 Message-ID: <20190215164645.GD889@char.us.oracle.com> References: <20190214040858.15975-1-xiaoyao.li@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Paolo Bonzini , Radim =?utf-8?B?S3LEjW3DocWZ?= , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" To: Xiaoyao Li Return-path: Content-Disposition: inline In-Reply-To: <20190214040858.15975-1-xiaoyao.li@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: kvm.vger.kernel.org On Thu, Feb 14, 2019 at 12:08:58PM +0800, Xiaoyao Li wrote: > Commit ca83b4a7f2d068da79a0 ("x86/KVM/VMX: Add find_msr() helper function") > introduces the helper function find_msr(), which returns -ENOENT when > not find the msr in vmx->msr_autoload.guest/host. Correct checking contion s/not find/cannot find/ s/contion/condition/ ? > of no more available entry in vmx->msr_autoload. > > Fixes: ca83b4a7f2d0 ("x86/KVM/VMX: Add find_msr() helper function") > Signed-off-by: Xiaoyao Li > --- > arch/x86/kvm/vmx/vmx.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c > index 95d618045001..1aaef2d536bd 100644 > --- a/arch/x86/kvm/vmx/vmx.c > +++ b/arch/x86/kvm/vmx/vmx.c > @@ -863,7 +863,8 @@ static void add_atomic_switch_msr(struct vcpu_vmx *vmx, unsigned msr, > if (!entry_only) > j = find_msr(&m->host, msr); > > - if (i == NR_AUTOLOAD_MSRS || j == NR_AUTOLOAD_MSRS) { > + if ((i < 0 && m->guest.nr == NR_AUTOLOAD_MSRS) || > + (j < 0 && m->host.nr == NR_AUTOLOAD_MSRS)) { > printk_once(KERN_WARNING "Not enough msr switch entries. " > "Can't add msr %x\n", msr); > return; > -- > 2.19.1 >