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 v16 5/7] kexec: exclude hot remove cpu from elfcorehdr notes
Date:   Thu,  5 Jan 2023 10:17:07 -0500
Message-Id: <20230105151709.1845-6-eric.devolder@oracle.com>
In-Reply-To: <20230105151709.1845-1-eric.devolder@oracle.com>
References: <20230105151709.1845-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?7dd/7lo93WH/ggeR2G6vVxeeVCFG0yir2h2sEHv3D/61ivKdVkCpaMArjYhH?=
 =?us-ascii?Q?qIVejiMfRnvYVwOt7XG64bFw/E9BC8objZWUPYMenxQouP6FgMjAYb1P9FEd?=
 =?us-ascii?Q?SBPGv4AO2SWItKiNraczNiLFJUw+fSQHefFRcqlkH5L2oxa4dYCBmpVNGYWO?=
 =?us-ascii?Q?hrhnKt4YnKptKe3vuhX5RzepXRby73SJyL2yw0EBeybkI8BXI7sik7nJuK/i?=
 =?us-ascii?Q?KhjkD/mEdMK53BKLsimKRK1OemvFD1W2dotxrbrIa70tXGy5iqydQTwMzScB?=
 =?us-ascii?Q?dLB9wxcoOrdN7fnCtYLjiClvzBWhlxOvzw1qdBFezkHHHa0Aaf26ntYuuHyQ?=
 =?us-ascii?Q?txU87FNfze5dYYy9ul7fnAFsWiXPc/ImeM/2dAe1km3EXYu9lUsnKXX6r4ET?=
 =?us-ascii?Q?pKglWIPZOf2MiCl8hyXdXRH520ka5kaB8hWjd4GCg6wAzxWMZZ5J83mrK6eg?=
 =?us-ascii?Q?3oJpROIhCn5RlFL7xA+RVZxbaH1v0iROMbz1IlYOvARcSv7E9oM1VbId+bgf?=
 =?us-ascii?Q?RRphvKBSiAk3gI8YvgFaKvMa8om1LDmw8cfJmBBLTYKjoJPur0jAbLBl25a0?=
 =?us-ascii?Q?oZoIrbclFxksjKMBNr/OAtBlHQiEqQPedmAFDZPfJPS6Gy8FT8+XbiwsKL10?=
 =?us-ascii?Q?wE0okbr7NWRhWGWZKHwYX6pLA56ie4c+/G+qshdm4al0z/4Ch7KE+4sIlNPY?=
 =?us-ascii?Q?uhg4We9ouN5psz98K8yFc/u7vlTYVLQjdthWCVL91d9pKvRYbymZzd79xnHz?=
 =?us-ascii?Q?AADS4mN2wwJ58yKpDatQrhqY9SRtIs0xb8137sNmbUAbMFU4RcMDku3SChfZ?=
 =?us-ascii?Q?+QSqroNdnTIbBppUTwYYMX5+m1f2rF007Q/FzZ6JTylXOc94xHVhsjQQHhXn?=
 =?us-ascii?Q?PZw6DxYmVTAPNYa4SFW/vWm3lVsX0z4x+CvM7jpqIblZjqzfhR+zv9Ynor0X?=
 =?us-ascii?Q?O3iYiohivIrCBQ3mHwBIL170o2nZ/T2UsfXR2cy++lsngIcVMUjPjsQXskqf?=
 =?us-ascii?Q?pmxLMNgvCJDkezL4j0Q9Hbf651m+OXRATbBeTHjSB0VjIBg8Iq/x2/lMVXJc?=
 =?us-ascii?Q?dkDv06iN8Dvsv5BX13wyakQbZLyttzVRRecdYb04aNzKzfYcaqE9cWYDRUCn?=
 =?us-ascii?Q?NxKolx0skbewJTULp5seeKsCNkRjojXC7EFFVLJ6J2u15uqYU5lT7uMxk+cB?=
 =?us-ascii?Q?8qPsY9remh/ZiISHH3R/v1XsCzUJScEhSQFsmp7iDmfM9dlVDle4mFe69290?=
 =?us-ascii?Q?vLgZNDPWGJcHiZ+Jc+/1gcuIKBuN521AxuUk0azxSPv6rGmQI52KN0iH8SUw?=
 =?us-ascii?Q?kBWHHG+sCBAOfkoYP7qZjgYiiiM6TMV8je0yif4+Bcf/9pml0RTiYp8erWRc?=
 =?us-ascii?Q?DIJeRXD+8m+hYVplfr6GNy5X6Yc6+BWclNgnpzNBm8Xud4xtlQ7vKZR81Vno?=
 =?us-ascii?Q?5rgI30+hkUM1bTxz2/6z/Mujqbh5KYdfw0Yzp4ZCSHlhGJy2QkCNePiH7iBq?=
 =?us-ascii?Q?idvqsCJSoEzS+AWJRM77EuwjO3eHlekHl4GeltXyfpI9iseXrX54dnMGua3y?=
 =?us-ascii?Q?kRzDQa+2LaTt6AoCkONXronbs46Oxi2g0yJ9P5pw5ibrDoPm26tchh+dAfHq?=
 =?us-ascii?Q?/Q=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?pqu0D9Zfzrvwcq8TiOBlGJPpH03taaVEJTK2sK3425Uz2h1L2IDWbzhZGaCY?=
 =?us-ascii?Q?2kNunSE6lIeQby56peoPzgyD9OwUL8CN7ODTI7KtCIkRtOXcIkSIB7GGHYL3?=
 =?us-ascii?Q?vraZZNHxts9tAvh64Omc+u0vJes/Lbo8QimxP8kfP+yRNNk4CUhjLZujpuCQ?=
 =?us-ascii?Q?5c2Rj/I6mT/gDUV7dnLJAAS38nxwP3+MV7hyPskE+j5ajZ6Gq4NdlWE77QvQ?=
 =?us-ascii?Q?Z/qLSf4vwJPSFRDUwnqU4CGH7WUkQf9QAfdexrsuRatyOzSP7HakzcFJT+GJ?=
 =?us-ascii?Q?VVTO1LGf9NLXN4ScEB6Cqlacl8eS2/hfQ+GCC1ELklHkfjLZqqbqArP3Qdb6?=
 =?us-ascii?Q?sKBvaej74hylYxysJVYghtHd6wIJml1jzBAe3AiLPyIQeg+ZbudUGA5iG14T?=
 =?us-ascii?Q?PmIAUpMH4vY0JPeaILeHs/ZKbKkeHd83aaK7fkE57bC0E+uN5oSxyM8b8Gdt?=
 =?us-ascii?Q?Xr05qOpNPx3gbskA7+ft72vN2qcsVqEYB5wu3uiZhpMeLKUFI+nmpxpBkc2f?=
 =?us-ascii?Q?NL4ENXGi4M0Jgc2aJtHUKyeWQuzIGIro9JE3x1bMqif2qUXlEP5Qy4u2SXxv?=
 =?us-ascii?Q?+f+PHYduZZtYGYMQIFC21ANO3OcJwsmh/df7KR513JABXsuVunLmhNdg4bJX?=
 =?us-ascii?Q?9p1AApxtSHDztuKq7mgULz4JAWshJc3JVPr+ib85jLGUYxo3o7EbkOfYplmt?=
 =?us-ascii?Q?yWZaz5TSLi50ZbGonqeee8efJcx/+7Xr6Rv8Fv3o/edap2W896621O4KwSqP?=
 =?us-ascii?Q?rPjbSVPbvupNpGeNQ4KuSXJ9krY/gEOFL9JL1pVkhAZ3oN4PMxzJWkNegoAH?=
 =?us-ascii?Q?lTvEIBrq0kzdB/7oKzmIMaK9N21Pbu+7yw7NN5ajoVwIa+mOoAnUIZrL+3MA?=
 =?us-ascii?Q?mcOk/03uc57t/BD2noGcB55Kv7cXJ4lP9E/3RMaZ1E73PZi7oVMryrRXesLa?=
 =?us-ascii?Q?GMn7b0vHwZA40cqjZ5Izjw2XL8663Qp8J8PWIFNJ/KHwF4gpOPCCBCLMPRsA?=
 =?us-ascii?Q?CIgSOLJVSmCiPbCkVVoiF6nM371sd2L7kErxOU5OeQZQ1w9lJf0ZLc6h20Jb?=
 =?us-ascii?Q?+Djd3umHmPSTx92539oVOSjNkDjUpL3SkzJ1OxMc5x31n7Yqc/ZBKVNuKRc9?=
 =?us-ascii?Q?FnZh3wz6IdZ8ftuLlmhpVOYB3TJZ897+czlDVRjqfe2VnrC7fhkX9xSMRvC7?=
 =?us-ascii?Q?xrrMPG47buLwvtx9OPoi9Kwma3F2AA0UuwAzteGl9tbkK2Dz3qdx6aV/VUlD?=
 =?us-ascii?Q?vBQhRXnNRlQhXFf0JRgcUcIsdwqUQNaY1RC1A+kqHdbT0ljihr4x+Lqj2/JI?=
 =?us-ascii?Q?Y+vucw2W/maV51Djpv2kRM6qRkadirOQ3hqHgBlaUOu5rA=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: eb176ac2-4956-4d31-160e-08daef2ff7a5
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2023 15:17:32.5982
 (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: 3zGzcIIeQkvqE1h4S7YOd0EE3EKoPbigKRsVQzMa+EGgOs4b897lOqqmcDz4g9G58kfNT5oSYYdt6ad25IKsqrMejegRpJSGTGTHYLYh5RE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB7406
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2023-01-05_06,2023-01-05_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 phishscore=0
 suspectscore=0 malwarescore=0 mlxscore=0 mlxlogscore=999 spamscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2301050119
X-Proofpoint-GUID: yYp3wk1BMn9ch-yXEabeK0XNpOOtzc0s
X-Proofpoint-ORIG-GUID: yYp3wk1BMn9ch-yXEabeK0XNpOOtzc0s
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 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 | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/kernel/crash_core.c b/kernel/crash_core.c
index 973d7ddff1cf..910d377ea317 100644
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
@@ -366,6 +366,13 @@ 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) {
+#ifdef CONFIG_CRASH_HOTPLUG
+		if (IS_ENABLED(CONFIG_HOTPLUG_CPU)) {
+			/* 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;
@@ -686,6 +693,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);
 
-- 
2.31.1