Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <e9b456cee5032c62cab6b9a3ab1411196d4d1c3c.camel@redhat.com>
Subject: Re: [PATCH] KVM: x86: Always enable legacy fp/sse
From:   Leonardo =?ISO-8859-1?Q?Br=E1s?= <leobras@redhat.com>
To:     Sean Christopherson <seanjc@google.com>,
        "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
Cc:     kvm@vger.kernel.org, pbonzini@redhat.com, tglx@linutronix.de,
        linux-kernel@vger.kernel.org, mingo@redhat.com, bp@alien8.de,
        dave.hansen@linux.intel.com, x86@kernel.org
Date:   Wed, 17 Aug 2022 00:29:17 -0300
In-Reply-To: <YvwODUu/rdzjzDjk@google.com>
References: <20220816175936.23238-1-dgilbert@redhat.com>
         <YvwODUu/rdzjzDjk@google.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.44.3 
MIME-Version: 1.0
Precedence: bulk

On Tue, 2022-08-16 at 21:37 +0000, Sean Christopherson wrote:
> On Tue, Aug 16, 2022, Dr. David Alan Gilbert (git) wrote:
> > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> >=20
> > A live migration under qemu is currently failing when the source
> > host is ~Nehalem era (pre-xsave) and the destination is much newer,
> > (configured with a guest CPU type of Nehalem).
> > QEMU always calls kvm_put_xsave, even on this combination because
> > KVM_CAP_CHECK_EXTENSION_VM always returns true for KVM_CAP_XSAVE.
> >=20
> > When QEMU calls kvm_put_xsave it's rejected by
> >    fpu_copy_uabi_to_guest_fpstate->
> >      copy_uabi_to_xstate->
> >        validate_user_xstate_header
> >=20
> > when the validate checks the loaded xfeatures against
> > user_xfeatures, which it finds to be 0.
> >=20
> > I think our initialisation of user_xfeatures is being
> > too strict here, and we should always allow the base FP/SSE.
> >=20
> > Fixes: ad856280ddea ("x86/kvm/fpu: Limit guest user_xfeatures to suppor=
ted bits of XCR0")

Thanks for fixing this, Dave!

> > bz: https://bugzilla.redhat.com/show_bug.cgi?id=3D2079311
> >=20
> > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> > ---
> >  arch/x86/kvm/cpuid.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >=20
> > diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
> > index de6d44e07e34..3b2319cecfd1 100644
> > --- a/arch/x86/kvm/cpuid.c
> > +++ b/arch/x86/kvm/cpuid.c
> > @@ -298,7 +298,8 @@ static void kvm_vcpu_after_set_cpuid(struct kvm_vcp=
u *vcpu)
> >  	guest_supported_xcr0 =3D
> >  		cpuid_get_supported_xcr0(vcpu->arch.cpuid_entries, vcpu->arch.cpuid_=
nent);
> > =20
> > -	vcpu->arch.guest_fpu.fpstate->user_xfeatures =3D guest_supported_xcr0=
;
> > +	vcpu->arch.guest_fpu.fpstate->user_xfeatures =3D guest_supported_xcr0=
 |
> > +		XFEATURE_MASK_FPSSE;
>=20
> I don't think this is correct.  This will allow the guest to set the SSE =
bit
> even when XSAVE isn't supported due to kvm_guest_supported_xcr0() returni=
ng
> user_xfeatures.
>=20
>   static inline u64 kvm_guest_supported_xcr0(struct kvm_vcpu *vcpu)
>   {
> 	return vcpu->arch.guest_fpu.fpstate->user_xfeatures;
>   }
>=20
> I believe the right place to fix this is in validate_user_xstate_header()=
.  It's
> reachable if and only if XSAVE is supported in the host, and when XSAVE i=
s _not_
> supported, the kernel unconditionally allows FP+SSE.  So it follows that =
the kernel
> should also allow FP+SSE when using XSAVE too.  That would also align the=
 logic
> with fpu_copy_guest_fpstate_to_uabi(), which fordces the FPSSE flags.  Di=
tto for
> the non-KVM save_xstate_epilog().
>=20
> Aha!  And fpu__init_system_xstate() ensure the host supports FP+SSE when =
XSAVE
> is enabled (knew their had to be a sanity check somewhere).

Thanks for the feedback Sean!

I have near to no experience in this code, and I hope you can help me with =
a
question I have, based in Dave's commit message:

> > QEMU always calls kvm_put_xsave, even on this combination because
> > KVM_CAP_CHECK_EXTENSION_VM always returns true for KVM_CAP_XSAVE.

Any particular reason why it always returns true for KVM_CAP_XSAVE, even wh=
en
the CPU does not support it?=20

IIUC, if it returns false to this capability, kvm_put_xsave() should never =
be
called, and thus it can avoid bug reproduction.=20

Thanks in advance,

Leo

>=20
> ---
>  arch/x86/kernel/fpu/xstate.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
>=20
> diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c
> index c8340156bfd2..83b9a9653d47 100644
> --- a/arch/x86/kernel/fpu/xstate.c
> +++ b/arch/x86/kernel/fpu/xstate.c
> @@ -399,8 +399,13 @@ int xfeature_size(int xfeature_nr)
>  static int validate_user_xstate_header(const struct xstate_header *hdr,
>  				       struct fpstate *fpstate)
>  {
> -	/* No unknown or supervisor features may be set */
> -	if (hdr->xfeatures & ~fpstate->user_xfeatures)
> +	/*
> +	 * No unknown or supervisor features may be set.  Userspace is always
> +	 * allowed to restore FP+SSE state (XSAVE/XRSTOR are used by the kernel
> +	 * if and only if FP+SSE are supported in xstate).
> +	 */
> +	if (hdr->xfeatures & ~fpstate->user_xfeatures &
> +	    ~(XFEATURE_MASK_FP | XFEATURE_MASK_SSE))
>  		return -EINVAL;
>=20
>  	/* Userspace must use the uncompacted format */
>=20
> base-commit: de3d415edca23831c5d1f24f10c74a715af7efdb
> --
>=20