From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=pass header.i=@oracle.com header.s=corp-2020-01-29 header.b=XLXYflAp; spf=pass (domain: oracle.com, ip: 141.146.126.79, mailfrom: ankur.a.arora@oracle.com) 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 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=+3bXinEZ60WMWrmk1NDiDkwT8uTwh3vAxcj3qYBEanA=; b=XLXYflApdRQjK+22V4i0f6pthPnwNg3WWqGJDW1wcNosfIz2nhHxdIGex6AvLPLiTOrU aRlvxkB+h/Q2aLLJvNSIfERFC4PN4zRDwRTHLVUKJMSbrukF4rYRfEGfueyKkcUvHu3Z OZHR9TqsJDJQZwX4jQqpMqOCDZCTSUJJ/ztrhZe3L3pCOik0RuoJEARw5OB97tkOgiAM uh9A6buOUYrCfhHyL/rfEqAhey1f6mrcwf66BbxO6f0VVlfrURdL90c3rQ+Wj75G0ihm KtvEnmVe/hSzdp/Xw87HON2buGsMJaOsRFwgXl5ZTm3N3o+CpMcrG1TW82loPE0rEFWA UQ== 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 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 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 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=+3bXinEZ60WMWrmk1NDiDkwT8uTwh3vAxcj3qYBEanA=; b=VZqjGcguQFoTfcDZsG9nl1Av/sYz8kLLYACI6TclFrtL+/k2x/XwG0n1KHeyaEaK7SAbBdxBAPICBOpgl4Kv6H67Yb3geS837U6Iv47VxgYf+Em15ckB57ovKSlfggpO8nb3QWmJGvwb7fNOAfZI5oeBh9JltyodCxA1lrOOYYM= 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.3868.29; Mon, 22 Feb 2021 07:19:43 +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.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: [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> X-Mailer: git-send-email 2.29.2 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 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: BCL:0; X-Microsoft-Antispam-Message-Info: s6PDVrpDN9GWEokHfYLJge7YXcWTzlq7gbByVYJSWSUBV8ZELGjhsbJhp9MApgtY3Z0elkwhGk74LwJ6SeDPZaIK5JuBeYZMWKFzVFmCwwWy/K3wNITR4KDZi05iP8jqn66LFy3pm66wux0VO0JjeYa15Ii1ZadrgGutKBTg8GdH768ZgAkr4Xr378tC/UscqD01DwnJgnb2M6+DtLgpAp2GlOc9g9Tz+WeUtIUcfSEoGgUFc/hEFFRX1W5DbuwCGFPNqfx07MICls2JSf69B761Z5MBfkMDCztXTppqsMByfIdTuxmasF++jhnEVjfxIF7i3bYkW0WhaXB8lAB4xlPNtJB9EHBwNCQhXfIK9DYAGaYkF8u5+SzdTB4GEpeFTXQl4m96ZZXTAq9xJNeCeqGzSdMUPSDwZbg0KM7RX2NfzVL4EX1KZuOjwmwD4n5gbXy0ZpqsLZCnXOht8MXVA1xCrkWEzkpxh1960yZlV6GyMOB1s2zf5SE17xuQaSOens9IuW2jlPaHjFyPeeDZ9uQalYwVe61cLvdV/z7e1VWBcfiKbkp6JJ3LSBpZKTLb/M7vfwEBfzuZYDDXomyBaW9EgjDC9Exp/FJ8J0C3iVk= 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:(39860400002)(136003)(346002)(376002)(396003)(366004)(2906002)(8936002)(54906003)(316002)(83380400001)(478600001)(86362001)(8676002)(6916009)(6486002)(2616005)(186003)(16526019)(956004)(26005)(107886003)(5660300002)(7696005)(52116002)(66946007)(6666004)(66476007)(66556008)(36756003)(1076003)(4326008)(966005)(103116003);DIR:OUT;SFP:1101; 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 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9902 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 phishscore=0 spamscore=0 suspectscore=0 bulkscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2102220064 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9902 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 impostorscore=0 phishscore=0 mlxlogscore=999 malwarescore=0 clxscore=1015 suspectscore=0 lowpriorityscore=0 bulkscore=0 adultscore=0 priorityscore=1501 mlxscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2102220064 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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=3132 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 UINT64. 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 + ## 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|0x1c gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderMmioTranslation|FALSE|BOOLEAN|0x1d diff --git a/OvmfPkg/Include/Pcd/CpuHotEjectData.h b/OvmfPkg/Include/Pcd/CpuHotEjectData.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 -> QemuSelector + // 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_ -- 2.9.3