From nobody Mon Feb 9 12:11:32 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1684314671676511.5407121827286; Wed, 17 May 2023 02:11:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzDBJ-0008UR-Al; Wed, 17 May 2023 05:10:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzDBH-0008Tj-PW; Wed, 17 May 2023 05:10:47 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzDBF-0006LR-Oe; Wed, 17 May 2023 05:10:47 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 304B76828; Wed, 17 May 2023 12:10:43 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 8D3105EF4; Wed, 17 May 2023 12:10:42 +0300 (MSK) Received: (nullmailer pid 3626672 invoked by uid 1000); Wed, 17 May 2023 09:10:42 -0000 From: Michael Tokarev To: qemu-stable@nongnu.org Cc: qemu-devel@nongnu.org, Yang Zhong , Kai Huang , Paolo Bonzini Subject: [PATCH v7.2.3 02/30] target/i386: Change wrong XFRM value in SGX CPUID leaf Date: Wed, 17 May 2023 12:10:14 +0300 Message-Id: <20230517091042.3626593-2-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1684314674917100003 From: Yang Zhong The previous patch wrongly replaced FEAT_XSAVE_XCR0_{LO|HI} with FEAT_XSAVE_XSS_{LO|HI} in CPUID(EAX=3D12,ECX=3D1):{ECX,EDX}. As a result, SGX enclaves only supported SSE and x87 feature (xfrm=3D0x3). Fixes: 301e90675c3f ("target/i386: Enable support for XSAVES based features= ") Signed-off-by: Yang Zhong Reviewed-by:=C2=A0Yang Weijiang Reviewed-by: Kai Huang Signed-off-by: Paolo Bonzini (cherry picked from commit 72497cff896fecf74306ed33626c30e43633cdd6) Signed-off-by: Michael Tokarev --- 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 22b681ca37..0f71ff9fea 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5584,8 +5584,8 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, = uint32_t count, } else { *eax &=3D env->features[FEAT_SGX_12_1_EAX]; *ebx &=3D 0; /* ebx reserve */ - *ecx &=3D env->features[FEAT_XSAVE_XSS_LO]; - *edx &=3D env->features[FEAT_XSAVE_XSS_HI]; + *ecx &=3D env->features[FEAT_XSAVE_XCR0_LO]; + *edx &=3D env->features[FEAT_XSAVE_XCR0_HI]; =20 /* FP and SSE are always allowed regardless of XSAVE/XCR0. */ *ecx |=3D XSTATE_FP_MASK | XSTATE_SSE_MASK; --=20 2.39.2