From: Paolo Bonzini <pbonzini@redhat.com>
To: Like Xu <like.xu.linux@gmail.com>
Cc: Sean Christopherson <seanjc@google.com>,
Jim Mattson <jmattson@google.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Wanpeng Li <wanpengli@tencent.com>,
Joerg Roedel <joro@8bytes.org>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] KVM: x86: Fix the #GP(0) and #UD conditions for XSETBV emulation
Date: Mon, 17 Jan 2022 09:31:44 +0100 [thread overview]
Message-ID: <a133d6e2-34de-8a41-475e-3858fc2902bf@redhat.com> (raw)
In-Reply-To: <20220117072456.71155-1-likexu@tencent.com>
On 1/17/22 08:24, Like Xu wrote:
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 76b4803dd3bd..7d8622e592bb 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -1024,7 +1024,11 @@ static int __kvm_set_xcr(struct kvm_vcpu *vcpu, u32 index, u64 xcr)
>
> int kvm_emulate_xsetbv(struct kvm_vcpu *vcpu)
> {
> - if (static_call(kvm_x86_get_cpl)(vcpu) != 0 ||
> + if (!guest_cpuid_has(vcpu, X86_FEATURE_XSAVE) ||
> + !kvm_read_cr4_bits(vcpu, X86_CR4_OSXSAVE))
> + return kvm_handle_invalid_op(vcpu);
There's no need to check XSAVE, because it XSAVE=0 will prevent setting
CR4.OSXSAVE.
Likewise, CPL and SS.DPL are also defined in real mode so there's no
need to check is_protmode. The Intel manuals sometimes still act as the
descriptor caches don't exist, even though VMX effectively made them
part of the architecture.
Also, the "Fixes" tag is not really correct as the behavior was the same
before. Rather, it fixes commit 02d4160fbd76 ("x86: KVM: add xsetbv to
the emulator", 2019-08-22). Checking OSXSAVE is a bug in the emulator
path, even though it's not needed in the XSETBV vmexit case.
Thanks,
Paolo
> + if ((is_protmode(vcpu) && static_call(kvm_x86_get_cpl)(vcpu) != 0) ||
> __kvm_set_xcr(vcpu, kvm_rcx_read(vcpu), kvm_read_edx_eax(vcpu))) {
> kvm_inject_gp(vcpu, 0);
> return 1;
next prev parent reply other threads:[~2022-01-17 8:31 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-17 7:24 [PATCH] KVM: x86: Fix the #GP(0) and #UD conditions for XSETBV emulation Like Xu
2022-01-17 8:31 ` Paolo Bonzini [this message]
2022-01-17 9:44 ` Like Xu
2022-01-17 11:18 ` Paolo Bonzini
2022-01-20 7:48 ` [DROP][PATCH] " Like Xu
2022-01-20 9:17 ` Paolo Bonzini
2022-01-20 9:31 ` Xiaoyao Li
2022-01-20 9:49 ` 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=a133d6e2-34de-8a41-475e-3858fc2902bf@redhat.com \
--to=pbonzini@redhat.com \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=like.xu.linux@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=seanjc@google.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.