From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.53]) by mx.groups.io with SMTP id smtpd.web09.9430.1603981185425864204 for ; Thu, 29 Oct 2020 07:19:45 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=EqB6fDhT; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.237.53, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tr6pmt8kJBfKvnn2XFMGyjaeYOoe6YYHLlLzCI4fHDVV09rVEmzflpg9Za3NFW3V4TQH9Gp56siYHdpAF6HfQOm3jRcMILb0pIsyf5R+xosoSdeABAegwYJr8W5jUnI6FXUzNumz/A5GwS9Ctw60uxlTA81wJD3AqSErJj9nMRaBwGlr57T11qzWfxsXA/MkPxuxLRAOOcRiylMUZGgcrXefaQjZt/XkN1MAtdwHBPt9vV1VtmNTstQALjzDGBO/t4TpIsAKQjNGvGuNAvnfhvtt6pzxeRX8ZwBBx0XdIG4IhRuW/GpnZfK8pOn2m5+y2MfrGTdpbsf7bEBJDb5e7A== 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-SenderADCheck; bh=YizIqpGSk6OdeqMrTc1SwpHMZJ+B/yvtMLYEXL/H+rg=; b=grEF6MU9Sli8Do8TyEjBpCcCCy/vYky/oKxbdYdzYezVkJsu4ZV3Q5o2Cln9NtqoQ5RWJrzaA26Qzff+mrVrSAKArkUc+lOKzCKDfoghNAVlfCWth3DNwOlOFRFeM9jTj+TqqJxNohb7M/e+51Az5ZcavxBAuOcoeC53hNz47VvVy5B4Bf5dPGcss9n+3mIxK9QHmvXNB8bAad7CTgdTNNY7o5ODGH8i7Mfb2YahUaciU1x/gSwYKdGX0e/fVNCvoUSU+lVaalFcSs4vf4zX8njP3HjcPiAyFRbRhsnktA+AFzjXSdUAilGDQ/f6kX67UjNXLcmdKdG9CMCi5J5Mog== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YizIqpGSk6OdeqMrTc1SwpHMZJ+B/yvtMLYEXL/H+rg=; b=EqB6fDhTNDSAHdcs7gpA29Kw/OZZz2OeeidHs6eJ26C4+tABtyDdl0vyWu0KaEx50Y13p08oNhtbbyNcrM00jyzcyW6XdCg1kvkDcFvQTgUhxJPeIuQu1Z4fzPYO3jfUs6ylvmT2rBZQGkaNd2VNw8kEUJtbXLJS+cGvlIyqIhc= Authentication-Results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=amd.com; Received: from DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM6PR12MB3276.namprd12.prod.outlook.com (2603:10b6:5:15e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.24; Thu, 29 Oct 2020 14:19:43 +0000 Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::e442:c052:8a2c:5fba]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::e442:c052:8a2c:5fba%6]) with mapi id 15.20.3499.027; Thu, 29 Oct 2020 14:19:43 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Eric Dong , Ray Ni , Laszlo Ersek , Rahul Kumar Subject: [PATCH v3 11/11] UefiCpuPkg/MpInitLib: For SEV-ES guest, set stack based on processor number Date: Thu, 29 Oct 2020 09:18:02 -0500 Message-ID: X-Mailer: git-send-email 2.28.0 In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM6PR02CA0158.namprd02.prod.outlook.com (2603:10b6:5:332::25) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) Return-Path: thomas.lendacky@amd.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from tlendack-t1.amd.com (165.204.77.1) by DM6PR02CA0158.namprd02.prod.outlook.com (2603:10b6:5:332::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.18 via Frontend Transport; Thu, 29 Oct 2020 14:19:42 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 8b466c47-16f3-4a0f-6aaa-08d87c15ae01 X-MS-TrafficTypeDiagnostic: DM6PR12MB3276: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2449; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ee0bDJ6zHAf9bOgDT7S+j7WhgzJSxBcPJ3TRaybyFEdxQrXHPLPQlONu7qLx3YzVchJSqCysBkRWCBOtQsarEGD7/Bwb4xxJOd7QQDa20mAdEx5g5ne8RiLmDmNVZ4s8RnmMyVQtfg14oJcT5ezKIhkcf7adjaS1wECEucI/37Xx9QH9Of/Wpxwuyw7Ao7iGCqM4mbuP1egBC3Wb8kuhiM+yWQed42Pxo1QVdXBs3xTqNKalNkye8RRnG4cHqf+W5Nxs38a2zMUm0dZoNP43VdNhMs1jGfrZH0/Gb1DgzKmwZtAtk+k6RZnsDQCUbGDyGPv/tMWd9Ly9xPFb+leb38VOkuSUcX0C3RCgkhU3fH7KCAABraCdiuuJ8hSirYZ19QFjy03KLTQmp0eUranARQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR12MB1355.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(6029001)(4636009)(39860400002)(396003)(376002)(136003)(346002)(366004)(26005)(8676002)(186003)(16526019)(4326008)(86362001)(6486002)(83380400001)(7696005)(52116002)(54906003)(66556008)(5660300002)(2906002)(6666004)(966005)(36756003)(2616005)(478600001)(316002)(6916009)(956004)(8936002)(66476007)(19627235002)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: WDzpSZ8r4hsneTjgmQPd6sLWgoKFKkCY4+LGAkKRZ5CTXS6Ol8flB4J4yW0tRGFNYG9B8dUqytxliRFQvY46Ki6Q20j+Me7ZZj8KH/IJ6vf2quQSDe4cFCjcUjjHuC2dyYjljdxmdjERU16THcewPzEw4fBqskBPqVyCM89FgrSwVDP0JIjJKK0K0qMLTn2aaMlIschnebUcAHQEpaTomKA7F5pjb+fRYFsLf7atfdJgP9fRFPhOw/55/hlQ1rtHhXeJ/QM7ZMBcXihneN92SqFxydWZSyk+wVtfrAroMp7BbeLxo1Ak8jlD4LvUNmV04nntUzObgRrnOwVT1xVb8f6xAKoBuGZwj/1ZLRF+sWm+lfZeeBBRDPjxIJgy4rhvU0uWSjOn0X5qw2pBzbhQnpeiIj72ZzJFnVXkm4Vg1UB5ItVKzUpj9M2TG1p96FgSSa4npyTsoSkd5nepfpib7Pj6jG0rZaF1pIK3xZQ00J391cspb0lHY85TolNJcQO2y3BpEBdPftZvsKOYhD4WFM45IBHDiSUTLPhR/Qm/zfo+kN7p2yu5ixLxEYqhDZKUBvLRHaRyiQiW/ie9n6sCu916wGUYz6N5j1NMTsL0smIIY1cYm9a9KTohk1k8ZkRwwGxH87Q0044KarDnIx0Umw== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8b466c47-16f3-4a0f-6aaa-08d87c15ae01 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2020 14:19:42.9610 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: B52RjD1veNk30pizNhnGDlxhNhJYuX0BK9i3Qn6UpZczOqHdehRYjbvbF4tSqo+e1BoThZex92Mbpyj8BvI1fQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3276 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable From: Tom Lendacky BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3008 Set the SEV-ES reset stack address for an AP based on the processor number instead of the APIC ID in case the APIC IDs are not zero-based and densely packed/enumerated. This will ensure an AP reset stack address does not get set outside of the AP reset stack memory allocation. Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Cc: Rahul Kumar Acked-by: Ray Ni Signed-off-by: Tom Lendacky --- UefiCpuPkg/Library/MpInitLib/MpLib.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpIn= itLib/MpLib.c index 1f47ff3f73b5..681fa79b4cff 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c @@ -680,11 +680,16 @@ MpInitLibSevEsAPReset ( IN CPU_MP_DATA *CpuMpData ) { + EFI_STATUS Status; + UINTN ProcessorNumber; UINT16 Code16, Code32; AP_RESET *APResetFn; UINTN BufferStart; UINTN StackStart; =20 + Status =3D GetProcessorNumber (CpuMpData, &ProcessorNumber); + ASSERT_EFI_ERROR (Status); + Code16 =3D GetProtectedMode16CS (); Code32 =3D GetProtectedMode32CS (); =20 @@ -696,7 +701,7 @@ MpInitLibSevEsAPReset ( =20 BufferStart =3D CpuMpData->MpCpuExchangeInfo->BufferStart; StackStart =3D CpuMpData->SevEsAPResetStackStart - - (AP_RESET_STACK_SIZE * GetApicId ()); + (AP_RESET_STACK_SIZE * ProcessorNumber); =20 // // This call never returns. --=20 2.28.0