Skip to content

Commit b741092

Browse files
sourabhjainsmpe
authored andcommitted
powerpc/crash: add crash CPU hotplug support
Due to CPU/Memory hotplug or online/offline events, the elfcorehdr (which describes the CPUs and memory of the crashed kernel) and FDT (Flattened Device Tree) of kdump image becomes outdated. Consequently, attempting dump collection with an outdated elfcorehdr or FDT can lead to failed or inaccurate dump collection. Going forward, CPU hotplug or online/offline events are referred as CPU/Memory add/remove events. The current solution to address the above issue involves monitoring the CPU/Memory add/remove events in userspace using udev rules and whenever there are changes in CPU and memory resources, the entire kdump image is loaded again. The kdump image includes kernel, initrd, elfcorehdr, FDT, purgatory. Given that only elfcorehdr and FDT get outdated due to CPU/Memory add/remove events, reloading the entire kdump image is inefficient. More importantly, kdump remains inactive for a substantial amount of time until the kdump reload completes. To address the aforementioned issue, commit 2472627 ("crash: add generic infrastructure for crash hotplug support") added a generic infrastructure that allows architectures to selectively update the kdump image component during CPU or memory add/remove events within the kernel itself. In the event of a CPU or memory add/remove events, the generic crash hotplug event handler, `crash_handle_hotplug_event()`, is triggered. It then acquires the necessary locks to update the kdump image and invokes the architecture-specific crash hotplug handler, `arch_crash_handle_hotplug_event()`, to update the required kdump image components. This patch adds crash hotplug handler for PowerPC and enable support to update the kdump image on CPU add/remove events. Support for memory add/remove events is added in a subsequent patch with the title "powerpc: add crash memory hotplug support" As mentioned earlier, only the elfcorehdr and FDT kdump image components need to be updated in the event of CPU or memory add/remove events. However, on PowerPC architecture crash hotplug handler only updates the FDT to enable crash hotplug support for CPU add/remove events. Here's why. The elfcorehdr on PowerPC is built with possible CPUs, and thus, it does not need an update on CPU add/remove events. On the other hand, the FDT needs to be updated on CPU add events to include the newly added CPU. If the FDT is not updated and the kernel crashes on a newly added CPU, the kdump kernel will fail to boot due to the unavailability of the crashing CPU in the FDT. During the early boot, it is expected that the boot CPU must be a part of the FDT; otherwise, the kernel will raise a BUG and fail to boot. For more information, refer to commit 36ae37e ("powerpc: Make boot_cpuid common between 32 and 64-bit"). Since it is okay to have an offline CPU in the kdump FDT, no action is taken in case of CPU removal. There are two system calls, `kexec_file_load` and `kexec_load`, used to load the kdump image. Few changes have been made to ensure kernel can safely update the FDT of kdump image loaded using both system calls. For kexec_file_load syscall the kdump image is prepared in kernel. So to support an increasing number of CPUs, the FDT is constructed with extra buffer space to ensure it can accommodate a possible number of CPU nodes. Additionally, a call to fdt_pack (which trims the unused space once the FDT is prepared) is avoided if this feature is enabled. For the kexec_load syscall, the FDT is updated only if the KEXEC_CRASH_HOTPLUG_SUPPORT kexec flag is passed to the kernel by userspace (kexec tools). When userspace passes this flag to the kernel, it indicates that the FDT is built to accommodate possible CPUs, and the FDT segment is excluded from SHA calculation, making it safe to update. The changes related to this feature are kept under the CRASH_HOTPLUG config, and it is enabled by default. Signed-off-by: Sourabh Jain <[email protected]> Acked-by: Hari Bathini <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://msgid.link/[email protected]
1 parent 0857bef commit b741092

File tree

5 files changed

+134
-1
lines changed

5 files changed

+134
-1
lines changed

arch/powerpc/Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -686,6 +686,10 @@ config ARCH_SELECTS_CRASH_DUMP
686686
depends on CRASH_DUMP
687687
select RELOCATABLE if PPC64 || 44x || PPC_85xx
688688

689+
config ARCH_SUPPORTS_CRASH_HOTPLUG
690+
def_bool y
691+
depends on PPC64
692+
689693
config FA_DUMP
690694
bool "Firmware-assisted dump"
691695
depends on CRASH_DUMP && PPC64 && (PPC_RTAS || PPC_POWERNV)

arch/powerpc/include/asm/kexec.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,14 @@ static inline void crash_setup_regs(struct pt_regs *newregs,
135135
ppc_save_regs(newregs);
136136
}
137137

138+
#ifdef CONFIG_CRASH_HOTPLUG
139+
void arch_crash_handle_hotplug_event(struct kimage *image, void *arg);
140+
#define arch_crash_handle_hotplug_event arch_crash_handle_hotplug_event
141+
142+
int arch_crash_hotplug_support(struct kimage *image, unsigned long kexec_flags);
143+
#define arch_crash_hotplug_support arch_crash_hotplug_support
144+
#endif /* CONFIG_CRASH_HOTPLUG */
145+
138146
extern int crashing_cpu;
139147
extern void crash_send_ipi(void (*crash_ipi_callback)(struct pt_regs *));
140148
extern void crash_ipi_callback(struct pt_regs *regs);

arch/powerpc/kexec/crash.c

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <linux/delay.h>
1717
#include <linux/irq.h>
1818
#include <linux/types.h>
19+
#include <linux/libfdt.h>
1920

2021
#include <asm/processor.h>
2122
#include <asm/machdep.h>
@@ -392,3 +393,105 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
392393
if (ppc_md.kexec_cpu_down)
393394
ppc_md.kexec_cpu_down(1, 0);
394395
}
396+
397+
#ifdef CONFIG_CRASH_HOTPLUG
398+
#undef pr_fmt
399+
#define pr_fmt(fmt) "crash hp: " fmt
400+
401+
/**
402+
* get_fdt_index - Loop through the kexec segment array and find
403+
* the index of the FDT segment.
404+
* @image: a pointer to kexec_crash_image
405+
*
406+
* Returns the index of FDT segment in the kexec segment array
407+
* if found; otherwise -1.
408+
*/
409+
static int get_fdt_index(struct kimage *image)
410+
{
411+
void *ptr;
412+
unsigned long mem;
413+
int i, fdt_index = -1;
414+
415+
/* Find the FDT segment index in kexec segment array. */
416+
for (i = 0; i < image->nr_segments; i++) {
417+
mem = image->segment[i].mem;
418+
ptr = __va(mem);
419+
420+
if (ptr && fdt_magic(ptr) == FDT_MAGIC) {
421+
fdt_index = i;
422+
break;
423+
}
424+
}
425+
426+
return fdt_index;
427+
}
428+
429+
/**
430+
* update_crash_fdt - updates the cpus node of the crash FDT.
431+
*
432+
* @image: a pointer to kexec_crash_image
433+
*/
434+
static void update_crash_fdt(struct kimage *image)
435+
{
436+
void *fdt;
437+
int fdt_index;
438+
439+
fdt_index = get_fdt_index(image);
440+
if (fdt_index < 0) {
441+
pr_err("Unable to locate FDT segment.\n");
442+
return;
443+
}
444+
445+
fdt = __va((void *)image->segment[fdt_index].mem);
446+
447+
/* Temporarily invalidate the crash image while it is replaced */
448+
xchg(&kexec_crash_image, NULL);
449+
450+
/* update FDT to reflect changes in CPU resources */
451+
if (update_cpus_node(fdt))
452+
pr_err("Failed to update crash FDT");
453+
454+
/* The crash image is now valid once again */
455+
xchg(&kexec_crash_image, image);
456+
}
457+
458+
int arch_crash_hotplug_support(struct kimage *image, unsigned long kexec_flags)
459+
{
460+
#ifdef CONFIG_KEXEC_FILE
461+
if (image->file_mode)
462+
return 1;
463+
#endif
464+
return kexec_flags & KEXEC_CRASH_HOTPLUG_SUPPORT;
465+
}
466+
467+
/**
468+
* arch_crash_handle_hotplug_event - Handle crash CPU/Memory hotplug events to update the
469+
* necessary kexec segments based on the hotplug event.
470+
* @image: a pointer to kexec_crash_image
471+
* @arg: struct memory_notify handler for memory hotplug case and NULL for CPU hotplug case.
472+
*
473+
* Update the kdump image based on the type of hotplug event, represented by image->hp_action.
474+
* CPU add: Update the FDT segment to include the newly added CPU.
475+
* CPU remove: No action is needed, with the assumption that it's okay to have offline CPUs
476+
* part of the FDT.
477+
* Memory add/remove: No action is taken as this is not yet supported.
478+
*/
479+
void arch_crash_handle_hotplug_event(struct kimage *image, void *arg)
480+
{
481+
switch (image->hp_action) {
482+
case KEXEC_CRASH_HP_REMOVE_CPU:
483+
return;
484+
485+
case KEXEC_CRASH_HP_ADD_CPU:
486+
update_crash_fdt(image);
487+
break;
488+
489+
case KEXEC_CRASH_HP_REMOVE_MEMORY:
490+
case KEXEC_CRASH_HP_ADD_MEMORY:
491+
pr_info_once("Crash update is not supported for memory hotplug\n");
492+
return;
493+
default:
494+
pr_warn_once("Unknown hotplug action\n");
495+
}
496+
}
497+
#endif /* CONFIG_CRASH_HOTPLUG */

arch/powerpc/kexec/elf_64.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ static void *elf64_load(struct kimage *image, char *kernel_buf,
116116
if (ret)
117117
goto out_free_fdt;
118118

119-
fdt_pack(fdt);
119+
if (!IS_ENABLED(CONFIG_CRASH_HOTPLUG) || image->type != KEXEC_TYPE_CRASH)
120+
fdt_pack(fdt);
120121

121122
kbuf.buffer = fdt;
122123
kbuf.bufsz = kbuf.memsz = fdt_totalsize(fdt);

arch/powerpc/kexec/file_load_64.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include <asm/iommu.h>
3131
#include <asm/prom.h>
3232
#include <asm/plpks.h>
33+
#include <asm/cputhreads.h>
3334

3435
struct umem_info {
3536
__be64 *buf; /* data buffer for usable-memory property */
@@ -789,6 +790,9 @@ static unsigned int kdump_extra_fdt_size_ppc64(struct kimage *image)
789790
unsigned int cpu_nodes, extra_size = 0;
790791
struct device_node *dn;
791792
u64 usm_entries;
793+
#ifdef CONFIG_CRASH_HOTPLUG
794+
unsigned int possible_cpu_nodes;
795+
#endif
792796

793797
if (!IS_ENABLED(CONFIG_CRASH_DUMP) || image->type != KEXEC_TYPE_CRASH)
794798
return 0;
@@ -816,6 +820,19 @@ static unsigned int kdump_extra_fdt_size_ppc64(struct kimage *image)
816820
if (cpu_nodes > boot_cpu_node_count)
817821
extra_size += (cpu_nodes - boot_cpu_node_count) * cpu_node_size();
818822

823+
#ifdef CONFIG_CRASH_HOTPLUG
824+
/*
825+
* Make sure enough space is reserved to accommodate possible CPU nodes
826+
* in the crash FDT. This allows packing possible CPU nodes which are
827+
* not yet present in the system without regenerating the entire FDT.
828+
*/
829+
if (image->type == KEXEC_TYPE_CRASH) {
830+
possible_cpu_nodes = num_possible_cpus() / threads_per_core;
831+
if (possible_cpu_nodes > cpu_nodes)
832+
extra_size += (possible_cpu_nodes - cpu_nodes) * cpu_node_size();
833+
}
834+
#endif
835+
819836
return extra_size;
820837
}
821838

0 commit comments

Comments
 (0)