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 v7 6/8] kexec: exclude hot remove cpu from elfcorehdr notes
Date:   Wed, 13 Apr 2022 12:42:35 -0400
Message-Id: <20220413164237.20845-7-eric.devolder@oracle.com>
In-Reply-To: <20220413164237.20845-1-eric.devolder@oracle.com>
References: <20220413164237.20845-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?OGrxUIqcaOJhbUQOv84Vc/CrqmDnejDISEH5vypjIRHj4GziPK4rdR1sqqsI?=
 =?us-ascii?Q?+wZIF3ZH/kETRSIZGrkFWIbYS2ZBTXKhOTg3Gvbi/73LTFAIgDuS4pXYt+9q?=
 =?us-ascii?Q?uOdnNg1eayjPfa50xNDV+zPw2QAjqvfLugQc5W8SRULz89P1NIfC+M6KYM28?=
 =?us-ascii?Q?+mvjiC+LG4+6miMD/oXGPUg+8kJdJZhtMKUQpoXaUNSpcFew1VGr3oJdc6Lq?=
 =?us-ascii?Q?Ln5Me0UI+UDl8QszeFzjmpkl8hNVaGsw5hqonoPa9kBz+Mwl3G7rnpKMuz8k?=
 =?us-ascii?Q?NfFzxwKWL/aS0OrV8/dyx6dqU9aEdsf4yGM66WTAAEvm/7iA8Z0mwkUTNppM?=
 =?us-ascii?Q?67csdtyAQxm9ebRV8F5xHulgVNaM0Hcp3FawxwvWya6Em6X2j0PeWds6VR79?=
 =?us-ascii?Q?bFryAQusfaNOftYSEf4tp1XRKrQPSaUT/EVyQBihDDDQky7V593lLaBr/cVb?=
 =?us-ascii?Q?l5eY8a9bOAVVBiI4MiLZRcF1RBYgylD5oyfPyBBI/QojmbqrlkVlDh+Z4lhd?=
 =?us-ascii?Q?5UUqO9ajml8BVBz1vd0+0rnJ+aH4iV91m/uuUwkiPamEBdZewUY3QIBr6PMv?=
 =?us-ascii?Q?GJ5bMr73qORx73c6nh94Xmuxdzh7lTt5qVwOGWnG5TAUIpMlb5xiQ4HcGeIm?=
 =?us-ascii?Q?WAChGFbseNaLOPcKqmg14XJQbzSw3DU1uPZeIVvabTxyCT6+Pi4GeB+1dIF9?=
 =?us-ascii?Q?XQO8us4wA0TvqKBhx7yJmHkm1MyEO4EjOK24Jk1Bq1CUYRcsHSDjN/YLwBKh?=
 =?us-ascii?Q?OCReiGFVXEr5N+G0342jV9+jeSqzCNIl7lHBLhYsEOsmqH31v2+HlWULzyF4?=
 =?us-ascii?Q?ySebc55i85M+B+cgp6ltpPyZOr0fMXuPSGDh9VCGM+YexuAot6PDFdC4isYr?=
 =?us-ascii?Q?hVFTniP/bjqtpUJZcNW3Ty3bXJagnhUmTjX91zAZkcMJL63Fsd9lOxMihkB4?=
 =?us-ascii?Q?oJ/caL/W7Jm5jxDMX2IOvog/t+FeOeONZBjMHhFJmCXl1jLWoGZOm7BnV4jR?=
 =?us-ascii?Q?2SLpRxaVYUVSp22a7x2ZH9FikllhXrJtmXReOv6kzUt8Yef69UHjUoOYpxWM?=
 =?us-ascii?Q?F6WE9f3n9FJyHpQKQTBYcbKK0sE+NwXuu8/QrqIgUkb9wTT6qnvNdOqe/irP?=
 =?us-ascii?Q?NNMxdCLGjHf/xAi+OhZXTjmnl+khf3PAcNhjljdJY10JOyz3qC7Omg/EPpq2?=
 =?us-ascii?Q?g1kY1s4wb9athI6R78H2b4wBce0/yVFkEOD6TZscSzxgZuDQsOkUTAtw9coA?=
 =?us-ascii?Q?Iv7qtM/Xrr4aE1/PfKG633sMx65uFH0/8dxVVdlIncmhueEac0sJ5VrP9N30?=
 =?us-ascii?Q?DRKKDqwP3cI1ELW7bV+pxFfn8jDJB7k9/NfDy4I+EpuC26IZHDIgoRpiJYqW?=
 =?us-ascii?Q?SmFx7QczB3AQix7maP/4SKLpffA7HJcg/PsJkm7JXSSL+x4ZTv64Uxr2eJxt?=
 =?us-ascii?Q?asim011kcszziFlPDbaEmuMES6eSpPiFm6sbuWTPQLpqlx/4BIpLDTH6BHeK?=
 =?us-ascii?Q?q2jFHO2NAdsxsyQPzar1xJAH1HV15P+FHz8FgDi8tLq1zYvQBZV3hCyp+hND?=
 =?us-ascii?Q?MU/jaD8/eN8h4u6Bp5NyNioot7uNzgU2m8zBNOJO8SQKmuUo/4cCNpzACy1i?=
 =?us-ascii?Q?SFFqgRZUQeLb+QUyeURKdCPq+ifQEbVXS6PnNCid4Fftq9tLQGQklK17L7oQ?=
 =?us-ascii?Q?xFhy2LSkEyvKdwymbT/u+3Yb5+QaF0tusrjSkQkSOSlVIXBvMT43wzPA6Z4T?=
 =?us-ascii?Q?+2H0oQd8tnvLU1tgVo/WwEpzFXEEGzQ=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 330f1a34-2d9c-42df-e983-08da1d6cb0b7
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2022 16:43:08.6737
 (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: AyReFIk1qOafXwHefamp9kGH80/gXTaUQnTmyYRWD4J+DwaYKkSAlSeqrYVXgTGRBise7xLrs0F7pVQOA4JuMzx/2NYq6F9KbmlOPwt101I=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB3562
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858
 definitions=2022-04-13_03:2022-04-13,2022-04-13 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 adultscore=0 mlxscore=0
 bulkscore=0 phishscore=0 spamscore=0 mlxlogscore=999 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000
 definitions=main-2204130085
X-Proofpoint-ORIG-GUID: YHzokLuWxaRzDY_gjJehJ-X7lS8hIrFY
X-Proofpoint-GUID: YHzokLuWxaRzDY_gjJehJ-X7lS8hIrFY
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 | 9 +++++++++
 kernel/kexec_file.c | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/kernel/crash_core.c b/kernel/crash_core.c
index ecf746243ab2..036243b1f252 100644
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
@@ -521,6 +521,15 @@ 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) ? cpu : ~0U;
+
 		/* Now invoke arch-specific update handler */
 		arch_crash_hotplug_handler(kexec_crash_image, hp_action, cpu);
 
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