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.web08.4833.1615530436464209442 for ; Thu, 11 Mar 2021 22:27:16 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@oracle.com header.s=corp-2020-01-29 header.b=0ZeJGudP; 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 12C68p0B167414; Fri, 12 Mar 2021 06:27:13 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=W4G/9tJMJE8B66m+q8RYiTcxRG8s0I9WhzY+9kdJExs=; b=0ZeJGudP4l4DLmALADS6gAoIBwID+3NpvsmC6M/oghtc4NCscJ8ILxmPrvivE3UoGuFl WoQK08Wqvyl4OPD6oRhZR7g6snHAeTudH8LwY5Xr7b2mb7oYhINA25ylktzR5g/2GlQp qPysS1I3X08Py4iaLLOWdTFlFFRurWdb+DC5w5iKriV92bLtEXiT7IVyrRL+RxyHG0HA VjTfG33Q8piS5wOqS+bkHmM597aIimvMZDBVHQnOuOIYjJW7WGXCO2YbNwr6Coyje9Xe 0vBtC4u7lXYX+nqsQyXO5aWBJwKEDtv9JU+298ydVl+iqbyxNRdS100qz938h69yt0AX xA== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by aserp2120.oracle.com with ESMTP id 3741pmrya7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Mar 2021 06:27:13 +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 12C6PAsM055220; Fri, 12 Mar 2021 06:27:12 GMT Received: from nam02-dm3-obe.outbound.protection.outlook.com (mail-dm3nam07lp2049.outbound.protection.outlook.com [104.47.56.49]) by userp3020.oracle.com with ESMTP id 374kgw3bq3-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Mar 2021 06:27:11 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JXH1FwJkpCS0OgLvae7LzKjgqeQvv8mt+nkW+zq3uOCjwRQubz7gbnrCGukX3idBUtG/we0eVwUueH7fCTaHmQV0DE51lyU4qQA5B/TxeyjpzYipMq0Ii94gJsZJrzJ3e84NUBo4Kq5Px4+/uX73AF1/9DXSbQy5XrZAXE6OSNnEvf3hiZyYV8SBBMKc9HLmW1LojxqfEF+rp2gEzQkx4Uxcv5OJGXpOrPanuSskEMVHAgULuH8fyy94FofTDcFFxY88M+DViJGx6/v0FSNmZU4vJ9OnUSOKXDW0Qx1eUKsUxZkw2l1qtfeNo65Gvh7yX2woZh39V+mAJQTYsUf6Iw== 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=W4G/9tJMJE8B66m+q8RYiTcxRG8s0I9WhzY+9kdJExs=; b=Wx451MEDGZQpMCB1N0ls6itQWrn99Dhfp31VlVQxBOkLOlxrJYxudHXU8/XamrlnpkFt5fjucycIYrVPBv03xOjzmJhBglfS7S2d/fvQzkuu9UxRdRAyAPDVv9eai3WOKbnuf1Zsd2a/xAM38KonOcoyCz9aR3fSNGumUTABrRB+esCUuXfmFmlA4ByDmK3OmpK2oJnFo/DFUZQF+qe98TcbRfJNkmO4YJZxWxfN5GpkySnsgu7qybYLA6hC1hgw0IHP8bXF12azWMbeKFGdRSOGI8MISuycZmimUHFqAEkkRf1570MjMs8f2z8OhVfX+F2ucRV1KBukhczKQKd2Jg== 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=W4G/9tJMJE8B66m+q8RYiTcxRG8s0I9WhzY+9kdJExs=; b=D91Bz8D/YjiG/TgdjALemDu2Fo7Y2g7R0ovHXHkHjj4npUjuJnd/XSX40HJXr5MzgC8Ly9EUGah70gG6cn/5/5Px0PqAquM6Ogc5vIv0DR5bY9+Mvq9scUlH6Du6Hg1UFjV8rFSQ2kPhe4nJYLPw5ir/yq5B4W2aTqtWkkMqHoY= 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 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.3890.24; Fri, 12 Mar 2021 06:27:10 +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:10 +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 04/10] OvmfPkg/CpuHotplugSmm: introduce UnplugCpus() Date: Thu, 11 Mar 2021 22:26:50 -0800 Message-Id: <20210312062656.2477515-5-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:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: da5b5b40-798b-4787-b9d3-08d8e51fddd9 X-MS-TrafficTypeDiagnostic: BYAPR10MB3191: 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: BCL:0; X-Microsoft-Antispam-Message-Info: 99mbkdRbqaYc/5hJK7D0IYH1C71Og9kXgvshatq5kFKTfETWf6j13BXVJfCOMyEZY1F18FUKAGDaAcCTJSOKWjmo9+yTZhHSW5pI+OWex/9Avjp6JLVcQ05ybk2XQwFX1gZnDpB64Y8a5ymbND2jkzOqwIwhOCmq0JWOC5id97KxdKgfGcPH4sKMy2K1J5Jxt47iHaIVNBo48Fgf+4CAn1sF+sSbC7jqmi1idwVX3Qkz6aHSi89dx5dd1nPvF5FoUJZOAhggkq+GGXp38gt6ghF5kwpaQ8NrOqpdRyxwq82PPjUnFjEne0bwZZ+S6OYf5xhN56r6iYnWVLsWL1gnIrIwTKLicXi7xDN1S255TQyiDdPR04/RY8jMvSjB0uedz9U2J1rVlSpktZfzYBwh1O5ZbMI/JEc05zJkIH4VC2g+oAlZ42YGVIIGbUrfx33Xeb+ov2gMD2q+Hn+nO792opH5eeWK/BvgsIaW/vQP8xbfe7WlGkHLB6vcjTrGZzhddjD79iip6jExZlLbzZ+nvb9/7GTwXqTfcpp31aaF2MqqwfDnbdFzJaoh85jrwPyvP1qOND125I+uDsmymGR11622OcY582ZotpFT9BMt1Jw= 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:(346002)(39860400002)(396003)(376002)(366004)(136003)(54906003)(86362001)(4326008)(36756003)(478600001)(66556008)(66476007)(66946007)(316002)(5660300002)(2906002)(6916009)(103116003)(966005)(6486002)(26005)(2616005)(956004)(6666004)(186003)(107886003)(7696005)(16526019)(52116002)(1076003)(8936002)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?8fHl3ViafkL0nEUyxohHrgyhpg+4Uew/iEevT1ErDnQFEvIlPqhnpy0b6J83?= =?us-ascii?Q?nXafwfnxNgnprNC6utepoFh+sQpn556zuHdBHQK3qRhkKmVoJds7LIC5bFWQ?= =?us-ascii?Q?QxyfVybNd3SruPmbjxkm6hl0q5nUJYx0A7OvpsPT8t9Qsr0LPzPhn9/Pny0r?= =?us-ascii?Q?GrtpaZ4A6hw2sEycOVwMBJCsk0Kpn04BcHrJnAfY/M+2zKY6XH5YruA5bdJz?= =?us-ascii?Q?/T9HazFGqWAMpSam5XH3yz1w55ps93mmKPoCB4pqywYT833IXVDyDGXnPy/l?= =?us-ascii?Q?J2gvNG7Hrle6wA66NacfyigYRgsj1NkmqdKmz44V4berSFZ6YgMZHY37C7rO?= =?us-ascii?Q?0DyGkmJNKx8KQWeV9EXb/AFseMKJeffUyD5rZJVt/CAkmBwSTAGZI8kaqtGE?= =?us-ascii?Q?NQxQrgeE3ShKdPpY1cQSbAubpp+J/8a1bbl9ikRv9NVo/XSvYOR38irvO/Uh?= =?us-ascii?Q?UsepEBcQmZ3nyNrTbO6XfyRfvCLgXCa+A7VbeIlosCavEBIlFY2IboVyZDQO?= =?us-ascii?Q?8e+XDyhf5QZd2f4AxtoVygH4U2/4iTZ51Xql+VhTUX6q2/1VtJ+KGpCFDFSN?= =?us-ascii?Q?0qf1WiOH99waNnuR3xXLnOuL4Ej56O+dICrP+WcU8P7UaRfG0wKyHpEzsC6v?= =?us-ascii?Q?wB6lxXHSf26T6oGjhWPsKVBpIwDVc7+ltr+qDqLEYusW1hMaykDP8WRI38f2?= =?us-ascii?Q?rXNFBCbTkuK8uQRwvUrxBKWdvrP1gUVkgE7jvZxrHWgldJUijQ2RFhoxQuUu?= =?us-ascii?Q?JSAKFcQNsCba6ld9Z1Jj9cKYq9AzrWr1U9Nx35rC+tocZy0wC9BYQfe1fASH?= =?us-ascii?Q?96YgN9MIYh8VuslsmATz6+2+YXgTZvr3kVp1MfLWRoqmcRyHc8l/vf/0AxYx?= =?us-ascii?Q?KT3zgeipMnFA9tGaNQXnxqHT81/6pvHPs9eqdmnCjXXIAR7yR/P1vvs+Rbpn?= =?us-ascii?Q?4hOzrqC/2l8P/7xTkHtzoELFnY3/M/k2J/gRhWOI28CD3+QFKAEBcG9LFsxE?= =?us-ascii?Q?VloG/R1VlvgBbZ82MyBh533oWrLQu15To+NhbwrnR9OoSmQqL075/NZqVTx5?= =?us-ascii?Q?ir+NF2M+u7rRcLm8ylfZcTp2cv352jD1Vg1s7Ik1yPw+jLxKjzj7GBUeJLo3?= =?us-ascii?Q?Oc7fYNJLl6NtI3uqCJXfIbX25TspRlNHX2Z/+HW6dlo7x10+vro/sZIV02//?= =?us-ascii?Q?z7gjnSkZP+9ep2n+fFR606Hde+BC5UbPL8cAifdHSg94GpZINZekwlfSI+kZ?= =?us-ascii?Q?NUxvD+YvKj3wwrdvw7qMDWsysUVn+bGyIk8z4VO8PQDhAsRfeOW0xCb7L7kU?= =?us-ascii?Q?tUNerGcwx9vmfxT4u7RPKHa+?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: da5b5b40-798b-4787-b9d3-08d8e51fddd9 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:10.3507 (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: WAoyr17h1360igIJ8aqIDFvDCOX+xrT9dZd5kCMi4xr72viullb5F4YwkavuMDEoLRh1OG2sRVvECcCGkaZghMaJJeiLo4ZF1jN80qCFyF8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3191 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 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=3132 Signed-off-by: Ankur Arora Reviewed-by: Laszlo Ersek --- OvmfPkg/CpuHotplugSmm/CpuHotplug.c | 84 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/OvmfPkg/CpuHotplugSmm/CpuHotplug.c b/OvmfPkg/CpuHotplugSmm/CpuHotplug.c index ee1497b93140..59f000eb7886 100644 --- a/OvmfPkg/CpuHotplugSmm/CpuHotplug.c +++ b/OvmfPkg/CpuHotplugSmm/CpuHotplug.c @@ -190,6 +190,83 @@ RevokeNewSlot: } /** + 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 = 0; + while (ToUnplugIdx < ToUnplugCount) { + APIC_ID RemoveApicId; + + RemoveApicId = ToUnplugApicIds[ToUnplugIdx]; + + // + // mCpuHotPlugData->ApicId maps ProcessorNum -> ApicId. Use it to find + // the ProcessorNum for the APIC ID to be removed. + // + for (ProcessorNum = 0; + ProcessorNum < mCpuHotPlugData->ArrayLength; + ProcessorNum++) { + if (mCpuHotPlugData->ApicId[ProcessorNum] == RemoveApicId) { + break; + } + } + + // + // Ignore the unplug if APIC ID not found + // + if (ProcessorNum == 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 = 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. This is a root MMI handler. @@ -311,6 +388,13 @@ CpuHotplugMmi ( } } + if (ToUnplugCount > 0) { + Status = UnplugCpus (mToUnplugApicIds, ToUnplugCount); + if (EFI_ERROR (Status)) { + goto Fatal; + } + } + // // We've handled this MMI. // -- 2.9.3