From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from aserp2120.oracle.com (aserp2120.oracle.com [141.146.126.78]) by mx.groups.io with SMTP id smtpd.web11.4908.1615530441279466488 for ; Thu, 11 Mar 2021 22:27:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@oracle.com header.s=corp-2020-01-29 header.b=bVdLimQw; spf=pass (domain: oracle.com, ip: 141.146.126.78, mailfrom: ankur.a.arora@oracle.com) 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 12C68vva167464; Fri, 12 Mar 2021 06:27:18 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2020-01-29; bh=SVBy6Dr1CxfbqFJQ//fGo3VS5yVWlGZUKq15HXAWjk0=; b=bVdLimQwqv3b+KqPABUrQ2xMNg55yo+nprTijY1YT+0lYv4pAyfoAc1Ck2SHjJusTXqb aW6iTs9lcbez0GIubYMxkRprfx50viykN9pkk78KOPhxWdRJnpuA+mrDnhaECxYi2chM iX8MnMdR7bejLrDFSBewohy3q9+090u1dGDU90lIgXe2MQWVlBwdn7aOhnqzIVEMqtGm tjCzbE4Y7yWfReM3ZoXnPZLkcklgfIZvEjKDxwdfhL6vDok1EyUy0mbwjfOlgiP1/8sA EXOHGELtM/l7Zvw7Bv4GPGHk0efA7PH+39LBBNXp9GrVtL1ekkeTmzI/0HqqSKmX4s2e 4g== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by aserp2120.oracle.com with ESMTP id 3741pmryaa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Mar 2021 06:27:17 +0000 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 12C6P9bu055196; Fri, 12 Mar 2021 06:27:17 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2109.outbound.protection.outlook.com [104.47.55.109]) by userp3020.oracle.com with ESMTP id 374kgw3bs0-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Mar 2021 06:27:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iB58DLIb+Ix0pwmRJ6czeMWRwNekk/iNhQYk/6yJwYf/86WcsrvHsyLwPv+G3cCIM0gEhAtVxXIA2JG3Oxuz4vD/n5lCv7Db2IqA+oTi45KCgoqa0Z+BEV+JTb8/GYq9TRev4AOL9eBQXHVOkyKA4U/OJRnFNix6/SWTzuN9vL/VGP31Y6OkZfmlFNzpyBgJlXuU8SJfnUyVES5KbKDIUbPw02MpB0c4Y3zqBxVbrZh7NvkV4laDtrR8Y/MhxfPlSFJvP/Vr/1TSBe7ATk/QpA5qodNp+7q6Ac2pAWJ/nRJfKI06DwIzNQp6/kT8I4FxrewpZ939hxUiG7imR9ScZg== 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=SVBy6Dr1CxfbqFJQ//fGo3VS5yVWlGZUKq15HXAWjk0=; b=PH/+9fpTgOuSnhyOKTZtxtclCvOyOAtozhvhpcNxedhLvQYAd47o5xuidy4TOP/Z2qgfLoxS9CNuiSSVmeLB2j7/UyxQbNVuHT7Hwp3FOxPmbwlzx9JACw+hL2XOe4/9+wKFDx6HkVw0KrxK6k4AVuJzOQ6JTrHo0CvY5L3AWZ3WLquGWaC8VAvxpQLa3BNAarsIKdm2bOFsgjGu++5eB9nUwLaGUlO6FvXbXKPG96kuh5g6NbNZCk331Bd3yHV21QppbS2FZba2kR4IQN4GVz2x8ZT/phshGhIVS/fPx6VHZJfjtQk+2vYtRWRh3OkjYPTxzHqc8gnQbTCAnsUUrw== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SVBy6Dr1CxfbqFJQ//fGo3VS5yVWlGZUKq15HXAWjk0=; b=TiVXFHldXq3P4BXhfWBwOVPru1MqygHkpPvyERfLwjMNXikeRVLlDKHMtPcloLs9zdWyY9IW7hEXcTCKPvpYW4dMfpaVYgRePhxlAhyd9hVFsTmCtVPGtcJAqVOANTbvL1ejmHWJuZjyKXPXQnzo5Ou5gv71fmwQ+wacWv6yttY= Authentication-Results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=oracle.com; Received: from SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) by SJ0PR10MB4544.namprd10.prod.outlook.com (2603:10b6:a03:2ad::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.31; Fri, 12 Mar 2021 06:27:15 +0000 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.3912.030; Fri, 12 Mar 2021 06:27:15 +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: [PATCH v9 08/10] OvmfPkg/CpuHotplugSmm: add EjectCpu() Date: Thu, 11 Mar 2021 22:26:54 -0800 Message-Id: <20210312062656.2477515-9-ankur.a.arora@oracle.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210312062656.2477515-1-ankur.a.arora@oracle.com> References: <20210312062656.2477515-1-ankur.a.arora@oracle.com> X-Originating-IP: [148.87.23.12] X-ClientProxiedBy: MWHPR02CA0018.namprd02.prod.outlook.com (2603:10b6:300:4b::28) To SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from prion.us.oracle.com (148.87.23.12) by MWHPR02CA0018.namprd02.prod.outlook.com (2603:10b6:300:4b::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17 via Frontend Transport; Fri, 12 Mar 2021 06:27:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 61f1457d-da2e-4664-94a5-08d8e51fe0c9 X-MS-TrafficTypeDiagnostic: SJ0PR10MB4544: 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: BCL:0; X-Microsoft-Antispam-Message-Info: 6sZsfqf/GUBs3W5NllUgaMh63H5vL2uPN2gpGy35kwtVdsG9iGBO2MYixvVZL7GDNGAzi1yftlg7DcVDHrdvGWD4em2+d/puUuycZ90es81KSP3GOp0bDoGQ6+PxkA9xzkE2+rsS2FuLRc/NOiV44gxNqf2QKOPVFQgdAUMsmbl1IcRnH9UO8J6YrI5AdvHRGwsxPwUNRCIXWf5aZKg8nJt15o/RNkkx7HCjcxJLF9BOh5WIb9T6QXNhFDNO6SBHr4VH7oFW1GPvSbDBKmlZpbCaSE+dT0I3Nz4IIAUmm0xpK8M6m9pdKLtqs/FDj3zDwNeG3rEQBPYO8ac8/kYFCuVCsvOTck+C4F8oZR7c70ektZCT9wfk2pSj7uGjvRCcXjdr0pTeXe3VmbXMQTJOzJDI2aBKfChq24CKot6p7hygVVr6dYES4XBpzk4CqlcO7Xl8eu2v4Z+M0d0YN5K1J/rwjL7N0l0JgzF60oqg5rOp2Lrn0eG1YuQiYZrqJrrR/LRu34Aq5/BEUplvXYvwD5eswOQ3M28i1uYGOoP1u/mUWkmWC9mlbc199yxCIgWHjwgpAU6vgWhsC//IwtNfZXu85d1AGOJgQ2gm/FebfMlO8+N0VfcQhkBOz+37EvTtdGkFWPmVCdEK/QA2IwKQ6Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR10MB4605.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(396003)(366004)(39860400002)(136003)(346002)(376002)(956004)(83380400001)(1076003)(26005)(2616005)(6666004)(30864003)(107886003)(6486002)(6916009)(66946007)(7696005)(4326008)(5660300002)(103116003)(66476007)(86362001)(36756003)(8676002)(66556008)(316002)(2906002)(478600001)(966005)(54906003)(16526019)(8936002)(52116002)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?ZlBGd//bAKhVIobsiIl/ADmiHnyBEsBZ2ilerrPytTUyg9mmF79lXfPsoQxS?= =?us-ascii?Q?kXj69DgKf0HKw7OxgOTX4L4sBIozavu1DjY91oEzgcrPlhOvTjzSdA32p/MW?= =?us-ascii?Q?UXhmMi2Sb2vG0m1qS6P5eEPabP8l6eAyWzrbvr9ZDVYvnr5nu5Y5EWl4qzyO?= =?us-ascii?Q?ezxUnjEOhmz3v/CPyzaPe3SK8wbEAb59vyASSVKVsPViqV+sPNTQDMTeU9MW?= =?us-ascii?Q?cnFotjf818oA8b12pN9pC1hIY9PSwzzE0yeMar2xllFs90xFMk+HU7Oq/vz1?= =?us-ascii?Q?6Bg56tfR4+IrWPXeVZkyqK0h3FhZBwyz5fJ5R16q0OtJkNI/Z7AQ1Xqljiol?= =?us-ascii?Q?6pS/MmDBn9ow0dEtX45bRVuPoXnIu4D+9XbqJVoYSnP51OFMxo1B1JyMeCDw?= =?us-ascii?Q?LX3eZNShWSKbE9KFHfDDcCWlz8oSF+6zmSljzVKi5B5Q3LLaOE+g2/XJzhYD?= =?us-ascii?Q?dZttDmLFPS/KpgyG2FYv33vpn0jYb3c71+mvS+Zh81wdK5vgV1b3Uz6VCMLw?= =?us-ascii?Q?4KHQDhifbvKsm1Yulj2zQ57ZIH4LECE7u5bQoxKKXJgDzlOl5FM/NDnQMzbX?= =?us-ascii?Q?v+DyZ5BBBf/lBu1CsqyFKQ9FvKgdKV8nsK2RcXVmvdtqwqg3wp2Pxnjfi+re?= =?us-ascii?Q?Ld6c1a6/SDaPXQzx7BiZ8xn+IN9EqaM10wTzoTVY1gtK2WeGtggWs1RjmDHj?= =?us-ascii?Q?ccw8nF6YIz+/eJiyL4kBLqufbMK/SkJ95WmmxDFsdqd0J+lpCnpEowvl9Jvg?= =?us-ascii?Q?G68DxIij6vfejJxRzNhBGPsJLQC9tE3lqFt5wt0A5I/8JnuOpP3dkuqXNpZf?= =?us-ascii?Q?5ncp1kMhZezfg5QWPHtK0+BoBDw91ph/V6BwZZu1jTa7vS1hBlam0MiSgM3D?= =?us-ascii?Q?+yRhEKG6j9UB4NoftxlHUwu/rikg8GMZK123pSkTFHENcyHY35rTXMeVgiNV?= =?us-ascii?Q?ke2E/d8DdEd+nDfen1mIP8dYJWISL7J0AGzH7Tuu+XwEPN+t0xLY/Xh8rS/B?= =?us-ascii?Q?b5/wfcd/cjsSHEue9MYUxUwnJlTY6kWTOkOMvYKQDga7QxSylCQ3aFnqd5uu?= =?us-ascii?Q?3fPnf3rfx2L6mhBNfjNf5go2o5czCUUXeq9YuQMLjfBwvfFlCxN31dPOM1P3?= =?us-ascii?Q?w+FEKc76ioNLjsYi4on9JpPDMUt7lKQemFWv12NxDFWWKqGV/5fXzyuk+Teq?= =?us-ascii?Q?dWUToyzD3SP+SxcL0tc9Z4lXW/oyiVrYFzqwCRd6MwS3h5IxrXZ6/M9u/ga1?= =?us-ascii?Q?MWEL00U8hdRjn6Ri6yyuIhEB1YMlLTlyunBqDYZ50merA38JaK16PcjvjcS4?= =?us-ascii?Q?Tatadnta34+5gtW4sKHlc/3K?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 61f1457d-da2e-4664-94a5-08d8e51fe0c9 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4605.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2021 06:27:15.2661 (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: 8iq/lJaeIEVssGcLz0hV9lfW7s7NNrtWLE/Pt7k5/sRxBbNvGzeaPpa1FCoXxBz1HadQtvlf4OdXWSQUu/J8wrIptjLkODymZw6zBZ1WgRY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4544 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9920 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 adultscore=0 malwarescore=0 bulkscore=0 suspectscore=0 mlxscore=0 mlxlogscore=999 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2103120044 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9920 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 bulkscore=0 mlxlogscore=999 adultscore=0 impostorscore=0 suspectscore=0 clxscore=1015 malwarescore=0 priorityscore=1501 phishscore=0 spamscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2103120043 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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=3132 Signed-off-by: Ankur Arora --- Notes: Addresses the following comments from v8: (1) Fixup the coment about UnplugCpus() to reference stashing QEMU Cpu Selectors instead of APIC IDs. (2) s/ToUnplugSelector/ToUnplugSelectors/ (3) Use plural for APIC ID in comment describing retval EFI_ALREADY_STARTED. (4) Fixup indentation in check against CPU_EJECT_QEMU_SELECTOR_INVALID. (5) Clarify comment: - // never match more than one APIC ID and by transitivity, more than one - // QemuSelector in a single invocation of UnplugCpus(). + // never match more than one APIC ID -- nor, by transitivity, designate + // more than one QemuSelector -- in a single invocation of UnplugCpus(). (6a) Remove unnecessary UINT64 cast for mCpuHotEjectData->QemuSelectorMap[ProcessorNum]. (6b) Switch from 0x%Lx -> %Lu for QemuSelectorMap[ProcessorNum]. (6c) Switch from 0x%Lx -> %u for QemuSelector (7) Switch to "return EFI_ALREADY_STARTED". (8a) Replace "QemuSelector 0x%Lx" with "QemuSelector %u". (8b) Replace the mCpuHotEjectData->QemuSelectorMap[ProcessorNum] argument with just QemuSelector in DEBUG call. (9) Clarify comment and make the language complementary to that in patch-7 Explicitly mention release memory fence. OvmfPkg/CpuHotplugSmm/CpuHotplugSmm.inf | 2 + OvmfPkg/CpuHotplugSmm/CpuHotplug.c | 154 ++++++++++++++++++++++++++++++-- 2 files changed, 148 insertions(+), 8 deletions(-) diff --git a/OvmfPkg/CpuHotplugSmm/CpuHotplugSmm.inf b/OvmfPkg/CpuHotplugSmm/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] [Pcd] gUefiCpuPkgTokenSpaceGuid.PcdCpuHotPlugDataAddress ## CONSUMES + gUefiOvmfPkgTokenSpaceGuid.PcdCpuHotEjectDataAddress ## CONSUMES gUefiOvmfPkgTokenSpaceGuid.PcdQ35SmramAtDefaultSmbase ## CONSUMES [FeaturePcd] diff --git a/OvmfPkg/CpuHotplugSmm/CpuHotplug.c b/OvmfPkg/CpuHotplugSmm/CpuHotplug.c index 59f000eb7886..2eeb4567a262 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_PROTOCOL #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 events (of // known event types), for the time of just one MMI. @@ -190,18 +193,71 @@ RevokeNewSlot: } /** + 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 = mCpuHotEjectData->QemuSelectorMap[ProcessorNum]; + if (QemuSelector == CPU_EJECT_QEMU_SELECTOR_INVALID) { + return; + } + + // + // APs being unplugged get here from SmmCpuFeaturesRendezvousExit() + // after having been cleared to exit the SMI and so have no SMM + // processing remaining. + // + // Keep them penned here until the BSP tells QEMU to eject them. + // + for (;;) { + DisableInterrupts (); + CpuSleep (); + } +} + +/** 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. + EFI_SMM_CPU_SERVICE_PROTOCOL and stash the QEMU Cpu Selectors for later + ejection. If the to be hot-unplugged CPU is unknown, skip it silently. + + Additonally, if we do stash any Cpu Selectors, also install a CPU eject + handler which would handle the ejection. @param[in] ToUnplugApicIds The APIC IDs of the CPUs that are about to be hot-unplugged. + @param[in] ToUnplugSelectors The QEMU Selectors of the CPUs that are about to + be hot-unplugged. + @param[in] ToUnplugCount The number of filled-in APIC IDs in ToUnplugApicIds. + @retval EFI_ALREADY_STARTED For the ProcessorNum that + EFI_SMM_CPU_SERVICE_PROTOCOL had assigned to + one of the APIC IDs in ToUnplugApicIds, + mCpuHotEjectData->QemuSelectorMap already has + the QemuSelector value stashed. (This should + never happen.) + @retval EFI_SUCCESS Known APIC IDs have been removed from SMM data structures. @@ -212,23 +268,36 @@ STATIC EFI_STATUS UnplugCpus ( IN APIC_ID *ToUnplugApicIds, + IN UINT32 *ToUnplugSelectors, IN UINT32 ToUnplugCount ) { EFI_STATUS Status; UINT32 ToUnplugIdx; + UINT32 EjectCount; UINTN ProcessorNum; ToUnplugIdx = 0; + EjectCount = 0; while (ToUnplugIdx < ToUnplugCount) { APIC_ID RemoveApicId; + UINT32 QemuSelector; RemoveApicId = ToUnplugApicIds[ToUnplugIdx]; + QemuSelector = ToUnplugSelectors[ToUnplugIdx]; // - // mCpuHotPlugData->ApicId maps ProcessorNum -> ApicId. Use it to find - // the ProcessorNum for the APIC ID to be removed. + // mCpuHotPlugData->ApicId maps ProcessorNum -> ApicId. Use RemoveApicId + // 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 (where + // we only have ProcessorNum available.) + // + for (ProcessorNum = 0; ProcessorNum < mCpuHotPlugData->ArrayLength; ProcessorNum++) { @@ -257,11 +326,62 @@ UnplugCpus ( return Status; } + if (mCpuHotEjectData->QemuSelectorMap[ProcessorNum] != + CPU_EJECT_QEMU_SELECTOR_INVALID) { + // + // mCpuHotEjectData->QemuSelectorMap[ProcessorNum] is set to + // CPU_EJECT_QEMU_SELECTOR_INVALID when mCpuHotEjectData->QemuSelectorMap + // is allocated, and once the subject processsor is ejected. + // + // Additionally, mMmCpuService->RemoveProcessor(ProcessorNum) invalidates + // mCpuHotPlugData->ApicId[ProcessorNum], so a given ProcessorNum can + // never match more than one APIC ID -- nor, by transitivity, designate + // more than one QemuSelector -- in a single invocation of UnplugCpus(). + // + DEBUG ((DEBUG_ERROR, "%a: ProcessorNum %Lu maps to QemuSelector %Lu, " + "cannot also map to %u\n", __FUNCTION__, (UINT64)ProcessorNum, + mCpuHotEjectData->QemuSelectorMap[ProcessorNum], QemuSelector)); + + return EFI_ALREADY_STARTED; + } + + // + // Stash the QemuSelector so we can do the actual ejection later. + // + mCpuHotEjectData->QemuSelectorMap[ProcessorNum] = (UINT64)QemuSelector; + + DEBUG ((DEBUG_INFO, "%a: Started hot-unplug on ProcessorNum %Lu, APIC ID " + FMT_APIC_ID ", QemuSelector %u\n", __FUNCTION__, (UINT64)ProcessorNum, + RemoveApicId, QemuSelector)); + + EjectCount++; ToUnplugIdx++; } + if (EjectCount != 0) { + // + // We have processors to be ejected; install the handler. + // + mCpuHotEjectData->Handler = EjectCpu; + + // + // The BSP and APs load mCpuHotEjectData->Handler, and + // mCpuHotEjectData->QemuSelectorMap[] in SmmCpuFeaturesRendezvousExit() + // and EjectCpu(). + // + // The comment in SmmCpuFeaturesRendezvousExit() details how we use + // the AllCpusInSync control-dependency to ensure that any loads are + // ordered-after the stores above. + // + // Ensure that the stores above are ordered-before the AllCpusInSync store + // by using a MemoryFence() with release semantics. + // + 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; } @@ -389,7 +509,7 @@ CpuHotplugMmi ( } if (ToUnplugCount > 0) { - Status = UnplugCpus (mToUnplugApicIds, ToUnplugCount); + Status = UnplugCpus (mToUnplugApicIds, mToUnplugSelectors, ToUnplugCount); if (EFI_ERROR (Status)) { goto Fatal; } @@ -460,9 +580,14 @@ CpuHotplugEntry ( // // Our DEPEX on EFI_SMM_CPU_SERVICE_PROTOCOL guarantees that PiSmmCpuDxeSmm - // 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 = (VOID *)(UINTN)PcdGet64 (PcdCpuHotPlugDataAddress); + mCpuHotEjectData = (VOID *)(UINTN)PcdGet64 (PcdCpuHotEjectDataAddress); + if (mCpuHotPlugData == NULL) { Status = EFI_NOT_FOUND; DEBUG ((DEBUG_ERROR, "%a: CPU_HOT_PLUG_DATA: %r\n", __FUNCTION__, Status)); @@ -474,6 +599,19 @@ CpuHotplugEntry ( if (mCpuHotPlugData->ArrayLength == 1) { return EFI_UNSUPPORTED; } + + if (mCpuHotEjectData == NULL) { + Status = EFI_NOT_FOUND; + } else if (mCpuHotPlugData->ArrayLength != mCpuHotEjectData->ArrayLength) { + Status = EFI_INVALID_PARAMETER; + } else { + Status = EFI_SUCCESS; + } + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "%a: CPU_HOT_EJECT_DATA: %r\n", __FUNCTION__, Status)); + goto Fatal; + } + // // Allocate the data structures that depend on the possible CPU count. // -- 2.9.3