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 v5 6/8] kexec: exclude hot remove cpu from elfcorehdr notes
Date:   Thu,  3 Mar 2022 11:27:23 -0500
Message-Id: <20220303162725.49640-7-eric.devolder@oracle.com>
In-Reply-To: <20220303162725.49640-1-eric.devolder@oracle.com>
References: <20220303162725.49640-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?3+PoP65wIn12q8/BP8oSafOXCI+qrfF4njNZTb8o6+inryEjCsHy4+MTuZwa?=
 =?us-ascii?Q?cU9QKKIbLlfuMm7kugVUF6G/KYHxVHQtNsdHs9trXA1ZYOhwXcpeO7AZ5Viq?=
 =?us-ascii?Q?TlnUtjbp3eSeMURK/mQJmDIb7SRdSOeUiQgH/9d+YqzeyatzVoeQ89mfYBps?=
 =?us-ascii?Q?NlyjUu/WX5NnThAfSQaWedxYyZCQHx5EUEIxEcxUXc/d4KBa9YKM2RagZA3k?=
 =?us-ascii?Q?RoBUpoA36WWDrVAMIERIdiZrYDKoWa85ZWpLXodcNwtvzJi80V9npoUiLzKE?=
 =?us-ascii?Q?YbTd/hDVyzNGOv3n7tt5KqHn9ylpKLwY5ICBuLyDp19axHLffJq6fYJt8X2k?=
 =?us-ascii?Q?MHyh1a5t1NH7ofq3ZaB8FqEgdg8XC1BhfT3Z5DSOUjIEYm0O/1O5Vx1W8Vva?=
 =?us-ascii?Q?p4a7axHHv0imlTYtBv129PCJi8VyY91b7eTLnsAut8RZR3sp9xGe9nM0fBnH?=
 =?us-ascii?Q?c7jdCQjQGyknTD9gkpwZoSMVEH4TrZrJJ7L9gnd0k98PYRSXesO+/mVRBtGJ?=
 =?us-ascii?Q?SJVlzvvYddUvOvNCnDbhJ0O0QJXO0uPr4h5Wy+qh9o+vJ6UbDZ3zJLi+1llD?=
 =?us-ascii?Q?BtV3eXCqUp0I3uobZb8ZQmSWmceIRZy1ufVgw7pCy2cPBn7WHh7WIHKLw20G?=
 =?us-ascii?Q?SlM12Tn1KMu3kYnmlznzTzYaCcZPKkaoYos0jEGszdzuCqd7ZO6gcjk3zKnL?=
 =?us-ascii?Q?FJ/U/E2/ABoNePg2QaPVBiaD/w9hJY5OaBmTkzhLqaz646GhJXMzwOpXTF7m?=
 =?us-ascii?Q?HaRpKMAboPplS8VEztgA8i6tI306E3lD7B7O563vWoXa3ttheFcbvTgTjcg2?=
 =?us-ascii?Q?vhkoV/Ojm7ZLstAXgyGG8gG00herbuF1gKxJ/h0LyHi/StWLvshIWC5XBXld?=
 =?us-ascii?Q?EA21ZpR+cSYkH5YBCvJiGtIfFkYQTRyZJp0H4fE0ST1MbP2ibS2NYZO6Z2BX?=
 =?us-ascii?Q?rDPdWWQJ1GNlhl+Yqh9DcSFQJzA18kc37lklP7eLIK2oLhu0rpdyd9b/9U7V?=
 =?us-ascii?Q?zsl4W5lYtFxmrIONjPB4zWqqKwrZJbHYGVL9hjMekb8DnS/T4/t+G2FDPPc7?=
 =?us-ascii?Q?9861M05fko+sZc0FU/Z+UXHG74W1tubTpwu4/tb7eP07HCu4TJPJDNyOc8K4?=
 =?us-ascii?Q?fTVRwILIi7t3IAd3by7RLngaRhOXAVO695xBobUMWZKk3v7E88P7lzjjwOtI?=
 =?us-ascii?Q?mQM7E0Shq8edKG/D7MqFCJ0iI4BI8DTyDrc/gNURpORjYaMWIuGUzJe2Lerf?=
 =?us-ascii?Q?7q+smUMcDYy8J41fEPCgxN7OaOFc9QVLdmZ73XdII4RsrE9/wrYG3moR+SFa?=
 =?us-ascii?Q?sS+bPthLuCbc0vaCODBFvzOKplxARoKy1vntiYv59/d2AMoru1tnpYaL+01g?=
 =?us-ascii?Q?A/jjVVpTnzCTfyXEyo+WV6YszKrmPkAcDaM+eZWUx9jdvMra7Axal+g+28Cn?=
 =?us-ascii?Q?m5CIT6Y850XHOKjuzAzD0PT0vYKXcgHkDFXJAeVZsv5IyfCddDlZewjCyjWH?=
 =?us-ascii?Q?tllaq6BSZVc8+dzgOHysJRY7+ekdy4gmR0r3oNvl/aq+X848MjTj55AoAKEj?=
 =?us-ascii?Q?geQlC57swrf1gewHvTclESREbY+O53+iE86aYKPO5ieb7HA8XTLuESjXVId/?=
 =?us-ascii?Q?9T1PcH7++WSzB9OJSCDH6SWxoxPbjCBtG7Zg6eC2R6y9vBIFkrknIz4OV9CE?=
 =?us-ascii?Q?3AO7og=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fc3af331-4864-4e60-8196-08d9fd32c62b
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2022 16:27:56.6911
 (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: F5o8p8DkCBVjpReAYtMG9HU/S8Dszs5Nu/Yuj7r38yvj20jnBvSZ6irl2f4hW6Naa/doB8mCuOf9JzhHY32AOAM/0ewYVrZdJ0PqCpd7gYY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4704
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10275 signatures=686983
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 bulkscore=0 malwarescore=0
 mlxscore=0 phishscore=0 suspectscore=0 adultscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000
 definitions=main-2203030079
X-Proofpoint-ORIG-GUID: gC-NOuP6BiQ7FVaq0D2a1rsvl4cCymsi
X-Proofpoint-GUID: gC-NOuP6BiQ7FVaq0D2a1rsvl4cCymsi
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 93bb0c0ce66c..339995d42169 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