From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, HK_RANDOM_FROM,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2CB38C433DF for ; Thu, 4 Jun 2020 03:55:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 109D720679 for ; Thu, 4 Jun 2020 03:55:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726946AbgFDDzf (ORCPT ); Wed, 3 Jun 2020 23:55:35 -0400 Received: from mga01.intel.com ([192.55.52.88]:34717 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725936AbgFDDzf (ORCPT ); Wed, 3 Jun 2020 23:55:35 -0400 IronPort-SDR: xWJKvnjjWtZ0NALSCQpfHO7XCHPmPy82xhGzFp9qCel4BH0/xbVy2Qhjcc3RG1x1TehI6bGx26 +Dk+BjF7u/6Q== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jun 2020 20:55:34 -0700 IronPort-SDR: vsv62uYmJxsnpuJhSY9ikvOBFjgXEbIiyTOGu4Mh/HyK94t0GAM7DbTZZAdIQiRRoX/KuBbFy/ 0qsct/Yd439w== X-IronPort-AV: E=Sophos;i="5.73,471,1583222400"; d="scan'208";a="445358915" Received: from unknown (HELO [10.239.13.99]) ([10.239.13.99]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jun 2020 20:55:33 -0700 Subject: Re: [PATCH] KVM: x86: Assign correct value to array.maxnent To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org References: <20200604024304.14643-1-xiaoyao.li@intel.com> From: Xiaoyao Li Message-ID: <95f888b8-eed5-cb31-57a4-148d7708b7cb@intel.com> Date: Thu, 4 Jun 2020 11:55:31 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.8.1 MIME-Version: 1.0 In-Reply-To: <20200604024304.14643-1-xiaoyao.li@intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 6/4/2020 10:43 AM, Xiaoyao Li wrote: > Delay the assignment of array.maxnent to use correct value for the case > cpuid->nent > KVM_MAX_CPUID_ENTRIES. > > Fixes: e53c95e8d41e ("KVM: x86: Encapsulate CPUID entries and metadata in struct") > Signed-off-by: Xiaoyao Li > --- > arch/x86/kvm/cpuid.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c > index 253b8e875ccd..befff01d100c 100644 > --- a/arch/x86/kvm/cpuid.c > +++ b/arch/x86/kvm/cpuid.c > @@ -870,7 +870,6 @@ int kvm_dev_ioctl_get_cpuid(struct kvm_cpuid2 *cpuid, > > struct kvm_cpuid_array array = { > .nent = 0, > - .maxnent = cpuid->nent, > }; > int r, i; > > @@ -887,6 +886,8 @@ int kvm_dev_ioctl_get_cpuid(struct kvm_cpuid2 *cpuid, > if (!array.entries) > return -ENOMEM; > > + array.maxnent = cpuid->nent; Miss the fact that maxnent is const, V2 is coming. > + > for (i = 0; i < ARRAY_SIZE(funcs); i++) { > r = get_cpuid_func(&array, funcs[i], type); > if (r) >