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.web09.6097.1613725505888869563 for ; Fri, 19 Feb 2021 01:05:06 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@oracle.com header.s=corp-2020-01-29 header.b=zptAF/Ka; 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 11J93veV178541; Fri, 19 Feb 2021 09:05:02 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=zptAF/KaJ7ebIHY8j3IRiydIep/zm6sYaNlb3rutXCeYuNry8gZR+2U/2yudLZDwQXtG au32N00bayYlhTQRGJ6ta4cEnPLGnaxt0hePM29c0rpk97G+YaRnwGFkdoBcyC0Xoop1 /vXNuiWfuW92qA269wyUOZl3dLsdoTi+Tt9/0Te+U9UYpqSxiCxEmvvjxNWJa3yBNcJ8 s9BvdIhGTMSRwboDbkSNBdK9k1Jgt0jWeDngGmnjlq50RWHdN9Yr5K2IyfNfb/4zn+uF ASl2hB5jmDMrPzVTZC0273+8Ix1Ex0PGXjBh3TJoJ9o1FVHZ2yGXxprayeaXbjj0XDds sw== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by aserp2120.oracle.com with ESMTP id 36pd9ag89s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Feb 2021 09:05:02 +0000 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 11J8uJSG131491; Fri, 19 Feb 2021 09:05:02 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2177.outbound.protection.outlook.com [104.47.55.177]) by aserp3020.oracle.com with ESMTP id 36prp2pa12-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Feb 2021 09:05:01 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BYK+xL6JGcNPMiYPF6xz2BkXaNBlTf2v0yTGDcnD0qzbUHpc1MbHJDpaktjAKjerooQVQ351XOSn8j0L36b8Uuva4T8uGppOHqUL85I4gOugxWtO5w0AjOQiaqW9vgZ0Ayt4eP8A6fJTkDqFjFpkd3Ta6xvdW54XdQn+WQ6ny0XRjMVojD6jp9KxJ1JGdD0qkVN7dhfFmaQXJDx0lx76RYNHRkKtxg+X6IgpriBS32uFsY6JEI3/zIgQKjx56RVGnRWvnEG9zOtBiN/W+zk9p4Y8qIo/mMJkmLYqRJXlY8+j9Yt7kOdyccQulEr0f6e59cL+vIN4mqyftim2ytT0yw== 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=VXvtoF+SKmGDItyPH0Kdn/0KjjYX0MqdyX+0VPs0ahxDh0Nd1BTIQzwSkmkrheWHWBQKfL4nB0dxkXjyVAZX2WtgBdLlacOS3yu4W+WzgWdHeNzWhrngjw6002RjW/plqSr19naIyiUaivF20OWCthW1bEUeuNAhc3B8bWeHyX1oi0u5ex18RiZyx11OEKp1HLYkZ3+x1nlHvjwZAHyTOvzEiUHMYPHrEVr5PAgRgCTrVLTfaPGAT4DSU/U48wehwzgcRCxUwZVvSpweQIH/z3SbJFyY20Iez2Q/WyFd/Wio/NT7gQFKLJ+xhp0ulBLZUM9ecjWAHVcXvQ7DMKXPGA== 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=M8wYlr7dIA1DB7o5i+z0qI5ggdOWUhSUX9cN4G9FNQyh1gnQnKX40l+PcKnWRP0MUFxQXSxLA8MeulueF/D+aE2WIDcqCdJLttQ+GNNztfO4QdD90LU93xW4qP24SZwgAagLCstZr0un1+XqSWTCVSzdfMDwjfUBbAMkDaOGKuA= 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 BYAPR10MB3605.namprd10.prod.outlook.com (2603:10b6:a03:129::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.27; Fri, 19 Feb 2021 09:04:59 +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.029; Fri, 19 Feb 2021 09:04:59 +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 v7 05/10] OvmfPkg/CpuHotplugSmm: define CPU_HOT_EJECT_DATA Date: Fri, 19 Feb 2021 01:04:39 -0800 Message-Id: <20210219090444.1332380-6-ankur.a.arora@oracle.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210219090444.1332380-1-ankur.a.arora@oracle.com> References: <20210219090444.1332380-1-ankur.a.arora@oracle.com> X-Originating-IP: [148.87.23.5] X-ClientProxiedBy: MWHPR13CA0004.namprd13.prod.outlook.com (2603:10b6:300:16::14) 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.5) by MWHPR13CA0004.namprd13.prod.outlook.com (2603:10b6:300:16::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.8 via Frontend Transport; Fri, 19 Feb 2021 09:04:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 21165d02-4107-4184-4f10-08d8d4b56f64 X-MS-TrafficTypeDiagnostic: BYAPR10MB3605: 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: t2fWglAegj2AuUG03YG+WfvAmSFTTbElcLj9SJ2tfvMWsnt2lKdzj5kmmw/KjRPYll+6T+l6oUPaWOgyAflm+mm8sy6IJWTV5QyKA9KlMPLxxbFGa6aD5lPTJJmuBoEToTMjRdTUyM1qMsR3KZfXAqwEqc7/vr0ntFsAjxICQIv8lQNCNUHknlgQncySmznQOAUKAVQTcO5qR2c9dPrpsp0cpJvAQCz0p8fyjYidny3P+80nmpGroFws9QH8adzW3kLX+3kNsE/nRMb3CTae3ARY6G60Ey8cCqZw39vIkUKrkp5k/pqmwaK68mZBI5Y9tRLA2oFA5CyZik1hQTbqCA/3ZU+MFKYr8kM+2To0354wsaVP5cq9VcHIXZA1lKscdV5mZtCBGfCXYvnFWuPTiAhSQuSF2LIrAU77pr309Ag6MODD+HnbruAUA6fFAbwhAVpOLzOpqAIAToCLxOn2miN0X8fI3jqdCZj7ne0VU1DiZ94hQvOGqOeI7Gz0VgHfnjavfZP1TaGsRKEZXeFn4Epzezf/5ENl+t0eQdG3o8FlRy6eJMQJCEa33N1d2hBCrQ78cMQJYGiZWbmSXxEDEJTC4coZpAXzZGNLrGDGfxA= 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:(366004)(376002)(39860400002)(346002)(396003)(136003)(83380400001)(7696005)(66946007)(2616005)(66556008)(6486002)(36756003)(86362001)(316002)(6666004)(54906003)(966005)(8676002)(66476007)(52116002)(478600001)(956004)(4326008)(5660300002)(6916009)(8936002)(2906002)(107886003)(1076003)(186003)(103116003)(26005)(16526019);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?FAAi7oDKzvmm8HhNgGoetQ83k+NMAsE6WUisZLWxdwMzAgQEh3prnK/yZcKn?= =?us-ascii?Q?8J3EhYn995bfq3cQI6n5BW4oa+ij52bsgtVG5GvsnxHJyPSy5CROAbe1vBMv?= =?us-ascii?Q?9k4K6cNPfLSFGc9TtKMaJG9RsCocIH186ve1s6dvvIHgDU6aFCDwnKEZ9BvH?= =?us-ascii?Q?ix93dz6uzNUQ0+Nu/fZAUZZXtaqrfWx7Ft3oQC8W3qdeOUIwODIlD0A16pUb?= =?us-ascii?Q?7s0xKGdsTXGkCGr/8yQSqX1X8rih4Xdn1QRzZmHdGQhhaRfIbEfWZzyBOEZa?= =?us-ascii?Q?GYaW+Yn1t+jEe8iORMjL6Ttt8MrBw6hd9OunYFqsN0/mQcvyKszZ89JPWDfd?= =?us-ascii?Q?WvVDIBTHBLtVmT8MBIWMd6gDA/mqSVAqukHKxg7+Unp5UW0g4v3VRkKv8rF2?= =?us-ascii?Q?WZ1aooVdeW//wqbYwbENogwxFVn4ugxOO6ATFRLmc9X/cf4XHXAHm39mF5v3?= =?us-ascii?Q?Q99TeTzKTdEvnimx0bPfqb6NAnylFxK7Aj3LJeNRpSFMiGo1taysxuUe2yfn?= =?us-ascii?Q?INTEKp3GZHhEfKhqKqKe19s8r0t045pLss74e5ypBzqX/Z4PMWK6SkAs1/vc?= =?us-ascii?Q?OPQWMM4sEAqrxovYPBG+XoM0h8r5QoWNVaCWX2viXaUySKpNF4FLPKFQgnhq?= =?us-ascii?Q?16h0LHjGMCxr460PcxHHxwG/hNwBOydlHQ7HC2OJSbDtG5Og2aSEfkbMJVvx?= =?us-ascii?Q?Se4U08tvziSeYoR9gxqqGApeCRvYTrJiHv7BjWfaLcrIhb0/0RB+Xf2mRN2n?= =?us-ascii?Q?s5mVJDD2iMdXDFgARm1gHQlAywRENbnNyNn1eanSMlHEyFBY3l9SAcG5drLm?= =?us-ascii?Q?gEWs3AV7VEzt+/rGNMFP37oJXBoc2tyk27JbEK8Z8rU7N8laJy98iyBowfFK?= =?us-ascii?Q?tjh3y0uRi0qNNmae1GdYFTy6eRlDA4Af8LThT8YNaWiMa+BNw+NHYYZVmQSr?= =?us-ascii?Q?FpCP5FfZ4Lcp4JqHFiKuXdpseYPmnAxTBTg2CEIDS/Qx9hG+oZndZYq5QLA+?= =?us-ascii?Q?z8tya7hH4yvTGE3mhdQrYQGKbbQEPSVxGp/dIcR7a9ruL+vZM0lSHH6T2JIZ?= =?us-ascii?Q?4lNpsQGZhu80WqrNaXioPplY3pM5P5WFX5kBESrW4xTBLGkGrS/PrkIhTW4x?= =?us-ascii?Q?cgKqBJRd0x8t9+4DvIptJjPlTBPpHIQL0TcHoCNvKPJR1YxEwVwHAhGbN5PZ?= =?us-ascii?Q?/pmhwJP8XA6pCYNNa2RG7AhpWA1Bm+swNASsY9JqzVdlGK3nZcqh/LLlvFU+?= =?us-ascii?Q?iGwp+JA6GDtIYwa4cPx0V2Dlz8RrxUZbAxJKX7AmtqCg8hCs0wy9taOuTdjm?= =?us-ascii?Q?fG1rJ9MNyrZqAStjtbjyYfeM?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21165d02-4107-4184-4f10-08d8d4b56f64 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4605.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2021 09:04:59.7790 (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: QLwoePifVPhmLu1CtRAuzzCFUZEOj535Vb7HZSnHWIOr94QOsJEBJsLrbCX73dPJyBjPGc0UBo1CZy4YAUO4Hav8TL5QyXEcdHTxEWbhIwI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3605 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9899 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxlogscore=999 bulkscore=0 suspectscore=0 spamscore=0 malwarescore=0 mlxscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2102190070 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9899 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 clxscore=1015 impostorscore=0 mlxscore=0 phishscore=0 mlxlogscore=999 spamscore=0 bulkscore=0 priorityscore=1501 malwarescore=0 suspectscore=0 adultscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2102190071 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