From nobody Thu May 16 23:24:32 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+110767+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 1699310754965142.73809768096214; Mon, 6 Nov 2023 14:45:54 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=Le21kOLnYbFlmXPzyf8zCskhdUphk4QdFFbBJtYqU1w=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:Received-SPF:From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1699310754; v=1; b=bVxZ4eNZETYolQjWY48gqQgJGiZMk2wMsUbEkT2S9FFQXllrH6EWXjPw9PPbraqIk7i0XTJ2 G4GK5bRArfkZvGf5HksoKPbDjVyY056xpobbV8pxjotkXCcqt4R+X3SQLyO4RXntHSxzXOA/z5h /JWlE/BotHYC+qdIr4lhErdY= X-Received: by 127.0.0.2 with SMTP id i4iUYY1788612xoul5iRKEAs; Mon, 06 Nov 2023 14:45:54 -0800 X-Received: from NAM12-DM6-obe.outbound.protection.outlook.com (NAM12-DM6-obe.outbound.protection.outlook.com [40.107.243.42]) by mx.groups.io with SMTP id smtpd.web11.70907.1699310753923435597 for ; Mon, 06 Nov 2023 14:45:54 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CXlYtDX2+jJxgvEYBLrEvwk2dDVdFGgMUvJv88yt3NNkb3T7H16aEQ7uznDdA8Jkm/Ig6KbSxE5YREG8aRdtChfMmUdIBcVlnxbFv35AJf235mRkeVn2C4gth3qA7UMjf9k0BNR6oA6nJ+HjVDqUOOu5ePXd/8qzs4HR40dmMUxGm135yNXVI0pPKZQF2WFhGOAfrszJPdn1EOP2fU8YtfstRVhT5IPH6LmLHspQWIQ9Q6PBcW+8PJsXCvj4Go8ubuC5xIy5icBNz79v7eMVV92fblME+jNXRYIY6e3F6rfc4TQzq1QHiB1wPGJKXQBmUT5uTRlKkF9hDrfI1ns+0g== 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=RJIFKDvuFoaSS08zJHyLfkaxl/JECZISVLjenk3NoeA=; b=lbNS5dxcSSrhANwoCWmKypLrolX1fjh9/RqBlJDPb+cbvvI5MTxZIOjkWDXpLfI+Q1FUzoZCdZFTPvdnDAgAVuu40Z33Y4Hgu8Td+zVn1U4yaQ/N3tW0NT/cib4ifpRWM5MY2hwX1BlUAHgcuuELybclkFmrjPx7SDTb8YVMDz48iP0/YD7pZJqkQXcUByj/pQO90k8HIsYfKpqQQwTb9ELDPZQ48JGA92TnlrQvqRaaA1bJM3k/YWlCxn+TDe1XWQ3auTnRqhLOq9y+ANxgbuitVXTl6EVzGRDx5u9kf54FRk36YC20tkwPjFHdxRzOnaYYKbP1mkZMDVtD5edYzw== 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 (0) X-Received: from CY5PR15CA0216.namprd15.prod.outlook.com (2603:10b6:930:88::11) by SA1PR12MB7320.namprd12.prod.outlook.com (2603:10b6:806:2b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.28; Mon, 6 Nov 2023 22:45:50 +0000 X-Received: from CY4PEPF0000E9CE.namprd03.prod.outlook.com (2603:10b6:930:88:cafe::bc) by CY5PR15CA0216.outlook.office365.com (2603:10b6:930:88::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.28 via Frontend Transport; Mon, 6 Nov 2023 22:45:50 +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+110767+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 CY4PEPF0000E9CE.mail.protection.outlook.com (10.167.241.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6977.16 via Frontend Transport; Mon, 6 Nov 2023 22:45:50 +0000 X-Received: from tlendack-t1.amdoffice.net (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.2507.32; Mon, 6 Nov 2023 16:45:49 -0600 From: "Lendacky, Thomas via groups.io" To: CC: Eric Dong , Ray Ni , Rahul Kumar , Gerd Hoffmann , Ard Biesheuvel , Michael Roth Subject: [edk2-devel] [PATCH 1/2] UefiCpuPkg/MpInitLib: Use AsmCpuidEx() for CPUID_EXTENDED_TOPOLOGY leaf Date: Mon, 6 Nov 2023 16:45:30 -0600 Message-ID: <91d35526ba20ff73653128d78f2461876cd6dce2.1699310731.git.thomas.lendacky@amd.com> In-Reply-To: References: 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: CY4PEPF0000E9CE:EE_|SA1PR12MB7320:EE_ X-MS-Office365-Filtering-Correlation-Id: 943e3e03-5409-44a8-358c-08dbdf1a2012 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: WZjeLLZo239vdRbjXkutstKwXGzwN3oIHN+/+6+oMb8V0qzcewph/jwB7/I/rpX638NFrdXaXJFB3slYBTSusnDDFXfQlicyAHIm0mcNk4FZCc0MeO+fxVb+d9oDIJUfX49AmFo0YMRCJRLkbAeFVTqddFgOnqhIWos3pNVDKtI4j5eunS+9AYQjbjNe7sqHd7CEy3w2Qn0y1oVMbENRysm9r1Sr8pzAJZnpz158XEj5AJcbV5bczqRyFCFwrOwRBK0c3f4OlP9JUoaz53btKrIxnray0jOskGHWmYJ1p7aQGmWIZxKa1QI8Mg+NbpUpuoyvBFS1E6oy2abgfCoOXFiJKvlGqA+EaWCKTXsFbxoKh677/8miIPZZZs7apHqx7nNx7UEgRyvVpSZ00mnXsUaiDfj3oKf448Y8BzBZaljP06W36gwUQ1++Qgn2ahYnTw/YgvUt2EYW51+gsmne6nBQfL8v7QsN0nfJhFVb8sIDEety6IJ7+FBbI/2zjfpnJ8PM7aH68SdrqrFA2TUZeKRNn0JTynTXw8blfEru+i5tK6NeB/FF8XwUk/EyNL2dd+38xWFZLrPB4kv01pnyo1emS27lPPpCd7rO5xXISRgvTZW+qml/Kh6OAKn/jkFNwEqo9ygWN83CrNgdap7sUgdSGjaFe1LiKRhoa9uyVCrcmA2nb4GdvQj6yBfOrX3INXJNoI0t82IcroNZytx8FArIT8fOvezj/2iSNg6Dz/9pM1OH4wgahnEpEVi3r3Ri7+OQD7GHVc13OoWWj9EkIXM3dmfLoauSfbUsFYCaVco= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2023 22:45:50.2171 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 943e3e03-5409-44a8-358c-08dbdf1a2012 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: CY4PEPF0000E9CE.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7320 Precedence: Bulk 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,thomas.lendacky@amd.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: ue52bGonLmMsEWNHADls27Yzx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1699310756629100001 Content-Type: text/plain; charset="utf-8" The CPUID_EXTENDED_TOPOLOGY CPUID leaf takes a subleaf as input when returning CPUID information. However, the AsmCpuid() function does not zero out ECX before the CPUID instruction, so the input leaf is used as the sub-leaf for the CPUID request and returns erroneous/invalid CPUID data, since the intent of the request was to get data related to sub-leaf 0. Instead, use AsmCpuidEx() for the CPUID_EXTENDED_TOPOLOGY leaf. Fixes: d4d7c9ad5fe5 ("UefiCpuPkg/MpInitLib: use BSP to do extended ...") Signed-off-by: Tom Lendacky Acked-by: Gerd Hoffmann Reviewed-by: Ray Ni --- UefiCpuPkg/Library/MpInitLib/AmdSev.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/UefiCpuPkg/Library/MpInitLib/AmdSev.c b/UefiCpuPkg/Library/MpI= nitLib/AmdSev.c index bda4960f6fd3..d34f9513e002 100644 --- a/UefiCpuPkg/Library/MpInitLib/AmdSev.c +++ b/UefiCpuPkg/Library/MpInitLib/AmdSev.c @@ -256,7 +256,14 @@ FillExchangeInfoDataSevEs ( if (StdRangeMax >=3D CPUID_EXTENDED_TOPOLOGY) { CPUID_EXTENDED_TOPOLOGY_EBX ExtTopoEbx; =20 - AsmCpuid (CPUID_EXTENDED_TOPOLOGY, NULL, &ExtTopoEbx.Uint32, NULL, NUL= L); + AsmCpuidEx ( + CPUID_EXTENDED_TOPOLOGY, + 0, + NULL, + &ExtTopoEbx.Uint32, + NULL, + NULL + ); ExchangeInfo->ExtTopoAvail =3D !!ExtTopoEbx.Bits.LogicalProcessors; } } --=20 2.42.0 -=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 (#110767): https://edk2.groups.io/g/devel/message/110767 Mute This Topic: https://groups.io/mt/102432043/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- From nobody Thu May 16 23:24:32 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+110768+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 1699310761861863.6955597549281; Mon, 6 Nov 2023 14:46:01 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=mysip4f5OISlPV6Oz/dIjl5qebAzgt6ozoSH1MT6sCk=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:Received-SPF:From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1699310761; v=1; b=skMqHgZbHB09zlOe5Nst5wP9GkJh7oiiI7sPNnslcPlMMwS8Tqv8leBfpXoPE6w3W6zPGmZC qEcF9uY843p579UcWRpiWHuUma7Q8nro3of0LY9QPMcqY9g9uAkjMRaigM+Kqj8pnNKhU7bTKDr CD7pbQ9ZXEi1RmLXaZx++I8s= X-Received: by 127.0.0.2 with SMTP id hi2JYY1788612xFyUf5AqfWv; Mon, 06 Nov 2023 14:46:01 -0800 X-Received: from NAM12-DM6-obe.outbound.protection.outlook.com (NAM12-DM6-obe.outbound.protection.outlook.com [40.107.243.63]) by mx.groups.io with SMTP id smtpd.web11.70911.1699310760922249132 for ; Mon, 06 Nov 2023 14:46:01 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UlRP/L8ekum7sR1l03Y2CCw2eoCsgk9VzZ/ivQlSqQ5PPkh9AvJv5rofHrwmhltndQnrJtwa0AR3QmAqpZ021qBX0fN0R21QeJlrAQvrFH9Pk0RnUrBM8bobtm67DGh8/rDxzpUQmU2QQTmHaxIbq6kokuZufHZKZk0BFTcjMFzt/OnvDUQmwymKYtuqFLvmXnKEpZth82/1aOhIk9yyI3diy3uOfDh8Apjef1Z74LQDx2bDjRfKFkSDOasjo5i+AzNWyE/2XAYPdiqK3+CwRIWlRQjDL3qBgsF2FtiVAKQTz5LNlxd0pS7razmyYdjDRVrtnSc31C4s1aRvV16IBw== 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=Jo5m6L+rgMYyVArm5iZWvyc7/g45B9CYLiLab8EzFeQ=; b=n4oD3gMcw+aPAjIDPkRhIH27nJDq7g+k/vJ6YGmXS0r+xyu0A62uXVIOPKPsl1NXZvS2oVEKorLEhy31tnavfdBoknmEvAAiIZoN0bjL9fynN84DbNKwjsLQ57RwxoAqJmDIBzmuWcglP4uP51FPmnPKmQKaxpg8ICPJ6WtMenfdwgn0dmD/ywcS8eE+GZcQSJIL6zeRL4RPxpyE3kPkpz7cfWhhIehhnYZviFeFeekF9UtCOXGIRixTjZV86yekmNYhRN+qJqEe5JDhudUYy0Givg3VXM8Gydc3YpCoEsehxh97TJ/yGza5kmSXKLxVqQgzcn4bMCRNXU3UXUUleg== 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 (0) X-Received: from CY5PR04CA0013.namprd04.prod.outlook.com (2603:10b6:930:1e::33) by SA0PR12MB4432.namprd12.prod.outlook.com (2603:10b6:806:98::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.28; Mon, 6 Nov 2023 22:45:57 +0000 X-Received: from CY4PEPF0000E9D1.namprd03.prod.outlook.com (2603:10b6:930:1e:cafe::1a) by CY5PR04CA0013.outlook.office365.com (2603:10b6:930:1e::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.28 via Frontend Transport; Mon, 6 Nov 2023 22:45:57 +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+110768+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 CY4PEPF0000E9D1.mail.protection.outlook.com (10.167.241.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6977.16 via Frontend Transport; Mon, 6 Nov 2023 22:45:57 +0000 X-Received: from tlendack-t1.amdoffice.net (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.2507.32; Mon, 6 Nov 2023 16:45:56 -0600 From: "Lendacky, Thomas via groups.io" To: CC: Eric Dong , Ray Ni , Rahul Kumar , Gerd Hoffmann , Ard Biesheuvel , Michael Roth Subject: [edk2-devel] [PATCH 2/2] UefiCpuPkg/MpInitLib: Copy SEV-ES save area pointer during APIC ID sorting Date: Mon, 6 Nov 2023 16:45:31 -0600 Message-ID: <09a41658fc43ceffadf5bfcda44356fa38049935.1699310731.git.thomas.lendacky@amd.com> In-Reply-To: References: 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: CY4PEPF0000E9D1:EE_|SA0PR12MB4432:EE_ X-MS-Office365-Filtering-Correlation-Id: 76962e76-27a6-4909-56a5-08dbdf1a2475 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: 2WQvRhU8wHOBZ+fQxUnHmagz0lcabo/gkEBWjHE46P4NAWw9nwueMEUmgo2vBDDKPQ1UOjylHlc7MwLzjigy5vWtbR5vskVJlYLK/9vJ8KwdHryabauxu6rjeurNnjUtRowGnzwXNVc6QlVktrhiL7/H7RJzrBnTv3jxYDRtDkegB3QHgF9sfkGddmjymSTfqrzjqEW+/QbHZiH4AgaPoh/Y60ODt236xE8tOeAI/xGUdXSeRXff/gYNlWQNZsy0gyI+43ben8FZWHYfgm0bUBgOQZqGPW9WQ7U3Um+/xGXkP08uPfJ3H/pIOlMiNIKdwAjB/UV8jhRB4+A9lwQ4FKOkK08neccf1xOZ9lnWoZXxBJpmmwPaFfVRGrHgyOMmbGlMCZdQgt7vYsGR8263fbvYbjEO3NkZ5aN85dj7epQctgm/a5QEQU8MPO2MgaZVQiXKQMvZhjO+rkP/2RVZr7YAJcq6QrRBdX9KDsJOW+HEN51dMEfL8kthSzLz+Exg/udwZVB7KjIn7gnE+bpSNDBu06Dzr2AvsOdkPks7pppszS+Sz0J0zzqP8MBa5Kz4EpB8KQpIwBOeoCz8Ck9GsB13kCY5gQFlxu/ttNHczk2bwotAjNK8h8eCiaVIxJJ7NFzoOoE97RLOJW4shEigSR/w+DcbyXEh4GXy8CsqZaZfdNbN/Ew2j+R2z0L1mBiq1C4RR80iTaoyKM8ExdEZQ/WIb7Z7sYyK3iwqfg2hPaxz85h+fiiUBK1VP1ADH1iedFgPpxoJvOy1MYlHr09XRg== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2023 22:45:57.5776 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 76962e76-27a6-4909-56a5-08dbdf1a2475 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: CY4PEPF0000E9D1.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4432 Precedence: Bulk 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,thomas.lendacky@amd.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: ccOCNqCDZMYPrwAwhZMB6VvWx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1699310762725100001 Content-Type: text/plain; charset="utf-8" With SEV-SNP, the SEV-ES save area for a vCPU should be unique to that vCPU. After commit 3323359a811a, the VMSA allocation was re-used, but when sorting the CPUs by APIC ID, the save area was not updated to follow the original CPU. Similar to the StartupApSignal address, the SevEsSaveArea address should be updated when sorting the CPUs. This does not cause an issue at this time because all APs are in HLT state and then are (re)started at the same time, with the same VMSA contents. However, this should be fixed to account for any change in future behavior. Fixes: 3323359a811a ("UefiCpuPkg/MpInitLib: Reuse VMSA allocation to ...") Signed-off-by: Tom Lendacky Acked-by: Gerd Hoffmann Reviewed-by: Ray Ni --- UefiCpuPkg/Library/MpInitLib/MpLib.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpIn= itLib/MpLib.c index 9a6ec5db5ce9..a41b9e5701af 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c @@ -370,6 +370,7 @@ SortApicId ( UINT32 ApCount; CPU_INFO_IN_HOB *CpuInfoInHob; volatile UINT32 *StartupApSignal; + VOID *SevEsSaveArea; =20 ApCount =3D CpuMpData->CpuCount - 1; CpuInfoInHob =3D (CPU_INFO_IN_HOB *)(UINTN)CpuMpData->CpuInfoInHob; @@ -397,12 +398,17 @@ SortApicId ( CopyMem (&CpuInfoInHob[Index1], &CpuInfo, sizeof (CPU_INFO_IN_HOB)= ); =20 // - // Also exchange the StartupApSignal. + // Also exchange the StartupApSignal and SevEsSaveArea. // StartupApSignal =3D CpuMpData->CpuData[= Index3].StartupApSignal; CpuMpData->CpuData[Index3].StartupApSignal =3D CpuMpData->CpuData[Index1].StartupApSignal; CpuMpData->CpuData[Index1].StartupApSignal =3D StartupApSignal; + + SevEsSaveArea =3D CpuMpData->CpuData[In= dex3].SevEsSaveArea; + CpuMpData->CpuData[Index3].SevEsSaveArea =3D + CpuMpData->CpuData[Index1].SevEsSaveArea; + CpuMpData->CpuData[Index1].SevEsSaveArea =3D SevEsSaveArea; } } =20 --=20 2.42.0 -=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 (#110768): https://edk2.groups.io/g/devel/message/110768 Mute This Topic: https://groups.io/mt/102432047/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-