From nobody Mon Sep 16 19:34:11 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+103600+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 1682454911783485.1343300123724; Tue, 25 Apr 2023 13:35:11 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 2S6TYY1788612xYmayl623VP; Tue, 25 Apr 2023 13:35:11 -0700 X-Received: from NAM11-CO1-obe.outbound.protection.outlook.com (NAM11-CO1-obe.outbound.protection.outlook.com [40.107.220.40]) by mx.groups.io with SMTP id smtpd.web11.91276.1682454910837479504 for ; Tue, 25 Apr 2023 13:35:10 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VMnz3TFXNb/TkO1Ojr3hf9XG4bKpfEJAraoGXfr9NAlH0l7TkrhwS1avTDiNkLcelpT/CthSubY1x2v0sz1WV7ZTwbi9ZEyJ5wDC9OP9ME3rntLc7HYSCDyhS9oJonYImOZOJsfBq6M7wg73OWhU2kY8rewBa+7qrKgHWc6/jJZ3Rg0zJLGSplCaw8D7idHnktgnA7tV+3KictCY92nApabrRYcSkbT0exUSFP/CtvIb9ezqwGeuG86SEtU9Q4uCMYgh8XPJsrh2Il9YtOjnfU0mI4NmFOui6yAZgXNu8L/AqJGo+qOT7XPQ3tse7SOJccFAFKmIHb2nNMRn6eIOoQ== 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=LIBZcU3BgcajhOWS8VCnGiUzuHjdHtGFvvROY/RzuMs=; b=md9PQLldYEr4Gv5NPFcGM8hCPl8xQwDPZH4sJOm6BxdKg+5wzbpidrcAiVwyOQd2eOGgn+IfNCIHeFj+J7GVU6S63NJFDwzKbpA9YZt4s7xFGi5ZUcgYHLdrW+Xnj8MAIV6Azyyzk4d1km8IEsQAm16O6BQt6JQtkMWLaadkARMQTf5SUlT3S0Kra6taJ/HSdiGi1nIWz3Hl4TkNYrCtJ5YUfDoH82dc5fUTf4wLEEmTk7E3O8spSkg3WDmcNm77B5YtVsV7Xmn++i0j9aNYXNwA1l8fh/pH9dmBWBM8mCxqtPDNI3dejLNa4qJvULl13dReccyoaJMTRqEs7KBHrw== 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 BN9PR03CA0123.namprd03.prod.outlook.com (2603:10b6:408:fe::8) by DM4PR12MB5087.namprd12.prod.outlook.com (2603:10b6:5:38a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Tue, 25 Apr 2023 20:35:07 +0000 X-Received: from BN8NAM11FT024.eop-nam11.prod.protection.outlook.com (2603:10b6:408:fe:cafe::c6) by BN9PR03CA0123.outlook.office365.com (2603:10b6:408:fe::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.34 via Frontend Transport; Tue, 25 Apr 2023 20:35:07 +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+103600+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 BN8NAM11FT024.mail.protection.outlook.com (10.13.177.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6340.20 via Frontend Transport; Tue, 25 Apr 2023 20:35:06 +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; Tue, 25 Apr 2023 15:35:05 -0500 From: "Roth, Michael via groups.io" To: CC: Ard Biesheuvel , Tom Lendacky , Jiewen Yao , , Gerd Hoffmann , Erdem Aktas , James Bottomley , Min Xu Subject: [edk2-devel] [PATCH v2 4/4] OvmfPkg/CcExitLib: Use documented XSave area base size for SEV-SNP Date: Tue, 25 Apr 2023 15:32:58 -0500 Message-ID: <20230425203258.255583-5-michael.roth@amd.com> In-Reply-To: <20230425203258.255583-1-michael.roth@amd.com> References: <20230425203258.255583-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: BN8NAM11FT024:EE_|DM4PR12MB5087:EE_ X-MS-Office365-Filtering-Correlation-Id: 577382dc-ed3d-4828-2a64-08db45cc8e48 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: pUpvR+oG86eLT7lu/WwwjMLXqXKyG3xNgKLNdeRusUWwk6pO1raEHjTuMmkI6+cRp4llWHUX/VAm94EkqQfa4s3MCx/f19fpzLPfpjG0jKgeT36G3l3wNGJ2QX947f8DEw7xQy0d6PgXCwSYTKDP7jKPcM8ZDD7hvvE7IgeZB4ISO8fDw4IYHNlZcaIXMJXZZUe7T53N3Vye5nPyeHPJt/RTKORCQx9I4mVhMtiyKTdmg1TUjK3cS8Unli8U3vo/GIV1IqkaCkW6QnBlFiIszYx3ioQ7PGd7uzyOaywO4UUfzAAO8mlfvPYIGfhkiH0rGksVIZcUro7vj5mZNjyzvvLBvdJQ0y6yEAhJ/Ai7mQHGkSOLrKHvdaTf8Yjc/l5fxs+wq9qVUtcx5fm1YqbkxvrnfqTFV7RPUc0wT4La2pQ5fGULoT4rQz21w2LY6w2xJCsr0cONIAsiBDzLYwW906DyPF2e/IyBvage5GrMDqClzGXlWRIbPyo5iDaF/IRUKFqdiU8rWCnrCS6kuE0T4Wg8mGcNXWBluCwt4Ry0bV5BkhmpNLcgbx8Kx83alEQCBRXbD8gOw+juDmfHZhtDH1qa4t1CMbYeZRDmNSekTjrV3ssVfnmp/W4dAu86nD/3umW7zZsT8IRK5ks7LF/9/d0cJ3COb8kZvlX/S2z5EV7leEN9iRcNB6FGchv+HpbzF1L8K970hIs8lz4WSEdWCytzJs39LwIPEcfs069kW0g= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 20:35:06.5483 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 577382dc-ed3d-4828-2a64-08db45cc8e48 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: BN8NAM11FT024.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5087 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: EKk4UNE1kCOBGSpRwaGDB8MBx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1682454911; bh=w75BI9/Q4/Od2MEUXtd8DLQt94rBs5+jNmh+cQW6vWo=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=RGEgwFuuAnd7I1yP2dALuqW/m0QPiQSrlW5GrCfsVwmhPwdzCiA5nXyX9p9AmRd1ybj voxCWekG7yE393zmBSkPC8nbP11ZGAlbUcNVoNAS0KL/KBP6zoXDYzhIB/mxmNfylVnY8 Lo8U8dmCuMK4zwAvzRS16Z/7s6oiCvTIrFQ= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1682454913467100001 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 Acked-by: Gerd Hoffmann Signed-off-by: Michael Roth --- 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 (#103600): https://edk2.groups.io/g/devel/message/103600 Mute This Topic: https://groups.io/mt/98501826/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-