Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2148240imj; Mon, 18 Feb 2019 00:30:34 -0800 (PST) X-Google-Smtp-Source: AHgI3IZxzdIWeHPBWitpbWRlmkshoOWAbBFoeiloutok7XIkviUrSYGJuIvN0cRhRMtWepPL1ilI X-Received: by 2002:a17:902:104:: with SMTP id 4mr24064789plb.62.1550478634604; Mon, 18 Feb 2019 00:30:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550478634; cv=none; d=google.com; s=arc-20160816; b=QLjEiv8TmHdT4+HkArYlIwUJG0wiyNfz8tbkh1TP0Nfn3E0eJS/nY1MEYFdgOpl/1E ukyHCEdDFQHGrcmXZKExi+LRBdeE/HcKjV2jm2Gr03/bqDpf8P+lXqWakJFh4iViMhbk QozBcWYvbR6AY7fjtHMKf+S05MLK7nGwnXYI8GqROlHeK2KmjVtoLXVU4yv7Jl4mN9tH 5rlbwetGnkG8PPbsGXOd7V1zYfzh9L+0H5+DxLVt04iWbfpAH7eLUYUay6uMrW8zMfUi bISmQRNfb+/NtrAlyqVTF9ci9ABARAE7BzFq0cLALaij7Sm+DDkMb+hgy0PgbrcfGwXg hcEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:date:cc:to:from:subject :message-id; bh=CDu5107YAMq5zub3aC7JcCFirazl7WLtOEmWQfv4dHY=; b=ZAl4X3ObV7zzJPMrp796UNeKyxJ/Ffqsy72MwmD8u/1WxYMcH3vQz7sTXMpSTWK/7L IMHIVQPuB6fVanpp3MLbfDZuKhsv1Mw0um+3o31Ls0C3sQUzP48FjsIuu/KWJNovfNMp 6NMuBrGUPdfVqfYbTPEykHuWVxLBh5uM22gPlhhfK27MD0tn9FHD0I1gmBzqBdGPJYI3 L3mLv8HIDeY/ItrMbpM3YeyumnhyzY9gzr8/7faoYfFivus3E4ZjighEE0Rstknb0u4K 2yK/vqecDAVHOaMX76DUP4vz0XIzPNtaknJA906oXFLm+1r3za6L7NZAjAOwYm0ETcGn kSmw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w123si12866080pfb.172.2019.02.18.00.30.17; Mon, 18 Feb 2019 00:30:34 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729166AbfBRIaM (ORCPT + 99 others); Mon, 18 Feb 2019 03:30:12 -0500 Received: from mga04.intel.com ([192.55.52.120]:31206 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728342AbfBRIaM (ORCPT ); Mon, 18 Feb 2019 03:30:12 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Feb 2019 00:30:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,384,1544515200"; d="scan'208";a="123265393" Received: from lxy-dell.sh.intel.com ([10.239.159.147]) by fmsmga007.fm.intel.com with ESMTP; 18 Feb 2019 00:29:56 -0800 Message-ID: <03c21ba903c472ef64c57baca0c58217b2212d7e.camel@linux.intel.com> Subject: Re: [PATCH] kvm: vmx: Fix entry nubmer check for add_atomic_switch_msr() From: "linux.intel.com" To: Konrad Rzeszutek Wilk , Paolo Bonzini Cc: x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Radim =?UTF-8?Q?Kr=C4=8Dm=C3=A1=C5=99?= , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" Date: Mon, 18 Feb 2019 16:26:59 +0800 In-Reply-To: <20190215164645.GD889@char.us.oracle.com> References: <20190214040858.15975-1-xiaoyao.li@linux.intel.com> <20190215164645.GD889@char.us.oracle.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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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? > > 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 > >