* [Resend PATCH] KVM/x86: Move X86_CR4_OSXSAVE check into kvm_valid_sregs()
@ 2018-07-23 12:31 Tianyu Lan
2018-08-02 12:58 ` Paolo Bonzini
0 siblings, 1 reply; 2+ messages in thread
From: Tianyu Lan @ 2018-07-23 12:31 UTC (permalink / raw)
Cc: Tianyu Lan, pbonzini, rkrcmar, tglx, mingo, hpa, x86, kvm, linux-kernel
X86_CR4_OSXSAVE check belongs to sregs check and so move into
kvm_valid_sregs().
Signed-off-by: Lan Tianyu <Tianyu.Lan@microsoft.com>
---
arch/x86/kvm/x86.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 153564db7980..5c9acdbb2020 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -8045,6 +8045,10 @@ EXPORT_SYMBOL_GPL(kvm_task_switch);
static int kvm_valid_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
{
+ if (!guest_cpuid_has(vcpu, X86_FEATURE_XSAVE) &&
+ (sregs->cr4 & X86_CR4_OSXSAVE))
+ return -EINVAL;
+
if ((sregs->efer & EFER_LME) && (sregs->cr0 & X86_CR0_PG)) {
/*
* When EFER.LME and CR0.PG are set, the processor is in
@@ -8075,10 +8079,6 @@ static int __set_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
struct desc_ptr dt;
int ret = -EINVAL;
- if (!guest_cpuid_has(vcpu, X86_FEATURE_XSAVE) &&
- (sregs->cr4 & X86_CR4_OSXSAVE))
- goto out;
-
if (kvm_valid_sregs(vcpu, sregs))
goto out;
--
2.14.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Resend PATCH] KVM/x86: Move X86_CR4_OSXSAVE check into kvm_valid_sregs()
2018-07-23 12:31 [Resend PATCH] KVM/x86: Move X86_CR4_OSXSAVE check into kvm_valid_sregs() Tianyu Lan
@ 2018-08-02 12:58 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2018-08-02 12:58 UTC (permalink / raw)
To: Tianyu Lan; +Cc: rkrcmar, tglx, mingo, hpa, x86, kvm, linux-kernel
On 23/07/2018 14:31, Tianyu Lan wrote:
> X86_CR4_OSXSAVE check belongs to sregs check and so move into
> kvm_valid_sregs().
>
> Signed-off-by: Lan Tianyu <Tianyu.Lan@microsoft.com>
> ---
> arch/x86/kvm/x86.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 153564db7980..5c9acdbb2020 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -8045,6 +8045,10 @@ EXPORT_SYMBOL_GPL(kvm_task_switch);
>
> static int kvm_valid_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
> {
> + if (!guest_cpuid_has(vcpu, X86_FEATURE_XSAVE) &&
> + (sregs->cr4 & X86_CR4_OSXSAVE))
> + return -EINVAL;
> +
> if ((sregs->efer & EFER_LME) && (sregs->cr0 & X86_CR0_PG)) {
> /*
> * When EFER.LME and CR0.PG are set, the processor is in
> @@ -8075,10 +8079,6 @@ static int __set_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
> struct desc_ptr dt;
> int ret = -EINVAL;
>
> - if (!guest_cpuid_has(vcpu, X86_FEATURE_XSAVE) &&
> - (sregs->cr4 & X86_CR4_OSXSAVE))
> - goto out;
> -
> if (kvm_valid_sregs(vcpu, sregs))
> goto out;
>
>
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-08-02 12:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-23 12:31 [Resend PATCH] KVM/x86: Move X86_CR4_OSXSAVE check into kvm_valid_sregs() Tianyu Lan
2018-08-02 12:58 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).