Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Eric DeVolder <eric.devolder@oracle.com>
To:     linux-kernel@vger.kernel.org, x86@kernel.org,
        kexec@lists.infradead.org, ebiederm@xmission.com,
        dyoung@redhat.com, bhe@redhat.com, vgoyal@redhat.com
Cc:     tglx@linutronix.de, mingo@redhat.com, bp@alien8.de,
        dave.hansen@linux.intel.com, hpa@zytor.com,
        nramas@linux.microsoft.com, thomas.lendacky@amd.com,
        robh@kernel.org, efault@gmx.de, rppt@kernel.org, david@redhat.com,
        sourabhjain@linux.ibm.com, konrad.wilk@oracle.com,
        boris.ostrovsky@oracle.com, eric.devolder@oracle.com
Subject: [PATCH v9 5/7] kexec: exclude hot remove cpu from elfcorehdr notes
Date:   Mon, 13 Jun 2022 18:42:38 -0400
Message-Id: <20220613224240.79400-6-eric.devolder@oracle.com>
In-Reply-To: <20220613224240.79400-1-eric.devolder@oracle.com>
References: <20220613224240.79400-1-eric.devolder@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9nNUs+QHRE3S7ZLt63TTp4l2pYFe+buAFj6DYKlZtyh+FE1NLh6hhUF+ag/U?=
 =?us-ascii?Q?lKn0JxwMz/3lNjrMvob4YZRTS1Rzj7kgCGD0IrofMdysQr5uFsTpl+BCiC6a?=
 =?us-ascii?Q?qyzmbBWtZdA9iBelMETRPkI9fZm4tiZw9k2H9tCXT8AWFjAauhdSg0JtVRwP?=
 =?us-ascii?Q?sOW2m9pN0HwdY1dKKyzo5I5WYvOX0WMbpWzMJYFxaQ3Ptc9UYH1dNWsUUBN6?=
 =?us-ascii?Q?asdrAhp7b4Xndg+ZWZBEbO2eP+DehpSivOyZm8ZdbcDsWdoJFvxXEq5ksXPg?=
 =?us-ascii?Q?VSf9wrD+46hQJlhcC39TUxPmFnyeXoSzW3JgRLeiup6anGPS573aTiYv77ub?=
 =?us-ascii?Q?k7vFvkGwPYBT4TyOoTxj0w3u9tnFxwTk0iXhD8nDk3CTLbi5eQRE/U4WkVdx?=
 =?us-ascii?Q?LV5q/M5/6fORjWoBrHf/2jRz6HEcXfp+cEyLEO4/9nVZaQx8clZDoZrbTIek?=
 =?us-ascii?Q?gJMr94ZfMBdZ/BNeq+OUHtGIQEeZQGGcUK9SEuFTN6zAp/KryZVA08GLGfuj?=
 =?us-ascii?Q?1do2a6Z3tXPXv0weDHrxJ7a/p0L+Rlc+lKhP5M+Fs5JEbW302z8eZR2NPq98?=
 =?us-ascii?Q?1SfsfoYLpVRXy5T9yTNVtWdFoExonl2dRHCnWXz5SDKyb9Rh+wg61i0EY1rJ?=
 =?us-ascii?Q?Hq39V0TpwIclt/VdvtD1O9BPFwlXgfm1alxwu68pkgIS3LSkCtBQMvKZNJQ9?=
 =?us-ascii?Q?c2A9sOsMJYLAaGK+KPWmYp2db6AJmmT6jDUHfAXVSLG5cW6DK7srLm9ZyFGd?=
 =?us-ascii?Q?wGbv2BwmE33VDPlqK1FgtQdnJbiiceS4J6KPDLkigZuQ25+msoCXz2qhoP1y?=
 =?us-ascii?Q?DHjJ7a1AmosTt6rePHLkH73XHFn6w7s50nLDLAb4LRSn55gvFbScQGq8/c2R?=
 =?us-ascii?Q?fLW5bfZ/10XRsPQlwQL9yv/HKCWD+xGWKi+yhqSSgaMblEgPco4KsbkbSFY4?=
 =?us-ascii?Q?lG/TDIrBk2p6ePwA6aSvASN3XXI7tLLEnVyu7HU4tzu/3ukroNlI74wrJRj4?=
 =?us-ascii?Q?FRBksjRMQPQcUR8bSv+B3fAVhITQREfAyksjw1sxzGfjNit6rguoxGiZ/U7o?=
 =?us-ascii?Q?9NlS7xM+0pcHDW4XUEIQ+a2C0CRwuKGTnkLEKs5JFHBjWISX2QPvXQicZtX/?=
 =?us-ascii?Q?Jcz3ZKTDCjmmBkIQdfNhO0P1STyRjV/ph13k7wh92xNFXrcI2fVjPYQVXjsM?=
 =?us-ascii?Q?LoIAuHMa5qx+exz/stl6//D+y8L2aeWmV+QThf2/FiZxboNyNUm+CHsJ5024?=
 =?us-ascii?Q?rPkrpj3zEgA2wzWi7CqcVpetzEz/oY0l/oN37LZKAVvJ0VfSCrP4e2w8SCid?=
 =?us-ascii?Q?ubD3rTLpRYX4des7pJuppKU8W/1CWbd46ehU+ubAed10Nn11BxXI4ajQSw12?=
 =?us-ascii?Q?Sr6G2gVlFyO+zGHTqb1joywS8VQbppnIPl50ojvKalpN9y8X7i2QzQnLChmI?=
 =?us-ascii?Q?Iagq5ptOb8hCFDVzpxPkQLHfCvruAUXWOjsqXjQ7VR3fCeGcKCaBJsvwu7X6?=
 =?us-ascii?Q?bu4ri/xjouTozBhkbbrqPUZfG7Lh6GVW0QQwvomR5/zl/SHIrRue2UM+LlNW?=
 =?us-ascii?Q?bXODGnNqzkSHz8UL08R6vtx1ybu2Z44uZGGDVRsrfJY7lPbZ5Y1NnPiLDjSQ?=
 =?us-ascii?Q?5KER60zZSzmb9famk/wvmgkPzrmK//oWDBGUYuv6UBVAXuGrhdi4CSjeRqzx?=
 =?us-ascii?Q?45AXOvP2tYXD2ki7MIWpU2RhaCuglnLaOL00xuIny1w4MkZ2qCNXl64k1C0r?=
 =?us-ascii?Q?DGYGOkaEaXh2lsuuyqKTU8jqLOsPvKk=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8ca56f55-7b91-4fc8-7669-08da4d8e1953
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4542.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2022 22:43:13.3659
 (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: gsF0vr46DbnA2CwtsgMOTqJRWy1m3KIwyCsPrFKmE3gkG6MX0voolhe1yWZz2EYkt/VYDAC2TFKDEpE1fehlMGQPjOKO7NqYDF77ojj9GF4=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB3824
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.874
 definitions=2022-06-13_09:2022-06-13,2022-06-13 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 adultscore=0
 mlxlogscore=999 mlxscore=0 bulkscore=0 phishscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000
 definitions=main-2206130087
X-Proofpoint-GUID: Nh9CzpBbS7gl9ybmdFMu7syof4hQFDDH
X-Proofpoint-ORIG-GUID: Nh9CzpBbS7gl9ybmdFMu7syof4hQFDDH
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Due to use of CPUHP_AP_ONLINE_DYN, upon CPU unplug, the CPU is
still in the for_each_present_cpu() list when within the
handle_hotplug_event(). Thus the CPU must be explicitly excluded
when building the new list of CPUs.

This change identifies in handle_hotplug_event() the CPU to be
excluded, and the check for excluding the CPU in
crash_prepare_elf64_headers().

Signed-off-by: Eric DeVolder <eric.devolder@oracle.com>
Acked-by: Baoquan He <bhe@redhat.com>
---
 kernel/crash_core.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/kernel/crash_core.c b/kernel/crash_core.c
index 84eb10a4241f..47f667df1c0b 100644
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
@@ -358,6 +358,11 @@ int crash_prepare_elf64_headers(struct kimage *image, struct crash_mem *mem,
 
 	/* Prepare one phdr of type PT_NOTE for each present CPU */
 	for_each_present_cpu(cpu) {
+#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_MEMORY_HOTPLUG)
+		/* Skip the soon-to-be offlined cpu */
+		if (image->hotplug_event && (cpu == image->offlinecpu))
+			continue;
+#endif
 		phdr->p_type = PT_NOTE;
 		notes_addr = per_cpu_ptr_to_phys(per_cpu_ptr(crash_notes, cpu));
 		phdr->p_offset = phdr->p_paddr = notes_addr;
@@ -650,6 +655,16 @@ static void handle_hotplug_event(unsigned int hp_action, unsigned int cpu)
 		/* Flag to differentiate between normal load and hotplug */
 		image->hotplug_event = true;
 
+		/*
+		 * Due to use of CPUHP_AP_ONLINE_DYN, upon unplug and during
+		 * this callback, the CPU is still in the for_each_present_cpu()
+		 * list. Must explicitly look to exclude this CPU when building
+		 * new list.
+		 */
+		image->offlinecpu =
+			(hp_action == KEXEC_CRASH_HP_REMOVE_CPU) ?
+				cpu : KEXEC_CRASH_HP_INVALID_CPU;
+
 		/* Now invoke arch-specific update handler */
 		arch_crash_handle_hotplug_event(image, hp_action, cpu);
 
-- 
2.31.1