From: Xiaoyao Li <xiaoyao.li@intel.com>
To: Paolo Bonzini <pbonzini@redhat.com>,
Sean Christopherson <sean.j.christopherson@intel.com>,
Jim Mattson <jmattson@google.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-doc@vger.kernel.org, Jonathan Corbet <corbet@lwn.net>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Wanpeng Li <wanpengli@tencent.com>,
Joerg Roedel <joro@8bytes.org>
Subject: Re: [PATCH v3 3/8] KVM: X86: Introduce kvm_check_cpuid()
Date: Wed, 8 Jul 2020 20:28:06 +0800 [thread overview]
Message-ID: <3a085ea6-1f2b-904a-99a4-e10ed00e99a0@intel.com> (raw)
In-Reply-To: <20200708065054.19713-4-xiaoyao.li@intel.com>
On 7/8/2020 2:50 PM, Xiaoyao Li wrote:
> Use kvm_check_cpuid() to validate if userspace provides legal cpuid
> settings and call it before KVM updates CPUID.
>
> Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
[...]
> @@ -202,12 +208,16 @@ int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu,
> vcpu->arch.cpuid_entries[i].padding[2] = 0;
> }
> vcpu->arch.cpuid_nent = cpuid->nent;
> + r = kvm_check_cpuid(vcpu);
> + if (r) {
> + vcpu->arch.cpuid_nent = 0;
Paolo,
here lack a kvfree(cpuid_entries);
Can you help fix it?
Apologize for it.
> + goto out;
> + }
> +
> cpuid_fix_nx_cap(vcpu);
> kvm_apic_set_version(vcpu);
> kvm_x86_ops.cpuid_update(vcpu);
> - r = kvm_update_cpuid(vcpu);
> - if (r)
> - vcpu->arch.cpuid_nent = 0;
> + kvm_update_cpuid(vcpu);
>
> kvfree(cpuid_entries);
> out:
next prev parent reply other threads:[~2020-07-08 12:28 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-08 6:50 [PATCH v3 0/8] Refactor handling flow of KVM_SET_CPUID* Xiaoyao Li
2020-07-08 6:50 ` [PATCH v3 1/8] KVM: X86: Reset vcpu->arch.cpuid_nent to 0 if SET_CPUID* fails Xiaoyao Li
2020-07-08 12:00 ` Paolo Bonzini
2020-07-08 6:50 ` [PATCH v3 2/8] KVM: X86: Go on updating other CPUID leaves when leaf 1 is absent Xiaoyao Li
2020-07-08 6:50 ` [PATCH v3 3/8] KVM: X86: Introduce kvm_check_cpuid() Xiaoyao Li
2020-07-08 12:28 ` Xiaoyao Li [this message]
2020-07-08 12:43 ` Paolo Bonzini
2020-07-08 6:50 ` [PATCH v3 4/8] KVM: X86: Split kvm_update_cpuid() Xiaoyao Li
2020-07-08 12:06 ` Paolo Bonzini
2020-07-08 12:33 ` Xiaoyao Li
2020-07-08 12:41 ` Paolo Bonzini
2020-07-08 13:27 ` Xiaoyao Li
2020-07-08 13:30 ` Paolo Bonzini
2020-07-08 6:50 ` [PATCH v3 5/8] KVM: X86: Rename cpuid_update() to update_vcpu_model() Xiaoyao Li
2020-07-08 12:08 ` Paolo Bonzini
2020-07-08 6:50 ` [PATCH v3 6/8] KVM: X86: Move kvm_x86_ops.update_vcpu_model() into kvm_update_vcpu_model() Xiaoyao Li
2020-07-08 6:50 ` [PATCH v3 7/8] KVM: lapic: Use guest_cpuid_has() in kvm_apic_set_version() Xiaoyao Li
2020-07-08 6:50 ` [PATCH v3 8/8] KVM: X86: Move kvm_apic_set_version() to kvm_update_vcpu_model() Xiaoyao Li
2020-07-08 12:10 ` [PATCH v3 0/8] Refactor handling flow of KVM_SET_CPUID* Paolo Bonzini
2020-07-09 4:27 ` Xiaoyao Li
2020-07-09 9:37 ` Paolo Bonzini
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=3a085ea6-1f2b-904a-99a4-e10ed00e99a0@intel.com \
--to=xiaoyao.li@intel.com \
--cc=corbet@lwn.net \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=sean.j.christopherson@intel.com \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.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