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

kexec_file, arm64: print out debugging message if required 

Then when specifying '-d' for kexec_file_load interface, loaded locations
of kernel/initrd/cmdline etc can be printed out to help debug.

Here replace pr_debug() with the newly added kexec_dprintk() in kexec_file
loading related codes.

And also remove the kimage->segment[] printing because the generic code
has done the printing.

Link: https://lkml.kernel.org/r/20231213055747.61826-5-bhe@redhat.com


Signed-off-by: default avatarBaoquan He <bhe@redhat.com>
Cc: Conor Dooley <conor@kernel.org>
Cc: Joe Perches <joe@perches.com>
Cc: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent e687b2fa

arch/arm64/kernel/kexec_image.c

+3 −3
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static void *image_load(struct kimage *image, 
	kernel_segment->memsz -= text_offset;

	image->start = kernel_segment->mem;



	pr_debug("Loaded kernel at 0x%lx bufsz=0x%lx memsz=0x%lx\n",

	kexec_dprintk("Loaded kernel at 0x%lx bufsz=0x%lx memsz=0x%lx\n",

		      kernel_segment->mem, kbuf.bufsz,

		      kernel_segment->memsz);

arch/arm64/kernel/machine_kexec.c

+6 −20
Original line number Diff line number Diff line
@@ -32,26 +32,12 @@ 
static void _kexec_image_info(const char *func, int line,

	const struct kimage *kimage)

{

	unsigned long i;



	pr_debug("%s:%d:\n", func, line);

	pr_debug("  kexec kimage info:\n");

	pr_debug("    type:        %d\n", kimage->type);

	pr_debug("    start:       %lx\n", kimage->start);

	pr_debug("    head:        %lx\n", kimage->head);

	pr_debug("    nr_segments: %lu\n", kimage->nr_segments);

	pr_debug("    dtb_mem: %pa\n", &kimage->arch.dtb_mem);

	pr_debug("    kern_reloc: %pa\n", &kimage->arch.kern_reloc);

	pr_debug("    el2_vectors: %pa\n", &kimage->arch.el2_vectors);



	for (i = 0; i < kimage->nr_segments; i++) {

		pr_debug("      segment[%lu]: %016lx - %016lx, 0x%lx bytes, %lu pages\n",

			i,

			kimage->segment[i].mem,

			kimage->segment[i].mem + kimage->segment[i].memsz,

			kimage->segment[i].memsz,

			kimage->segment[i].memsz /  PAGE_SIZE);

	}

	kexec_dprintk("%s:%d:\n", func, line);

	kexec_dprintk("  kexec kimage info:\n");

	kexec_dprintk("    type:        %d\n", kimage->type);

	kexec_dprintk("    head:        %lx\n", kimage->head);

	kexec_dprintk("    kern_reloc: %pa\n", &kimage->arch.kern_reloc);

	kexec_dprintk("    el2_vectors: %pa\n", &kimage->arch.el2_vectors);

}



void machine_kexec_cleanup(struct kimage *kimage)

arch/arm64/kernel/machine_kexec_file.c

+6 −6
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ int load_other_segments(struct kimage *image, 
		image->elf_load_addr = kbuf.mem;

		image->elf_headers_sz = headers_sz;



		pr_debug("Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\n",

		kexec_dprintk("Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\n",

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

	}
@@ -148,7 +148,7 @@ int load_other_segments(struct kimage *image, 
			goto out_err;

		initrd_load_addr = kbuf.mem;



		pr_debug("Loaded initrd at 0x%lx bufsz=0x%lx memsz=0x%lx\n",

		kexec_dprintk("Loaded initrd at 0x%lx bufsz=0x%lx memsz=0x%lx\n",

			      initrd_load_addr, kbuf.bufsz, kbuf.memsz);

	}
@@ -179,7 +179,7 @@ int load_other_segments(struct kimage *image, 
	image->arch.dtb = dtb;

	image->arch.dtb_mem = kbuf.mem;



	pr_debug("Loaded dtb at 0x%lx bufsz=0x%lx memsz=0x%lx\n",

	kexec_dprintk("Loaded dtb at 0x%lx bufsz=0x%lx memsz=0x%lx\n",

		      kbuf.mem, kbuf.bufsz, kbuf.memsz);



	return 0;