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

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

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 arm64 with some adjustments.

Here wrap up crash dumping codes with CONFIG_CRASH_DUMP ifdeffery.

[bhe@redhat.com: fix building error in generic codes]
  Link: https://lkml.kernel.org/r/20240129135033.157195-2-bhe@redhat.com
Link: https://lkml.kernel.org/r/20240124051254.67105-8-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>
parent a4eeb217

arch/arm64/include/asm/kexec.h

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static inline void crash_setup_regs(struct pt_regs *newregs, 
	}

}



#if defined(CONFIG_KEXEC_CORE) && defined(CONFIG_HIBERNATION)

#if defined(CONFIG_CRASH_DUMP) && defined(CONFIG_HIBERNATION)

extern bool crash_is_nosave(unsigned long pfn);

extern void crash_prepare_suspend(void);

extern void crash_post_resume(void);

arch/arm64/kernel/machine_kexec.c

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ void machine_crash_shutdown(struct pt_regs *regs) 
	pr_info("Starting crashdump kernel...\n");

}



#ifdef CONFIG_HIBERNATION

#if defined(CONFIG_CRASH_DUMP) && defined(CONFIG_HIBERNATION)

/*

 * To preserve the crash dump kernel image, the relevant memory segments

 * should be mapped again around the hibernation.

arch/arm64/kernel/machine_kexec_file.c

+8 −2
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image) 
	return kexec_image_post_load_cleanup_default(image);

}



#ifdef CONFIG_CRASH_DUMP

static int prepare_elf_headers(void **addr, unsigned long *sz)

{

	struct crash_mem *cmem;
@@ -80,6 +81,7 @@ static int prepare_elf_headers(void **addr, unsigned long *sz) 
	kfree(cmem);

	return ret;

}

#endif



/*

 * Tries to add the initrd and DTB to the image. If it is not possible to find
@@ -93,8 +95,8 @@ int load_other_segments(struct kimage *image, 
			char *cmdline)

{

	struct kexec_buf kbuf;

	void *headers, *dtb = NULL;

	unsigned long headers_sz, initrd_load_addr = 0, dtb_len,

	void *dtb = NULL;

	unsigned long initrd_load_addr = 0, dtb_len,

		      orig_segments = image->nr_segments;

	int ret = 0;
@@ -102,7 +104,10 @@ int load_other_segments(struct kimage *image, 
	/* not allocate anything below the kernel */

	kbuf.buf_min = kernel_load_addr + kernel_size;



#ifdef CONFIG_CRASH_DUMP

	/* load elf core header */

	void *headers;

	unsigned long headers_sz;

	if (image->type == KEXEC_TYPE_CRASH) {

		ret = prepare_elf_headers(&headers, &headers_sz);

		if (ret) {
@@ -130,6 +135,7 @@ int load_other_segments(struct kimage *image, 
		kexec_dprintk("Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\n",

			      image->elf_load_addr, kbuf.bufsz, kbuf.memsz);

	}

#endif



	/* load initrd */

	if (initrd) {

arch/arm64/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static void __init arch_reserve_crashkernel(void) 
	bool high = false;

	int ret;



	if (!IS_ENABLED(CONFIG_KEXEC_CORE))

	if (!IS_ENABLED(CONFIG_CRASH_RESERVE))

		return;



	ret = parse_crashkernel(cmdline, memblock_phys_mem_size(),

drivers/of/kexec.c

+2 −0
Original line number Diff line number Diff line
@@ -395,6 +395,7 @@ void *of_kexec_alloc_and_setup_fdt(const struct kimage *image, 
		if (ret)

			goto out;



#ifdef CONFIG_CRASH_DUMP

		/* add linux,usable-memory-range */

		ret = fdt_appendprop_addrrange(fdt, 0, chosen_node,

				"linux,usable-memory-range", crashk_res.start,
@@ -410,6 +411,7 @@ void *of_kexec_alloc_and_setup_fdt(const struct kimage *image, 
			if (ret)

				goto out;

		}

#endif

	}



	/* add bootargs */