From nobody Fri Oct 18 08:40:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+101248+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1678917590755935.9094513003887; Wed, 15 Mar 2023 14:59:50 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id V7ROYY1788612x0LTmm4I7Lf; Wed, 15 Mar 2023 14:59:49 -0700 X-Received: from NAM02-DM3-obe.outbound.protection.outlook.com (NAM02-DM3-obe.outbound.protection.outlook.com [40.107.95.62]) by mx.groups.io with SMTP id smtpd.web10.6889.1678917584945076997 for ; Wed, 15 Mar 2023 14:59:45 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b7Ea7uyXzUIkAthU8rcbsdx1Qo2ZsJ8vO/PhT+ZRXy/SSyE35NOysMVIgtPiCp1XT0fmHbjJ3fShtpB7/Aj2Kil9cYaU3Z/mFwf9UV/i9rHNFbzQMfWJk0v2zA3mc/ABA38A8tQt8klz/bvLa38Ogl3mVj1+1fwrbbnR/tPpjXfRfhqK83UHNoc7DECCvqfzBbaYEj1eVxvFCB6s3sUeFAK6oMNeyy+oc8XLMxl0ivXR8ZxZxsV3JTr8/1IYqMnz8pgURC4EHAlBFGIHyM8AVP6fVqjjQdVEg3ckcojSY8ClBVsCY13KlJuwVedrXB8Dlrt4hLNolU9AXvvsxKlV5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=OpyPEkvfxtzB+MRwFRdrlIIujSS/LR8jK6aZYleQqXI=; b=mKqGErP/T7Ka3Df6SZxTbR0Ds93yL0tz79uodNor+8jKKXY3y5BnVe5F+Hl1V0Qw3McGbBZ+a/Bt7IHMJBvtBh/y+0w7oWSXPkrh8cV6vNyjbtQzjrqebU0NVW0+FdtD387du3j5wx2FCZDRdlc//NlojKPzht63hwfr6Snd1IS9hGNa99cjD/FIKmB5WWnwzGgFpj8pbsHnt/caRNap23CGcmuB8hucPVhSM7k5+MLjBKi/KaSr/bw1SXb1mYiLLIyP0LjWHONA66n4oPHcThUSLBBlEfDZVP23x7gAsdOGMLoRTVt+wJtttwANsfxP1rsv/Ey7q4t7uGWdWQBpBQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none X-Received: from MW4PR04CA0046.namprd04.prod.outlook.com (2603:10b6:303:6a::21) by DM8PR12MB5431.namprd12.prod.outlook.com (2603:10b6:8:34::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.26; Wed, 15 Mar 2023 21:59:43 +0000 X-Received: from CO1NAM11FT078.eop-nam11.prod.protection.outlook.com (2603:10b6:303:6a:cafe::c) by MW4PR04CA0046.outlook.office365.com (2603:10b6:303:6a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.26 via Frontend Transport; Wed, 15 Mar 2023 21:59:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+101248+1787277+3901457@groups.io; helo=mail02.groups.io; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C X-Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT078.mail.protection.outlook.com (10.13.175.177) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6199.11 via Frontend Transport; Wed, 15 Mar 2023 21:59:42 +0000 X-Received: from localhost (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Wed, 15 Mar 2023 16:59:41 -0500 From: "Roth, Michael via groups.io" To: CC: Tom Lendacky , Jiewen Yao , , Gerd Hoffmann , Erdem Aktas , James Bottomley , Min Xu Subject: [edk2-devel] [PATCH RESEND 4/4] OvmfPkg/CcExitLib: Use documented XSave area base size for SEV-SNP Date: Wed, 15 Mar 2023 16:57:47 -0500 Message-ID: <20230315215747.1543837-5-michael.roth@amd.com> In-Reply-To: <20230315215747.1543837-1-michael.roth@amd.com> References: <20230315215747.1543837-1-michael.roth@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT078:EE_|DM8PR12MB5431:EE_ X-MS-Office365-Filtering-Correlation-Id: 9342d301-1499-4258-b044-08db25a09522 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: hYtllo1/YYjRbrTvBQewJCGHoZENsaAy13NugnSttvHdX9mxDai95xvxuzI1sni6/+cgU3hsN+GOOlIPwVBIbQwp13gz154gBOES3O4as13usDz0fcH6KSkIPYjT5LdNCLwO4uZe0bhEsQAb6znQ+AxUcOOuo5/KbspZ7+CRkyzRtdIxYxKHy0tebF99EcSQfltLaQHTRN5DM+rA9Ll2FT0kh/E3wU3RBvML3hRtMn6BTQSoi6MM2UpmFEqORTzym04Yph7sELWpcMdR2lY8rCwkAnWxzejgDlhFcyQHK2K4fMjdmbABAs33htxxQyIqjjWvZQ3/VoosJYgEjVLGcqitW0EC2aFQp16Pmc/rqelCCyhCzYZPofNOhOJpQPojasG3CCpYDiyg2kSvnoW04Hjdx/ayRONJqVx8zVa6hrHOe8mwrAvj61Zrrey7m9jfsO/F5hhyT+K+zFHcgEpfq35Dd+/aG4TvJsnl2YiPWWRn12PzwlZIUCLfHgqrUd6XDXYJM0480gQLFB/VY8yzEF0CecaR6x3FFaftN55sr99ypQxsi7q04Az1JEGNuciqt62YDCAyCIGTN2wTF64knhqrw2AM+jT/SN77jc3VK0ia6yCV1hrRGr9p9/lJqgpge2GCEAp+iLzi6CjG0rhMmE8nrvtKTCgtJY1IQUdn/rm6ydVjAD6M5DN17CC6sy27Su5SnSbv35XR4UtMQfhfhLOl65iYjfN8GFpDfK0STNY= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2023 21:59:42.7162 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9342d301-1499-4258-b044-08db25a09522 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT078.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8PR12MB5431 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,Michael.Roth@amd.com X-Gm-Message-State: vsvLrZa5gYIpBBzHw95R38qex1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1678917589; bh=wZBhUCng8bvUpA5wCi6p7i6gKesvg7BKRQBo+gH9UOs=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=Q6c7afkJSn+IQTpXB5t80adc7iT5WDox6KhBr8O6lNjpRW/eb1ygIu2Z9jP1kNUlBTl J3asD3edmmYCq5M0OVN+oUczuGwxrqA4FyiBn0usycH1xk3Ee6Tuc4d+2cNgVO9k17lnG WlFl90sCY8FjGFstWyOI0rkOIAeYQ3wX7Mo= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1678917592217100002 Content-Type: text/plain; charset="utf-8" Currently OVMF tries to rely on the base size advertised via the CPUID table entries corresponding to leaf 0xD, sub-leafs 0x0/0x1. This will generally work for KVM guests, but might not for other SEV-SNP hypervisor implementations. Make the handling more robust by simply using the base area size documented by the APM. Reviewed-by: Tom Lendacky Acked-by: Jiewen Yao Signed-off-by: Michael Roth Acked-by: Gerd Hoffmann --- OvmfPkg/Library/CcExitLib/CcExitVcHandler.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/OvmfPkg/Library/CcExitLib/CcExitVcHandler.c b/OvmfPkg/Library/= CcExitLib/CcExitVcHandler.c index 94f0c4872c..0fc30f7bc4 100644 --- a/OvmfPkg/Library/CcExitLib/CcExitVcHandler.c +++ b/OvmfPkg/Library/CcExitLib/CcExitVcHandler.c @@ -1114,8 +1114,6 @@ SnpEnabled ( =20 @param[in] XFeaturesEnabled Bit-mask of enabled XSAVE features/are= as as indicated by XCR0/MSR_IA32_XSS bits - @param[in] XSaveBaseSize Base/legacy XSAVE area size (e.g. when - XCR0 is 1) @param[in, out] XSaveSize Pointer to storage for calculated XSAV= E area size @param[in] Compacted Whether or not the calculation is for = the @@ -1130,7 +1128,6 @@ STATIC BOOLEAN GetCpuidXSaveSize ( IN UINT64 XFeaturesEnabled, - IN UINT32 XSaveBaseSize, IN OUT UINT32 *XSaveSize, IN BOOLEAN Compacted ) @@ -1139,7 +1136,10 @@ GetCpuidXSaveSize ( UINT64 XFeaturesFound =3D 0; UINT32 Idx; =20 - *XSaveSize =3D XSaveBaseSize; + // + // The base/legacy XSave size is documented to be 0x240 in the APM. + // + *XSaveSize =3D 0x240; CpuidInfo =3D (SEV_SNP_CPUID_INFO *)(UINT64)PcdGet32 (PcdOvmfCpuidBase); =20 for (Idx =3D 0; Idx < CpuidInfo->Count; Idx++) { @@ -1355,7 +1355,6 @@ GetCpuidFw ( =20 if (!GetCpuidXSaveSize ( XCr0 | XssMsr.Uint64, - *Ebx, &XSaveSize, Compacted )) --=20 2.25.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#101248): https://edk2.groups.io/g/devel/message/101248 Mute This Topic: https://groups.io/mt/97638519/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-