mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: Sean Christopherson <sean.j.christopherson@intel.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
	Xiaoyao Li <xiaoyao.li@intel.com>
Subject: Re: [PATCH v2] KVM: x86: Assign correct value to array.maxnent
Date: Thu, 4 Jun 2020 18:21:51 +0200	[thread overview]
Message-ID: <16f6f2f6-f10a-b385-2ce1-7a3515633b43@redhat.com> (raw)
In-Reply-To: <20200604151233.GC30223@linux.intel.com>

On 04/06/20 17:12, Sean Christopherson wrote:
> On Thu, Jun 04, 2020 at 12:16:36PM +0800, 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 <xiaoyao.li@intel.com>
>> ---
>> v2:
>>    - remove "const" of maxnent to fix build error.
>> ---
>>  arch/x86/kvm/cpuid.c | 5 +++--
>>  1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
>> index 253b8e875ccd..3d88ddf781d0 100644
>> --- a/arch/x86/kvm/cpuid.c
>> +++ b/arch/x86/kvm/cpuid.c
>> @@ -426,7 +426,7 @@ EXPORT_SYMBOL_GPL(kvm_set_cpu_caps);
>>  
>>  struct kvm_cpuid_array {
>>  	struct kvm_cpuid_entry2 *entries;
>> -	const int maxnent;
>> +	int maxnent;
>>  	int nent;
>>  };
>>  
>> @@ -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;
> 
> Eh, I'd vote to just do:
> 
> diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
> index 253b8e875ccd..1e5b1ee75a76 100644
> --- a/arch/x86/kvm/cpuid.c
> +++ b/arch/x86/kvm/cpuid.c
> @@ -870,7 +870,7 @@ int kvm_dev_ioctl_get_cpuid(struct kvm_cpuid2 *cpuid,
> 
>         struct kvm_cpuid_array array = {
>                 .nent = 0,
> -               .maxnent = cpuid->nent,
> +               .maxnent = min(cpuid->nent, (u32)KVM_MAX_CPUID_ENTRIES),
>         };
>         int r, i;
> 

Both are fine, I've queued Xiaoyao's patch.

Paolo


      reply	other threads:[~2020-06-04 16:22 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-04  4:16 Xiaoyao Li
2020-06-04 15:12 ` Sean Christopherson
2020-06-04 16:21   ` Paolo Bonzini [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=16f6f2f6-f10a-b385-2ce1-7a3515633b43@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sean.j.christopherson@intel.com \
    --cc=xiaoyao.li@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®