* [PATCH v3] target/i386: Change wrong XFRM value
@ 2023-04-06 6:40 Yang Zhong
2023-04-06 11:32 ` Huang, Kai
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Yang Zhong @ 2023-04-06 6:40 UTC (permalink / raw)
To: pbonzini
Cc: qemu-devel, seanjc, christian.ehrhardt, kai.huang, weijiang.yang,
yang.zhong
The previous patch wrongly replaced FEAT_XSAVE_XCR0_{LO|HI} with
FEAT_XSAVE_XSS_{LO|HI} in CPUID(EAX=12,ECX=1):{ECX,EDX}, which made
SGX enclave only supported SSE and x87 feature(xfrm=0x3).
Fixes: 301e90675c3f ("target/i386: Enable support for XSAVES based features")
Signed-off-by: Yang Zhong <yang.zhong@linux.intel.com>
Reviewed-by: Yang Weijiang <weijiang.yang@intel.com>
---
target/i386/cpu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 6576287e5b..f083ff4335 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -5718,8 +5718,8 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
} else {
*eax &= env->features[FEAT_SGX_12_1_EAX];
*ebx &= 0; /* ebx reserve */
- *ecx &= env->features[FEAT_XSAVE_XSS_LO];
- *edx &= env->features[FEAT_XSAVE_XSS_HI];
+ *ecx &= env->features[FEAT_XSAVE_XCR0_LO];
+ *edx &= env->features[FEAT_XSAVE_XCR0_HI];
/* FP and SSE are always allowed regardless of XSAVE/XCR0. */
*ecx |= XSTATE_FP_MASK | XSTATE_SSE_MASK;
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v3] target/i386: Change wrong XFRM value
2023-04-06 6:40 [PATCH v3] target/i386: Change wrong XFRM value Yang Zhong
@ 2023-04-06 11:32 ` Huang, Kai
2023-04-06 12:05 ` Paolo Bonzini
2023-04-09 13:40 ` Michael Tokarev
2 siblings, 0 replies; 6+ messages in thread
From: Huang, Kai @ 2023-04-06 11:32 UTC (permalink / raw)
To: pbonzini@redhat.com, yang.zhong@linux.intel.com
Cc: christian.ehrhardt@canonical.com, Yang, Weijiang,
Christopherson,, Sean, qemu-devel@nongnu.org
On Thu, 2023-04-06 at 02:40 -0400, Yang Zhong wrote:
> The previous patch wrongly replaced FEAT_XSAVE_XCR0_{LO|HI} with
> FEAT_XSAVE_XSS_{LO|HI} in CPUID(EAX=12,ECX=1):{ECX,EDX}, which made
> SGX enclave only supported SSE and x87 feature(xfrm=0x3).
I don't particularly like the sentence's second half, and looks it's better to
also call out "wrong XFRM value in SGX CPUID leaf" in the patch title.
Anyway ...
>
> Fixes: 301e90675c3f ("target/i386: Enable support for XSAVES based features")
>
> Signed-off-by: Yang Zhong <yang.zhong@linux.intel.com>
> Reviewed-by: Yang Weijiang <weijiang.yang@intel.com>
...
Reviewed-by: Kai Huang <kai.huang@intel.com>
> ---
> target/i386/cpu.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/target/i386/cpu.c b/target/i386/cpu.c
> index 6576287e5b..f083ff4335 100644
> --- a/target/i386/cpu.c
> +++ b/target/i386/cpu.c
> @@ -5718,8 +5718,8 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
> } else {
> *eax &= env->features[FEAT_SGX_12_1_EAX];
> *ebx &= 0; /* ebx reserve */
> - *ecx &= env->features[FEAT_XSAVE_XSS_LO];
> - *edx &= env->features[FEAT_XSAVE_XSS_HI];
> + *ecx &= env->features[FEAT_XSAVE_XCR0_LO];
> + *edx &= env->features[FEAT_XSAVE_XCR0_HI];
>
> /* FP and SSE are always allowed regardless of XSAVE/XCR0. */
> *ecx |= XSTATE_FP_MASK | XSTATE_SSE_MASK;
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v3] target/i386: Change wrong XFRM value
2023-04-06 6:40 [PATCH v3] target/i386: Change wrong XFRM value Yang Zhong
2023-04-06 11:32 ` Huang, Kai
@ 2023-04-06 12:05 ` Paolo Bonzini
2023-04-07 11:10 ` Yang Zhong
2023-04-09 13:40 ` Michael Tokarev
2 siblings, 1 reply; 6+ messages in thread
From: Paolo Bonzini @ 2023-04-06 12:05 UTC (permalink / raw)
To: Yang Zhong
Cc: pbonzini, qemu-devel, seanjc, christian.ehrhardt, kai.huang,
weijiang.yang
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3] target/i386: Change wrong XFRM value
2023-04-06 12:05 ` Paolo Bonzini
@ 2023-04-07 11:10 ` Yang Zhong
0 siblings, 0 replies; 6+ messages in thread
From: Yang Zhong @ 2023-04-07 11:10 UTC (permalink / raw)
To: Paolo Bonzini
Cc: qemu-devel, seanjc, christian.ehrhardt, kai.huang, weijiang.yang
On Thu, Apr 06, 2023 at 02:05:06PM +0200, Paolo Bonzini wrote:
> Queued, thanks.
>
Paolo, thanks!
Yang
> Paolo
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3] target/i386: Change wrong XFRM value
2023-04-06 6:40 [PATCH v3] target/i386: Change wrong XFRM value Yang Zhong
2023-04-06 11:32 ` Huang, Kai
2023-04-06 12:05 ` Paolo Bonzini
@ 2023-04-09 13:40 ` Michael Tokarev
2023-04-10 5:37 ` Yang Zhong
2 siblings, 1 reply; 6+ messages in thread
From: Michael Tokarev @ 2023-04-09 13:40 UTC (permalink / raw)
To: Yang Zhong, pbonzini
Cc: qemu-devel, seanjc, christian.ehrhardt, kai.huang, weijiang.yang,
qemu-stable
06.04.2023 09:40, Yang Zhong wrote:
> The previous patch wrongly replaced FEAT_XSAVE_XCR0_{LO|HI} with
> FEAT_XSAVE_XSS_{LO|HI} in CPUID(EAX=12,ECX=1):{ECX,EDX}, which made
> SGX enclave only supported SSE and x87 feature(xfrm=0x3).
>
> Fixes: 301e90675c3f ("target/i386: Enable support for XSAVES based features")
This seems to be -stable material, no?
/mjt
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v3] target/i386: Change wrong XFRM value
2023-04-09 13:40 ` Michael Tokarev
@ 2023-04-10 5:37 ` Yang Zhong
0 siblings, 0 replies; 6+ messages in thread
From: Yang Zhong @ 2023-04-10 5:37 UTC (permalink / raw)
To: Michael Tokarev
Cc: pbonzini, qemu-devel, seanjc, christian.ehrhardt, kai.huang,
weijiang.yang, qemu-stable
On Sun, Apr 09, 2023 at 04:40:50PM +0300, Michael Tokarev wrote:
> 06.04.2023 09:40, Yang Zhong wrote:
> > The previous patch wrongly replaced FEAT_XSAVE_XCR0_{LO|HI} with
> > FEAT_XSAVE_XSS_{LO|HI} in CPUID(EAX=12,ECX=1):{ECX,EDX}, which made
> > SGX enclave only supported SSE and x87 feature(xfrm=0x3).
> >
> > Fixes: 301e90675c3f ("target/i386: Enable support for XSAVES based features")
>
> This seems to be -stable material, no?
>
I checked Qemu stable-7.2, the 301e90675c3f patch was included into this release.
So, this fix patch need to be merged into stable release. thanks!
Regards,
Yang
> /mjt
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-04-10 5:38 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-06 6:40 [PATCH v3] target/i386: Change wrong XFRM value Yang Zhong
2023-04-06 11:32 ` Huang, Kai
2023-04-06 12:05 ` Paolo Bonzini
2023-04-07 11:10 ` Yang Zhong
2023-04-09 13:40 ` Michael Tokarev
2023-04-10 5:37 ` Yang Zhong
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).