From nobody Tue May 21 09:15:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.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; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1666786070; cv=none; d=zohomail.com; s=zohoarc; b=CDXiL52nPidD6sWmHY+o02lkiAoYHtxGTPnZwAX6G9GZp+ElzdNuT9/2dBy4uztHQQ8rU56/WqWtg1le64xE7BIH47AG8IRUU/c1Id1oLBoiXVRuy76+DAsXfLVvozSEm4R5yKt6OSv/DcjYRNHrH8URn+zo/5sh4GaUkIfsWWM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1666786070; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=rY3Am/gvSpL9IK6aQc34dgSXkc6Y2rNTBMG/TWhY7/8=; b=bbE6gnLxq0iYUqMCRK5yj8qb01icwAWMgxpwie7bkRrqsIovAiA7gxFiIdtPNswlrVJuCF9RK5SIReSNuIwVAGRell80gW3qLxoiz0QmZT6D1dHWoRSGR5Fmye4cFW29lRdV5gQfmXawcBm6JP6JGbvh673QK8A9ysisUtGFeks= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1666786070312934.6555872497669; Wed, 26 Oct 2022 05:07:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1onf34-0002Im-NE; Wed, 26 Oct 2022 07:58:18 -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 1onf32-0002IE-FQ for qemu-devel@nongnu.org; Wed, 26 Oct 2022 07:58:16 -0400 Received: from mga06b.intel.com ([134.134.136.31] helo=mga06.intel.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1onf2z-0006OX-Om for qemu-devel@nongnu.org; Wed, 26 Oct 2022 07:58:16 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Oct 2022 04:57:50 -0700 Received: from icx.bj.intel.com ([10.240.192.136]) by fmsmga002.fm.intel.com with ESMTP; 26 Oct 2022 04:57:48 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666785493; x=1698321493; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=qpe+uYYSF2ldwKkB0xjCpu/yX9aDBsOtvWK3n9gT+k4=; b=VMozqZ/Pe/Euf39KCpHJ0Ywt++aoNJAu1AnKGz9ajKNQ7YryCnrmGmpg v2lCqsy1Y5o8gosZ7gy74LRxRNCMXdKHCWNj4NR/B3Bn+5LnUWaLRDLb9 5MlZW6GX9SlNS27K7QzjQyq2H/AcfLc2PV3U8D8wKCR+fEVG7DCTo05H1 R5kFKXhmRBqswqgjegTvraxLWqodVBVS8XymTp/51fS9w8Rz0ySXrrJG6 qR5Knan0/oDRPwA+9tnYIqA7NLlxKJlx3LqiFnaHf3j2Ss0qwTqfoUVEr 7sM3NAad/5Jd8TsO0D9qdfGzyc7VSW73Am4kMmcx0xMN06SSkbI6vkXDz g==; X-IronPort-AV: E=McAfee;i="6500,9779,10511"; a="369992925" X-IronPort-AV: E=Sophos;i="5.95,214,1661842800"; d="scan'208";a="369992925" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10511"; a="737208966" X-IronPort-AV: E=Sophos;i="5.95,214,1661842800"; d="scan'208";a="737208966" From: Yang Zhong To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, weijiang.yang@intel.com, yang.zhong@linux.intel.com, Yang Zhong Subject: [RESEND PATCH v2] target/i386: Switch back XFRM value Date: Wed, 26 Oct 2022 07:57:45 -0400 Message-Id: <20221026115745.528314-1-yang.zhong@intel.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 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=134.134.136.31; envelope-from=yang.zhong@intel.com; helo=mga06.intel.com X-Spam_score_int: -48 X-Spam_score: -4.9 X-Spam_bar: ---- X-Spam_report: (-4.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.515, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1666786071166100001 Content-Type: text/plain; charset="utf-8" The previous patch wrongly replaced FEAT_XSAVE_XCR0_{LO|HI} with FEAT_XSAVE_XSS_{LO|HI} in CPUID(EAX=3D12,ECX=3D1):{ECX,EDX}, which made SGX enclave 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=A0 Yang Weijiang --- 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 ad623d91e4..19aaed877b 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.30.2