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 v22 5/8] x86/crash: add x86 crash hotplug support
Date:   Wed,  3 May 2023 18:41:42 -0400
Message-Id: <20230503224145.7405-6-eric.devolder@oracle.com>
In-Reply-To: <20230503224145.7405-1-eric.devolder@oracle.com>
References: <20230503224145.7405-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?WKbORwh3TLBYRMvHWgPYaRBEd7kLkDcgUK10vicYBQCcQ/6mjBXAuIOpjJkl?=
 =?us-ascii?Q?qH4zyktOSXDb1yBUtLN56jjkPet7IdxV5YO4NVPN/R8eeIEC3cHeDOrxiasO?=
 =?us-ascii?Q?XWgsKKs+nwckbS+AvAFIA5lF7E+z83B3ZZEeTtqFsJ36VZ5eoPk9ALHzFCZ5?=
 =?us-ascii?Q?XPGsxS28pukBbzZNy4Z/O+NQPlQYei/CxVZmWnRybwsyv6WotoW9EVxgIR94?=
 =?us-ascii?Q?mhyzXG4BtboyCYnzXzhtacBBOMMLHlBV6J/HhBqMXOCYy0iLOgaBEgjexFOB?=
 =?us-ascii?Q?H5MUXUVfgCVW4rDT1o+T/VK85Yz0ZBezs9zsBaPsb5XejEw8j6KyrKQU6twA?=
 =?us-ascii?Q?93yO+QJ+ch3mFtksmR7/AGumYIVIL4eG7/cyndY0BRBC7wEC26UngK0WWJ/4?=
 =?us-ascii?Q?+8o1ChfI22P1WwyNHRtH2kXMWpTKlHZEkQeU1WsoY8MXo8sfNbrgaiCxMuFN?=
 =?us-ascii?Q?EZ5QJRjb3PdxejLHgqxzfBoOSmiu7IdsOqlnMivEa26tw69OJe1k/TwL7tFK?=
 =?us-ascii?Q?OIl0bKnlLVtQc5b/ERdllDdwpR1gy/KnASFf8xjmBZ6J+YhjFaZ0ITw2n+Uq?=
 =?us-ascii?Q?m6HzHK6TlV7PidPz8cZsloQBuB5ls6QmXW/um8NzBO9gfux1JrtjlM1hl17Y?=
 =?us-ascii?Q?v60/SAzJB3lvVZPa0wg7v4i1fE7GXxdSwtPnx+lBLgC5R4JeYpZCkid89Rp6?=
 =?us-ascii?Q?b8c85grU8a4l/9ko0nwkDcyPH0Lgcl69j939JX99OYLJ4PIc0SfH25b7us5b?=
 =?us-ascii?Q?JfWfeE/C+CmWjr0uFrK1NcIcZCLpAZuL454LlCJYtDRIppVftIjVLHIvXyPl?=
 =?us-ascii?Q?JWUzrfKi7sOjCGN+JNrVBthk73ZYq6mCRKDuloiHDvUYIHCX+ZB5fvdTMuqt?=
 =?us-ascii?Q?8C9Qke+7GZOsDVgFeBPtXEBsZwRas08R+LPElLt6KkXmp1OEHdmzTjJH0ofd?=
 =?us-ascii?Q?wywS4su5kySny2vTO8dQL2zFvMgp9NP2RDg+D2NRPagaCI6uRlWIe6nTfOHZ?=
 =?us-ascii?Q?9OXdttAljHl6/TXtBgH4OXOL+jVqCwt5AEn64bgVesJe/czcyS2qYzdHKcTG?=
 =?us-ascii?Q?K1G5aolBMdxgfHrniYJ/KXBDvLMP5uRdINkq4E4snJy09OIdCfLjrD56/pHP?=
 =?us-ascii?Q?aQSAJPwIajJfQJwpVavPhBDwxMIjnoGFRacxEixIobkqc2JnJDaw0B25Hj1I?=
 =?us-ascii?Q?3r2eNIl8XHwJu0+w2F94LtIm4T/DSV/qYwSuAW/5kn5rJ5TNzAjHak5enjxU?=
 =?us-ascii?Q?Wae1vyujhdJrEsVat9u/vH5vznH2ve2+yY7gCUhsHbj0+6x9k8kF17d2Yt8S?=
 =?us-ascii?Q?DCtVBJzKCySjCoZ1wjtE5zDRuEnpygZUxIhheIgie+lbC1qPCIroC5cZu+Et?=
 =?us-ascii?Q?2z1FSuDypKZbcUb1hLWmTGX5c77nvQ0CtQLnAHTLC5Bq0RrBzPT0RyYOfERc?=
 =?us-ascii?Q?JJf4pl3PIk7WCzS1J9WGTyfCsa3cvNVHJL61fnTWOQfBmSEC/6klfNZdMSoo?=
 =?us-ascii?Q?+TvSyGR9YSE9/zeb/k3NJet2pLtPO79pLDfYd7IHwW3bw2vzeslBvEwnekkJ?=
 =?us-ascii?Q?WRHVWaEQpELy76/HGTEDFvywW3wQSzA+HEB9ZHEniCrtSBb1V+eK8cM3ScUJ?=
 =?us-ascii?Q?qw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?21KDzZYT4WSDqX9wAHAZlyxEp0LYktjuY6i4hohgOUGNbN3Kj5m6L13NWcoi?=
 =?us-ascii?Q?8emlyXxgKVFvfrKK9VG1Ta++CDzTrwfziVTbf3quZzSccZGX/GdbCifOj+F/?=
 =?us-ascii?Q?11xi3tSoGfHC4SQifctgYjUFXPrnZe9W/h/iMdqNrmTIFnQc8OnhTMwoFMpU?=
 =?us-ascii?Q?tSTn3aBHk2Xqaml2oK9h/ZJWWM+30E6UiJwTiZRqd9hKYWDA1UjcQ40wGQ+E?=
 =?us-ascii?Q?u4SMhaqDioMfNcyc82oz5e/igvshTIvi/6AlGOQui7a47GlUS94TmqCmMNEH?=
 =?us-ascii?Q?9GTJxKlKw38TzCqngOBwy3vkvqu1KfHGMfBlYxMbdPAkgjmcR5t/g9wyFg/v?=
 =?us-ascii?Q?ZZt7mSEQrYWidH5emC6iwyK2vA2nZs/7SmZ1uu6jCMOP+5l0ElUyuWE4vdqi?=
 =?us-ascii?Q?SabcgFe9uVyRISjWnXCfW/9TN9rJjhRwZatGcAx+wYeiJKy3ZeGZ+9MFGLRK?=
 =?us-ascii?Q?9niXsAveFoyIJUxbHmbsTbBKIuJKmun3gyWqQ0OUwPcQMygWnSSJ0eyLJFC+?=
 =?us-ascii?Q?PR/kbgJzZ4GTDGfFgn5SNt52Fq/ekVbrQlKLCHslu0FMWQh4RkoAPDBOLSwB?=
 =?us-ascii?Q?PZaPxQvvrotozDARbOwInGy+YUua2iOxIrm5caqWaiAA5plHM0zrcH9Ch+BQ?=
 =?us-ascii?Q?aoCZ9+yAEDcoZv86N1zkW1joK9IK0LkXlspIDTZ0VFDUDjgv8OL/oAo50crY?=
 =?us-ascii?Q?+A/w8HV7DCud9e87X0RIgqJa+EKHvbECnbqBb3L3NUGJzomrav4KqIEJfEnY?=
 =?us-ascii?Q?5ysKjlqvNAYbAEJ7gPGNfFdZTAQLPoSjcZHAHhQiRZGqrYoGBBzonglL6ONZ?=
 =?us-ascii?Q?xBgKIwwXfsGysFrD9IK+is/aKMRpzP6J1pjjcZO4ksJKL5mc5jAh0tLr1hTs?=
 =?us-ascii?Q?GbXP9E39zXNBcE7GzoDHiwVYQdKnVQTjWggTRWvA8CjhNmz8j2RXrFA3UGVo?=
 =?us-ascii?Q?paSQ+Kv1G/dtKbL0w1LrZ0nnE8jvStKIl2IMNNMmCrkP/1/WgdavxQx7GhMj?=
 =?us-ascii?Q?rgPk8RhuYs9mYc4LBQuqHEnL1YE8xP8Cq+gs+sfKyaL7HdduS5GIzjugKblM?=
 =?us-ascii?Q?kwLatyDXeuNoQ4+rTknw8/Jpiw4+GqpWv6Eq7XoyCkJFfg/hvDhjaBzsYOcr?=
 =?us-ascii?Q?TXtMGQWkwGj+kXVXGR4oIy+p/n0KabjsmGp8EMAgK9S4Hj+HIiQX7jE=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: da11d856-286e-4af0-faf9-08db4c279ec9
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2023 22:42:05.7200
 (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: hJGbg9UtIFV0ehSKdUSDmNYpbG2EAihg4CzH0otNBjnaaefZnhhumL52FVDr2mGLr4gmrlgiw71a/wy4xxO32B9bCty1F7KfmyVy47ffwMU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB6846
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-05-03_14,2023-05-03_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0
 mlxlogscore=999 spamscore=0 phishscore=0 adultscore=0 mlxscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2303200000 definitions=main-2305030195
X-Proofpoint-GUID: j_jemY3WbOcLRBnSZd7GIoZ_xzV7scXi
X-Proofpoint-ORIG-GUID: j_jemY3WbOcLRBnSZd7GIoZ_xzV7scXi
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

When CPU or memory is hot un/plugged, or off/onlined, the crash
elfcorehdr, which describes the CPUs and memory in the system,
must also be updated.

The segment containing the elfcorehdr is identified at run-time
in crash_core:crash_handle_hotplug_event(), which works for both
the kexec_load() and kexec_file_load() syscalls. A new elfcorehdr
is generated from the available CPUs and memory into a buffer,
and then installed over the top of the existing elfcorehdr.

In the patch 'kexec: exclude elfcorehdr from the segment digest'
the need to update purgatory due to the change in elfcorehdr was
eliminated.  As a result, no changes to purgatory or boot_params
(as the elfcorehdr= kernel command line parameter pointer
remains unchanged and correct) are needed, just elfcorehdr.

To accommodate a growing number of resources via hotplug, the
elfcorehdr segment must be sufficiently large enough to accommodate
changes, see the CRASH_MAX_MEMORY_RANGES description. This is used
only on the kexec_file_load() syscall; for kexec_load() userspace
will need to size the segment similarly.

To accommodate kexec_load() syscall in the absence of
kexec_file_load() syscall support, and with CONFIG_CRASH_HOTPLUG
enabled, it is necessary to move prepare_elf_headers() and
dependents outside of CONFIG_KEXEC_FILE.

Signed-off-by: Eric DeVolder <eric.devolder@oracle.com>
Reviewed-by: Sourabh Jain <sourabhjain@linux.ibm.com>
Acked-by: Baoquan He <bhe@redhat.com>
---
 arch/x86/Kconfig             |  13 ++++
 arch/x86/include/asm/kexec.h |  15 +++++
 arch/x86/kernel/crash.c      | 119 ++++++++++++++++++++++++++++++++---
 3 files changed, 140 insertions(+), 7 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 53bab123a8ee..80538524c494 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2119,6 +2119,19 @@ config CRASH_DUMP
 	  (CONFIG_RELOCATABLE=y).
 	  For more details see Documentation/admin-guide/kdump/kdump.rst
 
+config CRASH_HOTPLUG
+	bool "Update the crash elfcorehdr on system configuration changes"
+	default y
+	depends on CRASH_DUMP && (HOTPLUG_CPU || MEMORY_HOTPLUG)
+	help
+	  Enable direct update to the crash elfcorehdr (which contains
+	  the list of CPUs and memory regions to be dumped upon a crash)
+	  in response to hot plug/unplug or online/offline of CPUs or
+	  memory. This is a much more advanced approach than userspace
+	  attempting that.
+
+	  If unsure, say Y.
+
 config KEXEC_JUMP
 	bool "kexec jump"
 	depends on KEXEC && HIBERNATION
diff --git a/arch/x86/include/asm/kexec.h b/arch/x86/include/asm/kexec.h
index 5b77bbc28f96..9143100ea3ea 100644
--- a/arch/x86/include/asm/kexec.h
+++ b/arch/x86/include/asm/kexec.h
@@ -209,6 +209,21 @@ typedef void crash_vmclear_fn(void);
 extern crash_vmclear_fn __rcu *crash_vmclear_loaded_vmcss;
 extern void kdump_nmi_shootdown_cpus(void);
 
+#ifdef CONFIG_CRASH_HOTPLUG
+void arch_crash_handle_hotplug_event(struct kimage *image);
+#define arch_crash_handle_hotplug_event arch_crash_handle_hotplug_event
+
+#ifdef CONFIG_HOTPLUG_CPU
+static inline int crash_hotplug_cpu_support(void) { return 1; }
+#define crash_hotplug_cpu_support crash_hotplug_cpu_support
+#endif
+
+#ifdef CONFIG_MEMORY_HOTPLUG
+static inline int crash_hotplug_memory_support(void) { return 1; }
+#define crash_hotplug_memory_support crash_hotplug_memory_support
+#endif
+#endif
+
 #endif /* __ASSEMBLY__ */
 
 #endif /* _ASM_X86_KEXEC_H */
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index cdd92ab43cda..0c9d496cf7ce 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -41,6 +41,21 @@
 #include <asm/crash.h>
 #include <asm/cmdline.h>
 
+/*
+ * For the kexec_file_load() syscall path, specify the maximum number of
+ * memory regions that the elfcorehdr buffer/segment can accommodate.
+ * These regions are obtained via walk_system_ram_res(); eg. the
+ * 'System RAM' entries in /proc/iomem.
+ * This value is combined with NR_CPUS_DEFAULT and multiplied by
+ * sizeof(Elf64_Phdr) to determine the final elfcorehdr memory buffer/
+ * segment size.
+ * The value 8192, for example, covers a (sparsely populated) 1TiB system
+ * consisting of 128MiB memblocks, while resulting in an elfcorehdr
+ * memory buffer/segment size under 1MiB. This represents a sane choice
+ * to accommodate both baremetal and virtual machine configurations.
+ */
+#define CRASH_MAX_MEMORY_RANGES 8192
+
 /* Used while preparing memory map entries for second kernel */
 struct crash_memmap_data {
 	struct boot_params *params;
@@ -158,8 +173,6 @@ void native_machine_crash_shutdown(struct pt_regs *regs)
 	crash_save_cpu(regs, safe_smp_processor_id());
 }
 
-#ifdef CONFIG_KEXEC_FILE
-
 static int get_nr_ram_ranges_callback(struct resource *res, void *arg)
 {
 	unsigned int *nr_ranges = arg;
@@ -231,7 +244,7 @@ static int prepare_elf64_ram_headers_callback(struct resource *res, void *arg)
 
 /* Prepare elf headers. Return addr and size */
 static int prepare_elf_headers(struct kimage *image, void **addr,
-					unsigned long *sz)
+					unsigned long *sz, unsigned long *nr_mem_ranges)
 {
 	struct crash_mem *cmem;
 	int ret;
@@ -249,6 +262,9 @@ static int prepare_elf_headers(struct kimage *image, void **addr,
 	if (ret)
 		goto out;
 
+	/* Return the computed number of memory ranges, for hotplug usage */
+	*nr_mem_ranges = cmem->nr_ranges;
+
 	/* By default prepare 64bit headers */
 	ret =  crash_prepare_elf64_headers(cmem, IS_ENABLED(CONFIG_X86_64), addr, sz);
 
@@ -257,6 +273,7 @@ static int prepare_elf_headers(struct kimage *image, void **addr,
 	return ret;
 }
 
+#ifdef CONFIG_KEXEC_FILE
 static int add_e820_entry(struct boot_params *params, struct e820_entry *entry)
 {
 	unsigned int nr_e820_entries;
@@ -371,18 +388,42 @@ int crash_setup_memmap_entries(struct kimage *image, struct boot_params *params)
 int crash_load_segments(struct kimage *image)
 {
 	int ret;
+	unsigned long pnum = 0;
 	struct kexec_buf kbuf = { .image = image, .buf_min = 0,
 				  .buf_max = ULONG_MAX, .top_down = false };
 
 	/* Prepare elf headers and add a segment */
-	ret = prepare_elf_headers(image, &kbuf.buffer, &kbuf.bufsz);
+	ret = prepare_elf_headers(image, &kbuf.buffer, &kbuf.bufsz, &pnum);
 	if (ret)
 		return ret;
 
-	image->elf_headers = kbuf.buffer;
-	image->elf_headers_sz = kbuf.bufsz;
+	image->elf_headers	= kbuf.buffer;
+	image->elf_headers_sz	= kbuf.bufsz;
+	kbuf.memsz		= kbuf.bufsz;
+
+#ifdef CONFIG_CRASH_HOTPLUG
+	/*
+	 * Ensure the elfcorehdr segment large enough for hotplug changes.
+	 * Account for VMCOREINFO and kernel_map and maximum CPUs.
+	 */
+	if (IS_ENABLED(CONFIG_MEMORY_HOTPLUG))
+		pnum = 2 + CONFIG_NR_CPUS_DEFAULT + CRASH_MAX_MEMORY_RANGES;
+	else
+		pnum += 2 + CONFIG_NR_CPUS_DEFAULT;
+
+	if (pnum < (unsigned long)PN_XNUM) {
+		kbuf.memsz = pnum * sizeof(Elf64_Phdr);
+		kbuf.memsz += sizeof(Elf64_Ehdr);
+
+		image->elfcorehdr_index = image->nr_segments;
+
+		/* Mark as usable to crash kernel, else crash kernel fails on boot */
+		image->elf_headers_sz = kbuf.memsz;
+	} else {
+		pr_err("number of Phdrs %lu exceeds max\n", pnum);
+	}
+#endif
 
-	kbuf.memsz = kbuf.bufsz;
 	kbuf.buf_align = ELF_CORE_HEADER_ALIGN;
 	kbuf.mem = KEXEC_BUF_MEM_UNKNOWN;
 	ret = kexec_add_buffer(&kbuf);
@@ -395,3 +436,67 @@ int crash_load_segments(struct kimage *image)
 	return ret;
 }
 #endif /* CONFIG_KEXEC_FILE */
+
+#ifdef CONFIG_CRASH_HOTPLUG
+
+#undef pr_fmt
+#define pr_fmt(fmt) "crash hp: " fmt
+
+/**
+ * arch_crash_handle_hotplug_event() - Handle hotplug elfcorehdr changes
+ * @image: the active struct kimage
+ *
+ * The new elfcorehdr is prepared in a kernel buffer, and then it is
+ * written on top of the existing/old elfcorehdr.
+ */
+void arch_crash_handle_hotplug_event(struct kimage *image)
+{
+	void *elfbuf = NULL, *old_elfcorehdr;
+	unsigned long nr_mem_ranges;
+	unsigned long mem, memsz;
+	unsigned long elfsz = 0;
+
+	/*
+	 * Create the new elfcorehdr reflecting the changes to CPU and/or
+	 * memory resources.
+	 */
+	if (prepare_elf_headers(image, &elfbuf, &elfsz, &nr_mem_ranges)) {
+		pr_err("unable to prepare elfcore headers");
+		goto out;
+	}
+
+	/*
+	 * Obtain address and size of the elfcorehdr segment, and
+	 * check it against the new elfcorehdr buffer.
+	 */
+	mem = image->segment[image->elfcorehdr_index].mem;
+	memsz = image->segment[image->elfcorehdr_index].memsz;
+	if (elfsz > memsz) {
+		pr_err("update elfcorehdr elfsz %lu > memsz %lu",
+			elfsz, memsz);
+		goto out;
+	}
+
+	/*
+	 * Copy new elfcorehdr over the old elfcorehdr at destination.
+	 */
+	old_elfcorehdr = kmap_local_page(pfn_to_page(mem >> PAGE_SHIFT));
+	if (!old_elfcorehdr) {
+		pr_err("updating elfcorehdr failed\n");
+		goto out;
+	}
+
+	/*
+	 * Temporarily invalidate the crash image while the
+	 * elfcorehdr is updated.
+	 */
+	xchg(&kexec_crash_image, NULL);
+	memcpy_flushcache(old_elfcorehdr, elfbuf, elfsz);
+	xchg(&kexec_crash_image, image);
+	kunmap_local(old_elfcorehdr);
+	pr_debug("updated elfcorehdr\n");
+
+out:
+	vfree(elfbuf);
+}
+#endif
-- 
2.31.1