Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Message-ID: <1e29ef488b637d3ddcdc02c35895e30dfece89b8.camel@linux.intel.com>
Subject: Re: [PATCH] kvm: vmx: Fix entry nubmer check for
 add_atomic_switch_msr()
From:   Xiaoyao Li <xiaoyao.li@linux.intel.com>
To:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
        Paolo Bonzini <pbonzini@redhat.com>
Cc:     x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
        Radim =?UTF-8?Q?Kr=C4=8Dm=C3=A1=C5=99?= <rkrcmar@redhat.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        "H. Peter Anvin" <hpa@zytor.com>
Date:   Mon, 18 Feb 2019 18:45:41 +0800
In-Reply-To: <03c21ba903c472ef64c57baca0c58217b2212d7e.camel@linux.intel.com>
References: <20190214040858.15975-1-xiaoyao.li@linux.intel.com>
         <20190215164645.GD889@char.us.oracle.com>
         <03c21ba903c472ef64c57baca0c58217b2212d7e.camel@linux.intel.com>
Content-Type: text/plain; charset="UTF-8"
User-Agent: Evolution 3.30.1-1build1 
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Mon, 2019-02-18 at 16:26 +0800, linux.intel.com wrote:
> On Fri, 2019-02-15 at 11:46 -0500, Konrad Rzeszutek Wilk wrote:
> > 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/ ?
> > 
> 
> Hi Paolo,
> Could you correct these typos in KVM tree or when sending a PR?
> 

Please disregard this. I just noticed tha this patch had been merged into
mainline.

> > > of no more available entry in vmx->msr_autoload.
> > > 
> > > Fixes: ca83b4a7f2d0 ("x86/KVM/VMX: Add find_msr() helper function")
> > > Signed-off-by: Xiaoyao Li <xiaoyao.li@linux.intel.com>
> > > ---
> > >  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
> > >