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,
        konrad.wilk@oracle.com, boris.ostrovsky@oracle.com,
        eric.devolder@oracle.com
Subject: [PATCH v6 6/8] kexec: exclude hot remove cpu from elfcorehdr notes
Date:   Fri,  1 Apr 2022 14:30:38 -0400
Message-Id: <20220401183040.1624-7-eric.devolder@oracle.com>
In-Reply-To: <20220401183040.1624-1-eric.devolder@oracle.com>
References: <20220401183040.1624-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?q4AdhhupmT37l3Rj1eiyPMDARf1VYyhnQwaJiya7ZXXNAOGCnmtdhiZxmDc2?=
 =?us-ascii?Q?YUSz0ZD0Y8o0creIIJ0ZepFGkksThSciMwfMduYk52DnFwYBD9FM8OMsgKZJ?=
 =?us-ascii?Q?2neSJ2H7KtbxLg5uTVId8lEfeAfyDxoRxhTkGWjZ5ZNg15XrbKSF1038AxTY?=
 =?us-ascii?Q?D+h02nx55dSgVRRhEEpJNdGqf2cSOZryP3f+PvdC+yuuJ1oy0bFM11N2Dhvr?=
 =?us-ascii?Q?vHbluxrIrFET+evOf60niI1omeZc60jK04kCyunUQrqqr35VTyUH11GSBpT5?=
 =?us-ascii?Q?yDIPIo1Qt8kOkGTpVtC4NypzSA1IXvJ0j1PjbULULIv8ySPkWbPFdySsTFJM?=
 =?us-ascii?Q?q5jhhlQayAv3B9Gpu20bE7mFDmBqOYypFUpLN0Sok5Bq1GA2v3c2FlqFi0Mk?=
 =?us-ascii?Q?kpcB7PVNKlKuianaU3/oTDqeewaDBi0yYXRGnHJBKjaZZJ+zXOX8LVoBbxMS?=
 =?us-ascii?Q?zGv1ct1zfMM0bAChTB6sNcoOkSGYGyDlcEgIsX6aPnQpOH9uxJMR9YONi7h8?=
 =?us-ascii?Q?XmG/DhnnEXhQ9qIb0IX4YA/+ZtXMfyBX9BcIxnieWFpvvE/uvtdp8ioreHkd?=
 =?us-ascii?Q?os2a8jc6RXGYUmcczhId60vgrE0aYlXV7XSfeTyN2KEPsXbZQz/VMoEz3dyK?=
 =?us-ascii?Q?6rQ4LSudaLq3vEgmTSRACrxnhCjlVKbIdxrK/blPZhMeI6+n5t3kzh6kJEXr?=
 =?us-ascii?Q?N5BMlSVc/iznORsqWNtzyU+b3tkL1lkRB0bac90IHZx57Oz9S4SLmlynr/ND?=
 =?us-ascii?Q?43sq6+RE4CEPcdnk6Xd+XsbCtHT5izP22u/QPv0oozkYETspKvACH6zZGPhl?=
 =?us-ascii?Q?7W0JHD6AOlRgVSMMqflNkxW3aBfIQlenPD7f7e0jPlY2XXagVgW1x/ZXsjyR?=
 =?us-ascii?Q?5MbwMjwcTWK8U7zjvKIPuMGJxeJCBqIvOXXpQeSpmT4iUxGfePssB1z0jlJE?=
 =?us-ascii?Q?MkRpfjkwnSmU3plvnOODo9byaO6HuwA+5G8fvLZjPh2qyJZnITtewoFNBs6z?=
 =?us-ascii?Q?ySbX9Uu5iU2YQ4b9rWaVgj1imfMbKMa41E8jgSyVi2atzP2E0iybkNThTPyL?=
 =?us-ascii?Q?UfeJjZllITbZCiGE75fSvvCWsMyLBunjqjuSdO4hZUnm7ntD6KHKCjWfvw53?=
 =?us-ascii?Q?fbHK+SGxLMtivHz1Afj3p//eYFsSBWv9+NjLGdYmzYbRqz1TmpJBywuwDjYm?=
 =?us-ascii?Q?+j7Cphi3uWsd2m0OcHaF5dzG6Hf1ly4ynce8CyzmLdHAIo7SmRaEpZdCwBOW?=
 =?us-ascii?Q?wTh18JKW6VF8BMZzFRg3+yflZz5eCjZ92j3Wum5cKxq+RkMHD8hWpRFYwrQ5?=
 =?us-ascii?Q?9sILnOEZvFuxfBlr+TINDqD1oPH3M20Z/R+xaR8FcsW7me1I1mWz/NEU1kIW?=
 =?us-ascii?Q?mULLOjBulaFH7uLlPz3W8r687hQVa5oYynnVEh6ISNZALOLDWdGRIf8jo6Ue?=
 =?us-ascii?Q?n1z0bA4gOTtaW1rOIqnqCqtFWJvkx2CPnapym78HRMw2xIdHCXJpZ06pLG0+?=
 =?us-ascii?Q?jh0a+Gtg1pDdfgIFodJGJ+LPbSJSrX4W8G3YCBb6zAqYoJKlsOICjfrkG4pS?=
 =?us-ascii?Q?jYsEe+6O5XgpVigVIAm86jMjZ6xVdO0WIni56FabbRBOp1dPmQcsTr9t6DoL?=
 =?us-ascii?Q?K11dtdDqWvK0ig1y0zrJqDscI+un4Tn7+8kqtSOrGsLPiQ82MgbBh/3jYw+M?=
 =?us-ascii?Q?YaQ1Af3wZtrO2O5q+7K25H3D65lV3rbnI0dQHeyj9CRMl5n/6tkq2yQxIEkV?=
 =?us-ascii?Q?haVrBcMQJXhaKKPpGBQeucHeNfP3R0s=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ccf74a89-192d-4deb-3891-08da140dcc9e
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2022 18:31:12.7804
 (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: uLBFzcXda4pz+VMk34am3KygcX2qtR6qyiu+dn/kXT7sXkHewMO+ZgOd8WCV7wkgblzgCMQ4JqCmX9z3eWn14pOGFzRAXGi6fBYAWGJx9aw=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5502
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.425,18.0.850
 definitions=2022-04-01_05:2022-03-30,2022-04-01 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999
 phishscore=0 malwarescore=0 bulkscore=0 suspectscore=0 adultscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2202240000 definitions=main-2204010087
X-Proofpoint-ORIG-GUID: nPEpEN4ILchOlTnJK0kg1xS89H30O9Dh
X-Proofpoint-GUID: nPEpEN4ILchOlTnJK0kg1xS89H30O9Dh
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_H5,RCVD_IN_MSPIKE_WL,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
crash_hotplug_handler(). Thus the CPU must be explicitly excluded
when building the new list of CPUs.

This change identifies in crash_hotplug_handler() 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 | 10 ++++++++++
 kernel/kexec_file.c |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/kernel/crash_core.c b/kernel/crash_core.c
index 76959d440f71..d3fd51f2195c 100644
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
@@ -522,6 +522,16 @@ static void crash_hotplug_handler(unsigned int hp_action,
 		/* Flag to differentiate between normal load and hotplug */
 		kexec_crash_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.
+		 */
+		kexec_crash_image->offlinecpu =
+			(hp_action == KEXEC_CRASH_HP_REMOVE_CPU) ?
+				(unsigned int)a : ~0U;
+
 		/* Now invoke arch-specific update handler */
 		arch_crash_hotplug_handler(kexec_crash_image, hp_action, a, b);
 
diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
index 94a459209111..9d5c4eea0179 100644
--- a/kernel/kexec_file.c
+++ b/kernel/kexec_file.c
@@ -1314,6 +1314,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) {
+#ifdef CONFIG_CRASH_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;
-- 
2.27.0