From nobody Tue May 7 20:23:30 2024 Delivered-To: importer@patchew.org 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+71912+1787277+3901457@groups.io; helo=mail02.groups.io; 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+71912+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=oracle.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1613978384979181.2822698996057; Sun, 21 Feb 2021 23:19:44 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id IOhIYY1788612xS47F3sbTAa; Sun, 21 Feb 2021 23:19:44 -0800 X-Received: from userp2130.oracle.com (userp2130.oracle.com [156.151.31.86]) by mx.groups.io with SMTP id smtpd.web11.31684.1613978384065597426 for ; Sun, 21 Feb 2021 23:19:44 -0800 X-Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 11M7FMVo133524; Mon, 22 Feb 2021 07:19:41 GMT X-Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by userp2130.oracle.com with ESMTP id 36tsuqtktm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Feb 2021 07:19:41 +0000 X-Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 11M7EeNc161412; Mon, 22 Feb 2021 07:19:40 GMT X-Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2171.outbound.protection.outlook.com [104.47.59.171]) by aserp3030.oracle.com with ESMTP id 36uc0kwq89-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Feb 2021 07:19:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bdYTtf5Ry7xSgliUkKFuEWTJZKEneg8G2ArxfToKljXij5FVM+cMTAp9V/AW/bJC+TiB0zbvmF96kYn1ffcqlkvhWtHGxmuu2poiNQq370vAFu8gxAFZZkRfLMK3QCAO+u5Fw9PHCFZXzFazKn4rbhA5bgbFkWC4ywb9N/78+1o3+wW3eJ8Y+ZZg3Og5VILKLNVuUMtOh70Q/dwt5r7To/hb2cUnq985McENCdkWWgTLx4UmUWM35mNxvsPMgj+Jp7K03t80J8MLfYij/R+BrlnqRx2Dx3mNLJqZAegFCW0QJMoAp+UM7XZaYd7Wz1hK+9vGjsEjuZAhOKJJWuZQqQ== 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=j5sLrnWcUR41bTrM95Iz2yAXNjCYFkDKXmHyHRZ5diI=; b=S9MfSgoCi9njgIJ+p4t+Lgo7zifOIB4qP715BzOXN+oZrnOJZkDbkYiZRz8XTMhtHBP5gPCtFhmIpdhjnWNHScq/BVec8nR39FgYDV065epkqRzKGgWPAJV+LGMnEQAfpZVtLlEXubw7cLmp7+Fo/ybCRa9eZT4Bt7yEAcRvlPPYe/XRsmox9pTxerpLFHbcgq4LB1oliIKr+cYIxQ4hjSiw+k9NShfqvG9tf3WiO6PY8dIpPjDp9YqsCpk0uJnOp5JaA7z+5SJcDYXEnWo4vG0/93X36nsjuuMhzp0GEK80YtS7COHuKKA/aJ5F4NFn/ldpri0QEADiqDFoUXWuww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none X-Received: from SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) by BYAPR10MB3191.namprd10.prod.outlook.com (2603:10b6:a03:14f::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.29; Mon, 22 Feb 2021 07:19:38 +0000 X-Received: from SJ0PR10MB4605.namprd10.prod.outlook.com ([fe80::a021:790:7ce6:6f16]) by SJ0PR10MB4605.namprd10.prod.outlook.com ([fe80::a021:790:7ce6:6f16%6]) with mapi id 15.20.3868.033; Mon, 22 Feb 2021 07:19:38 +0000 From: "Ankur Arora" To: devel@edk2.groups.io Cc: lersek@redhat.com, imammedo@redhat.com, boris.ostrovsky@oracle.com, Ankur Arora , Jordan Justen , Ard Biesheuvel , Aaron Young Subject: [edk2-devel] [PATCH v8 01/10] OvmfPkg/CpuHotplugSmm: refactor hotplug logic Date: Sun, 21 Feb 2021 23:19:19 -0800 Message-Id: <20210222071928.1401820-2-ankur.a.arora@oracle.com> In-Reply-To: <20210222071928.1401820-1-ankur.a.arora@oracle.com> References: <20210222071928.1401820-1-ankur.a.arora@oracle.com> X-Originating-IP: [148.87.23.11] X-ClientProxiedBy: MWHPR17CA0065.namprd17.prod.outlook.com (2603:10b6:300:93::27) To SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from prion.us.oracle.com (148.87.23.11) by MWHPR17CA0065.namprd17.prod.outlook.com (2603:10b6:300:93::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Mon, 22 Feb 2021 07:19:37 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 456845d1-22ce-4068-3790-08d8d7023706 X-MS-TrafficTypeDiagnostic: BYAPR10MB3191: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: lQN2RhuAc6meb7JNl27VpvHQSyoQYFKpRPjex+roBNIGfe8I0qH+rb77J3yzWF9EQJsvcu4sia72usPu+kKmPLMfXkyBRkExH9moYj1juvIGksc0DmSL9HZ+zcoAeWRx+BbQjJW3uEyinAlJY8+EHPoEttxzFKurxHZYoKUYriUGMJSVqaeGXuX5mHgUZbtXM+guVr3dgkkeH9CODGFiUWApyVlONnefz7/g+GQ7n9Rwbr1YO+uSAoeDSyp1/o2C9MIBOwTkwlvYxTj5k9UPkocUeNSxr5DueR0O0ktdGkz28W8g/Wdq5EgKTNN+KYKZoxACAG8dcHsjajIo4AJh/h/pud70mTDirjE/Wt/08mJG4BCZCuV0QwsbUqf2VtPm+3z7YelcqtFixPAsa8ubQDTZKyz44BA4za88CLLR0zyW1j1KEVBYmJU0unYQPKR08szRVgznGuy05N3chEWC4pqBbZRG02Zh+3APvUvqap8RGb1syePvSMhAPHJUu8aeUkGBaRRoejyDpHf4iCOoYaM4EcBliSc8/IE7Yc3u4xUnX2M9ScC7JtGEoQjBnabWVPHeez3IB0guGI7rz1xo2e1Z1VEbp0giTem6KrsX6k8= X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?3J3kI7NuM+cVkJv2BJgRu+JzddAetfERD4hrIz5mGRVXbLrefAUueDSBskwr?= =?us-ascii?Q?c0SS4RcqI6BIPoJzRMLPz2cSxj9F7fm09oqmcebT3QUVABj20S9Q7VMeB0Qp?= =?us-ascii?Q?hUhueXMy6QIjaJ9DQo4XwUuLsKaThGhOfcLADpWlnTdnmBkowK6kt9bEUt+e?= =?us-ascii?Q?ZqjWT81MO71HiXIu8BHGXRA9oOY5Bt14am8gQZox4Ym3sZ7SlDQJaY9ACBE7?= =?us-ascii?Q?aqvDw4Sb77lIMzFFawxZhjcpaLJLOVt8uanS8sBy71U/rvl/l3gBioyrmKCW?= =?us-ascii?Q?EPzamqfOP/9rsW5Jd8SvFJ4yxhpLawNww+t70fk0JQjH1Vb1ByanDp7TN5ov?= =?us-ascii?Q?0C7V9hbMNnr5OgnaLwy+2wsXy2xwq4X9KwNTnMTu5TO9EnPyNy8MsBH/SigJ?= =?us-ascii?Q?gjtVnf3jZA+fUonzmoDdj9Cb5yXtPd4gnUpuFpo6dgAkQlq71GmsC7Uuee+V?= =?us-ascii?Q?S3orMdF8m+tEMIdFL9DREeQLzph/J4en84Oqmv7APJSvqMXsToKQ87iMtsMb?= =?us-ascii?Q?sWSIWPq9zxdjrxywm+PRAC7mwBGWC9RjvY1DEsn9Gzy86ZtF95AQCSQu6uGR?= =?us-ascii?Q?cBuOs0UxQom5l8X9NAgLDitLeDdIVjlXnskOU5vA3mJ27SzGXFm/CKw0yPNS?= =?us-ascii?Q?KM7KcldvoDk5wDy+GFkzDK5oCmsALqvJhV2P2LAstbB77ZV/eWBqGKFTceAi?= =?us-ascii?Q?1MqXPP/bTRTknVzKfIj+gYZu5HdjmbL88BqFM0rBY5T39z22hCErwbpMEkrf?= =?us-ascii?Q?rGi1a/rGbRB/u0Z6/Eoh9uzLJz58AxGHShDrM3s8qagFRKdL8cA0WuQT+7GB?= =?us-ascii?Q?GAQqM4DwvKUnmLby7hYRztUXXmGaKHWg/JJLp1+6UtSSQ7hbrBc/f0CGCfAw?= =?us-ascii?Q?QCJKBEr95xjvvAXVqdBD/XRZRUm1R9eBBsKS8jPCrAsFrpY1jn6GdapwxMKp?= =?us-ascii?Q?xc+++a1RNm63+bTARvGlZAeg14RwoiUScur4wAoPD4Bp0UKbCYBpcGAQ/uMT?= =?us-ascii?Q?+MDzLoUmuE8LOIH0GUHvW6/ZV8kI4mcMjfRb4bGRhEYZqOPtL2iLE9h1aezy?= =?us-ascii?Q?/lfpPKI5ZtcT3J9fjEj484ESfLoiaMiiQ4jxe1dDnjmC8gTiy3hMnLnZCFzs?= =?us-ascii?Q?/5bjXhm0oyst6OAPwV6hxZd/v3A/WtOVnscdMieqMX4za4raUcK0xXqX080+?= =?us-ascii?Q?QWCBggiKC5vPhnRuX2WOWkMgA8VwF40mmOe++y54om2Ha63mG+D9a/UgM2Iz?= =?us-ascii?Q?GKz3gzyKMjd7DGE2h4DJX2cD4U/qs5LTviLN4gBqDVvCUdiGJoFsvddjkbmb?= =?us-ascii?Q?vCVIv6wUHBztAgIlDJIx0SiI?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 456845d1-22ce-4068-3790-08d8d7023706 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4605.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2021 07:19:38.7987 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: IfrEdx1+YM5OcwV3aR/+j84D7RO4v6yq/5p61ckWvkYflu1vB+BYlUBnCkA31Vxg7DDh1k+2/qCbynWfMvJppW74cOBWKNMngiCJYDcgLLc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3191 Precedence: Bulk List-Unsubscribe: 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,ankur.a.arora@oracle.com X-Gm-Message-State: jPMvVaI1UlGUfFS37aXdVsuZx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1613978384; bh=SdSj8XpqWq9ELLVtbXYOJtywkNKixQxFuVRlqVpsRDs=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=fmLe55/O+l3vcHz3y1GGPj71tmwVsOjtT9g75yBAPJYiSOMnjE/FWx6beFGftyvkhlC Kw2GtL+EU+Kr8yOwyx4+gahzN6hI7JpKJKNKHkrA3oFjBmNfYb8NHFPNRFVlAyufKIzgZ 6PaARQ00GMkSXvuN97qQ9ywVivP/oLqeK0E= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Refactor CpuHotplugMmi() to pull out the CPU hotplug logic into ProcessHotAddedCpus(). This is in preparation for supporting CPU hot-unplug. Cc: Laszlo Ersek Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Igor Mammedov Cc: Boris Ostrovsky Cc: Aaron Young Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3132 Signed-off-by: Ankur Arora Reviewed-by: Laszlo Ersek --- Notes: Addresses these review comments from v6: (1) s/EFI_ERROR(/EFI_ERROR (/ (2) Remove the empty line in the comment block above ProcessHotAddedCpus(). () Nest the EFI_ERROR handling inside the (PluggedCount > 0) clause. OvmfPkg/CpuHotplugSmm/CpuHotplug.c | 210 ++++++++++++++++++++++-----------= ---- 1 file changed, 126 insertions(+), 84 deletions(-) diff --git a/OvmfPkg/CpuHotplugSmm/CpuHotplug.c b/OvmfPkg/CpuHotplugSmm/Cpu= Hotplug.c index cfe698ed2b5e..bf68fcd42914 100644 --- a/OvmfPkg/CpuHotplugSmm/CpuHotplug.c +++ b/OvmfPkg/CpuHotplugSmm/CpuHotplug.c @@ -62,6 +62,129 @@ STATIC UINT32 mPostSmmPenAddress; // STATIC EFI_HANDLE mDispatchHandle; =20 +/** + Process CPUs that have been hot-added, per QemuCpuhpCollectApicIds(). + + For each such CPU, relocate the SMBASE, and report the CPU to PiSmmCpuDx= eSmm + via EFI_SMM_CPU_SERVICE_PROTOCOL. If the supposedly hot-added CPU is alr= eady + known, skip it silently. + + @param[in] PluggedApicIds The APIC IDs of the CPUs that have been + hot-plugged. + + @param[in] PluggedCount The number of filled-in APIC IDs in + PluggedApicIds. + + @retval EFI_SUCCESS CPUs corresponding to all the APIC IDs are + populated. + + @retval EFI_OUT_OF_RESOURCES Out of APIC ID space in "mCpuHotPlugData". + + @return Error codes propagated from SmbaseRelocate() + and mMmCpuService->AddProcessor(). +**/ +STATIC +EFI_STATUS +ProcessHotAddedCpus ( + IN APIC_ID *PluggedApicIds, + IN UINT32 PluggedCount + ) +{ + EFI_STATUS Status; + UINT32 PluggedIdx; + UINT32 NewSlot; + + // + // The Post-SMM Pen need not be reinstalled multiple times within a sing= le + // root MMI handling. Even reinstalling once per root MMI is only pruden= ce; + // in theory installing the pen in the driver's entry point function sho= uld + // suffice. + // + SmbaseReinstallPostSmmPen (mPostSmmPenAddress); + + PluggedIdx =3D 0; + NewSlot =3D 0; + while (PluggedIdx < PluggedCount) { + APIC_ID NewApicId; + UINT32 CheckSlot; + UINTN NewProcessorNumberByProtocol; + + NewApicId =3D PluggedApicIds[PluggedIdx]; + + // + // Check if the supposedly hot-added CPU is already known to us. + // + for (CheckSlot =3D 0; + CheckSlot < mCpuHotPlugData->ArrayLength; + CheckSlot++) { + if (mCpuHotPlugData->ApicId[CheckSlot] =3D=3D NewApicId) { + break; + } + } + if (CheckSlot < mCpuHotPlugData->ArrayLength) { + DEBUG ((DEBUG_VERBOSE, "%a: APIC ID " FMT_APIC_ID " was hot-plugged " + "before; ignoring it\n", __FUNCTION__, NewApicId)); + PluggedIdx++; + continue; + } + + // + // Find the first empty slot in CPU_HOT_PLUG_DATA. + // + while (NewSlot < mCpuHotPlugData->ArrayLength && + mCpuHotPlugData->ApicId[NewSlot] !=3D MAX_UINT64) { + NewSlot++; + } + if (NewSlot =3D=3D mCpuHotPlugData->ArrayLength) { + DEBUG ((DEBUG_ERROR, "%a: no room for APIC ID " FMT_APIC_ID "\n", + __FUNCTION__, NewApicId)); + return EFI_OUT_OF_RESOURCES; + } + + // + // Store the APIC ID of the new processor to the slot. + // + mCpuHotPlugData->ApicId[NewSlot] =3D NewApicId; + + // + // Relocate the SMBASE of the new CPU. + // + Status =3D SmbaseRelocate (NewApicId, mCpuHotPlugData->SmBase[NewSlot], + mPostSmmPenAddress); + if (EFI_ERROR (Status)) { + goto RevokeNewSlot; + } + + // + // Add the new CPU with EFI_SMM_CPU_SERVICE_PROTOCOL. + // + Status =3D mMmCpuService->AddProcessor (mMmCpuService, NewApicId, + &NewProcessorNumberByProtocol); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "%a: AddProcessor(" FMT_APIC_ID "): %r\n", + __FUNCTION__, NewApicId, Status)); + goto RevokeNewSlot; + } + + DEBUG ((DEBUG_INFO, "%a: hot-added APIC ID " FMT_APIC_ID ", SMBASE 0x%= Lx, " + "EFI_SMM_CPU_SERVICE_PROTOCOL assigned number %Lu\n", __FUNCTION__, + NewApicId, (UINT64)mCpuHotPlugData->SmBase[NewSlot], + (UINT64)NewProcessorNumberByProtocol)); + + NewSlot++; + PluggedIdx++; + } + + // + // We've processed this batch of hot-added CPUs. + // + return EFI_SUCCESS; + +RevokeNewSlot: + mCpuHotPlugData->ApicId[NewSlot] =3D MAX_UINT64; + + return Status; +} =20 /** CPU Hotplug MMI handler function. @@ -122,8 +245,6 @@ CpuHotplugMmi ( UINT8 ApmControl; UINT32 PluggedCount; UINT32 ToUnplugCount; - UINT32 PluggedIdx; - UINT32 NewSlot; =20 // // Assert that we are entering this function due to our root MMI handler @@ -179,87 +300,11 @@ CpuHotplugMmi ( goto Fatal; } =20 - // - // Process hot-added CPUs. - // - // The Post-SMM Pen need not be reinstalled multiple times within a sing= le - // root MMI handling. Even reinstalling once per root MMI is only pruden= ce; - // in theory installing the pen in the driver's entry point function sho= uld - // suffice. - // - SmbaseReinstallPostSmmPen (mPostSmmPenAddress); - - PluggedIdx =3D 0; - NewSlot =3D 0; - while (PluggedIdx < PluggedCount) { - APIC_ID NewApicId; - UINT32 CheckSlot; - UINTN NewProcessorNumberByProtocol; - - NewApicId =3D mPluggedApicIds[PluggedIdx]; - - // - // Check if the supposedly hot-added CPU is already known to us. - // - for (CheckSlot =3D 0; - CheckSlot < mCpuHotPlugData->ArrayLength; - CheckSlot++) { - if (mCpuHotPlugData->ApicId[CheckSlot] =3D=3D NewApicId) { - break; - } - } - if (CheckSlot < mCpuHotPlugData->ArrayLength) { - DEBUG ((DEBUG_VERBOSE, "%a: APIC ID " FMT_APIC_ID " was hot-plugged " - "before; ignoring it\n", __FUNCTION__, NewApicId)); - PluggedIdx++; - continue; - } - - // - // Find the first empty slot in CPU_HOT_PLUG_DATA. - // - while (NewSlot < mCpuHotPlugData->ArrayLength && - mCpuHotPlugData->ApicId[NewSlot] !=3D MAX_UINT64) { - NewSlot++; - } - if (NewSlot =3D=3D mCpuHotPlugData->ArrayLength) { - DEBUG ((DEBUG_ERROR, "%a: no room for APIC ID " FMT_APIC_ID "\n", - __FUNCTION__, NewApicId)); + if (PluggedCount > 0) { + Status =3D ProcessHotAddedCpus (mPluggedApicIds, PluggedCount); + if (EFI_ERROR (Status)) { goto Fatal; } - - // - // Store the APIC ID of the new processor to the slot. - // - mCpuHotPlugData->ApicId[NewSlot] =3D NewApicId; - - // - // Relocate the SMBASE of the new CPU. - // - Status =3D SmbaseRelocate (NewApicId, mCpuHotPlugData->SmBase[NewSlot], - mPostSmmPenAddress); - if (EFI_ERROR (Status)) { - goto RevokeNewSlot; - } - - // - // Add the new CPU with EFI_SMM_CPU_SERVICE_PROTOCOL. - // - Status =3D mMmCpuService->AddProcessor (mMmCpuService, NewApicId, - &NewProcessorNumberByProtocol); - if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a: AddProcessor(" FMT_APIC_ID "): %r\n", - __FUNCTION__, NewApicId, Status)); - goto RevokeNewSlot; - } - - DEBUG ((DEBUG_INFO, "%a: hot-added APIC ID " FMT_APIC_ID ", SMBASE 0x%= Lx, " - "EFI_SMM_CPU_SERVICE_PROTOCOL assigned number %Lu\n", __FUNCTION__, - NewApicId, (UINT64)mCpuHotPlugData->SmBase[NewSlot], - (UINT64)NewProcessorNumberByProtocol)); - - NewSlot++; - PluggedIdx++; } =20 // @@ -267,9 +312,6 @@ CpuHotplugMmi ( // return EFI_SUCCESS; =20 -RevokeNewSlot: - mCpuHotPlugData->ApicId[NewSlot] =3D MAX_UINT64; - Fatal: ASSERT (FALSE); CpuDeadLoop (); --=20 2.9.3 -=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 (#71912): https://edk2.groups.io/g/devel/message/71912 Mute This Topic: https://groups.io/mt/80819856/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 Tue May 7 20:23:30 2024 Delivered-To: importer@patchew.org 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+71914+1787277+3901457@groups.io; helo=mail02.groups.io; 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+71914+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=oracle.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1613978393259704.8973420738513; Sun, 21 Feb 2021 23:19:53 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 15KQYY1788612xQxrjgeCXUi; Sun, 21 Feb 2021 23:19:52 -0800 X-Received: from aserp2120.oracle.com (aserp2120.oracle.com [141.146.126.78]) by mx.groups.io with SMTP id smtpd.web08.32137.1613978387296919807 for ; Sun, 21 Feb 2021 23:19:47 -0800 X-Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 11M7Dv4e131242; Mon, 22 Feb 2021 07:19:43 GMT X-Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by aserp2120.oracle.com with ESMTP id 36ttcm2ke6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Feb 2021 07:19:43 +0000 X-Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 11M7GCDt126471; Mon, 22 Feb 2021 07:19:42 GMT X-Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2175.outbound.protection.outlook.com [104.47.59.175]) by userp3020.oracle.com with ESMTP id 36uc6pynae-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Feb 2021 07:19:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=flr4z6yQlAxFaUCZ9MvKDtoNuUQZ+XW0SFRSSYA2HNlXknK+DbI4shM2+wD9X9C5PSJXQKkNRuWVl36I8kHRDIxf3u0f9Kj+Sv5zP+IFz7KK9oPyUW5Y2HRgkoxqAvVzmxQ01u4jJ0aOIS2opgBn3Ik6qwC/kBeU1QkZ6RbEq0qfAcMQ+hJf1nfXEg6QlV8SwaqJYpAhkVjv9jSCXu8nZ/8I2Z0fSNN1/ZItMBV8OouWgt8wd73+o2lHa7mt2SXnIY6/PUMU0zrD4YFkvTMvZ8raz8wIUK6kaujbA3GzQA1+nzDi6UmVR2m7HdLSGO1b0vpzOZ4VlZ9nyN+c5X6c4g== 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=LRmSgHeU2Z8fSi2Ls38i75CZGzgGp6EbcgbHjRODjIU=; b=FSRPC4FVq9x+56VbzB+G4l2Au80TDTZGRZ7817+Yuaaa3vEuyhJLJX+WDAV16PZKIB6ad1nlfUio5XHIvWVkfGjZ3RiXeE0WMpm1vKzkEPeZyH961wI5fk4kk36rg2Q0eu/qKDmRWM+doMcJ+vrBFGtbEoIgjs//i32/8dpmCPpjNQQAcyqqQyQdFxABydCYfo+aTCFQBtCKaNr+/Mj6BdOsIudzD9aZpYicydRdYOWX24eoSm4Qa9womfhos4r4OzoLYhilk8p6sjdp4eMwi7QJD8C1gFxqqo2xBhbQPg4N0XFjrN1fb14AkP3lczLQW5sxa2ZeExSszlSLWXePaQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none X-Received: from SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) by BYAPR10MB3191.namprd10.prod.outlook.com (2603:10b6:a03:14f::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.29; Mon, 22 Feb 2021 07:19:40 +0000 X-Received: from SJ0PR10MB4605.namprd10.prod.outlook.com ([fe80::a021:790:7ce6:6f16]) by SJ0PR10MB4605.namprd10.prod.outlook.com ([fe80::a021:790:7ce6:6f16%6]) with mapi id 15.20.3868.033; Mon, 22 Feb 2021 07:19:40 +0000 From: "Ankur Arora" To: devel@edk2.groups.io Cc: lersek@redhat.com, imammedo@redhat.com, boris.ostrovsky@oracle.com, Ankur Arora , Jordan Justen , Ard Biesheuvel , Aaron Young Subject: [edk2-devel] [PATCH v8 02/10] OvmfPkg/CpuHotplugSmm: collect hot-unplug events Date: Sun, 21 Feb 2021 23:19:20 -0800 Message-Id: <20210222071928.1401820-3-ankur.a.arora@oracle.com> In-Reply-To: <20210222071928.1401820-1-ankur.a.arora@oracle.com> References: <20210222071928.1401820-1-ankur.a.arora@oracle.com> X-Originating-IP: [148.87.23.11] X-ClientProxiedBy: MWHPR17CA0065.namprd17.prod.outlook.com (2603:10b6:300:93::27) To SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from prion.us.oracle.com (148.87.23.11) by MWHPR17CA0065.namprd17.prod.outlook.com (2603:10b6:300:93::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Mon, 22 Feb 2021 07:19:39 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 28450373-8cec-48dc-8cdb-08d8d70237d2 X-MS-TrafficTypeDiagnostic: BYAPR10MB3191: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: jIy8nUp7CD4yHpSSs07qaz6VCjPf675lCsXuStNWEy9jR1ja8DdAE3jo2QVeRi3k+2TYQCn33zptV1O7BRqImmwrU50zYl+pTGAHo/EsM/6MXfyyePRPFTWtrMiMDO3QObazYcauWmj5NhsBM6qEEtBiYneBzbWlJ9qAbDFhbhDClEcTDewtBVat+b4rJSv9Ih9j+5WUkCWr+U/t66UhFdnQlRWZ7QjwoHdJRnsX2XZhH2XGPwU6DQfyZBz5uC4EtV6WQis7zFqi3cSnzXsqTtTVog2AAB5xEGbsBxc/vHor48l8HtbmaT3Mrv+OZPbeMDL5aDo6NkJ+Zr/kANaa4LagYXcRb1KfiqNJm6NT6a9Q8fNs76is2FdvCD3S6KAF832SupVpC2D7otmFO+ZeL6h30aTgUJ7gtHyi5HBT8Ta1ZqEhK5hjFG7mAEhyUMtY4Y5IS5DFI6vzUwjmJ0RCU8U0AZuzPNSewTyr4WA5NS7ZITgHhgDjeC6IT1wM00EW8Bra/hlxj3Z7AioCLYkKtDBHnGadSjJLiTpn38wwuwZ/JHe6wJJdSvPUdD5ltVLS8qHC57eFeKYJDcXVOQS71DV7Cy++dUvwLvJb0X5cIcw= X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?ZhnGId06Wn2ooV9oTeUAA+SvF56tYUHU6i+NsGRQExWkl6nutGwN3w7Y6qX+?= =?us-ascii?Q?t1dlWiacBQzqrpJx0LBT5EPzNo5W6VUWb891UAKMn0zxWyYLBljzk0CktjEE?= =?us-ascii?Q?/2KAXL7BGjwcki9fpb6kFYJHHg4eu9TSHJglPUBqRFnaxwKQ89svnaRZ9Dm6?= =?us-ascii?Q?ae5gfXBgClFVXPdfOJkfTeEgNQXX5mvbVmGeychiMPIFbIbAqtLGROxlFICZ?= =?us-ascii?Q?OZWCkF+aRniJIkhy5lsJVKzuqjduaDy8Vwd3x8mRDwRjEhYLIvAP3Bu+Kf3C?= =?us-ascii?Q?ipiOGAe7X6B50bWEUYp08HWKLjqymiR9tjMLI7enJJIr0GNiDPDJzAy35MMa?= =?us-ascii?Q?zHCMfVf2XOG8yJz0h6ktpYLEBiKC4mgDUjCncc56se6Gn8SpaAEh5V/pFXvf?= =?us-ascii?Q?32W96MU9yAlbZlD32BsY3UcqZ7RsIqZBoQ9tn1Uuxc0DtLuhhVwgo26UIM53?= =?us-ascii?Q?piNbc7m6lDzeCODSJUYfGxIxDSRIdxwXaHMdgJNkwUoKxnnFWWU4uPj9XxTQ?= =?us-ascii?Q?KVUarKAUBAYezRjPDn/vkqQaKnCWzE9d4Y+CAwFMNPAgiPsRINup0NgOLT/q?= =?us-ascii?Q?4I8CzLGylXaJGdFLyVe4RRg5Dxs0gXLn0d3K50JL7Mdc+rs3oZ+CLAuIVJqk?= =?us-ascii?Q?kBqox4eAWFIt2wD91Vxn3UugAvfD4ZU+DnbnVIGgwB0dp4+b3I4VTEAfeug1?= =?us-ascii?Q?s2nqdZ3/ygMneefM2xFBix9To+P2QBJdGGsH4BjRQHLFbmW/Q+wZXQRU+IuD?= =?us-ascii?Q?5eNJyEwkbvwvJrabgi3DapoLd4tlV+oqokpr2mhrXkYVjJiGkvCyh09f74mf?= =?us-ascii?Q?aOsMQNAHznoJHYCL4VvUizIK+OHluKJfH/LeByxUBXNZ34FUJTh3ypOth8u2?= =?us-ascii?Q?i9AIVhGYe4ahJ1NDdkUoWs9tP/HxNZS0u2RvvaWMBPRYvZzVWEstrVyQn3wt?= =?us-ascii?Q?2a0FkbJVh4uMMio28rhDXgSAnkwI6k6PLout7yUw/mUH2PvtJVyD9UUp/jVT?= =?us-ascii?Q?HZQLj9oV2pwFhVgluxJQfjlx3aYtCf89ZK9Sk/I6xCrt5hjRO8wLL4ef1sN3?= =?us-ascii?Q?4ZZDHw7QwalbIIol1wFWoVaO3psMJFxv3QTMH1hyIsYuLLsDe90MEUlfr/9e?= =?us-ascii?Q?HHDYI0avR3jj26/8gGohiARYmWYWQK0ljYQM2H8gCGT2coamrtdwMrtJVPf1?= =?us-ascii?Q?q87EQdWLQkRx+1QYafvz5beZ9WrR+Jm2nVDNRgyLoH/msuPNrUmnA1GztzED?= =?us-ascii?Q?u/P1+xasovQm4193R23mvA6W8AqHdt+dalRdw5ydObfcF40bHcM56/GwT3Zb?= =?us-ascii?Q?md7yS1KUOCc1mn639d5p9yjU?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 28450373-8cec-48dc-8cdb-08d8d70237d2 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4605.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2021 07:19:40.0790 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: EjlBEqMLSBUtlfwWuWxY8sbIXFTJauL6oiwqLa/fucPZANn7t8fd4HHruIDSAyDeUwm6lOrdn+f4fiopzwavxm+nDEF0DfXf5BxBgZQPM/U= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3191 Precedence: Bulk List-Unsubscribe: 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,ankur.a.arora@oracle.com X-Gm-Message-State: XS3QZveGRDQNo5dwqoOW0O77x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1613978392; bh=nWHmRU+iLq3oQsFSdmqHuk9t3nRflpBC5qw526t/O/Q=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=cswJcSRiG3nm+z9Dojxl68ABzr1Y45wOACwlmHItyez8Wnzg1TFuqmv39fbcuViqUK+ Pvni1jxzDnxBOrw+1098GEe3fepHkDfVci5KIyRucFZXb8pLCFT92Krcnse1ImYJCO3vE muf8fQIVGGy3ksqaFG+wyst0EI5kOH3vUSw= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Process fw_remove events in QemuCpuhpCollectApicIds() and collect corresponding APIC IDs for CPUs that are being hot-unplugged. In addition, we now ignore CPUs which only have remove set. These CPUs haven't been processed by OSPM yet. This is based on the QEMU hot-unplug protocol documented here: https://lore.kernel.org/qemu-devel/20201204170939.1815522-3-imammedo@redh= at.com/ Cc: Laszlo Ersek Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Igor Mammedov Cc: Boris Ostrovsky Cc: Aaron Young Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3132 Signed-off-by: Ankur Arora --- Notes: Addresses the following review comments from v6: (1,4) Move (and also rename) QEMU_CPUHP_STAT_EJECTED to patch 8, where we actually use it. (2) Downgrade debug mask from DEBUG_INFO to DEBUG_VERBOSE. (3a,3b,3c) Keep the CurrentSelector increment operation at the tail of the loop. () As discussed elsewhere we also need to get the CpuSelector while collecting ApicIds in QemuCpuhpCollectApicIds(). This patch adds a separate parameter for the CpuSelector values, because that works better alongside the hotplug ExtendIds logic. OvmfPkg/CpuHotplugSmm/QemuCpuhp.h | 1 + OvmfPkg/Include/IndustryStandard/QemuCpuHotplug.h | 1 + OvmfPkg/CpuHotplugSmm/CpuHotplug.c | 21 +++++- OvmfPkg/CpuHotplugSmm/QemuCpuhp.c | 84 ++++++++++++++++---= ---- 4 files changed, 79 insertions(+), 28 deletions(-) diff --git a/OvmfPkg/CpuHotplugSmm/QemuCpuhp.h b/OvmfPkg/CpuHotplugSmm/Qemu= Cpuhp.h index 8adaa0ad91f0..1e23b150910e 100644 --- a/OvmfPkg/CpuHotplugSmm/QemuCpuhp.h +++ b/OvmfPkg/CpuHotplugSmm/QemuCpuhp.h @@ -55,6 +55,7 @@ QemuCpuhpCollectApicIds ( OUT APIC_ID *PluggedApicIds, OUT UINT32 *PluggedCount, OUT APIC_ID *ToUnplugApicIds, + OUT UINT32 *ToUnplugSelector, OUT UINT32 *ToUnplugCount ); =20 diff --git a/OvmfPkg/Include/IndustryStandard/QemuCpuHotplug.h b/OvmfPkg/In= clude/IndustryStandard/QemuCpuHotplug.h index a34a6d3fae61..2ec7a107a64d 100644 --- a/OvmfPkg/Include/IndustryStandard/QemuCpuHotplug.h +++ b/OvmfPkg/Include/IndustryStandard/QemuCpuHotplug.h @@ -34,6 +34,7 @@ #define QEMU_CPUHP_STAT_ENABLED BIT0 #define QEMU_CPUHP_STAT_INSERT BIT1 #define QEMU_CPUHP_STAT_REMOVE BIT2 +#define QEMU_CPUHP_STAT_FW_REMOVE BIT4 =20 #define QEMU_CPUHP_RW_CMD_DATA 0x8 =20 diff --git a/OvmfPkg/CpuHotplugSmm/CpuHotplug.c b/OvmfPkg/CpuHotplugSmm/Cpu= Hotplug.c index bf68fcd42914..3192bfea1f15 100644 --- a/OvmfPkg/CpuHotplugSmm/CpuHotplug.c +++ b/OvmfPkg/CpuHotplugSmm/CpuHotplug.c @@ -52,6 +52,7 @@ STATIC CPU_HOT_PLUG_DATA *mCpuHotPlugData; // STATIC APIC_ID *mPluggedApicIds; STATIC APIC_ID *mToUnplugApicIds; +STATIC UINT32 *mToUnplugSelector; // // Address of the non-SMRAM reserved memory page that contains the Post-SM= M Pen // for hot-added CPUs. @@ -289,6 +290,7 @@ CpuHotplugMmi ( mPluggedApicIds, &PluggedCount, mToUnplugApicIds, + mToUnplugSelector, &ToUnplugCount ); if (EFI_ERROR (Status)) { @@ -333,7 +335,9 @@ CpuHotplugEntry ( ) { EFI_STATUS Status; + UINTN Len; UINTN Size; + UINTN SizeSel; =20 // // This module should only be included when SMM support is required. @@ -387,8 +391,9 @@ CpuHotplugEntry ( // // Allocate the data structures that depend on the possible CPU count. // - if (RETURN_ERROR (SafeUintnSub (mCpuHotPlugData->ArrayLength, 1, &Size))= || - RETURN_ERROR (SafeUintnMult (sizeof (APIC_ID), Size, &Size))) { + if (RETURN_ERROR (SafeUintnSub (mCpuHotPlugData->ArrayLength, 1, &Len)) = || + RETURN_ERROR (SafeUintnMult (sizeof (APIC_ID), Len, &Size))|| + RETURN_ERROR (SafeUintnMult (sizeof (UINT32), Len, &SizeSel))) { Status =3D EFI_ABORTED; DEBUG ((DEBUG_ERROR, "%a: invalid CPU_HOT_PLUG_DATA\n", __FUNCTION__)); goto Fatal; @@ -405,6 +410,12 @@ CpuHotplugEntry ( DEBUG ((DEBUG_ERROR, "%a: MmAllocatePool(): %r\n", __FUNCTION__, Statu= s)); goto ReleasePluggedApicIds; } + Status =3D gMmst->MmAllocatePool (EfiRuntimeServicesData, SizeSel, + (VOID **)&mToUnplugSelector); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "%a: MmAllocatePool(): %r\n", __FUNCTION__, Statu= s)); + goto ReleaseToUnplugApicIds; + } =20 // // Allocate the Post-SMM Pen for hot-added CPUs. @@ -412,7 +423,7 @@ CpuHotplugEntry ( Status =3D SmbaseAllocatePostSmmPen (&mPostSmmPenAddress, SystemTable->BootServices); if (EFI_ERROR (Status)) { - goto ReleaseToUnplugApicIds; + goto ReleaseToUnplugSelector; } =20 // @@ -472,6 +483,10 @@ ReleasePostSmmPen: SmbaseReleasePostSmmPen (mPostSmmPenAddress, SystemTable->BootServices); mPostSmmPenAddress =3D 0; =20 +ReleaseToUnplugSelector: + gMmst->MmFreePool (mToUnplugSelector); + mToUnplugSelector =3D NULL; + ReleaseToUnplugApicIds: gMmst->MmFreePool (mToUnplugApicIds); mToUnplugApicIds =3D NULL; diff --git a/OvmfPkg/CpuHotplugSmm/QemuCpuhp.c b/OvmfPkg/CpuHotplugSmm/Qemu= Cpuhp.c index 8d4a6693c8d6..36372a5e6193 100644 --- a/OvmfPkg/CpuHotplugSmm/QemuCpuhp.c +++ b/OvmfPkg/CpuHotplugSmm/QemuCpuhp.c @@ -164,6 +164,9 @@ QemuCpuhpWriteCommand ( @param[out] ToUnplugApicIds The APIC IDs of the CPUs that are about to = be hot-unplugged. =20 + @param[out] ToUnplugSelector The QEMU Selectors of the CPUs that are abo= ut to + be hot-unplugged. + @param[out] ToUnplugCount The number of filled-in APIC IDs in ToUnplugApicIds. =20 @@ -187,6 +190,7 @@ QemuCpuhpCollectApicIds ( OUT APIC_ID *PluggedApicIds, OUT UINT32 *PluggedCount, OUT APIC_ID *ToUnplugApicIds, + OUT UINT32 *ToUnplugSelector, OUT UINT32 *ToUnplugCount ) { @@ -204,6 +208,7 @@ QemuCpuhpCollectApicIds ( UINT32 PendingSelector; UINT8 CpuStatus; APIC_ID *ExtendIds; + UINT32 *ExtendSel; UINT32 *ExtendCount; APIC_ID NewApicId; =20 @@ -245,10 +250,10 @@ QemuCpuhpCollectApicIds ( if ((CpuStatus & QEMU_CPUHP_STAT_INSERT) !=3D 0) { // // The "insert" event guarantees the "enabled" status; plus it exclu= des - // the "remove" event. + // the "fw_remove" event. // if ((CpuStatus & QEMU_CPUHP_STAT_ENABLED) =3D=3D 0 || - (CpuStatus & QEMU_CPUHP_STAT_REMOVE) !=3D 0) { + (CpuStatus & QEMU_CPUHP_STAT_FW_REMOVE) !=3D 0) { DEBUG ((DEBUG_ERROR, "%a: CurrentSelector=3D%u CpuStatus=3D0x%x: " "inconsistent CPU status\n", __FUNCTION__, CurrentSelector, CpuStatus)); @@ -259,40 +264,69 @@ QemuCpuhpCollectApicIds ( CurrentSelector)); =20 ExtendIds =3D PluggedApicIds; + ExtendSel =3D NULL; ExtendCount =3D PluggedCount; - } else if ((CpuStatus & QEMU_CPUHP_STAT_REMOVE) !=3D 0) { - DEBUG ((DEBUG_VERBOSE, "%a: CurrentSelector=3D%u: remove\n", __FUNCT= ION__, - CurrentSelector)); + } else if ((CpuStatus & QEMU_CPUHP_STAT_FW_REMOVE) !=3D 0) { + // + // "fw_remove" event guarantees "enabled". + // + if ((CpuStatus & QEMU_CPUHP_STAT_ENABLED) =3D=3D 0) { + DEBUG ((DEBUG_ERROR, "%a: CurrentSelector=3D%u CpuStatus=3D0x%x: " + "inconsistent CPU status\n", __FUNCTION__, CurrentSelector, + CpuStatus)); + return EFI_PROTOCOL_ERROR; + } + + DEBUG ((DEBUG_VERBOSE, "%a: CurrentSelector=3D%u: fw_remove\n", + __FUNCTION__, CurrentSelector)); =20 ExtendIds =3D ToUnplugApicIds; + ExtendSel =3D ToUnplugSelector; ExtendCount =3D ToUnplugCount; + } else if ((CpuStatus & QEMU_CPUHP_STAT_REMOVE) !=3D 0) { + // + // Let the OSPM deal with the "remove" event. + // + DEBUG ((DEBUG_VERBOSE, "%a: CurrentSelector=3D%u: remove (ignored)\n= ", + __FUNCTION__, CurrentSelector)); + + ExtendIds =3D NULL; + ExtendSel =3D NULL; + ExtendCount =3D NULL; } else { DEBUG ((DEBUG_VERBOSE, "%a: CurrentSelector=3D%u: no event\n", __FUNCTION__, CurrentSelector)); break; } =20 - // - // Save the APIC ID of the CPU with the pending event, to the correspo= nding - // APIC ID array. - // - if (*ExtendCount =3D=3D ApicIdCount) { - DEBUG ((DEBUG_ERROR, "%a: APIC ID array too small\n", __FUNCTION__)); - return EFI_BUFFER_TOO_SMALL; - } - QemuCpuhpWriteCommand (MmCpuIo, QEMU_CPUHP_CMD_GET_ARCH_ID); - NewApicId =3D QemuCpuhpReadCommandData (MmCpuIo); - DEBUG ((DEBUG_VERBOSE, "%a: ApicId=3D" FMT_APIC_ID "\n", __FUNCTION__, - NewApicId)); - ExtendIds[(*ExtendCount)++] =3D NewApicId; + ASSERT ((ExtendIds =3D=3D NULL) =3D=3D (ExtendCount =3D=3D NULL)); + if (ExtendIds !=3D NULL) { + // + // Save the APIC ID of the CPU with the pending event, to the + // corresponding APIC ID array. + // For unplug events, also save the CurrentSelector. + // + if (*ExtendCount =3D=3D ApicIdCount) { + DEBUG ((DEBUG_ERROR, "%a: APIC ID array too small\n", __FUNCTION__= )); + return EFI_BUFFER_TOO_SMALL; + } + QemuCpuhpWriteCommand (MmCpuIo, QEMU_CPUHP_CMD_GET_ARCH_ID); + NewApicId =3D QemuCpuhpReadCommandData (MmCpuIo); + DEBUG ((DEBUG_VERBOSE, "%a: ApicId=3D" FMT_APIC_ID "\n", __FUNCTION_= _, + NewApicId)); + if (ExtendSel !=3D NULL) { + ExtendSel[(*ExtendCount)] =3D CurrentSelector; + } + ExtendIds[(*ExtendCount)++] =3D NewApicId; =20 - // - // We've processed the CPU with (known) pending events, but we must ne= ver - // clear events. Therefore we need to advance past this CPU manually; - // otherwise, QEMU_CPUHP_CMD_GET_PENDING would stick to the currently - // selected CPU. - // - CurrentSelector++; + // + // We've processed the CPU with (known) pending events, but we must = never + // clear events. Therefore we need to advance past this CPU manually; + // otherwise, QEMU_CPUHP_CMD_GET_PENDING would stick to the currently + // selected CPU. + // + CurrentSelector++; + } } while (CurrentSelector < PossibleCpuCount); =20 DEBUG ((DEBUG_VERBOSE, "%a: PluggedCount=3D%u ToUnplugCount=3D%u\n", --=20 2.9.3 -=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 (#71914): https://edk2.groups.io/g/devel/message/71914 Mute This Topic: https://groups.io/mt/80819858/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 Tue May 7 20:23:30 2024 Delivered-To: importer@patchew.org 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+71913+1787277+3901457@groups.io; helo=mail02.groups.io; 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+71913+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=oracle.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1613978387545692.6087789058715; Sun, 21 Feb 2021 23:19:47 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id cyuzYY1788612xE7VrVKrMx0; Sun, 21 Feb 2021 23:19:47 -0800 X-Received: from userp2130.oracle.com (userp2130.oracle.com [156.151.31.86]) by mx.groups.io with SMTP id smtpd.web10.31718.1613978386341564918 for ; Sun, 21 Feb 2021 23:19:46 -0800 X-Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 11M7FDtv133395; Mon, 22 Feb 2021 07:19:43 GMT X-Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2130.oracle.com with ESMTP id 36tsuqtkts-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Feb 2021 07:19:43 +0000 X-Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 11M7GCDu126471; Mon, 22 Feb 2021 07:19:42 GMT X-Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2175.outbound.protection.outlook.com [104.47.59.175]) by userp3020.oracle.com with ESMTP id 36uc6pynae-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Feb 2021 07:19:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lOJIBUbUqOrpnuExeQzQ5zQM5N0bS35YCCsizsxiRslZcgA8pqgB745hulEI/wjBO/5qSzFP4UKsxTrF3QZAkM/Grd9sYZE6DLfegOyzN2zyBoYrLpQCmmj6u3dgyICv/DA9+2ZZE5BykEfjKI1y2K6EGWAn8fRB7QJ24P7KX9lQDeCEbBp7xAIYqBhFf8R8AoRPAO3G2CZBqfFALvYSAK144RjmkHBgEHAOEKJ3xB63sOgsVkGzxh7yQfE7kUC6KWPsM+Sq79IqanyhW+QD/rCiumM/z+jV9Fok6BJAkISuHmNCbcQS2BZwQeQjhgRQLdjIXx32/ZSaOCXDhc9Eaw== 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=8fO67yOsbQGfKTZwTbqUZ414s/0CVrpbiuLZpLVLgDQ=; b=bR5TQsUsLtgVrWbHYA6czpMiWJHrguYqDjpqH9qkXb5TG3hk9wQ8ls85h9cewQuXLgWAtnmRw8emPKIQMcynfJVDeuZKp63L6wTeeJRmyMb4dcdh0brOMq2jnohyY5mYrmHCeCGkvTayvVlzeo3OT0YzvYUi9tlqsEzQNMM0Fi/Ua0lyLqbAD+GvbjYDHOuO+8nrM2njZe0LaJsExKm3exuwtTmlHXPuRWNzt3Zqr3ElzJkpxWQ6HCqcXb7vPbsMpx/g0LiTep/x6KbEKTT1H9rnnmScxTRHBAsGfpHbviXQ4hQKnvRi5hHf15mS1YHLuU4p33eaB+TWqhDxuyV33A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none X-Received: from SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) by BYAPR10MB3191.namprd10.prod.outlook.com (2603:10b6:a03:14f::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.29; Mon, 22 Feb 2021 07:19:41 +0000 X-Received: from SJ0PR10MB4605.namprd10.prod.outlook.com ([fe80::a021:790:7ce6:6f16]) by SJ0PR10MB4605.namprd10.prod.outlook.com ([fe80::a021:790:7ce6:6f16%6]) with mapi id 15.20.3868.033; Mon, 22 Feb 2021 07:19:41 +0000 From: "Ankur Arora" To: devel@edk2.groups.io Cc: lersek@redhat.com, imammedo@redhat.com, boris.ostrovsky@oracle.com, Ankur Arora , Jordan Justen , Ard Biesheuvel , Aaron Young Subject: [edk2-devel] [PATCH v8 03/10] OvmfPkg/CpuHotplugSmm: add Qemu Cpu Status helper Date: Sun, 21 Feb 2021 23:19:21 -0800 Message-Id: <20210222071928.1401820-4-ankur.a.arora@oracle.com> In-Reply-To: <20210222071928.1401820-1-ankur.a.arora@oracle.com> References: <20210222071928.1401820-1-ankur.a.arora@oracle.com> X-Originating-IP: [148.87.23.11] X-ClientProxiedBy: MWHPR17CA0065.namprd17.prod.outlook.com (2603:10b6:300:93::27) To SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from prion.us.oracle.com (148.87.23.11) by MWHPR17CA0065.namprd17.prod.outlook.com (2603:10b6:300:93::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Mon, 22 Feb 2021 07:19:40 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0c380061-ebbe-45cd-bdc3-08d8d702388b X-MS-TrafficTypeDiagnostic: BYAPR10MB3191: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: LgrIL9qO49/O8uGGhU6v46lXq9TY10dOUaBVtXvBAtQChPo20e4z6Ve26xp+8OkgdnIlC33Z3MwXcGF9L273VZonIxHiMOlt6IlLeuGqc9vR6UnfUDbBAlebfOBx8xQZ/fa/W706Kjx0SF2Gk9xzvwclhV3tbfih3zf/HVSyB5PyBUG2nW68N3Qg41hsuDrblTrlofvVFi4VAgPQjV/8e0TqvKO66ROSWllzdzuIKbwGaHPp3XrbU+bWPDrNUL1GK6i8lJ1w6/R2TUmX/HhyKcBaTe0PJKkO9XCeNyli9ICLNVIVF9aIAi54Rs6S/nFIokUduWPOJoiuavDpMOjSQ48A9aHGLfeaEVGrf7h1rOelXf7DircL3gl2Pp6f0vNxfeHKUHo9551jkHTm8nzXkdGBcWXWW0WzSJtdvo2RR1/IfAdIfqlQMl7nOqPUIDe5b6v7y9vpft7S0xJ3bU0Gd+TZJ8AlG9fCqS5BG/kOsOWxO7sWSA5yphIrDLFQWrmSxhIkCJ6ecpHMkLd1RRAUD0GuYN0qbAwh8zN28Wja6bYQ43wTKWqmkDdQP+Nr4GWBV5J4Jh64eZ2ul1vm+HD+m6EphJKBNngg6Y0lAYrBmng= X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?bNk4l9+ptwDuBlUPgMShMYRhkKQ4b5GdPlgJJ3OmgBj5DW6DRQvtB/bD30A1?= =?us-ascii?Q?payUUnvdq6iW0PITEsEWC3Nt3KSSQ7CKxwggOnM53e/jZH5Dbcl9s4Z19WLa?= =?us-ascii?Q?HM2xmheQVxKMm/4PEsFDWaiy+t/yTsIOCZSztU5oE5Cf/NncEoT0O/j+9k6T?= =?us-ascii?Q?Qm2w/fIPKwQzaqwaR5sf15gNgesJyI2oXxtrrLqFzTnoOD9Gr3x2t6V70w4u?= =?us-ascii?Q?LL42IzdR0CHqoB/B++53Bb2Jd6pEj0Qnd3xSql/rooe4qPlXPNaEAkgVLlie?= =?us-ascii?Q?vahouYBRuHjeDH4elYxMIFe2xSxEBrm1FqPU+RDLLRgmNpOAQge4KUDDN84c?= =?us-ascii?Q?BRN/Cr39mL9eC7fhYLGxQ7cdJ108dXvflCB6ecoffhujpJgl43bNCg/JjwtI?= =?us-ascii?Q?EjI2tUk4Btz9LKAwkWlVHGMn+kbkMpi0GCNZ5q+MlR8Kp74qNvj+w/G1QQnS?= =?us-ascii?Q?TWCk7Fjycc7LWvxSUrpXhNrl2pAxX+Ssq9tPlew2vyU/3ULG+9adCkzTPRzO?= =?us-ascii?Q?Yn3NJ5HSshNF3OHIuD/21Wl/Bm9Apw3qD+RCp15p/IjRYheOBfJwpJz3kKxp?= =?us-ascii?Q?IqNtgdDbsJecjqBiYkjdUoAA+p8gbfwEdA85Be5k3lDf4NYb9h8VQeAV83xN?= =?us-ascii?Q?e9UZweBwHTrx4zxtHjLsMtWtsdIwbTuVSnyvJNoX5CQ287hRNlqyFNH0XpHI?= =?us-ascii?Q?hwgkuLZXfbaZa9OEIAAKAm44zFwbj+85eXGZktWeLy6FcSzM707vxZoh+4FJ?= =?us-ascii?Q?pKCUPo54jMeT6xOWsW50SyMCHKvI0135K/YbdE5VrTVi5xzX3ldhPJxsCKcE?= =?us-ascii?Q?QJsuq9e1pmHve2l/c9YqFiuYJzOfn4x4tGXIjUK6Zh7iJrhXKu1I9FxuMjOz?= =?us-ascii?Q?lXPAISSR22RmMDJv6iZbVoLHnjxr6aAlGTBKNAyOFhQBePY1nmDr8ebMgIkO?= =?us-ascii?Q?02Qjc/P8rw5/grGSDg4Mgj69DNEnnu/Yjegn/0j6vFZlY3l186FJWAYD89Zf?= =?us-ascii?Q?8z7+3B9m9yT2W+rJDlZLsnLL3ai+ME8GBQVzbHN66MWyVqXTJVdM/2Z1sQD4?= =?us-ascii?Q?PBkwMbV9vpXrNZ/9sq2V5uDEEG0dlqGU3jTjssBi8YWSW9XwMoZPtoBZmJ+h?= =?us-ascii?Q?VxsIEmRpyOVmLfW0bOBpldagR6z2p6Q84T7+KyADaSQRIu1OSs/IMdnA0MzO?= =?us-ascii?Q?MWXSo44+0UtOAeSrqJGAdSAwRyi5a4k7N7+ajvi2ZsQEHNK5Rzp9cyR5z5wn?= =?us-ascii?Q?kwULiR/OPIUDVnxGkTKR4KY6wNrnqXBXq49F5MLLzUbu1iK1wLc/TBY1REBW?= =?us-ascii?Q?9t3PFHDWPj2wPisuMCOL0eTF?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0c380061-ebbe-45cd-bdc3-08d8d702388b X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4605.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2021 07:19:41.2668 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: MmSk/yxS4kFMt7kssIIQW+iHduTqY8w1DC9DW1CKUugT3QdUn1K/e5VjDFYAt3GEmYaGUZUn9Pan6fsxbBTWzx1d4OPse0ugPG8SepfG5dQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3191 Precedence: Bulk List-Unsubscribe: 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,ankur.a.arora@oracle.com X-Gm-Message-State: Z5b1RaigEhT61OAUwQBF3GHLx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1613978387; bh=Z5Ir4FEoBvoZheeBxXFADR1TZZAi6LqOGgtLhA9PRZA=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=loO/tfGcvY2WiBtup/FePm0hsomf/HyIJq4BfjyBpy+/fEE/B1i6TmABsdTIzLVFKyK RLuuTQG31HDU5hQvqxzD4Ej3v3SwOdz6rP8ux2EVGaQ7VVbMqdoevMpueu9adN4LtLQbM Y7YAy1WRr+jWZunTPMw4MnrGaltwNT4b7rc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Add QemuCpuhpWriteCpuStatus() which will be used to update the QEMU CPU status register. On error, it hangs in a similar fashion as other helper functions. Cc: Laszlo Ersek Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Igor Mammedov Cc: Boris Ostrovsky Cc: Aaron Young Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3132 Signed-off-by: Ankur Arora Reviewed-by: Laszlo Ersek --- Notes: Address this review comment: () Move QemuCpuhpWriteCpuStatus() (declaration and definition) between QemuCpuhpWriteCpuSelector() and QemuCpuhpWriteCommand() to match the order of the register descriptions in QEMU. OvmfPkg/CpuHotplugSmm/QemuCpuhp.h | 6 ++++++ OvmfPkg/CpuHotplugSmm/QemuCpuhp.c | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/OvmfPkg/CpuHotplugSmm/QemuCpuhp.h b/OvmfPkg/CpuHotplugSmm/Qemu= Cpuhp.h index 1e23b150910e..859412c1a173 100644 --- a/OvmfPkg/CpuHotplugSmm/QemuCpuhp.h +++ b/OvmfPkg/CpuHotplugSmm/QemuCpuhp.h @@ -42,6 +42,12 @@ QemuCpuhpWriteCpuSelector ( ); =20 VOID +QemuCpuhpWriteCpuStatus ( + IN CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo, + IN UINT8 CpuStatus + ); + +VOID QemuCpuhpWriteCommand ( IN CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo, IN UINT8 Command diff --git a/OvmfPkg/CpuHotplugSmm/QemuCpuhp.c b/OvmfPkg/CpuHotplugSmm/Qemu= Cpuhp.c index 36372a5e6193..9434bb14dd4e 100644 --- a/OvmfPkg/CpuHotplugSmm/QemuCpuhp.c +++ b/OvmfPkg/CpuHotplugSmm/QemuCpuhp.c @@ -114,6 +114,28 @@ QemuCpuhpWriteCpuSelector ( } =20 VOID +QemuCpuhpWriteCpuStatus ( + IN CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo, + IN UINT8 CpuStatus + ) +{ + EFI_STATUS Status; + + Status =3D MmCpuIo->Io.Write ( + MmCpuIo, + MM_IO_UINT8, + ICH9_CPU_HOTPLUG_BASE + QEMU_CPUHP_R_CPU_STAT, + 1, + &CpuStatus + ); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "%a: %r\n", __FUNCTION__, Status)); + ASSERT (FALSE); + CpuDeadLoop (); + } +} + +VOID QemuCpuhpWriteCommand ( IN CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo, IN UINT8 Command --=20 2.9.3 -=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 (#71913): https://edk2.groups.io/g/devel/message/71913 Mute This Topic: https://groups.io/mt/80819857/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 Tue May 7 20:23:30 2024 Delivered-To: importer@patchew.org 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+71915+1787277+3901457@groups.io; helo=mail02.groups.io; 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+71915+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=oracle.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1613978396256389.00393091151443; Sun, 21 Feb 2021 23:19:56 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id chqeYY1788612xfqFzcOXozx; Sun, 21 Feb 2021 23:19:54 -0800 X-Received: from aserp2120.oracle.com (aserp2120.oracle.com [141.146.126.78]) by mx.groups.io with SMTP id smtpd.web12.31930.1613978389308722014 for ; Sun, 21 Feb 2021 23:19:49 -0800 X-Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 11M7Dv4f131242; Mon, 22 Feb 2021 07:19:46 GMT X-Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by aserp2120.oracle.com with ESMTP id 36ttcm2kea-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Feb 2021 07:19:46 +0000 X-Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 11M7GNIN155898; Mon, 22 Feb 2021 07:19:45 GMT X-Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2176.outbound.protection.outlook.com [104.47.59.176]) by userp3030.oracle.com with ESMTP id 36ucbvqk4f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Feb 2021 07:19:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UpZWeUaddvqwPQwqAh8/3HSOjIXrvi7rNf7Op9GELZLaJT7/stj2oJFNz+IR2phqY8KbpPEG46/Ye0whhaKg/bpU+fuz8dQzgSVELIXZ5I6TYNLxfRbbGMVF7ssplqqds1x6iBq/CQXf2pML78H+sskfSzPizmEYc/7/7rLteE9gvKtdxFUK6Qs/ziJmCnPXNXjaoj/e1Bw2boxyMIwhraXHxBE9HifLV2MBeoU//W5R+Z3kf+vD7cCZEFhYcf+BQrXCGqKmOsAq6sYotUBt3xWJw1uxR/tBtIVlD9NCHKhS0rk/ioUccOouovs/FnOUeCL0aIm3AB0d50MHHtrDug== 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=b2bE66bX2QhqReGUL5sLF1Eh2kfjXO969oJmWd9P7zo=; b=LzATsUXOtO2tyolujm5gPjZRml3oRtgFkccyRTcCjt4t29sv+Ve19KhkxF4YLW7JJKwEW/T+kMpCS2QE+aKhca246/4+taZHr//3+GEsySZrOPLzKwVg7C12auyq1B4dMM6RWQmwneT4BzyL+18T5/fLU+3p5U56ZZDYwMIjyEJy8A7C8TZcRGi0Ek8KCO5z7XIhEmUNpQS9qLEM2badWAeuuWfoB/ky7aEY+PmexCxvX/oKvVq478SniU62AWU4Vh0CZPtWqngw9H9iTo4VCwRmM2XRPHdU2l4s8kyTM9uNWtEmmFQtd7nN+MCi90D64YvzJhs9KvUUMVuWePaqNw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none X-Received: from SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) by BYAPR10MB3191.namprd10.prod.outlook.com (2603:10b6:a03:14f::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.29; Mon, 22 Feb 2021 07:19:42 +0000 X-Received: from SJ0PR10MB4605.namprd10.prod.outlook.com ([fe80::a021:790:7ce6:6f16]) by SJ0PR10MB4605.namprd10.prod.outlook.com ([fe80::a021:790:7ce6:6f16%6]) with mapi id 15.20.3868.033; Mon, 22 Feb 2021 07:19:42 +0000 From: "Ankur Arora" To: devel@edk2.groups.io Cc: lersek@redhat.com, imammedo@redhat.com, boris.ostrovsky@oracle.com, Ankur Arora , Jordan Justen , Ard Biesheuvel , Aaron Young Subject: [edk2-devel] [PATCH v8 04/10] OvmfPkg/CpuHotplugSmm: introduce UnplugCpus() Date: Sun, 21 Feb 2021 23:19:22 -0800 Message-Id: <20210222071928.1401820-5-ankur.a.arora@oracle.com> In-Reply-To: <20210222071928.1401820-1-ankur.a.arora@oracle.com> References: <20210222071928.1401820-1-ankur.a.arora@oracle.com> X-Originating-IP: [148.87.23.11] X-ClientProxiedBy: MWHPR17CA0065.namprd17.prod.outlook.com (2603:10b6:300:93::27) To SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from prion.us.oracle.com (148.87.23.11) by MWHPR17CA0065.namprd17.prod.outlook.com (2603:10b6:300:93::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Mon, 22 Feb 2021 07:19:41 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 888238dc-774e-47e8-ee49-08d8d7023938 X-MS-TrafficTypeDiagnostic: BYAPR10MB3191: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: AWyXuwAM18boZsK2QanQc5MNypd1UCYZV8GLGqLzXrRjCVduCrDgVVOP+cWTw/+CNl+RJPUwXOuckiQcZFGnBhn7fdYGzCKEjfLz8shceHxSYw0DQTq8Fq3bZUPkM9krk2vWZxATwObMUEnQEKzU7QdpiPNZwkpVIZhWUMP5BSZHPbyrehcm3ygb6U/3UT0DF5EasXy2TPrqfKAA3yWdz3Phy+Jqpv9ATPA7mCvDa+jXzEyDd8hTcrGMgoUQ9EGII+aqw/6B9qY74jYzB5fuzmoXKtQHOWZnCErIbYJIH0lhN3OzX4lCWNRtjRjb18I/9n2uzYO4U+Fbro+rXvt944eUtgYKZFm7m5RLN8h14lS+zVS5PJG/wGyVhX+ayt1osIlFhmZi6Ez0u1ISIlLJK8NzCOP+rftsTlCL48mJXb/zbZmuSMJe9G1XRlsPVJE73uY+SIj758fgxV9BhyL8zEOa88SfbV52HtcJui5/LdDHqyWF9L85kj8WDTKgD2UgT7skB5cWYPMN8SccxZs5E6ZHo794nNtgOZoeJFaQKboVe+oCP9y+DBgVHDHe6XvGrVQHvoEA0vDWMuUzYFKsjm4mvBYQTLlvhlZCPmSbVUU= X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?Q6FNKt/NoWNUv6wE7yDj8Bt3IfsjCPJEXRl5nUJFy8CGsOHM9Jqxga0dsKns?= =?us-ascii?Q?PPYPyWqaMZJJyYMG/BSxnWgB9Xcg+sTEYQ2SGZFp18O7v4q/EXJHEEP+t11N?= =?us-ascii?Q?GMje3wXQaN50SvGkINX/BOVpBWPebGPM9U9v/QbFGfbeRvrk4gwqFCiRusxo?= =?us-ascii?Q?ufWBmdsXgRtaQ/1S9RcBloAKuMcocQn1SaJU0wIpkxa+ihevbROfUoE4lQ75?= =?us-ascii?Q?sH2TKVJAJXj3zVp/zbvV+H9oljvl8ZzgIxbaNBsKSGGFZskfT5n5sv0rfGvr?= =?us-ascii?Q?ngLWQ74VbhLnrNLO2eM2FERoZ4l43lecByFGN+Fxpn0F4zXoKxRgmDt7FXys?= =?us-ascii?Q?EUfVX07rGutno4r3xVE7DY8NTy2GKqb3BC6/M6KqPDxiO7QBqu7bHiscrR1b?= =?us-ascii?Q?eO8AayR4YHA4zLtBc3/6uisFVecwjf730ypVDN6h4HRSGJJkgncXrXWYw2P0?= =?us-ascii?Q?baHue1IHyPm994AMPb3bnXH50MQmphszOiJnx7xSDYfGrHfwt9+fuKRo6/Uo?= =?us-ascii?Q?XWO9YQ8LJA0F4mH1ojuJeIFgwtxnHLLMRNocC6zFBoi54fqxrAODBH6/S+fr?= =?us-ascii?Q?D6LpS4vMBstPT3v6cRVNZIKCEEejGOFnDsS1LnSqz3iwwcsEotj3eo9YOQsD?= =?us-ascii?Q?RTME3Piyw8Ur0faE5QPXQlqnCrgNfO6qvtTsr5YyzhmRGoV1j7OjJD8UOd73?= =?us-ascii?Q?6UtrETCkC4SX3NvdNlf8FGluc/L14bfKqPoKggSaMySAknsZE4rFgdJe95ix?= =?us-ascii?Q?soPwREpNNodmn/1eiKxa4Xfa15rnJayY9GEC2RtULPUiUshXBXUFJP3dh45X?= =?us-ascii?Q?OPJa5uyN0EhfFl6Qy9/HXn0TC18FN/PMOhuhtG0c9hoS8/rB73hGRdZ6Fqr9?= =?us-ascii?Q?R3rvit6nOoKDeU3xBSaUUPLf6M5B/Pmjch5NTZr9gfM7MpA5dFGmfgX/wRnj?= =?us-ascii?Q?vAAhYW0lG6ryVENaFtyDIwR43TBA/z0pNnnebT1+FSXOnqQlncvTUU1e6e+Y?= =?us-ascii?Q?q7sRgUTR3NFKaG4cONj42pp/ngFvbgtEq5Z9USD0FrXPSBgGxhM1Tiw8mHT8?= =?us-ascii?Q?/2IhdB8GkrC+hBGm6VXhvtVW8/PzAMDzKX7JoOzEO5SNtxv0NwxsY3vgEg5V?= =?us-ascii?Q?bAV5rYV4BaRYmalwFrRJ4RtJyzeG9hI9Uhyuj+TMR7cHVVaCHFOixS9BdutH?= =?us-ascii?Q?3GQHXwlyISgRPLwmoiUKTwL2FF//zldd6blH7aWFgs0N7RnjgxwQaSN4BKSf?= =?us-ascii?Q?jcihaY/SLSiS/Glx6MkLemZLfSzMD4hjqRbAm0OUzHATw/Pv8ZeKIad0AJ4P?= =?us-ascii?Q?Zd78sjmFvHibTp1hqaNJSvzY?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 888238dc-774e-47e8-ee49-08d8d7023938 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4605.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2021 07:19:42.4675 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: HOxMZ44QpF6MnZmO+yml46uC1qz/ddSrzWhpoEgb9GUAl0K2wbTJR8jK6AQKPLcjnxE5AfBQBe5nYX1ukDiwTOUsni0Ykc2Lu7gVJeOUT6U= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3191 Precedence: Bulk List-Unsubscribe: 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,ankur.a.arora@oracle.com X-Gm-Message-State: S1Q7DJKtlW533dlWByNb1wn1x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1613978394; bh=FBidQ8vDv/s06vozTuNSKisKvFFdbuoeCmHqa6PjjSc=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=ocB/+MsAnlw1wReyXaxLaodYVtAjecpo44qt7SuwaTQWbitheA6k8bdsRQIT1HyfFKz 0zwue5lcTB1Fwk1NXVX/wl73r/m8NAjNCs1PUk/hj003ybOCBTiTk2XUNabMndvBZh6C2 FuUN73MRp1AiQ6Ib9h3IYOg5vjxRzL3VM+8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Introduce UnplugCpus() which maps each APIC ID being unplugged onto the hardware ID of the processor and informs PiSmmCpuDxeSmm of removal by calling EFI_SMM_CPU_SERVICE_PROTOCOL.RemoveProcessor(). With this change we handle the first phase of unplug where we collect the CPUs that need to be unplugged and mark them for removal in SMM data structures. Cc: Laszlo Ersek Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Igor Mammedov Cc: Boris Ostrovsky Cc: Aaron Young Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3132 Signed-off-by: Ankur Arora Reviewed-by: Laszlo Ersek --- Notes: Addresses these review comments from v6: (1) Drop the empty line in the comment block around UnplugCpus(). (2) Make the "did not find APIC ID" DEBUG_VERBOSE instead of DEBUG_INF= O. (3) Un-Indented ("Outdented") the line following the comment "Ignore t= he unplug if APIC ID. (4) Remove the empty line between Status assignment and check. (5) Drop the "goto Fatal" logic and just return Status directly. (6) Handle both Plugging and Unplugging of CPUs in one go. (7) Also nest the EFI_STATUS check. OvmfPkg/CpuHotplugSmm/CpuHotplug.c | 84 ++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 84 insertions(+) diff --git a/OvmfPkg/CpuHotplugSmm/CpuHotplug.c b/OvmfPkg/CpuHotplugSmm/Cpu= Hotplug.c index 3192bfea1f15..f07b5072749a 100644 --- a/OvmfPkg/CpuHotplugSmm/CpuHotplug.c +++ b/OvmfPkg/CpuHotplugSmm/CpuHotplug.c @@ -188,6 +188,83 @@ RevokeNewSlot: } =20 /** + Process to be hot-unplugged CPUs, per QemuCpuhpCollectApicIds(). + + For each such CPU, report the CPU to PiSmmCpuDxeSmm via + EFI_SMM_CPU_SERVICE_PROTOCOL. If the to be hot-unplugged CPU is + unknown, skip it silently. + + @param[in] ToUnplugApicIds The APIC IDs of the CPUs that are about to= be + hot-unplugged. + + @param[in] ToUnplugCount The number of filled-in APIC IDs in + ToUnplugApicIds. + + @retval EFI_SUCCESS Known APIC IDs have been removed from SMM = data + structures. + + @return Error codes propagated from + mMmCpuService->RemoveProcessor(). +**/ +STATIC +EFI_STATUS +UnplugCpus ( + IN APIC_ID *ToUnplugApicIds, + IN UINT32 ToUnplugCount + ) +{ + EFI_STATUS Status; + UINT32 ToUnplugIdx; + UINTN ProcessorNum; + + ToUnplugIdx =3D 0; + while (ToUnplugIdx < ToUnplugCount) { + APIC_ID RemoveApicId; + + RemoveApicId =3D ToUnplugApicIds[ToUnplugIdx]; + + // + // mCpuHotPlugData->ApicId maps ProcessorNum -> ApicId. Use it to find + // the ProcessorNum for the APIC ID to be removed. + // + for (ProcessorNum =3D 0; + ProcessorNum < mCpuHotPlugData->ArrayLength; + ProcessorNum++) { + if (mCpuHotPlugData->ApicId[ProcessorNum] =3D=3D RemoveApicId) { + break; + } + } + + // + // Ignore the unplug if APIC ID not found + // + if (ProcessorNum =3D=3D mCpuHotPlugData->ArrayLength) { + DEBUG ((DEBUG_VERBOSE, "%a: did not find APIC ID " FMT_APIC_ID + " to unplug\n", __FUNCTION__, RemoveApicId)); + ToUnplugIdx++; + continue; + } + + // + // Mark ProcessorNum for removal from SMM data structures + // + Status =3D mMmCpuService->RemoveProcessor (mMmCpuService, ProcessorNum= ); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "%a: RemoveProcessor(" FMT_APIC_ID "): %r\n", + __FUNCTION__, RemoveApicId, Status)); + return Status; + } + + ToUnplugIdx++; + } + + // + // We've removed this set of APIC IDs from SMM data structures. + // + return EFI_SUCCESS; +} + +/** CPU Hotplug MMI handler function. =20 This is a root MMI handler. @@ -309,6 +386,13 @@ CpuHotplugMmi ( } } =20 + if (ToUnplugCount > 0) { + Status =3D UnplugCpus (mToUnplugApicIds, ToUnplugCount); + if (EFI_ERROR (Status)) { + goto Fatal; + } + } + // // We've handled this MMI. // --=20 2.9.3 -=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 (#71915): https://edk2.groups.io/g/devel/message/71915 Mute This Topic: https://groups.io/mt/80819859/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 Tue May 7 20:23:30 2024 Delivered-To: importer@patchew.org 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+71916+1787277+3901457@groups.io; helo=mail02.groups.io; 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+71916+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=oracle.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1613978390890312.64889700495235; Sun, 21 Feb 2021 23:19:50 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id zb52YY1788612xHU9e67UYY3; Sun, 21 Feb 2021 23:19:50 -0800 X-Received: from aserp2130.oracle.com (aserp2130.oracle.com [141.146.126.79]) by mx.groups.io with SMTP id smtpd.web12.31931.1613978389682934942 for ; Sun, 21 Feb 2021 23:19:49 -0800 X-Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 11M7ExFi143584; Mon, 22 Feb 2021 07:19:47 GMT X-Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by aserp2130.oracle.com with ESMTP id 36tqxbapqv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Feb 2021 07:19:47 +0000 X-Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 11M7GNIO155898; Mon, 22 Feb 2021 07:19:46 GMT X-Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2176.outbound.protection.outlook.com [104.47.59.176]) by userp3030.oracle.com with ESMTP id 36ucbvqk4f-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Feb 2021 07:19:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iry3pqXeMdFsXDiDIDfImr2W8lKozOPFCcDeCDVQ8BhjaDwDMnzIi63qq8nrmVDTuzuoj3pxOJwx9xNnZ2Ie2XJnBNHAHKK2ziaTHsqdAUcHDjUpugp8ioah1oyhjPNI09kramojRZbL3Id/WWuFR4qosDFYUVhH8mU1wfrLeJv/5p3VqOMdJHMtrPdSbfOpSEghHbfzLLC8Cz35tqIZXV7iqBkGTCrWbDYSts3ox9B3Qoxd9Ud2oVl/zpv3ZJhog9st7utNqoE0Qe1URw4XtFTyw48kWo5QTea1RYmRN9z0CPFXMt5ikmL+4x59I+IK6X/tx9ngW8MUPPpGoyG4KA== 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=+3bXinEZ60WMWrmk1NDiDkwT8uTwh3vAxcj3qYBEanA=; b=BCu2OKXrd62BvreSUG1+aeLZvFffYsv/iZJO61U7jEqx5/qAB2jrBCk+MpygFGS+MmOYd4xarDU76TM8Mg0wAxzdFczEMnXKprwh/QxfEpdeFNKGdgDzCmrAo00Y9YJtMm0ArBUUny9ORAP2NruPfX6IE/BuLnHG07TzRtN2hu5hzN4PRc9h0HDV60wk5rOsqANIrJQEWTjDnVz4VqepP1Ust6JAeT9nYEQsmigY6cG9Kk8RPVi3nClt+xQr+/0jSUZym5+RruQ/vJpPATFqA8i0L37yGXuPAFkQ3oWILreCcw6E6UerlXUEqCXm3OT7njNNRLFGJNC6KzxsL0gy0Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none X-Received: from SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) by BYAPR10MB3191.namprd10.prod.outlook.com (2603:10b6:a03:14f::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.29; Mon, 22 Feb 2021 07:19:43 +0000 X-Received: from SJ0PR10MB4605.namprd10.prod.outlook.com ([fe80::a021:790:7ce6:6f16]) by SJ0PR10MB4605.namprd10.prod.outlook.com ([fe80::a021:790:7ce6:6f16%6]) with mapi id 15.20.3868.033; Mon, 22 Feb 2021 07:19:43 +0000 From: "Ankur Arora" To: devel@edk2.groups.io Cc: lersek@redhat.com, imammedo@redhat.com, boris.ostrovsky@oracle.com, Ankur Arora , Jordan Justen , Ard Biesheuvel , Aaron Young Subject: [edk2-devel] [PATCH v8 05/10] OvmfPkg/CpuHotplugSmm: define CPU_HOT_EJECT_DATA Date: Sun, 21 Feb 2021 23:19:23 -0800 Message-Id: <20210222071928.1401820-6-ankur.a.arora@oracle.com> In-Reply-To: <20210222071928.1401820-1-ankur.a.arora@oracle.com> References: <20210222071928.1401820-1-ankur.a.arora@oracle.com> X-Originating-IP: [148.87.23.11] X-ClientProxiedBy: MWHPR17CA0065.namprd17.prod.outlook.com (2603:10b6:300:93::27) To SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from prion.us.oracle.com (148.87.23.11) by MWHPR17CA0065.namprd17.prod.outlook.com (2603:10b6:300:93::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Mon, 22 Feb 2021 07:19:42 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 94b7e310-2368-4989-4ff4-08d8d70239f5 X-MS-TrafficTypeDiagnostic: BYAPR10MB3191: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: s6PDVrpDN9GWEokHfYLJge7YXcWTzlq7gbByVYJSWSUBV8ZELGjhsbJhp9MApgtY3Z0elkwhGk74LwJ6SeDPZaIK5JuBeYZMWKFzVFmCwwWy/K3wNITR4KDZi05iP8jqn66LFy3pm66wux0VO0JjeYa15Ii1ZadrgGutKBTg8GdH768ZgAkr4Xr378tC/UscqD01DwnJgnb2M6+DtLgpAp2GlOc9g9Tz+WeUtIUcfSEoGgUFc/hEFFRX1W5DbuwCGFPNqfx07MICls2JSf69B761Z5MBfkMDCztXTppqsMByfIdTuxmasF++jhnEVjfxIF7i3bYkW0WhaXB8lAB4xlPNtJB9EHBwNCQhXfIK9DYAGaYkF8u5+SzdTB4GEpeFTXQl4m96ZZXTAq9xJNeCeqGzSdMUPSDwZbg0KM7RX2NfzVL4EX1KZuOjwmwD4n5gbXy0ZpqsLZCnXOht8MXVA1xCrkWEzkpxh1960yZlV6GyMOB1s2zf5SE17xuQaSOens9IuW2jlPaHjFyPeeDZ9uQalYwVe61cLvdV/z7e1VWBcfiKbkp6JJ3LSBpZKTLb/M7vfwEBfzuZYDDXomyBaW9EgjDC9Exp/FJ8J0C3iVk= X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?BGyLT2nlzRwyJDOJta0uNBLQ2TbaN8C4j5iZWzwJuh8iHT260gGLo3iMuhIU?= =?us-ascii?Q?sRETTAXKtn12xqOSQuCq+gCQ2o3t+cxtPUsr7CwIoPJPTC91H0K2tzrkHd9a?= =?us-ascii?Q?bkgGlfl+hHyJ4bU5qZiNAIusrPEBnXRKauzZB83Nn3s2oe+NMOlLQCCDXpXg?= =?us-ascii?Q?6x9J+5AYUjtC0ZyI6hxD9+bNaPt0jKwSRb926HsBTRyEuRkq3wkxj82zrKas?= =?us-ascii?Q?SDIHnSM0FG2bXqsgBnbnMORCHISmmxVesLp93nwwUAzMGjYUZxHO9yeDMZMW?= =?us-ascii?Q?iBPbefB/nIeIABoNbua8rG85G0CpN4ioEGw94mEG6e4EMK0/Jw3xwqwBibmU?= =?us-ascii?Q?j0wb18EQjAjbStRZdnarkLl94RxIYoIAcngyD+fybMIMqVi0Z8AHoh1YuNTg?= =?us-ascii?Q?kGdJJDJLl+yay/Yp3Iyf5Zr3n7+cVun7rR7rTodv79o+tRAHA91tn3ED/PQN?= =?us-ascii?Q?cR3qasX+cdptglnk/qJZPMh3VNKgoc4ikN/SdElxZj+rG3SNFdagGOc4J3Zo?= =?us-ascii?Q?Gk5SjXI9HYEcnqT2+3lSPpwy0JnPapU1SQWCacA7uHYM1/TmZZdQqbY12EIS?= =?us-ascii?Q?lVsTsvrzQUbAn9ZRaWcLdc0O/cMxJBaK1eMZJH2bu9D5G0NrlbWW5vhMNnBu?= =?us-ascii?Q?PjCystjrNi9loluz7FZzvKvhvFn1ivuOfY/NWUSS1K2/huKIsYS5JGj7FX09?= =?us-ascii?Q?Tnje5U4/kAEky44LuVCWiNZsvIGuczFBEDUiTzRacmVw0p7N1yVfSAAVOz+c?= =?us-ascii?Q?w5470PFOUIWn3zF3NjPEfd+fay7C4vDigUtzLS11SpO8l/6xyjJxtYqcOXO8?= =?us-ascii?Q?0xiabfFwHaje9TEH1cKgw/XmqGH/Xk6RBzKZLfWxH7zC+EuNc8JrsSgzj481?= =?us-ascii?Q?UGIUh0Fu8RKp9HLYyg9uVSTS1HYvkdxTDlcNoWjCg/nCeRtEZ17sl6Aia2cs?= =?us-ascii?Q?3toVpQmP8v15Fqm8Xt7MF4BsNPu6Ky3Q+GnFdnTpmYz3uqv9EokTgJZ0v0cJ?= =?us-ascii?Q?/DHJ9JeYRqV6g/skr6WNrpgwRnDLEA1aCsFwsHTWx+H1MHIhkLfZfQ6Gz0Vo?= =?us-ascii?Q?sGxCpi5RHIvI8qNMWG6N7QUacbanj5G3QIlTJFzg2mGUOFjf18vsKmj/DM2z?= =?us-ascii?Q?LEPQdCp3bHHMut4n3wdBt2LtM9fquLVsj9T+nSbj5Z/UL2N/uTnMNPf30xmM?= =?us-ascii?Q?nVoByG6N9iFgHqGZG6wzNVTvfEbnurb42cO5AXmtehGCB2MNvsncnBJcsVU/?= =?us-ascii?Q?uPdM//rdlK8iX6I7bXZ0fKI2WMSX5ipACYtwpGbLVDzUMKZiqMwUvkz6Aif7?= =?us-ascii?Q?AdtmAP7tp7EYMrPzpcc3YByH?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94b7e310-2368-4989-4ff4-08d8d70239f5 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4605.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2021 07:19:43.7191 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: OU982ffsjmS9WLNkgnsVREVVg7R/YswCZHr3HXrw4tdiHkJmaHhFwjlZuJKNaDiPs4wb85gFFuipmxRRzr4s822Cq28/XgBI7Ex41feo9U8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3191 Precedence: Bulk List-Unsubscribe: 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,ankur.a.arora@oracle.com X-Gm-Message-State: etWakY2v0Zcs96KW68PLLu1cx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1613978390; bh=+NBkeVoVf8dNEb10Nb1+pWHcA3aZ4Mbtki/H5Jkscb4=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=SEsr7JdTqrr/ZftVTHqiQgFdZaG5QMT1NKkMR7hucEye/x6LAX1IxEsgSxCcnTQpk2w oYWauZgWtOWfZKVcRE6/dUhxTXlz4Y3OJCNy2xZxxSru6OxnrTQ9U2+XcRbtkW9sisoyP WwPnWq9mcPnJY1xZKxYYIFpFBcbGWgidteg= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Define CPU_HOT_EJECT_DATA and add PCD PcdCpuHotEjectDataAddress, which will be used to share CPU ejection state between OvmfPkg/CpuHotPlugSmm and PiSmmCpuDxeSmm. Cc: Laszlo Ersek Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Igor Mammedov Cc: Boris Ostrovsky Cc: Aaron Young Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3132 Signed-off-by: Ankur Arora --- Notes: Addresses the following review comments in v6: (1) Dropped modifications to LibraryClasses in OvmfPkg.dec (2,3) Cleanup comments around PCD PcdCpuHotEjectDataAddress. (4) Move PCD PcdCpuHotEjectDataAddress declaration in CpuHotplugSmm.inf to a patch-7 where it actually gets used. (5a,5b) Change the comment in the top block to use Laszlo's language. Also detail when the PCD would contain a valid value. (6) Move Library/CpuHotEjectData.h to Pcd/CpuHotEjectData.h (7,15,16) Fixup guard macro to be C namespace compliant. Also fixup the comment style near the endif guard. (8-10) Rename CPU_HOT_EJECT_FN to a more EDK2 compliant style. Also add a comment block and fix spacing. () Rename ApicIdMap -> QemuSelectorMap while keeping the type as UINT6= 4. Related to a comment in patch-8 ("... add worker to do CPU ejection".) (11a,11b) Rename CPU_EJECT_INVALID to CPU_EJECT_QEMU_SELECTOR_INVALID and add a comment about it. () Remove CPU_EJECT_WORKER based on review comment on a patch 8. (12,14) Remove CPU_HOT_EJECT_DATA fields Revision and Reserved. Reorder CPU_HOT_EJECT_DATA to minimize internal padding and ensure elements are properly aligned. (13a,13b) Change CpuIndex->ApicId map to ProcessorNum -> QemuSelector () Make CPU_HOT_EJECT_HANDLER->Handler, CPU_HOT_EJECT_HANDLER->QemuSelectorMap volatile. OvmfPkg/OvmfPkg.dec | 4 +++ OvmfPkg/Include/Pcd/CpuHotEjectData.h | 52 +++++++++++++++++++++++++++++++= ++++ 2 files changed, 56 insertions(+) create mode 100644 OvmfPkg/Include/Pcd/CpuHotEjectData.h diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec index 4348bb45c64a..9629707020ba 100644 --- a/OvmfPkg/OvmfPkg.dec +++ b/OvmfPkg/OvmfPkg.dec @@ -352,6 +352,10 @@ [PcdsDynamic, PcdsDynamicEx] # This PCD is only accessed if PcdSmmSmramRequire is TRUE (see below). gUefiOvmfPkgTokenSpaceGuid.PcdQ35SmramAtDefaultSmbase|FALSE|BOOLEAN|0x34 =20 + ## This PCD adds a communication channel between OVMF's SmmCpuFeaturesLib + # instance in PiSmmCpuDxeSmm, and CpuHotplugSmm. + gUefiOvmfPkgTokenSpaceGuid.PcdCpuHotEjectDataAddress|0|UINT64|0x46 + [PcdsFeatureFlag] gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderPciTranslation|TRUE|BOOLEAN|0= x1c gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderMmioTranslation|FALSE|BOOLEAN= |0x1d diff --git a/OvmfPkg/Include/Pcd/CpuHotEjectData.h b/OvmfPkg/Include/Pcd/Cp= uHotEjectData.h new file mode 100644 index 000000000000..024a92726869 --- /dev/null +++ b/OvmfPkg/Include/Pcd/CpuHotEjectData.h @@ -0,0 +1,52 @@ +/** @file + Definition for the CPU_HOT_EJECT_DATA structure, which shares + CPU hot-eject state between OVMF's SmmCpuFeaturesLib instance in + PiSmmCpuDxeSmm, and CpuHotplugSmm. + + CPU_HOT_EJECT_DATA is allocated in SMRAM, and pointed-to by + PcdCpuHotEjectDataAddress. + + PcdCpuHotEjectDataAddress is valid when SMM_REQUIRE is TRUE + and MaxNumberOfCpus > 1. + + Copyright (C) 2021, Oracle Corporation. + + SPDX-License-Identifier: BSD-2-Clause-Patent +**/ + +#ifndef CPU_HOT_EJECT_DATA_H_ +#define CPU_HOT_EJECT_DATA_H_ + +/** + CPU Hot-eject handler, called from SmmCpuFeaturesRendezvousExit() + on each CPU at exit from SMM. + + @param[in] ProcessorNum ProcessorNum denotes the CPU exiting SMM, + and will be used as an index into + CPU_HOT_EJECT_DATA->QemuSelectorMap. It is + identical to the processor handle in + EFI_SMM_CPU_SERVICE_PROTOCOL. +**/ +typedef +VOID +(EFIAPI *CPU_HOT_EJECT_HANDLER) ( + IN UINTN ProcessorNum + ); + +// +// CPU_EJECT_QEMU_SELECTOR_INVALID marks CPUs not being ejected in +// CPU_HOT_EJECT_DATA->QemuSelectorMap. +// +// QEMU CPU Selector is UINT32, so we choose an invalid value larger +// than that type. +// +#define CPU_EJECT_QEMU_SELECTOR_INVALID (MAX_UINT64) + +typedef struct { + volatile UINT64 *QemuSelectorMap; // Maps ProcessorNum -> QemuSele= ctor + // for pending hot-ejects + volatile CPU_HOT_EJECT_HANDLER Handler; // Handler to do the CPU ejection + UINT32 ArrayLength; // Entries in the QemuSelectorMap +} CPU_HOT_EJECT_DATA; + +#endif // CPU_HOT_EJECT_DATA_H_ --=20 2.9.3 -=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 (#71916): https://edk2.groups.io/g/devel/message/71916 Mute This Topic: https://groups.io/mt/80819860/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 Tue May 7 20:23:30 2024 Delivered-To: importer@patchew.org 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+71917+1787277+3901457@groups.io; helo=mail02.groups.io; 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+71917+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=oracle.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1613978392375815.4657935344097; Sun, 21 Feb 2021 23:19:52 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id kkCFYY1788612xLduJPrilep; Sun, 21 Feb 2021 23:19:51 -0800 X-Received: from aserp2120.oracle.com (aserp2120.oracle.com [141.146.126.78]) by mx.groups.io with SMTP id smtpd.web10.31720.1613978391470280373 for ; Sun, 21 Feb 2021 23:19:51 -0800 X-Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 11M7F30k132647; Mon, 22 Feb 2021 07:19:48 GMT X-Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by aserp2120.oracle.com with ESMTP id 36ttcm2kec-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Feb 2021 07:19:48 +0000 X-Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 11M7GSL7067574; Mon, 22 Feb 2021 07:19:47 GMT X-Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2168.outbound.protection.outlook.com [104.47.57.168]) by aserp3020.oracle.com with ESMTP id 36ucawnxq0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Feb 2021 07:19:47 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gQMr5Iwkgn7uaiiq73+3cUTQFXUlCGcYP2XfaVLsLwnPA0Z9L1qDjVExbFzmQQ/ofl8PS+GvvjcIMKhmNI5Q3KC4LEDmKcnnNU0OUOR5eV1NZhUjTrkXrtTcRE9DQBb5kBvtnkId57egs6HFCmAMVPzsZEcwlI+jmQwBGO08rXz7yLQbSRtHhucwvkinPYk/ZMTIVOOyO2noCW6g866gZYrGt+1spG2C4ChKABNW6W6KGxGLlRoryE/eOrqZ53TgSOsjsxl5ssR3X+8bademITTNiWiCuFKH0af6XTl8tsgB0pDMygtjoJ+OZL45w5xkfvVYqW2vVbH3D+TOILAcoQ== 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=ZSmLXnkGnrGbL4Gfu1w8+AqfVIYwQx2NR1XNbeKZBdM=; b=OEPvNRKgo4u6ts7I3So179BpSxr0+NnmOuWo1b1oGch//jf39c3ByUfGlnHxBPR56+FOdAf5+7Gv282y84Hji3kSWEHbxKBXrAqEA9IgSO7hfkOIifKBrgYuJN0vSgXQWXKms+0/DezBW/ZwJmM5oNMLOpcTS6bx2d4jZZB9WMY7rczOHPmM1YuFQDRbZmkHgrElsrpoFAdVz6THFcOCXWpPqXLv7M68Q1nNouXFr6ZqTljYAqdmZONlJqmUouYkKZsJir2M05KILyw0mNINb5l7KeRfunF3sQg7MOlOHl2whlb62RiI3BQbiYArZwYkQ+7e6mMxbRnyAAEMn2SkIg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none X-Received: from SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) by BY5PR10MB3922.namprd10.prod.outlook.com (2603:10b6:a03:1fd::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.32; Mon, 22 Feb 2021 07:19:45 +0000 X-Received: from SJ0PR10MB4605.namprd10.prod.outlook.com ([fe80::a021:790:7ce6:6f16]) by SJ0PR10MB4605.namprd10.prod.outlook.com ([fe80::a021:790:7ce6:6f16%6]) with mapi id 15.20.3868.033; Mon, 22 Feb 2021 07:19:45 +0000 From: "Ankur Arora" To: devel@edk2.groups.io Cc: lersek@redhat.com, imammedo@redhat.com, boris.ostrovsky@oracle.com, Ankur Arora , Jordan Justen , Ard Biesheuvel , Aaron Young Subject: [edk2-devel] [PATCH v8 06/10] OvmfPkg/SmmCpuFeaturesLib: init CPU ejection state Date: Sun, 21 Feb 2021 23:19:24 -0800 Message-Id: <20210222071928.1401820-7-ankur.a.arora@oracle.com> In-Reply-To: <20210222071928.1401820-1-ankur.a.arora@oracle.com> References: <20210222071928.1401820-1-ankur.a.arora@oracle.com> X-Originating-IP: [148.87.23.11] X-ClientProxiedBy: MWHPR17CA0065.namprd17.prod.outlook.com (2603:10b6:300:93::27) To SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from prion.us.oracle.com (148.87.23.11) by MWHPR17CA0065.namprd17.prod.outlook.com (2603:10b6:300:93::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Mon, 22 Feb 2021 07:19:44 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 64b7c523-28d4-4054-c8b3-08d8d7023abc X-MS-TrafficTypeDiagnostic: BY5PR10MB3922: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:124; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: wgsn+GDSvNqIl5BSYwhzDrx2Br7NaY/n9j0gVa2nHa5u6wKIqhhGH04trQVsKjSNSdZsauxVI8SFe1o+UeKeLV5RGb5UrInPsPqybZNbCkXJ/nNv/ITKUpzWAZE/I3s5AFDeWs5m5zmMkT1syS/UefpNq2dLFLKM/tuce8vtSvGSfbZQqEvuDJ1J3Vi/hvWgj/NS/dT5uB9BhcWRD7A++nUkGkxFQgKE06fWl17jVVYG9U2JeLA2G4OtvwHoVXkdM84wav3nhTg3HnAQ43dClIpe1vRyj1ezQilcsUyK/gFBUXoVf5XKoV8cJYXNMNmk7ZvgMLD1/9zKZbaXECtnE0ROjDyN0ETtRfCJ5KrM7oGZwSBbliFMW1uk3wP7EBcWsOfyq/D4y8jcvUdp+scgVuHX+axgkYswcs4hY4FAjab6WXRvH5W80sN/jBCKRte0PXXRhErh7sjCZZOzJh/Q0ss79yip6VIdXuDz0g+MNoJsxvWi1c3ajdgE8Qc1gZNpDiOxkQqch9b4Br3Q/q/TJokXWKRQQm+XElCCQYHgpWf1U/oYCYGZeyyfwzxDy+FZQ8ta999Qvq3tXXeGyWBqe847518y6T52M69mM26lfwY= X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?oXXzLBlnfEkvsDuSVad1rN9FHIt4ymcGID0uAojkbtmpuJ8UyaO3X3KTVQ0x?= =?us-ascii?Q?t3xobMKslE0uNU5A2Dp7TuV9jbxgfRfGlOCz2uxwiU+QieivoAJSOFMYUmiX?= =?us-ascii?Q?Bbgk/9+nBnTK63nGeuzNCdKdipB2ibRB9EUMzWY4NPm4qMWSc/3zzkdcOEeK?= =?us-ascii?Q?1qnmbcbkxzioiCdWb6xowSlKSO6SPsCFTy2/p18tJb9tGoZVoj4U8j1twYmN?= =?us-ascii?Q?hTFpUBjlvy4+XSfWymtQ0J7F/0pK3o+iUcrJ/KGVC1yj1uCl8pLzo3ruE3Dg?= =?us-ascii?Q?kV90ko6o9PdqnKcxTPPv1mDTTFvzn9wIu5zq4c97QxcwRwoliFREyqRSrIMp?= =?us-ascii?Q?ECRDy4MIaNuKu/wwBYG555d56/aWatFpe6DCsnSRqI2xMUcG7OFr246CUk81?= =?us-ascii?Q?mzJrkP7eI85YSViK7YZxj23M82L6S2VWId+spH8F3wUrKW3X8m1d+22z1X9n?= =?us-ascii?Q?5n6W74aeb9hDaxEwJ0oPPPkJG+ZGU+7HfYGNPRGGcVC91G2gSxhmx3t6G8Pz?= =?us-ascii?Q?n8xa+JS3FnXCq03ZJ2y7RaC/8C6oYgZ2pDgAkLUkW0I8asyskc59A/QUVP7x?= =?us-ascii?Q?/SdyvZyiRzJ8v2zyhl7rRXKh/Nph4stfz7U8ZMr4JnqZ5wDqy1EEZ4geeB6a?= =?us-ascii?Q?dtQPtfpXmlJ5mU7xvFYF+hfMxCZFl9Cp/SCQ98AQ5XnJg8jcS5N17D8n0rG3?= =?us-ascii?Q?JDlsBbfw/LkA1N/Je81lknp3P23egMAvxwAzH3Si+udSHj2CWriewsXj4DXf?= =?us-ascii?Q?QVjGAzV5WmuUcFy+onYbYSLNxgxux1fh5YpzXeJj27HZpHfXtQr/Mqc4Ah5x?= =?us-ascii?Q?guj+xcD8Xjq9TlmZXobB1ufGGSJ9YX6A9VZvaLI+dlwEIyGxfkPLXWzmWOri?= =?us-ascii?Q?x/8LtKBOm5lojwMCuNL/mfDDxWsGUJKLYdCJH7Yp7/V8yNp7X8KlrzMGjUaX?= =?us-ascii?Q?0EIf16jl84Q7zuqY7qqex2K6F8U10eP/N3uKJ6pGdrUPbvZEFRyeUI/igFdp?= =?us-ascii?Q?qnckGYNfMLdUb3M5ss+q227MibEeHX55euN2NOPVUgvQcP2DTxUrWEGMPlJz?= =?us-ascii?Q?Lo4HbVY4zbxwzYFg1rMz0F5I/yfcsu0vCBbHxPX5kV1QHH+fVEHbBkwKyb53?= =?us-ascii?Q?erkhi/lAxzJqT+r9INCw4XVJBiwkta3yOeio+IaenRS55Rq5O7vGApuSNIdi?= =?us-ascii?Q?HcSsFKA9J43TMPzu0bp1mVj3o/tmKZA4Dd2XAm/2RagOIpKtNBQBYz/fpfeO?= =?us-ascii?Q?rOLiJDk08jPkGVyJhEu4ouOzOBI8IqNuFPrffFmFMDThWk4xxsR2RYY5gPPl?= =?us-ascii?Q?NiisrUBEec4xPFqA3xZEC7PL?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 64b7c523-28d4-4054-c8b3-08d8d7023abc X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4605.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2021 07:19:44.9586 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: W5RdDylVSly0vo/eE3jap8Fdz2UkwQVtaYZoAct/SkUAy1N3lRKkOOLz1MikJ5QlA8T+YU/PBkjaO6MeZ0ytuUpmfpweuPvX65TTQnCoWc0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB3922 Precedence: Bulk List-Unsubscribe: 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,ankur.a.arora@oracle.com X-Gm-Message-State: MkG3HLbXMrc3SlZqhiSjlBrVx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1613978391; bh=7zjqutfONjl1U++1sjyTUugni7xdLjUls2U3ssNdQ+E=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=M0iBjXLjkEbdVpK47NBikAoQ4j7ziFM/yFXoMLZ4LpyEtIyKl65AtvFmtjZUEuJG+Jo WGdN1MjgBs3d5FJC7XuRG5OZEA/ibirB1WfG++3JqpP9hvDF1r6xXlQHy6ox2nmTJSsUm 4ub0GslbKF1T8FFGD7piFVSy8NogILTIcNw= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Init CPU_HOT_EJECT_DATA, which will be used to share CPU ejection state between SmmCpuFeaturesLib (via PiSmmCpuDxeSmm) and CpuHotPlugSmm. The init happens via SmmCpuFeaturesSmmRelocationComplete(), and so it will run as part of the PiSmmCpuDxeSmm entry point function, PiCpuSmmEntry(). Once inited, CPU_HOT_EJECT_DATA is exposed via PcdCpuHotEjectDataAddress. The CPU hot-eject handler (CPU_HOT_EJECT_DATA->Handler) is setup when there is an ejection request via CpuHotplugSmm. Cc: Laszlo Ersek Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Igor Mammedov Cc: Boris Ostrovsky Cc: Aaron Young Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3132 Signed-off-by: Ankur Arora --- Notes: Addresses the following review comments: (1) Detail in commit message about context in which CPU_HOT_EJECT_DATA is inited. (2) Add in sorted order MemoryAllocationLib in LibraryClasses (3) Sort added includes in SmmCpuFeaturesLib.c (4a-4b) Fixup linkage directives for mCpuHotEjectData. (5) s/CpuHotEjectData/mCpuHotEjectData/ (6,10a,10b) Remove dependence on PcdCpuHotPlugSupport (7) Make the tense structure consistent in block comment for InitCpuHotEject(). (8) s/SmmCpuFeaturesSmmInitHotEject/InitCpuHotEject/ (9) s/mMaxNumberOfCpus/MaxNumberOfCpus/ (11) Remove a bunch of obvious comments. (14a,14b,14c) Use SafeUint functions and rework the allocation logic so we can just use a single allocation. (12) Remove the AllocatePool() cast. (13) Use a CpuDeadLoop() in case of failure; albeit via a goto, not inline. (15) Initialize the mCpuHotEjectData->QemuSelectorMap locally. (16) Fix indentation in PcdSet64S. (17) Change the cast in PcdSet64S() to UINTN. (18) Use RETURN_STATUS instead of EFI_STATUS. (19,20) Move the Handler logic in SmmCpuFeaturesRendezvousExit() into into a separate patch. .../SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf | 4 + .../Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c | 92 ++++++++++++++++++= ++++ 2 files changed, 96 insertions(+) diff --git a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf b/Ovmf= Pkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf index 97a10afb6e27..8a426a4c10fb 100644 --- a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf +++ b/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf @@ -30,9 +30,13 @@ [LibraryClasses] BaseMemoryLib DebugLib MemEncryptSevLib + MemoryAllocationLib PcdLib + SafeIntLib SmmServicesTableLib UefiBootServicesTableLib =20 [Pcd] + gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber + gUefiOvmfPkgTokenSpaceGuid.PcdCpuHotEjectDataAddress gUefiOvmfPkgTokenSpaceGuid.PcdQ35SmramAtDefaultSmbase diff --git a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c b/OvmfPk= g/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c index 7ef7ed98342e..adbfc90ad46e 100644 --- a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c +++ b/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c @@ -11,10 +11,13 @@ #include #include #include +#include #include +#include #include #include #include +#include #include #include #include @@ -171,6 +174,92 @@ SmmCpuFeaturesHookReturnFromSmm ( return OriginalInstructionPointer; } =20 +STATIC CPU_HOT_EJECT_DATA *mCpuHotEjectData =3D NULL; + +/** + Initialize mCpuHotEjectData if PcdCpuMaxLogicalProcessorNumber > 1. + + Also setup the corresponding PcdCpuHotEjectDataAddress. +**/ +STATIC +VOID +InitCpuHotEjectData ( + VOID + ) +{ + UINTN ArrayLen; + UINTN BaseLen; + UINTN TotalLen; + UINT32 Idx; + UINT32 MaxNumberOfCpus; + RETURN_STATUS PcdStatus; + + MaxNumberOfCpus =3D PcdGet32 (PcdCpuMaxLogicalProcessorNumber); + + if (MaxNumberOfCpus =3D=3D 1) { + return; + } + + // + // We want the following lay out for CPU_HOT_EJECT_DATA: + // UINTN alignment: CPU_HOT_EJECT_DATA + // --- padding if needed --- + // UINT64 alignment: CPU_HOT_EJECT_DATA->QemuSelectorMap[] + // + // Accordingly, we allocate: + // sizeof(*mCpuHotEjectData) + (MaxNumberOfCpus * + // sizeof(mCpuHotEjectData->QemuSelectorMap[0])). + // Add sizeof(UINT64) to use as padding if needed. + // + + if (RETURN_ERROR (SafeUintnMult (sizeof (*mCpuHotEjectData), 1, &BaseLen= )) || + RETURN_ERROR (SafeUintnMult ( + sizeof (mCpuHotEjectData->QemuSelectorMap[0]), + MaxNumberOfCpus, &ArrayLen)) || + RETURN_ERROR (SafeUintnAdd (BaseLen, ArrayLen, &TotalLen))|| + RETURN_ERROR (SafeUintnAdd (TotalLen, sizeof (UINT64), &TotalLen))) { + DEBUG ((DEBUG_ERROR, "%a: invalid CPU_HOT_EJECT_DATA\n", __FUNCTION__)= ); + goto Fatal; + } + + mCpuHotEjectData =3D AllocatePool (TotalLen); + if (mCpuHotEjectData =3D=3D NULL) { + ASSERT (mCpuHotEjectData !=3D NULL); + goto Fatal; + } + + mCpuHotEjectData->Handler =3D NULL; + mCpuHotEjectData->ArrayLength =3D MaxNumberOfCpus; + + mCpuHotEjectData->QemuSelectorMap =3D (void *)mCpuHotEjectData + + sizeof (*mCpuHotEjectData); + mCpuHotEjectData->QemuSelectorMap =3D + (void *)ALIGN_VALUE ((UINTN)mCpuHotEjectData->QemuSelectorMap, + sizeof (UINT64)); + // + // We use mCpuHotEjectData->QemuSelectorMap to map + // ProcessorNum -> QemuSelector. Initialize to invalid values. + // + for (Idx =3D 0; Idx < mCpuHotEjectData->ArrayLength; Idx++) { + mCpuHotEjectData->QemuSelectorMap[Idx] =3D CPU_EJECT_QEMU_SELECTOR_INV= ALID; + } + + // + // Expose address of CPU Hot eject Data structure + // + PcdStatus =3D PcdSet64S (PcdCpuHotEjectDataAddress, + (UINTN)(VOID *)mCpuHotEjectData); + if (RETURN_ERROR (PcdStatus)) { + ASSERT_EFI_ERROR (PcdStatus); + goto Fatal; + } + + return; + +Fatal: + CpuDeadLoop (); +} + /** Hook point in normal execution mode that allows the one CPU that was ele= cted as monarch during System Management Mode initialization to perform addit= ional @@ -188,6 +277,9 @@ SmmCpuFeaturesSmmRelocationComplete ( UINTN MapPagesBase; UINTN MapPagesCount; =20 + + InitCpuHotEjectData (); + if (!MemEncryptSevIsEnabled ()) { return; } --=20 2.9.3 -=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 (#71917): https://edk2.groups.io/g/devel/message/71917 Mute This Topic: https://groups.io/mt/80819861/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 Tue May 7 20:23:30 2024 Delivered-To: importer@patchew.org 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+71918+1787277+3901457@groups.io; helo=mail02.groups.io; 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+71918+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=oracle.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1613978399771540.7057518015431; Sun, 21 Feb 2021 23:19:59 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id yEnNYY1788612xZjuEykEx8p; Sun, 21 Feb 2021 23:19:59 -0800 X-Received: from aserp2120.oracle.com (aserp2120.oracle.com [141.146.126.78]) by mx.groups.io with SMTP id smtpd.web11.31685.1613978393933556067 for ; Sun, 21 Feb 2021 23:19:54 -0800 X-Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 11M7EsWr132240; Mon, 22 Feb 2021 07:19:50 GMT X-Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by aserp2120.oracle.com with ESMTP id 36ttcm2kee-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Feb 2021 07:19:50 +0000 X-Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 11M7GSL9067574; Mon, 22 Feb 2021 07:19:50 GMT X-Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2168.outbound.protection.outlook.com [104.47.57.168]) by aserp3020.oracle.com with ESMTP id 36ucawnxq0-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Feb 2021 07:19:49 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MMXyk/SQTK9KI4Y+jIp1qHqAxBQK0nTfwYgf/GpPQS3DdSbfVbgim7jxTVCX1dkQH8LtsxYPBHz0xyTP/an1HwHehMsYRKXKpiQWnJ5v+1d2pKCf0LzZfE/J+XXKVHAGebh8t0b6AJ6ULCWQtPHEghoVZx6FNaZdNl319mqqx7nTeVeHa3J3HcSlXF644KhTB7PjR/yM8M5rsgx0oFkNvtggySZFMMobZG5A7dVw+OeGTY3jo3ibpRda6wJWead8ZXccWhAIG1h0s2gV7WKDnpoU260HFgCjzEjxT0p3S+qKC94yWKdr0fL/jrb03K3H4GwTtav13gReO/Jg5ASR8w== 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=6EYCp3fdV5LngSVtDjqoaNvNu/L3do9lkVIBhAT0t3g=; b=gE4JbMva01QRWryGHe4Sqv2PyWlaDJoMhazIU2dot16wITtkO8izdoalsdZzkpyLCxyav3J5DIygi/kIaM2jnxcuvDAiajRDh77FJ0KzE1F9vlOuS3ZMdnqmvkMe1w2Tmp5MtSckjOMX2u5l3jYMtbxGwfqvzE1bgNU+F4YRJSU/45of8XBiAMyyL9kGOEwbMnaK/BwJamJhZxvrUNXuEY0RgYaWYC4a2nKvGX9ekpBwcq/w1wCca6SzDHyOwUp8IkzuulEtzKHvcJ81vmS+ll/IeEBTfMm5h83wgSQKipEZi6rl9FVmktQrDyg4DGdxP2wRv829tqK9TzqFRmkBYw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none X-Received: from SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) by BY5PR10MB3922.namprd10.prod.outlook.com (2603:10b6:a03:1fd::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.32; Mon, 22 Feb 2021 07:19:46 +0000 X-Received: from SJ0PR10MB4605.namprd10.prod.outlook.com ([fe80::a021:790:7ce6:6f16]) by SJ0PR10MB4605.namprd10.prod.outlook.com ([fe80::a021:790:7ce6:6f16%6]) with mapi id 15.20.3868.033; Mon, 22 Feb 2021 07:19:46 +0000 From: "Ankur Arora" To: devel@edk2.groups.io Cc: lersek@redhat.com, imammedo@redhat.com, boris.ostrovsky@oracle.com, Ankur Arora , Jordan Justen , Ard Biesheuvel , Aaron Young Subject: [edk2-devel] [PATCH v8 07/10] OvmfPkg/SmmCpuFeaturesLib: call CPU hot-eject handler Date: Sun, 21 Feb 2021 23:19:25 -0800 Message-Id: <20210222071928.1401820-8-ankur.a.arora@oracle.com> In-Reply-To: <20210222071928.1401820-1-ankur.a.arora@oracle.com> References: <20210222071928.1401820-1-ankur.a.arora@oracle.com> X-Originating-IP: [148.87.23.11] X-ClientProxiedBy: MWHPR17CA0065.namprd17.prod.outlook.com (2603:10b6:300:93::27) To SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from prion.us.oracle.com (148.87.23.11) by MWHPR17CA0065.namprd17.prod.outlook.com (2603:10b6:300:93::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Mon, 22 Feb 2021 07:19:45 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cc3452e5-f123-4599-e292-08d8d7023b6a X-MS-TrafficTypeDiagnostic: BY5PR10MB3922: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: NDh62lzq16baxmHPR67yepXRTvVb6I4r5GFILiCaMVqODoxRg1fU04Ff862jkSt89hIWRddzp0OawAVshT99OiWuMVX3wY2H+A0NViIsdHwFoVmyoFCeidXfszcM6GObL16oe+knMHEcp4KL8yLdNS6sPSecfYvPZozeDFFCS+BSodlLaBFcsupMBVrS8u14hS9jHAFcH8K0my5xd0INj+M0N0aWbKQ77UUKnzHzdnwG/eqBfdbF1vq3UEdkxEoqvxeVBMNGbc9YFsNVGg+hHptqyJu8cr078BEXdYZTwHIvhmndaHLWmtEsgXzE96utc5CpZV0e6fmYM1JQL7bvwpHZY7bhRNRTHWcJfs4mdTWG/vzhHsIOJVDMhfKA+QFVKmADs0jdY2KA7yWOeCQogah7yjEogtFVZo+433GtOJk+ss15O7fdGddPJbANs9gmVDBeYQiXx6+i6twRcHG31iSVlfTE5MFM+ZAYfMmGJTEy1JMAoEpVk2RhadIaha/UVtktEiGK6uEHdciNFb8rdJoBMj9KRCI3uMr91JhvW7zjfL/7lLYg3OInqxO0tzULjzAJc96IUS9wkRptfMv/D10Cks4yAsIMBS5g8BpT6JY= X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?wnJvWoNZDzacPnhpEVX+N10QqX50S3yqo6eX3MAGhA58Cv1EvoB0iCHgvwF4?= =?us-ascii?Q?CpOLk/lPy6//I4rzbDhFhMPXtwnSJfx6BHRzSLedHvOcwaTmA0pU7m5hUDao?= =?us-ascii?Q?ba3n+4XoJLGZ1AgBAwMsvDMw7/MIsXY8VR0mz6zlXNA+kHtnvJvBP3CIb84n?= =?us-ascii?Q?FMp2mv5aZN5VAuY7iWj4OmMY0Zd/8baBHsdm3vWwGdXJajaXnO96RKGHBrdK?= =?us-ascii?Q?Qbn1CQK3aRsu2UkX5rSmF7U2TKJpO2FLFirP0Cbb1TldulIIkLw4ScFN9abg?= =?us-ascii?Q?Ae8qx8O3/11BwDgMwEvO2UlvS/SV21bYQeaAAg3S4Ywcx1a0Y28UieJT8rb5?= =?us-ascii?Q?N6dTTnWg+tMCALjUCsHfAv+fnShY2KWlVFpq3Y3OC+i8uM65D1PgOqbKEahR?= =?us-ascii?Q?+empevbGg57eOZeem7mQQ/CXAZvH3ImEHpwTJD2yx5urXXZOOlfWp9JTjm2m?= =?us-ascii?Q?vVyYmsqNNbK8u8hZDVV7jZguxhD2z8q2JKImdpNKG2B5+YmkxjsBWmJxmHQU?= =?us-ascii?Q?K/K18nYcffb3ykWUhe3Kxy1eG9q0/Tr0N06i0kNv6z2n+2EpU1kH6PM+pGFr?= =?us-ascii?Q?jr/biAW5nvNe8BLIWzrfJAUsaQdS+2OVMUXyiAEjmaxpZaSp6ip7HuhariE2?= =?us-ascii?Q?pLjIyA96FEdG6g8H+V1qi5Cid/PbwfMRUYBtbFFSn4HJlNUOHnKCbxgxqb6V?= =?us-ascii?Q?IHiQ7zFeeUKJsgwimqD3YLnXdjFM2XoeYObkRzQ6WPan6HDqYZTm1Lj7owGn?= =?us-ascii?Q?pDGj2Ova+8FHU6qvL7FkfgMeGFUcWA7AnVKN+xtXn1V6oWJpG3M8pCru9tsM?= =?us-ascii?Q?PQFF6bvYFO2p5EIduEF9K5p4iSnorz/4B2to1WebB0ZuJB+HgZHo9GkRiCCa?= =?us-ascii?Q?412tCwe1J9W+gb+GrtfQfhkW1SGJ+/V8OymDyxEkHTw5e1ZFBmhrEaMHlEyk?= =?us-ascii?Q?P0XLI+nh8P5LKKVlH/MM2i45PxPcr4oamTQ5s/z834ANENQ+rg6GoC87YSHK?= =?us-ascii?Q?ojD7e+tJ7E6xgY25z7sPJqXtPGDo+nkqhJy+cMRbZenf1poSBWtVyE4yOHCG?= =?us-ascii?Q?1cS1zJYjiOKD8ZG6GBXp4cq8oDQo1oiHIYE/X9yDBCvBdYAkj+URDgRNBvBg?= =?us-ascii?Q?O1DpMh6Vnxw9imtdiJJS8n/1TUssjJuQeQG/BVxn4Pz0PxE8DuQV1LXzH2jy?= =?us-ascii?Q?xPItiS041FYyZaDUm2GhNR7aNxfGZcxM2/MerQBThmMICFgUqKtUdjrWrqBY?= =?us-ascii?Q?PSSS532jbp1vcUPE0r/vd1nN0obshz9BlT/iutTq8PxMFS7S2SAAeQLS6WFx?= =?us-ascii?Q?5inUmvgoFnl9eXSCIw7S3bzX?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: cc3452e5-f123-4599-e292-08d8d7023b6a X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4605.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2021 07:19:46.1315 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +pUU+8vRZF346hl6r7XH5y66jop5RsS4lTId98ij3It8BynSm2EC4DhCzsEQMfqfCV8eLrwri//mwzpioTAH35TICjAr8tmLKIO+6j+g6F4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB3922 Precedence: Bulk List-Unsubscribe: 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,ankur.a.arora@oracle.com X-Gm-Message-State: s3se7scrryfpWVYHlFWWp7dIx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1613978399; bh=RpETlrDM66yAodqiFhUXbLeZ7SPGk9RvpAXRxrzaBAk=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=BwBqMsbY/yErp0rkK9mMhUVvivcIoMAmhh8++u/QKvCs9GwgHpS0o6VyOdg6erSGoDO YIS091QCGGxUmuM2xzH657zYmP9E381nB6kULQd+WdeQ0ol22vPm3YvhG0NMCEJRW+OTu jHmR/GAcQMQ4tKBwpYU0cfhXCOyFt/ENqHc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Call the CPU hot-eject handler if one is installed. The condition for installation is (PcdCpuMaxLogicalProcessorNumber > 1), and there's a hot-unplug request. The handler executes in context of SmmCpuFeaturesRendezvousExit(), which is called at the tail end of SmiRendezvous() after the BSP has given the signal to exit via the "AllCpusInSync" loop. Cc: Laszlo Ersek Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Igor Mammedov Cc: Boris Ostrovsky Cc: Aaron Young Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3132 Signed-off-by: Ankur Arora --- Notes: Address the following review comments from v6, patch-6: (19a) Move the call to the ejection handler to a separate patch. (19b) Describe the calling context of SmmCpuFeaturesRendezvousExit(). (20) Add comment describing the state when the Handler is not armed. OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c b/OvmfPk= g/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c index adbfc90ad46e..99988285b6a2 100644 --- a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c +++ b/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c @@ -467,6 +467,21 @@ SmmCpuFeaturesRendezvousExit ( IN UINTN CpuIndex ) { + // + // We only call the Handler if CPU hot-eject is enabled + // (PcdCpuMaxLogicalProcessorNumber > 1), and hot-eject is needed + // in this SMI exit (otherwise mCpuHotEjectData->Handler is not armed.) + // + + if (mCpuHotEjectData !=3D NULL) { + CPU_HOT_EJECT_HANDLER Handler; + + Handler =3D mCpuHotEjectData->Handler; + + if (Handler !=3D NULL) { + Handler (CpuIndex); + } + } } =20 /** --=20 2.9.3 -=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 (#71918): https://edk2.groups.io/g/devel/message/71918 Mute This Topic: https://groups.io/mt/80819862/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 Tue May 7 20:23:30 2024 Delivered-To: importer@patchew.org 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+71919+1787277+3901457@groups.io; helo=mail02.groups.io; 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+71919+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=oracle.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 161397840076436.25579980732721; Sun, 21 Feb 2021 23:20:00 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id oHYdYY1788612xQb8YoOMe8K; Sun, 21 Feb 2021 23:20:00 -0800 X-Received: from userp2130.oracle.com (userp2130.oracle.com [156.151.31.86]) by mx.groups.io with SMTP id smtpd.web12.31932.1613978394304557488 for ; Sun, 21 Feb 2021 23:19:54 -0800 X-Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 11M7FHiC133455; Mon, 22 Feb 2021 07:19:51 GMT X-Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by userp2130.oracle.com with ESMTP id 36tsuqtku3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Feb 2021 07:19:51 +0000 X-Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 11M7GSLA067574; Mon, 22 Feb 2021 07:19:50 GMT X-Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2168.outbound.protection.outlook.com [104.47.57.168]) by aserp3020.oracle.com with ESMTP id 36ucawnxq0-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Feb 2021 07:19:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mA9u9CDd5n1fR0EAYPd/x7nqZ0iTKqlSnNQZLqd6xotZ3g94VQT3RU33ypL/pvD0AVANXCjo/ThcVu3GVDbXWLW8cpsQCOePC1ONujM/4p5AaSexUxoh31rMyhAnWaEAWNh782bO7z+sjIOfF9XQPYl7EsZR3P1OkG+L13T2/UCV4ho4fhhiRfNEwUItmlV3b/FiVqVjRgHSaOo9q/4pWGzmWL6kkG0UTiXFphIwgOIF7epVCzdP0wIrdZVT+/2xyjjykLc+ybaPsLFJr8E/VyUobBVdcVEh6pMhvF63ZEIhd/YHopGR+zo9k+ITueIhvg7PENHQKSn3wGY3kd4Chg== 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=aeYb9WJVc+e89pfAheC5+u1WtURwD/O9xE9kRRuwKoo=; b=WpPf/hVP1eYgsFNJbIx0avrK2CfV9Nb3BWmAfHzad/0RV6ofgbAds0+/JcnJrjrLBBPxGp1vf74nWyl4kbew34jdG/XItqM215S5wFkL8tfQ82AlHBbU3Q8jdux4+zjOj5PHkhkUU9Xq5hTphIgFUJXse/9YyPfo+9+fq1sFiMfvjqLn1iCbpqM+RRsETQP6NSjop93I4PuM0I5q283Q6aG55HEcihFDtF/mVF1sxgkWZsmBnOBndDvPOrEyY1T2eUC4ufjHVpmpLvHMAcdpw+DYKU8u2iCIIv3LnISjuaeKPrdvNsIeGH5/pO1ug40cFFXt+ZxwFBNsqp5RhgiWDg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none X-Received: from SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) by BY5PR10MB3922.namprd10.prod.outlook.com (2603:10b6:a03:1fd::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.32; Mon, 22 Feb 2021 07:19:47 +0000 X-Received: from SJ0PR10MB4605.namprd10.prod.outlook.com ([fe80::a021:790:7ce6:6f16]) by SJ0PR10MB4605.namprd10.prod.outlook.com ([fe80::a021:790:7ce6:6f16%6]) with mapi id 15.20.3868.033; Mon, 22 Feb 2021 07:19:47 +0000 From: "Ankur Arora" To: devel@edk2.groups.io Cc: lersek@redhat.com, imammedo@redhat.com, boris.ostrovsky@oracle.com, Ankur Arora , Jordan Justen , Ard Biesheuvel , Aaron Young Subject: [edk2-devel] [PATCH v8 08/10] OvmfPkg/CpuHotplugSmm: add EjectCpu() Date: Sun, 21 Feb 2021 23:19:26 -0800 Message-Id: <20210222071928.1401820-9-ankur.a.arora@oracle.com> In-Reply-To: <20210222071928.1401820-1-ankur.a.arora@oracle.com> References: <20210222071928.1401820-1-ankur.a.arora@oracle.com> X-Originating-IP: [148.87.23.11] X-ClientProxiedBy: MWHPR17CA0065.namprd17.prod.outlook.com (2603:10b6:300:93::27) To SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from prion.us.oracle.com (148.87.23.11) by MWHPR17CA0065.namprd17.prod.outlook.com (2603:10b6:300:93::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Mon, 22 Feb 2021 07:19:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4c6e9a39-95b3-4863-4a97-08d8d7023c25 X-MS-TrafficTypeDiagnostic: BY5PR10MB3922: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4303; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: WvYVoJh1TnC5Oo2oft+uVZhxPtm+owhwNcc2xUXJbTQG4YU+X6xf3/3tB2Hx3wT2QuU0izbbZn03ILsYDb5fvvhQ7m+9DwBetujPPq8+T+Lw4CA7fjmvYpazzClEufeM93HHB+KWTRjfp6gzRdnRPQYZaHBm0+foO979oqO9KF3e5kVsbiclOs2f/j4nwqJAV3++vIojXX0cQ/XyXMRC+PFS/5Z+IZRUYCmlI8yJpYITAoXG8tYXkZ0yLBrFJuMprtE7vT0GrWCuu7Jr3ogWS+KNoxUY4OTFr+S1NGLZHnvwvh/fs8DpxJAYNxYNtFPAAomyMSHNOBzp0jYtLW9yjjQuRa4xlDtx3vc6kYc/DikC3961+vWN8QzrkkOQfv0udVBEPR7aj7CbZ46QjIZj1FAaDRNfEcDHDh98lUfTwIDOTmHZnVw4NHmsPk4WmP7SHg2OmeTupLJOdEtdZZNJWn1E7dfxDBnr6Agf3LtKVeSyvFkzlq9zu+BnnFD+YqqzYwH0BxKk0BXa931UmH1f+eWOUU7TCwvwFLxNbPM/ihD2w5mwbUcKXIvgu+ihLT7gk9l3YCM8A0Gq/2nR0kuwC18YfgwvRAvalEnoOFrxmtc= X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?EDrBiyphfSp/noJjxurYp2QGvNS50cL5ffuEI0oW/M6fYcpv5GqcLwxUHPRY?= =?us-ascii?Q?LkNUlobrV3pe/acB1Aj+61CRJbRr3ZYMc1VFCPxYhJ8S7NhEqW4DmQDOX/UH?= =?us-ascii?Q?GPpoRxJXGkLZ1n/k5x4lTlWiKTparkAeQrOuHKITJpwOUZYuHBMD+s/KmsXb?= =?us-ascii?Q?m7X7Na02w2KVbzmyyz49bg5KHsYb5ova127ruop7gvoYSf3FWhgbfWQ1AFHO?= =?us-ascii?Q?twXonr8xK9GPDvU1lOpUO657H/mKXu/XtfwnAqBOyA/7DHiKG7MMK26dtdBM?= =?us-ascii?Q?lIylfDn7vkGNNdIXWMNT2MvXqwwLeF3TwcyTPSAY2pyke6rFrW5kFJzs/Nhg?= =?us-ascii?Q?qfrJBvICGe1FkxJMGittE1I69tZRYjyZSWdFCGPoYRTKEDThUrrf3QD8Zkd+?= =?us-ascii?Q?HwJIf4zLyNW+sh1RYgWQeN6/oYhXXagy0hlA/ZHdVjmKz6uRmv6Dh8FCS5Kd?= =?us-ascii?Q?wgla5AzbBJ4H2OlWHDrOZQ1LgSoVC+ZRPpXpQOJulC2iOMrbQtzHOsDT5Naw?= =?us-ascii?Q?W0pmT5vQhs00iKn/TTFrmGp3xKhHcE9CzfrtmPjGWlfOmPqMV0NlkLvjx4qi?= =?us-ascii?Q?+GhMClOjXH2ef0NIGr6OhETFivU6zSGYyC8J1jH6MG4BFU4fh/hdoMRt9GuZ?= =?us-ascii?Q?+bC5HbyAN5UkezH0is/fDwmWsXirFmXnwmBSIuaDqUTvP8Tnx5DVsv5GITf/?= =?us-ascii?Q?MB/j8C8dxrZAIu7DvvZDwgDnCLuJyIr964SAeGzFrnoVO9x46tvPQCwUmjOA?= =?us-ascii?Q?eju8b94qhQgwA65XhAQg15Cvjpalxz2Yap+dm8LR4igQuNYYhhPew9kRi0rH?= =?us-ascii?Q?/sdBckLgOmlhpkNwcOh9eHLQExmggJEt6p4hnROeqVodm14byK/M/Zs5CGpN?= =?us-ascii?Q?vGtXRE1NFBUgO6Qjr16hJd6uj56gvxDdSs1pvtBhD3HURa82LLIoPp5fxyh3?= =?us-ascii?Q?B+M+/DC+matw/BW/Y5ZkmJNEWEwDQCmwRrH3p6V6PQ+gwdVpBN1AXT7Zdlh0?= =?us-ascii?Q?J0rZeidmg2+iXdD/m8lsxOw+I4YFETJCnue4dObIvRqcrgezkCITsWv/CRUU?= =?us-ascii?Q?coGEhYIlJH6PTye3C+yfD9aQt3qhKWtJ9Gr2G21rLHW0fXI2Zv5TJGaTrrcU?= =?us-ascii?Q?U0T6zdHRiTQuHoMFkCOxbaJr549EcI3Dslypr0L3Y9LPwPKj+RPEb5y9YWRb?= =?us-ascii?Q?u4KSI2IqJL7WHlvUkQIbYREbOrmPJkQr9ounUT43otyxzdT1fGU0g41yLVlG?= =?us-ascii?Q?oO1/DUGICUVssY3zxeCTnkw5+dijvds2Sg2IFafH+J14YRaRT/xZY7z+pwgj?= =?us-ascii?Q?6jOYSkNs9m4XVgy4WoKwWcfu?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4c6e9a39-95b3-4863-4a97-08d8d7023c25 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4605.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2021 07:19:47.3362 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: z79A0RWKVUHdin8eFACqDFFdsMhkYTjIqMT5DDS+D2aKkSvdDctbvMP1ao7YgtkK7u6z2M+khLHZWZoHZ0k5dN8Cuy92onMF+wcmJdDXFrI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB3922 Precedence: Bulk List-Unsubscribe: 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,ankur.a.arora@oracle.com X-Gm-Message-State: MmSJcxCNZMxnzULRtNxCGVDvx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1613978400; bh=VeJ++XAUr+dnWdoHGyhZUWN25YQ2/KVAQsOR0z5D41I=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=VNLTc6rhJAiyNyjBCAfl9ayfJ20Yl8XTgSpxMRPRriQ3Gozni/HfTZByC5aJV1/hF3E sMcTNBPzCeYH46vOppzotbm1x5pkH9ltZfZibMmAokzvG92h27i7YC1ZHEQSwXdqRIOJw KuZPTLGCZo1SzwDYiHqM5osqUKJn9gVxUTw= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Add EjectCpu(), which handles the CPU ejection, and provides a holding area for said CPUs. It is called via SmmCpuFeaturesRendezvousExit(), at the tail end of the SMI handling. Also UnplugCpus() now stashes QEMU Selectors of CPUs which need to be ejected in CPU_HOT_EJECT_DATA.QemuSelectorMap. This is used by EjectCpu() to identify CPUs marked for ejection. Cc: Laszlo Ersek Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Igor Mammedov Cc: Boris Ostrovsky Cc: Aaron Young Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3132 Signed-off-by: Ankur Arora --- Notes: Address these review comments from v6: (1) s/CpuEject/EjectCpu/g (2) Ensure that the added include is in sorted order. (3) Switch to a cheaper CpuSleep() based loop instead of CpuDeadLoop(). Also add the CpuLib LibraryClass. (4) Remove the nested else clause (5) Use Laszlo's much clearer comment when we try to map multiple QemuSelector to the same ProcessorNum. (6a) Fix indentation of the debug print in the block in (5). (6b,6c,6d) Fix printf types for ProcessorNum, use FMT_APIC_ID for APIC_ID and 0x%Lx for QemuSelector[]. () As discussed elsewhere add an DEBUG_INFO print logging the correspondence between ProcessorNum, APIC_ID, QemuSelector. (7a,7b) Use EFI_ALREADY_STARTED instead of EFI_INVALID_PARAMETER and document it in the UnplugCpus() comment block. () As discussed elsewhere, add the import statement for PcdCpuHotEjectDataAddress. (9) Use Laszlo's comment in the PcdGet64(PcdCpuHotEjectDataAddress) description block. (10) Change mCpuHotEjectData init state checks from ASSERT to ones consistent with similar checks for mCpuHotPlugData. (11-14) Get rid of mCpuHotEjectData init loop: moved to a prior patch so it can be done at allocation time. (15) s/SmmCpuFeaturesSmiRendezvousExit/SmmCpuFeaturesRendezvousExit/ (16,17) Document the ordering requirements of mCpuHotEjectData->Handler, and mCpuHotEjectData->QemuSelectorMap. Not addressed: (8) Not removing the EjectCount variable as I'd like to minimize stores/loads to CPU_HOT_EJECT_DATA->Handler and so would like to do t= his a single time at the end of the iteration. (It is safe to write mult= iple times to the handler in UnplugCpus() but given the ordering concerns around it, it seems cleaner to not access it unnecessarily.) OvmfPkg/CpuHotplugSmm/CpuHotplugSmm.inf | 2 + OvmfPkg/CpuHotplugSmm/CpuHotplug.c | 157 ++++++++++++++++++++++++++++= ++-- 2 files changed, 151 insertions(+), 8 deletions(-) diff --git a/OvmfPkg/CpuHotplugSmm/CpuHotplugSmm.inf b/OvmfPkg/CpuHotplugSm= m/CpuHotplugSmm.inf index 04322b0d7855..ebcc7e2ac63a 100644 --- a/OvmfPkg/CpuHotplugSmm/CpuHotplugSmm.inf +++ b/OvmfPkg/CpuHotplugSmm/CpuHotplugSmm.inf @@ -40,6 +40,7 @@ [Packages] [LibraryClasses] BaseLib BaseMemoryLib + CpuLib DebugLib LocalApicLib MmServicesTableLib @@ -54,6 +55,7 @@ [Protocols] =20 [Pcd] gUefiCpuPkgTokenSpaceGuid.PcdCpuHotPlugDataAddress ## CON= SUMES + gUefiOvmfPkgTokenSpaceGuid.PcdCpuHotEjectDataAddress ## CON= SUMES gUefiOvmfPkgTokenSpaceGuid.PcdQ35SmramAtDefaultSmbase ## CON= SUMES =20 [FeaturePcd] diff --git a/OvmfPkg/CpuHotplugSmm/CpuHotplug.c b/OvmfPkg/CpuHotplugSmm/Cpu= Hotplug.c index f07b5072749a..851e2b28aad9 100644 --- a/OvmfPkg/CpuHotplugSmm/CpuHotplug.c +++ b/OvmfPkg/CpuHotplugSmm/CpuHotplug.c @@ -10,10 +10,12 @@ #include // ICH9_APM_CNT #include // QEMU_CPUHP_CMD_GET_PENDING #include // CpuDeadLoop() +#include // CpuSleep() #include // ASSERT() #include // gMmst #include // PcdGetBool() #include // SafeUintnSub() +#include // CPU_HOT_EJECT_DATA #include // EFI_MM_CPU_IO_PROTOCOL #include // EFI_SMM_CPU_SERVICE_PROTOC= OL #include // EFI_STATUS @@ -32,11 +34,12 @@ STATIC EFI_MM_CPU_IO_PROTOCOL *mMmCpuIo; // STATIC EFI_SMM_CPU_SERVICE_PROTOCOL *mMmCpuService; // -// This structure is a communication side-channel between the +// These structures serve as communication side-channels between the // EFI_SMM_CPU_SERVICE_PROTOCOL consumer (i.e., this driver) and provider // (i.e., PiSmmCpuDxeSmm). // STATIC CPU_HOT_PLUG_DATA *mCpuHotPlugData; +STATIC CPU_HOT_EJECT_DATA *mCpuHotEjectData; // // SMRAM arrays for fetching the APIC IDs of processors with pending event= s (of // known event types), for the time of just one MMI. @@ -188,18 +191,72 @@ RevokeNewSlot: } =20 /** + CPU Hot-eject handler, called from SmmCpuFeaturesRendezvousExit() + on each CPU at exit from SMM. + + If, the executing CPU is not being ejected, nothing to be done. + If, the executing CPU is being ejected, wait in a halted loop + until ejected. + + @param[in] ProcessorNum ProcessorNum denotes the CPU exiting SMM, + and will be used as an index into + CPU_HOT_EJECT_DATA->QemuSelectorMap. It is + identical to the processor handle number in + EFI_SMM_CPU_SERVICE_PROTOCOL. +**/ +VOID +EFIAPI +EjectCpu ( + IN UINTN ProcessorNum + ) +{ + UINT64 QemuSelector; + + QemuSelector =3D mCpuHotEjectData->QemuSelectorMap[ProcessorNum]; + if (QemuSelector =3D=3D CPU_EJECT_QEMU_SELECTOR_INVALID) { + return; + } + + // + // CPU(s) being unplugged get here from SmmCpuFeaturesRendezvousExit() + // after having been cleared to exit the SMI by the BSP and thus have + // no SMM processing remaining. + // + // Given that we cannot allow them to escape to the guest, we pen them + // here until the BSP tells QEMU to unplug them. + // + for (;;) { + DisableInterrupts (); + CpuSleep (); + } +} + +/** Process to be hot-unplugged CPUs, per QemuCpuhpCollectApicIds(). =20 For each such CPU, report the CPU to PiSmmCpuDxeSmm via - EFI_SMM_CPU_SERVICE_PROTOCOL. If the to be hot-unplugged CPU is - unknown, skip it silently. + EFI_SMM_CPU_SERVICE_PROTOCOL and stash the APIC ID for later ejection. + If the to be hot-unplugged CPU is unknown, skip it silently. + + Additonally, if we do stash any APIC IDs, also install a CPU eject handl= er + which would handle the ejection. =20 @param[in] ToUnplugApicIds The APIC IDs of the CPUs that are about to= be hot-unplugged. =20 + @param[in] ToUnplugSelector The QEMU Selectors of the CPUs that are ab= out to + be hot-unplugged. + @param[in] ToUnplugCount The number of filled-in APIC IDs in ToUnplugApicIds. =20 + @retval EFI_ALREADY_STARTED For the ProcessorNum that + EFI_SMM_CPU_SERVICE_PROTOCOL had assigned = to + one of the APIC ID in ToUnplugApicIds, + mCpuHotEjectData->QemuSelectorMap already = has + the QemuSelector value stashed. (This shou= ld + never happen.) + @retval EFI_SUCCESS Known APIC IDs have been removed from SMM = data structures. =20 @@ -210,23 +267,36 @@ STATIC EFI_STATUS UnplugCpus ( IN APIC_ID *ToUnplugApicIds, + IN UINT32 *ToUnplugSelector, IN UINT32 ToUnplugCount ) { EFI_STATUS Status; UINT32 ToUnplugIdx; + UINT32 EjectCount; UINTN ProcessorNum; =20 ToUnplugIdx =3D 0; + EjectCount =3D 0; while (ToUnplugIdx < ToUnplugCount) { APIC_ID RemoveApicId; + UINT32 QemuSelector; =20 RemoveApicId =3D ToUnplugApicIds[ToUnplugIdx]; + QemuSelector =3D ToUnplugSelector[ToUnplugIdx]; =20 // - // mCpuHotPlugData->ApicId maps ProcessorNum -> ApicId. Use it to find - // the ProcessorNum for the APIC ID to be removed. + // mCpuHotPlugData->ApicId maps ProcessorNum -> ApicId. Use RemoveApic= Id + // to find the corresponding ProcessorNum for the CPU to be removed. // + // With this we can establish a 3 way mapping: + // APIC_ID -- ProcessorNum -- QemuSelector + // + // We stash the ProcessorNum -> QemuSelector mapping so it can later be + // used for CPU hot-eject in SmmCpuFeaturesRendezvousExit() context (w= here + // we only have ProcessorNum available.) + // + for (ProcessorNum =3D 0; ProcessorNum < mCpuHotPlugData->ArrayLength; ProcessorNum++) { @@ -255,11 +325,64 @@ UnplugCpus ( return Status; } =20 + if (mCpuHotEjectData->QemuSelectorMap[ProcessorNum] !=3D + CPU_EJECT_QEMU_SELECTOR_INVALID) { + // + // mCpuHotEjectData->QemuSelectorMap[ProcessorNum] is set to + // CPU_EJECT_QEMU_SELECTOR_INVALID when mCpuHotEjectData->QemuSelect= orMap + // is allocated, and once the subject processsor is ejected. + // + // Additionally, mMmCpuService->RemoveProcessor(ProcessorNum) invali= dates + // mCpuHotPlugData->ApicId[ProcessorNum], so a given ProcessorNum can + // never match more than one APIC ID and by transitivity, more than = one + // QemuSelector in a single invocation of UnplugCpus(). + // + DEBUG ((DEBUG_ERROR, "%a: ProcessorNum %Lu maps to QemuSelector 0x%L= x, " + "cannot also map to 0x%Lx\n", __FUNCTION__, (UINT64)ProcessorNum, + (UINT64)mCpuHotEjectData->QemuSelectorMap[ProcessorNum], QemuSelec= tor)); + + Status =3D EFI_ALREADY_STARTED; + return Status; + } + + // + // Stash the QemuSelector so we can do the actual ejection later. + // + mCpuHotEjectData->QemuSelectorMap[ProcessorNum] =3D (UINT64)QemuSelect= or; + + DEBUG ((DEBUG_INFO, "%a: Started hot-unplug on ProcessorNum %Lu, APIC = ID " + FMT_APIC_ID ", QemuSelector 0x%Lx\n", __FUNCTION__, (UINT64)Processo= rNum, + RemoveApicId, mCpuHotEjectData->QemuSelectorMap[ProcessorNum])); + + EjectCount++; ToUnplugIdx++; } =20 + if (EjectCount !=3D 0) { + // + // We have processors to be ejected; install the handler. + // + mCpuHotEjectData->Handler =3D EjectCpu; + + // + // The BSP, CPUs to be ejected dereference mCpuHotEjectData->Handler, = and + // mCpuHotEjectData->QemuSelectorMap[] in SmmCpuFeaturesRendezvousExit= (). + // + // Assignments to both of these are ordered-before the BSP's SMI exit = signal + // which happens via a write to SMM_DISPATCHER_MP_SYNC_DATA->AllCpusIn= Sync. + // Dereferences of both are ordered-after the synchronization via + // "AllCpusInSync". + // + // So we are guaranteed that the Handler would see the assignments abo= ve. + // However, add a MemoryFence() here in-lieu of a compiler barrier to + // ensure that the compiler doesn't monkey around with the stores. + // + MemoryFence (); + } + // - // We've removed this set of APIC IDs from SMM data structures. + // We've removed this set of APIC IDs from SMM data structures and + // have installed an ejection handler if needed. // return EFI_SUCCESS; } @@ -387,7 +510,7 @@ CpuHotplugMmi ( } =20 if (ToUnplugCount > 0) { - Status =3D UnplugCpus (mToUnplugApicIds, ToUnplugCount); + Status =3D UnplugCpus (mToUnplugApicIds, mToUnplugSelector, ToUnplugCo= unt); if (EFI_ERROR (Status)) { goto Fatal; } @@ -458,9 +581,14 @@ CpuHotplugEntry ( =20 // // Our DEPEX on EFI_SMM_CPU_SERVICE_PROTOCOL guarantees that PiSmmCpuDxe= Smm - // has pointed PcdCpuHotPlugDataAddress to CPU_HOT_PLUG_DATA in SMRAM. + // has pointed: + // - PcdCpuHotPlugDataAddress to CPU_HOT_PLUG_DATA in SMRAM, + // - PcdCpuHotEjectDataAddress to CPU_HOT_EJECT_DATA in SMRAM, if the + // possible CPU count is greater than 1. // mCpuHotPlugData =3D (VOID *)(UINTN)PcdGet64 (PcdCpuHotPlugDataAddress); + mCpuHotEjectData =3D (VOID *)(UINTN)PcdGet64 (PcdCpuHotEjectDataAddress); + if (mCpuHotPlugData =3D=3D NULL) { Status =3D EFI_NOT_FOUND; DEBUG ((DEBUG_ERROR, "%a: CPU_HOT_PLUG_DATA: %r\n", __FUNCTION__, Stat= us)); @@ -472,6 +600,19 @@ CpuHotplugEntry ( if (mCpuHotPlugData->ArrayLength =3D=3D 1) { return EFI_UNSUPPORTED; } + + if (mCpuHotEjectData =3D=3D NULL) { + Status =3D EFI_NOT_FOUND; + } else if (mCpuHotPlugData->ArrayLength !=3D mCpuHotEjectData->ArrayLeng= th) { + Status =3D EFI_INVALID_PARAMETER; + } else { + Status =3D EFI_SUCCESS; + } + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "%a: CPU_HOT_EJECT_DATA: %r\n", __FUNCTION__, Sta= tus)); + goto Fatal; + } + // // Allocate the data structures that depend on the possible CPU count. // --=20 2.9.3 -=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 (#71919): https://edk2.groups.io/g/devel/message/71919 Mute This Topic: https://groups.io/mt/80819863/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 Tue May 7 20:23:30 2024 Delivered-To: importer@patchew.org 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+71920+1787277+3901457@groups.io; helo=mail02.groups.io; 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+71920+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=oracle.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1613978396747788.498777263765; Sun, 21 Feb 2021 23:19:56 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id IgUFYY1788612xy0oMk2zmek; Sun, 21 Feb 2021 23:19:56 -0800 X-Received: from userp2120.oracle.com (userp2120.oracle.com [156.151.31.85]) by mx.groups.io with SMTP id smtpd.web10.31722.1613978394805808714 for ; Sun, 21 Feb 2021 23:19:54 -0800 X-Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 11M7EsEs062555; Mon, 22 Feb 2021 07:19:52 GMT X-Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by userp2120.oracle.com with ESMTP id 36ugq39fhj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Feb 2021 07:19:52 +0000 X-Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 11M7GSLB067574; Mon, 22 Feb 2021 07:19:51 GMT X-Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2168.outbound.protection.outlook.com [104.47.57.168]) by aserp3020.oracle.com with ESMTP id 36ucawnxq0-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Feb 2021 07:19:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RyuYmAgZfZRTpHHcdlcDMW1jdc+exYTGfnwwCxTO33iYJbIqoVtwhHsH8lW+7uvMMMeFktz1hja0RkFYc+0zxE7n2pCZ6sVSXE5lKI1oAybhYt2JJsFgBlJXQul63IEjVdzpuzDIURYxSlGwKdUMGLhuyysjh9NnwMikfQciiIA5poSY1chYKEPKMH8uirzMmv//Gs9X+O9c1GZLweGjET8l8iIA4y6rSe6rBPTMQa+zzo3u2vymzoK9JKY/CdtXj2zp+KqnixlaR87dKpFYAHrgMKRIqMYSduiMH2ZUwP7bw02JnIMk+bSQG/hvK90GXz99VgsoN9gXnajpFEJW6g== 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=MgpR46G4gEZ1i5F/quRXYVLNsxZpGa9WkQv6hNoH3I8=; b=cWg4Qm/xHtlgI0exzoOrrNYl8ZJqh3aq2N2IeYDGsyD6iSR/47hINlU22wnvUIUjmhtLpmriJETR2ZClMkGm3X+AW0rekqZCivXf3zDLwb991QKvteSnoFsRlpCqAgU4Rr2ABypclc7Kq1lHBE6IuyJ27OTQZFGLky6eIP0R8wdoUJoL+rgXvutDO8DnPPoG3AXh9daEvkDa9rcr378yNCKb7JaeY+U+igGN2+gjQNZofQHLzt5MvbMU0QBlfMb4ubt6X983IbpyvR3KErSfJqWTbqyr0khn/SgQ1Mv9JzkQ2wWrcd2xqs0k6/JDNkkHwNPyZjv0Racq2IAhQT0Q/g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none X-Received: from SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) by BY5PR10MB3922.namprd10.prod.outlook.com (2603:10b6:a03:1fd::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.32; Mon, 22 Feb 2021 07:19:49 +0000 X-Received: from SJ0PR10MB4605.namprd10.prod.outlook.com ([fe80::a021:790:7ce6:6f16]) by SJ0PR10MB4605.namprd10.prod.outlook.com ([fe80::a021:790:7ce6:6f16%6]) with mapi id 15.20.3868.033; Mon, 22 Feb 2021 07:19:48 +0000 From: "Ankur Arora" To: devel@edk2.groups.io Cc: lersek@redhat.com, imammedo@redhat.com, boris.ostrovsky@oracle.com, Ankur Arora , Jordan Justen , Ard Biesheuvel , Aaron Young Subject: [edk2-devel] [PATCH v8 09/10] OvmfPkg/CpuHotplugSmm: do actual CPU hot-eject Date: Sun, 21 Feb 2021 23:19:27 -0800 Message-Id: <20210222071928.1401820-10-ankur.a.arora@oracle.com> In-Reply-To: <20210222071928.1401820-1-ankur.a.arora@oracle.com> References: <20210222071928.1401820-1-ankur.a.arora@oracle.com> X-Originating-IP: [148.87.23.11] X-ClientProxiedBy: MWHPR17CA0065.namprd17.prod.outlook.com (2603:10b6:300:93::27) To SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from prion.us.oracle.com (148.87.23.11) by MWHPR17CA0065.namprd17.prod.outlook.com (2603:10b6:300:93::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Mon, 22 Feb 2021 07:19:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4a67388a-8ca5-430f-09e0-08d8d7023cd7 X-MS-TrafficTypeDiagnostic: BY5PR10MB3922: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: Q4anziotrNaQ/9CJVL22sTb570wuwZk2AMHFRgjKSnlf/w3B5jxknaa17SEZT320XPOeEU6jwnoxKjZYiyf/uSXCEAXwe7xLe04gY2LulRE1H7XqXMybr6haSUdFVeUkHmXGikaN6bBm1uiuAVP60tKvYLRcjbXPTbmhpjKkkA2R6CYkImyjFRTvGj8AYzXi9Va2g2iZZdBG9wzPuiRJ0CTSdOtWdAdUiRYrLWzISdxbbwd+vl9gceINpDZWiqlqynYlro94Bs4VKpiEd/Obaw/8kevGVz2CKF0zqurnmKPUa9FiXxOBEs5xuy2nQ54UfhxWgZga7yA2BuUvDlGwMxaNLqjalx7Js0H0BF6xrSWHMkE1rPPHYmKU0osjY0gSsSBnrHWKTb3tVQBwpArx42STApc+RZJetd+KTqBoX2I+uwQsSoFW4EbSEfuP4Fl0SgROL9oavqLolWYNyQv2QntG5zht1Xo93Hg/vP374t5luZ1yby+Zqv1pEVUx7485lJH+pmaxLy6Q8ELwTbudW6mMbqSksIz3iTdRMqybiR4Na6PKsmOR9GOWEsBnpEYTU5SC7D/o27Omxdyni7F4Ic/5arFw0bHgdQwXc7EgcQ4= X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?27gA4IZ31iXKvE0scfCypzbp+VibftkKVqmWdscH1CSyDgGyKpkAVYWhvt7Z?= =?us-ascii?Q?6dqbLpZepHYMz3dBQW+jJeHQAzT5mgWRK0QipuufMvOLeNI49HYZSDsw9QOR?= =?us-ascii?Q?TM3KjX+MVKp36C5GWlNSNQq7WN/suPZftCJKXEYF2RcFqK/qSfgJkiKy38iK?= =?us-ascii?Q?EQMtkcYFc5Gd3iX0CPGXsw/xPY5i//CO+7YT8zEBhHTtc2e6+kN6H2b7k2+M?= =?us-ascii?Q?rMBqekhwtGL1VwOv9uqvDPwbpp4OOF1bCx+oK2bjSZ+cLkPR3r4J/dGIxLzo?= =?us-ascii?Q?hbEmWK3FFiLZ8OsUnVnEkCXzIiyT45I5G+VxWfuKw520HQShrI5IYStYXpjI?= =?us-ascii?Q?dJc6m3XVwjmZzRI/a8mG+ilDrVKhJpThF/OF95SNSP6rW6bZsoaKHkvkJs+X?= =?us-ascii?Q?Yvm/UKMlGhJrPTNn8BCD5bCe8nzGo/GWl2EIIb9/a7Jj7fvX0FHjr3Ny5mWK?= =?us-ascii?Q?dG/d/WaUawAkKqMkBOwhM8SEZEm6BkwY1ERUmRxlisntNUSheAZcbwLxKVqp?= =?us-ascii?Q?plM2TeTMbBE6cBZtRGkX1VRF0MS4kYE/4f6qldW52on3es4GjDUTiy9/Sv1Y?= =?us-ascii?Q?BU1SgCxXnndMb9rEfRTEKa+WyZh+J2iyQ/VXDY+sw3/CN8tTIu2xDYivdhml?= =?us-ascii?Q?CNfeZKxFkgPFhDFjoVPX3pNG7dpZr/0ey5lKuYnRivQmFp/q+17oXMvE/z3u?= =?us-ascii?Q?vT0KQ9VrFlxS5ZJmvzW03/OlvAmYom7f1ImNJPI3B++h/TMtzHN096OezoYd?= =?us-ascii?Q?TXNcoGYS4sbBBkKPJ4VvEkhHaV1d2BrVglZNXsPG49lhKA5486E7EiMiaUGI?= =?us-ascii?Q?ahqgZ/J+WSIZqZqZuw7AwdWw+PkcqChjf3/nElS120I/fR+rfdoLW3Um6sDz?= =?us-ascii?Q?pvLDiyIVqC9yTLRvgMOZYxMZ7K7n8LAKeDqrO2KOOFH782Ir69ufUC9hYxzl?= =?us-ascii?Q?cUJTZZxZBwAJ20c9mF2cvdiael2zoFNTGYzJa+tg1mgRnR4mtNppwPNw9zcE?= =?us-ascii?Q?NuuAWwT29fCYj5qGF6SrqoSQgmyxclPEs63B/ctJOD1Tj2h8bxs/h9jc4gvU?= =?us-ascii?Q?8Jw8Aj4TaEkJqjn33K9l/ijV8TU4iGSXVlRHO0hFGmUEGjcIIvtcobmoo9Tz?= =?us-ascii?Q?tZvlO9GO07hXW/S9Zt3CtqToS/zWdmCS88MvZSP5+meQF3QaJbbdDBMOc4Mr?= =?us-ascii?Q?WYaMNNCIOsyENI22506fakmWfvi6H1XdmeJsSrMuguBVT6LeZUbH4ji+r8ET?= =?us-ascii?Q?XM7jP64MG7CDM9uAr9Ozkq+MD+ZwnVzVMlAuDLewoABHSezNIgKHgMJSSyIN?= =?us-ascii?Q?xy+x2fZk9sQgZUvPx4L4cjWb?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a67388a-8ca5-430f-09e0-08d8d7023cd7 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4605.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2021 07:19:48.4811 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nhAzVFo94FUIEE+vxwTGNNavbysHH4iLRf79uC/j0OrTQQDc0z4JFEoP0Cjz20Hj4r+O0mmVdyUbpIs+ZvXKjmokp5BRAhTLTfInoJmq5u0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB3922 Precedence: Bulk List-Unsubscribe: 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,ankur.a.arora@oracle.com X-Gm-Message-State: fw63C1ywKOhnQAWumopRYDMFx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1613978396; bh=r0yntYN8QTqOOvBM+AmQjJOGTctr/gLUBzY0j4ajauk=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=Yvvi19OJOTDn0toDXgPOSopuA6GLz0lu+dZLlF/K9JlKpAYQcCUJrvpPKhg7jRiM79C KPETNT6bU84knfIp3W+ahpwprDwtdYQqsQ/WzBaJYrEjd6KlAdZf28lRTCPpJoIRmr4tO 5ylJXt8QG6cZnirWU0TcCHdz1nZIiNq18fM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Add logic in EjectCpu() to do the actual the CPU ejection. On the BSP, ejection happens by first selecting the CPU via its QemuSelector and then sending the QEMU "eject" command. QEMU in-turn signals the remote VCPU thread which context-switches the CPU out of the SMI handler. Meanwhile the CPU being ejected, waits around in its holding area until it is context-switched out. Note that it is possible that a slow CPU gets ejected before it reaches the wait loop. However, this would never happen before it has executed the "AllCpusInSync" loop in SmiRendezvous(). It can mean that an ejected CPU does not execute code after that point but given that the CPU state will be destroyed by QEMU, the missed cleanup is no great loss. Cc: Laszlo Ersek Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Igor Mammedov Cc: Boris Ostrovsky Cc: Aaron Young Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3132 Signed-off-by: Ankur Arora --- Notes: Addresses the following reviewing comments from v6: (1) s/CpuEject/EjectCpu/g (2,2a,2c) Get rid of eject-worker and related. (2b,2d) Use the PlatformSmmBspElection() logic to find out IsBSP. (3,3b) Use CPU_HOT_EJECT_DATA->QemuSelector instead of ApicIdMap to do the actual ejection. (4,5a,5b) Fix the format etc in the final unplugged log message () Also as discussed elsewhere document the ordering requirements for mCpuHotEjectData->QemuSelector[] and mCpuHotEjectData->Handler. () [from patch 2] Move definition of QEMU_CPUHP_STAT_EJECTED to this patch. () s/QEMU_CPUHP_STAT_EJECTED/QEMU_CPUHP_STAT_EJECT/ OvmfPkg/Include/IndustryStandard/QemuCpuHotplug.h | 1 + OvmfPkg/CpuHotplugSmm/CpuHotplug.c | 127 +++++++++++++++++= ++-- .../Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c | 31 +++++ 3 files changed, 152 insertions(+), 7 deletions(-) diff --git a/OvmfPkg/Include/IndustryStandard/QemuCpuHotplug.h b/OvmfPkg/In= clude/IndustryStandard/QemuCpuHotplug.h index 2ec7a107a64d..d0e83102c13f 100644 --- a/OvmfPkg/Include/IndustryStandard/QemuCpuHotplug.h +++ b/OvmfPkg/Include/IndustryStandard/QemuCpuHotplug.h @@ -34,6 +34,7 @@ #define QEMU_CPUHP_STAT_ENABLED BIT0 #define QEMU_CPUHP_STAT_INSERT BIT1 #define QEMU_CPUHP_STAT_REMOVE BIT2 +#define QEMU_CPUHP_STAT_EJECT BIT3 #define QEMU_CPUHP_STAT_FW_REMOVE BIT4 =20 #define QEMU_CPUHP_RW_CMD_DATA 0x8 diff --git a/OvmfPkg/CpuHotplugSmm/CpuHotplug.c b/OvmfPkg/CpuHotplugSmm/Cpu= Hotplug.c index 851e2b28aad9..0484be8fe43c 100644 --- a/OvmfPkg/CpuHotplugSmm/CpuHotplug.c +++ b/OvmfPkg/CpuHotplugSmm/CpuHotplug.c @@ -18,6 +18,7 @@ #include // CPU_HOT_EJECT_DATA #include // EFI_MM_CPU_IO_PROTOCOL #include // EFI_SMM_CPU_SERVICE_PROTOC= OL +#include // MSR_IA32_APIC_BASE_REGISTER #include // EFI_STATUS =20 #include "ApicId.h" // APIC_ID @@ -191,12 +192,39 @@ RevokeNewSlot: } =20 /** + EjectCpu needs to know the BSP at SMI exit at a point when + some of the EFI_SMM_CPU_SERVICE_PROTOCOL state has been torn + down. + Reuse the logic from OvmfPkg::PlatformSmmBspElection() to + do that. + + @param[in] ProcessorNum ProcessorNum denotes the processor handle n= umber + in EFI_SMM_CPU_SERVICE_PROTOCOL. +**/ +STATIC +BOOLEAN +CheckIfBsp ( + IN UINTN ProcessorNum + ) +{ + MSR_IA32_APIC_BASE_REGISTER ApicBaseMsr; + BOOLEAN IsBsp; + + ApicBaseMsr.Uint64 =3D AsmReadMsr64 (MSR_IA32_APIC_BASE); + IsBsp =3D (BOOLEAN)(ApicBaseMsr.Bits.BSP =3D=3D 1); + return IsBsp; +} + +/** CPU Hot-eject handler, called from SmmCpuFeaturesRendezvousExit() on each CPU at exit from SMM. =20 - If, the executing CPU is not being ejected, nothing to be done. + If, the executing CPU is neither the BSP, nor being ejected, nothing + to be done. If, the executing CPU is being ejected, wait in a halted loop until ejected. + If, the executing CPU is the BSP, set QEMU CPU status to eject + for CPUs being ejected. =20 @param[in] ProcessorNum ProcessorNum denotes the CPU exiting SMM, and will be used as an index into @@ -211,9 +239,99 @@ EjectCpu ( ) { UINT64 QemuSelector; + BOOLEAN IsBsp; =20 + IsBsp =3D CheckIfBsp (ProcessorNum); + + // + // mCpuHotEjectData->QemuSelectorMap[ProcessorNum] is updated + // on the BSP in the ongoing SMI iteration at two places: + // + // - UnplugCpus() where the BSP determines if a CPU is under ejection + // or not. As the comment where mCpuHotEjectData->Handler is set-up + // describes any such updates are guaranteed to be ordered-before the + // dereference below. + // + // - EjectCpu() on the BSP updates QemuSelectorMap[ProcessorNum] for + // CPUs after they have been hot-ejected. + // + // The CPU under ejection: might be executing anywhere between the + // "AllCpusInSync" exit loop in SmiRendezvous() to about to + // dereference QemuSelectorMap[ProcessorNum]. + // Given that the BSP ensures that this store only happens after the + // CPU has been ejected, this CPU would never see the after value. + // (Note that any CPU that is already executing the CpuSleep() loop + // below never raced any updates and always saw the before value.) + // + // CPUs not-under ejection: never see any changes so they are fine. + // + // Lastly, note that we are also guaranteed that any dereferencing + // CPU only sees the before or after value and not an intermediate + // value. This is because QemuSelectorMap[ProcessorNum] is aligned at + // a natural boundary. + // QemuSelector =3D mCpuHotEjectData->QemuSelectorMap[ProcessorNum]; - if (QemuSelector =3D=3D CPU_EJECT_QEMU_SELECTOR_INVALID) { + if (QemuSelector =3D=3D CPU_EJECT_QEMU_SELECTOR_INVALID && !IsBsp) { + return; + } + + if (IsBsp) { + UINT32 Idx; + + for (Idx =3D 0; Idx < mCpuHotEjectData->ArrayLength; Idx++) { + UINT64 QemuSelector; + + QemuSelector =3D mCpuHotEjectData->QemuSelectorMap[Idx]; + + if (QemuSelector !=3D CPU_EJECT_QEMU_SELECTOR_INVALID) { + // + // This to-be-ejected-CPU has already received the BSP's SMI exit + // signal and, will execute SmmCpuFeaturesRendezvousExit() + // followed by this callback or is already waiting in the + // CpuSleep() loop below. + // + // Tell QEMU to context-switch it out. + // + QemuCpuhpWriteCpuSelector (mMmCpuIo, (UINT32) QemuSelector); + QemuCpuhpWriteCpuStatus (mMmCpuIo, QEMU_CPUHP_STAT_EJECT); + + // + // We need a compiler barrier here to ensure that the compiler + // does not reorder the CpuStatus and QemuSelectorMap[Idx] stores. + // + // A store fence is not strictly necessary on x86 which has + // TSO; however, both of these stores are in different address spa= ces + // so also add a Store Fence here. + // + MemoryFence (); + + // + // Clear the eject status for this CPU Idx to ensure that an inval= id + // SMI later does not end up trying to eject it or a newly + // hotplugged CPU Idx does not go into the dead loop. + // + mCpuHotEjectData->QemuSelectorMap[Idx] =3D + CPU_EJECT_QEMU_SELECTOR_INVALID; + + DEBUG ((DEBUG_INFO, "%a: Unplugged ProcessorNum %u, " + "QemuSelector 0x%Lx\n", __FUNCTION__, Idx, QemuSelector)); + } + } + + // + // We are done until the next hot-unplug; clear the handler. + // + // By virtue of the MemoryFence() in the ejection loop above, the + // following store is ordered-after all the ejections are done. + // (We know that there is at least one CPU hot-eject handler if this + // handler was installed.) + // + // As described in OvmfPkg::SmmCpuFeaturesRendezvousExit() this + // means that the only CPUs which might dereference + // mCpuHotEjectData->Handler are not under ejection, so we can + // safely reset. + // + mCpuHotEjectData->Handler =3D NULL; return; } =20 @@ -496,11 +614,6 @@ CpuHotplugMmi ( if (EFI_ERROR (Status)) { goto Fatal; } - if (ToUnplugCount > 0) { - DEBUG ((DEBUG_ERROR, "%a: hot-unplug is not supported yet\n", - __FUNCTION__)); - goto Fatal; - } =20 if (PluggedCount > 0) { Status =3D ProcessHotAddedCpus (mPluggedApicIds, PluggedCount); diff --git a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c b/OvmfPk= g/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c index 99988285b6a2..ddfef05ee6cf 100644 --- a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c +++ b/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c @@ -472,6 +472,37 @@ SmmCpuFeaturesRendezvousExit ( // (PcdCpuMaxLogicalProcessorNumber > 1), and hot-eject is needed // in this SMI exit (otherwise mCpuHotEjectData->Handler is not armed.) // + // mCpuHotEjectData itself is stable once setup so it can be + // dereferenced without needing any synchronization, + // but, mCpuHotEjectData->Handler is updated on the BSP in the + // ongoing SMI iteration at two places: + // + // - UnplugCpus() where the BSP determines if a CPU is under ejection + // or not. As the comment where mCpuHotEjectData->Handler is set-up + // describes any such updates are guaranteed to be ordered-before the + // dereference below. + // + // - EjectCpu() (which is called via the Handler below), on the BSP + // updates mCpuHotEjectData->Handler once it is done with all ejection= s. + // + // The CPU under ejection: might be executing anywhere between the + // "AllCpusInSync" exit loop in SmiRendezvous() to about to + // dereference the Handler field. + // Given that the BSP ensures that this store only happens after all + // CPUs under ejection have been ejected, this CPU would never see + // the after value. + // (Note that any CPU that is already executing the CpuSleep() loop + // below never raced any updates and always saw the before value.) + // + // CPUs not-under ejection: might see either value of the Handler + // which is fine, because the Handler is a NOP for CPUs not-under + // ejection. + // + // Lastly, note that we are also guaranteed that any dereferencing + // CPU only sees the before or after value and not an intermediate + // value. This is because mCpuHotEjectData->Handler is aligned at a + // natural boundary. + // =20 if (mCpuHotEjectData !=3D NULL) { CPU_HOT_EJECT_HANDLER Handler; --=20 2.9.3 -=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 (#71920): https://edk2.groups.io/g/devel/message/71920 Mute This Topic: https://groups.io/mt/80819864/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 Tue May 7 20:23:30 2024 Delivered-To: importer@patchew.org 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+71921+1787277+3901457@groups.io; helo=mail02.groups.io; 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+71921+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=oracle.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1613978402296511.562059770293; Sun, 21 Feb 2021 23:20:02 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id OjaYYY1788612xHXLlJ0vjwU; Sun, 21 Feb 2021 23:20:01 -0800 X-Received: from userp2130.oracle.com (userp2130.oracle.com [156.151.31.86]) by mx.groups.io with SMTP id smtpd.web09.32253.1613978396461566180 for ; Sun, 21 Feb 2021 23:19:56 -0800 X-Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 11M7FAU5133303; Mon, 22 Feb 2021 07:19:52 GMT X-Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by userp2130.oracle.com with ESMTP id 36tsuqtku4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Feb 2021 07:19:52 +0000 X-Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 11M7GSLC067574; Mon, 22 Feb 2021 07:19:51 GMT X-Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2168.outbound.protection.outlook.com [104.47.57.168]) by aserp3020.oracle.com with ESMTP id 36ucawnxq0-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Feb 2021 07:19:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B+/0Vw3bOBgGx5tQ35WhfYzIYuayAhIW7PtjIJkTvCJ3x9IVe+ptatJhJCS1jdVeVXyia6XsGgWdXOdGQ4G2BwLbtDowGd3kkpRHg7ihOQ/ZpD7bCUgdVajll7EKIpqXg64jJ2J9iida9MEBL1dcDvHARQXw/MZdszlMVg/8q61ajjdcNEByGyKSi+/Wi38V4OOSVb+NbbVvGdIVkSVT+HAisawt+MIgH7tHuvFzVxYshdi2V/aiX0RrilRCUoeYu091coYhR5jD7oM+Pakx1U8zI1LgLB4N3tP03WwbMyoag1E4lglCg0OKVxry9oj7SHX31Md6giL9Bf7gWbFfpA== 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=9bkWGfoq1y7L5hpHb9XwV6nCkXOVbulHM1KyVz0wRtg=; b=dv+wo3u7+FaeU0aKV3YsWlgqP3SiQa/GShEqUfK9EZrCsh/gS3mt6PJx3Nw0H02n6DUe+8nQPuDkmAcinYDmApoJS90AR15bN3aefuSS++YcveYAyV+YrVDSNfd+HdhU3XpdY5mHNu7mtjtYNfwVuNEbb4VjUI3+P90oWSyAnYjv+hwmGjcEi0Ab5JZlWmIf6/IKAPCIMMLCuhr2VLcIHJcxi8x+HUNOMH/wO0eRUIxZu8BdMkupyT/9NiS3q11+cE56sn4SFl/7g7sMzfVhjK7c1+BuXxaA7xvhbM3vnsGiKY4OC9o7Oq0A9q62O6M84Uz/yXJ7BLZ3eW4rKCzcEw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none X-Received: from SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) by BY5PR10MB3922.namprd10.prod.outlook.com (2603:10b6:a03:1fd::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.32; Mon, 22 Feb 2021 07:19:50 +0000 X-Received: from SJ0PR10MB4605.namprd10.prod.outlook.com ([fe80::a021:790:7ce6:6f16]) by SJ0PR10MB4605.namprd10.prod.outlook.com ([fe80::a021:790:7ce6:6f16%6]) with mapi id 15.20.3868.033; Mon, 22 Feb 2021 07:19:49 +0000 From: "Ankur Arora" To: devel@edk2.groups.io Cc: lersek@redhat.com, imammedo@redhat.com, boris.ostrovsky@oracle.com, Ankur Arora , Jordan Justen , Ard Biesheuvel , Aaron Young Subject: [edk2-devel] [PATCH v8 10/10] OvmfPkg/SmmControl2Dxe: negotiate CPU hot-unplug Date: Sun, 21 Feb 2021 23:19:28 -0800 Message-Id: <20210222071928.1401820-11-ankur.a.arora@oracle.com> In-Reply-To: <20210222071928.1401820-1-ankur.a.arora@oracle.com> References: <20210222071928.1401820-1-ankur.a.arora@oracle.com> X-Originating-IP: [148.87.23.11] X-ClientProxiedBy: MWHPR17CA0065.namprd17.prod.outlook.com (2603:10b6:300:93::27) To SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from prion.us.oracle.com (148.87.23.11) by MWHPR17CA0065.namprd17.prod.outlook.com (2603:10b6:300:93::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Mon, 22 Feb 2021 07:19:48 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 93931eab-db88-4230-30f9-08d8d7023d8d X-MS-TrafficTypeDiagnostic: BY5PR10MB3922: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: F3SEbQiu1n7jqQUf3fnlHEeiaf5OHSZNZ+Y4TsPULq16IKF0kg1K24QIaUfldBUwzU7ZXg/+OUGGHhertCMFfAXIuKRI8k/1cWSpsSW2d/KWrEys79NnON/zbDlshJVM31OaqRHcvFPETd/jeSSZ4Clssh7285dN/86LndAjyLefoYlOZBAfpgcFmPSlVxbjVPVj9d1w0359+EDkT/iwAdQVlQamoB0zRS55CR3IVq1UNJCh5SLQQY1j6OTsLqlNHQAfBCHlgLdR9TkkmRM+1eBu4FQVtXlXQpqQ3CgTptV9UElRBZg2nDJCvQhMMtjxBHsKrbeHX7v41EEUoxCjBaCYmwgxv746IVxo6MRgKMK8xUCk4L9shz/8bvDlVW98tu99CV8un2uJMkWQp90j0uEhNgL06IPU1rQnuzmOVbwPBNLfYnIhmWz2htwdS2FH/dvo2/d443/Cf1CrUi2vzz7DvHxLMWLo0wegHIpXj2FZrs92SSUJoxBdnFhr9qINir/kpuGFGfTYr3ooT9i92ZsCM8R65tOvod3r9LWfy5ofUZAQlykkHoPSyPYTt5JilhSQ4X6rpheGk5afsLF/tOaR+RQ0BZF1RouSCL3MhZg= X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?F3qei1Sb2soyURQDN4q4/Vz/LrOcEUL2Nb0S5UpNr6cyW5pI5Md0PfIeELXL?= =?us-ascii?Q?YDpzgdwZTtvW3HqqvtKdFWoipmX01q11Vf41B3BLX2lPVksl3vCndwmuuxN8?= =?us-ascii?Q?IkzY0AxjUQ6bk4VqVledsKXSvzIAOBh+lhsn64/v3E9ZRcs5SZPi9FTSjYzo?= =?us-ascii?Q?O9uxyqYHmnihyoVxYriBYRIs/c+/FfHieJ8ZKFU6AT3uNzWNGP+gOevNLX+x?= =?us-ascii?Q?MBo4vu+dSOUulZy8amoKPfyQc3yx/TEglv4+EF13Uyny3iQB67RyPd8k0amo?= =?us-ascii?Q?jNlYRREON2MtYx5yV8sj+fgNMLURk2+5ZB752Z7bFDWJ4WVy4G8EElkDt17G?= =?us-ascii?Q?uhmPhGAB1TpMoAdybnkpEWtaef/EKdbIJnOPmi2zeQ74ZRLirtQeZyfsGZTJ?= =?us-ascii?Q?2YZoqiX8ik08XEYcG8gKretGz5rticxtX1Vc7nxbeEe96RRY7TedsPSoIkcB?= =?us-ascii?Q?3SgxGNsv70pdxzFYMe4pYKc2JeqeVC1Emb2/U0oAZ83s16hfURdnwHOqRvNW?= =?us-ascii?Q?O2QExOIU6dYgxNkO/XiM4R6PlRklf//yuhpW2sZOxOJfb5KS6vd/JEx+imZW?= =?us-ascii?Q?JaL16dU88tyDUpQjw2GbEpmOlTEzerIVmwxmJjPgPIuaswb3/L5onhpe+KN/?= =?us-ascii?Q?TwxNXWI83ChE6ALuhqm9UcwRepRRkW+Cd0vyC5T28CvaJCyqUKpuHN5H3p9y?= =?us-ascii?Q?lTTBBOZHAjyKT8s7QSbasf5WOyGi7343qCs+4VCKheqdcekgHA4TEjBVOe2Y?= =?us-ascii?Q?NHPN2v7kNdQXmuey2/X1NH5z/Jx6Gqxoxcgl8fc/bG/RQTO+vkxvmmzSWpta?= =?us-ascii?Q?pBkY6J50zDq7mW8cXi54/n9+JqunvMUjf7rRKFLK31/ioL/KTMI9MvZrP+H7?= =?us-ascii?Q?Jp3CWm1djxFlA1gfDqZtwFeKInED39ClCgIb6pKymq5q/EhKQY2YJActpSkQ?= =?us-ascii?Q?myiDunO5BV9dSLurKaxelKa7pG4Q4jdSZNmQxl2Vo5oPjmaKpF8BVr6sgnw6?= =?us-ascii?Q?yTaCX5HOsPmPvamJS+ivcJBTetOumi843ASbpRbWY39as/yJn3491SggEim+?= =?us-ascii?Q?wTaZVY8Ohu1muHH58Zmf6SYs4dr0TxWCBcrjr929AUhmT1o6tONru4Ldp+iA?= =?us-ascii?Q?NIONISruWlZhKlRund7/uZN8g1ZQbQWV7Kn00EMqP+cl2LxzfyL+vc5uMNFj?= =?us-ascii?Q?crcjMuklVHFFlgSEeqqnmdEsFdiSg1GT/81w4yR/+gXoOJf+PjYcTnv4VoSX?= =?us-ascii?Q?et1l9JLgU4rV70APewb+1l3DgbdgufZWKu0LhNqwiN3y0b43OrjVcVBH49Pq?= =?us-ascii?Q?yAnwby3+h/DhHugH3Qvp3pVn?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93931eab-db88-4230-30f9-08d8d7023d8d X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4605.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2021 07:19:49.6958 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: vnVfv3rKh5PgFx0oksq9CZLlD4rCH7ZI7S2rmBSwrn+GtQJZ/1BuEiJI0B6cAAHmnp3cFzKxZ859FP12JebtbHMhPly3Cafd2VBk6FUGMxQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB3922 Precedence: Bulk List-Unsubscribe: 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,ankur.a.arora@oracle.com X-Gm-Message-State: rc7YC5ShrMGlUwIYUKDJAYD0x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1613978401; bh=N3x2yOWSOdMTpRm8cCr5XqeN199yT5v3M/qfwUK/lIM=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=Hu6jxL2LhuNiyEKQEs50OiL/zWDJVySl6NXaGuKiFUNJFWwJY88R6ndZ0RYdtgU7l6n q8jQ2cRrVB9QI/Bvg8BmgjaTNYQSe/frwB8FlK8e8AvonN3P+5UqFD3zS34iF1S4i2tyO UBLxfIEExUb3c51/VInGRJhUm0SoxPeJymM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Advertise OVMF support for CPU hot-unplug and negotiate it if QEMU requests the feature. Cc: Laszlo Ersek Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Igor Mammedov Cc: Boris Ostrovsky Cc: Aaron Young Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3132 Signed-off-by: Ankur Arora --- Notes: Addresses the following review comments: (1,3) s/hot unplug/hot-unplug/ (2) Get rid of the reference to the made up ICH9_APM_CNT_CPU_HOT_UNPLUG (4,6) Remove the artificial tie in between ICH9_LPC_SMI_F_CPU_HOTPLUG, ICH9_LPC_SMI_F_CPU_HOT_UNPLUG. (5) Fully spell out "SMI on CPU hot-unplug". (7) Emit separate messages on negotiation (or not) of ICH9_LPC_SMI_F_CPU_HOT_UNPLUG. OvmfPkg/SmmControl2Dxe/SmiFeatures.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/SmmControl2Dxe/SmiFeatures.c b/OvmfPkg/SmmControl2Dxe/= SmiFeatures.c index c9d875543205..b1d59a559dae 100644 --- a/OvmfPkg/SmmControl2Dxe/SmiFeatures.c +++ b/OvmfPkg/SmmControl2Dxe/SmiFeatures.c @@ -29,6 +29,12 @@ // #define ICH9_LPC_SMI_F_CPU_HOTPLUG BIT1 =20 +// The following bit value stands for "enable CPU hot-unplug, and inject a= n SMI +// with control value ICH9_APM_CNT_CPU_HOTPLUG upon hot-unplug", in the +// "etc/smi/supported-features" and "etc/smi/requested-features" fw_cfg fi= les. +// +#define ICH9_LPC_SMI_F_CPU_HOT_UNPLUG BIT2 + // // Provides a scratch buffer (allocated in EfiReservedMemoryType type memo= ry) // for the S3 boot script fragment to write to and read from. @@ -112,7 +118,8 @@ NegotiateSmiFeatures ( QemuFwCfgReadBytes (sizeof mSmiFeatures, &mSmiFeatures); =20 // - // We want broadcast SMI, SMI on CPU hotplug, and nothing else. + // We want broadcast SMI, SMI on CPU hotplug, SMI on CPU hot-unplug + // and nothing else. // RequestedFeaturesMask =3D ICH9_LPC_SMI_F_BROADCAST; if (!MemEncryptSevIsEnabled ()) { @@ -120,8 +127,10 @@ NegotiateSmiFeatures ( // For now, we only support hotplug with SEV disabled. // RequestedFeaturesMask |=3D ICH9_LPC_SMI_F_CPU_HOTPLUG; + RequestedFeaturesMask |=3D ICH9_LPC_SMI_F_CPU_HOT_UNPLUG; } mSmiFeatures &=3D RequestedFeaturesMask; + QemuFwCfgSelectItem (mRequestedFeaturesItem); QemuFwCfgWriteBytes (sizeof mSmiFeatures, &mSmiFeatures); =20 @@ -166,6 +175,13 @@ NegotiateSmiFeatures ( __FUNCTION__)); } =20 + if ((mSmiFeatures & ICH9_LPC_SMI_F_CPU_HOT_UNPLUG) =3D=3D 0) { + DEBUG ((DEBUG_INFO, "%a: CPU hot-unplug not negotiated\n", __FUNCTION_= _)); + } else { + DEBUG ((DEBUG_INFO, "%a: CPU hot-unplug with SMI negotiated\n", + __FUNCTION__)); + } + // // Negotiation successful (although we may not have gotten the optimal // feature set). --=20 2.9.3 -=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 (#71921): https://edk2.groups.io/g/devel/message/71921 Mute This Topic: https://groups.io/mt/80819865/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-