Commit 443cbaf9 authored by Baoquan He's avatar Baoquan He Committed by Andrew Morton
Browse files

crash: split vmcoreinfo exporting code out from crash_core.c 

Now move the relevant codes into separate files:
kernel/crash_reserve.c, include/linux/crash_reserve.h.

And add config item CRASH_RESERVE to control its enabling.

And also update the old ifdeffery of CONFIG_CRASH_CORE, including of
<linux/crash_core.h> and config item dependency on CRASH_CORE
accordingly.

And also do renaming as follows:
 - arch/xxx/kernel/{crash_core.c => vmcore_info.c}
because they are only related to vmcoreinfo exporting on x86, arm64,
riscv.

And also Remove config item CRASH_CORE, and rely on CONFIG_KEXEC_CORE to
decide if build in crash_core.c.

[yang.lee@linux.alibaba.com: remove duplicated include in vmcore_info.c]
  Link: https://lkml.kernel.org/r/20240126005744.16561-1-yang.lee@linux.alibaba.com
Link: https://lkml.kernel.org/r/20240124051254.67105-3-bhe@redhat.com


Signed-off-by: default avatarBaoquan He <bhe@redhat.com>
Signed-off-by: default avatarYang Li <yang.lee@linux.alibaba.com>
Acked-by: default avatarHari Bathini <hbathini@linux.ibm.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Pingfan Liu <piliu@redhat.com>
Cc: Klara Modin <klarasmodin@gmail.com>
Cc: Michael Kelley <mhklinux@outlook.com>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Yang Li <yang.lee@linux.alibaba.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 85fcde40

arch/arm64/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ obj-$(CONFIG_KEXEC_FILE) += machine_kexec_file.o kexec_image.o 
obj-$(CONFIG_ARM64_RELOC_TEST)		+= arm64-reloc-test.o

arm64-reloc-test-y := reloc_test_core.o reloc_test_syms.o

obj-$(CONFIG_CRASH_DUMP)		+= crash_dump.o

obj-$(CONFIG_CRASH_CORE)		+= crash_core.o

obj-$(CONFIG_VMCORE_INFO)		+= vmcore_info.o

obj-$(CONFIG_ARM_SDE_INTERFACE)		+= sdei.o

obj-$(CONFIG_ARM64_PTR_AUTH)		+= pointer_auth.o

obj-$(CONFIG_ARM64_MTE)			+= mte.o

arch/arm64/kernel/crash_core.c→arch/arm64/kernel/vmcore_info.c

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * Copyright (C) Huawei Futurewei Technologies.

 */



#include <linux/crash_core.h>

#include <linux/vmcore_info.h>

#include <asm/cpufeature.h>

#include <asm/memory.h>

#include <asm/pgtable-hwdef.h>

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ config ARCH_SELECTS_CRASH_DUMP 
config FA_DUMP

	bool "Firmware-assisted dump"

	depends on PPC64 && (PPC_RTAS || PPC_POWERNV)

	select CRASH_CORE

	select VMCORE_INFO

	select CRASH_RESERVE

	select CRASH_DUMP

	help

arch/powerpc/kernel/setup-common.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ int ppc_do_canonicalize_irqs; 
EXPORT_SYMBOL(ppc_do_canonicalize_irqs);

#endif



#ifdef CONFIG_CRASH_CORE

#ifdef CONFIG_VMCORE_INFO

/* This keeps a track of which one is the crashing cpu. */

int crashing_cpu = -1;

#endif

arch/powerpc/platforms/powernv/opal-core.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/kobject.h>

#include <linux/sysfs.h>

#include <linux/slab.h>

#include <linux/crash_core.h>

#include <linux/vmcore_info.h>

#include <linux/of.h>



#include <asm/page.h>