Commit 47ff774c authored by Baoquan He's avatar Baoquan He Committed by Wen Zhiwei
Browse files

x86, crash: wrap crash dumping code into crash related ifdefs 

stable inclusion
from stable-v6.6.70
commit e5b1574a8ca28c40cf53eda43f6c3b016ed41e27
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBOHV1

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=e5b1574a8ca28c40cf53eda43f6c3b016ed41e27

--------------------------------

[ Upstream commit a4eeb2176d89fdf2785851521577b94b31690a60 ]

Now crash codes under kernel/ folder has been split out from kexec
code, crash dumping can be separated from kexec reboot in config
items on x86 with some adjustments.

Here, also change some ifdefs or IS_ENABLED() check to more appropriate
ones, e,g
 - #ifdef CONFIG_KEXEC_CORE -> #ifdef CONFIG_CRASH_DUMP
 - (!IS_ENABLED(CONFIG_KEXEC_CORE)) - > (!IS_ENABLED(CONFIG_CRASH_RESERVE))

[bhe@redhat.com: don't nest CONFIG_CRASH_DUMP ifdef inside CONFIG_KEXEC_CODE ifdef scope]
  Link: https://lore.kernel.org/all/SN6PR02MB4157931105FA68D72E3D3DB8D47B2@SN6PR02MB4157.namprd02.prod.outlook.com/T/#u
Link: https://lkml.kernel.org/r/20240124051254.67105-7-bhe@redhat.com


Signed-off-by: default avatarBaoquan He <bhe@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Hari Bathini <hbathini@linux.ibm.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>
Stable-dep-of: bcc80dec91ee ("x86/hyperv: Fix hv tsc page based sched_clock for hibernation")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 4fb4cf9d

arch/x86/kernel/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -101,9 +101,9 @@ obj-$(CONFIG_TRACING) += trace.o 
obj-$(CONFIG_RETHOOK)		+= rethook.o

obj-$(CONFIG_CRASH_CORE)	+= crash_core_$(BITS).o

obj-$(CONFIG_KEXEC_CORE)	+= machine_kexec_$(BITS).o

obj-$(CONFIG_KEXEC_CORE)	+= relocate_kernel_$(BITS).o crash.o

obj-$(CONFIG_KEXEC_CORE)	+= relocate_kernel_$(BITS).o

obj-$(CONFIG_KEXEC_FILE)	+= kexec-bzimage64.o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump_$(BITS).o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump_$(BITS).o crash.o

obj-y				+= kprobes/

obj-$(CONFIG_MODULES)		+= module.o

obj-$(CONFIG_X86_32)		+= doublefault_32.o

arch/x86/kernel/cpu/mshyperv.c

+8 −2
Original line number Diff line number Diff line
@@ -209,7 +209,9 @@ static void hv_machine_shutdown(void) 
	if (kexec_in_progress)

		hyperv_cleanup();

}

#endif /* CONFIG_KEXEC_CORE */



#ifdef CONFIG_CRASH_DUMP

static void hv_machine_crash_shutdown(struct pt_regs *regs)

{

	if (hv_crash_handler)
@@ -221,7 +223,7 @@ static void hv_machine_crash_shutdown(struct pt_regs *regs) 
	/* Disable the hypercall page when there is only 1 active CPU. */

	hyperv_cleanup();

}

#endif /* CONFIG_KEXEC_CORE */

#endif /* CONFIG_CRASH_DUMP */

#endif /* CONFIG_HYPERV */



static uint32_t  __init ms_hyperv_platform(void)
@@ -493,9 +495,13 @@ static void __init ms_hyperv_init_platform(void) 
	no_timer_check = 1;

#endif



#if IS_ENABLED(CONFIG_HYPERV) && defined(CONFIG_KEXEC_CORE)

#if IS_ENABLED(CONFIG_HYPERV)

#if defined(CONFIG_KEXEC_CORE)

	machine_ops.shutdown = hv_machine_shutdown;

#endif

#if defined(CONFIG_CRASH_DUMP)

	machine_ops.crash_shutdown = hv_machine_crash_shutdown;

#endif

#endif

	if (ms_hyperv.features & HV_ACCESS_TSC_INVARIANT) {

		/*

arch/x86/kernel/kexec-bzimage64.c

+4 −0
Original line number Diff line number Diff line
@@ -263,11 +263,13 @@ setup_boot_parameters(struct kimage *image, struct boot_params *params, 
	memset(&params->hd0_info, 0, sizeof(params->hd0_info));

	memset(&params->hd1_info, 0, sizeof(params->hd1_info));



#ifdef CONFIG_CRASH_DUMP

	if (image->type == KEXEC_TYPE_CRASH) {

		ret = crash_setup_memmap_entries(image, params);

		if (ret)

			return ret;

	} else

#endif

		setup_e820_entries(params);



	nr_e820_entries = params->e820_entries;
@@ -428,12 +430,14 @@ static void *bzImage64_load(struct kimage *image, char *kernel, 
		return ERR_PTR(-EINVAL);

	}



#ifdef CONFIG_CRASH_DUMP

	/* Allocate and load backup region */

	if (image->type == KEXEC_TYPE_CRASH) {

		ret = crash_load_segments(image);

		if (ret)

			return ERR_PTR(ret);

	}

#endif



	/*

	 * Load purgatory. For 64bit entry point, purgatory  code can be

arch/x86/kernel/kvm.c

+2 −2
Original line number Diff line number Diff line
@@ -769,7 +769,7 @@ static struct notifier_block kvm_pv_reboot_nb = { 
 * won't be valid. In cases like kexec, in which you install a new kernel, this

 * means a random memory location will be kept being written.

 */

#ifdef CONFIG_KEXEC_CORE

#ifdef CONFIG_CRASH_DUMP

static void kvm_crash_shutdown(struct pt_regs *regs)

{

	kvm_guest_cpu_offline(true);
@@ -852,7 +852,7 @@ static void __init kvm_guest_init(void) 
	kvm_guest_cpu_init();

#endif



#ifdef CONFIG_KEXEC_CORE

#ifdef CONFIG_CRASH_DUMP

	machine_ops.crash_shutdown = kvm_crash_shutdown;

#endif

arch/x86/kernel/machine_kexec_64.c

+3 −0
Original line number Diff line number Diff line
@@ -547,6 +547,8 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image) 
}

#endif /* CONFIG_KEXEC_FILE */



#ifdef CONFIG_CRASH_DUMP



static int

kexec_mark_range(unsigned long start, unsigned long end, bool protect)

{
@@ -591,6 +593,7 @@ void arch_kexec_unprotect_crashkres(void) 
{

	kexec_mark_crashkres(false);

}

#endif



/*

 * During a traditional boot under SME, SME will encrypt the kernel,