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: Baoquan 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: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/arm64/kernel/kexec_image.c b/arch/arm64/kernel/kexec_image.c
index 636be671515575c677cb1743b61d444a088daac2..532d72ea42ee8e5d4c83d4293e594a4a06d95127 100644 (file)
--- a/arch/arm64/kernel/kexec_image.c
+++ b/arch/arm64/kernel/kexec_image.c
@@ -122,9 +122,9 @@ 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",
-                               kernel_segment->mem, kbuf.bufsz,
-                               kernel_segment->memsz);
+       kexec_dprintk("Loaded kernel at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
+                     kernel_segment->mem, kbuf.bufsz,
+                     kernel_segment->memsz);
 
        return NULL;
 }

diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c
index 078910db77a41b6ffa60c665debc927dff0c7ca5..b38aae5b488d074dc6e4d36f44d741ea200acaf9 100644 (file)
--- a/arch/arm64/kernel/machine_kexec.c
+++ b/arch/arm64/kernel/machine_kexec.c
@@ -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)

diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
index a11a6e14ba89f648aac6e378beb2eb9d0d066c33..0e017358f4ba64ed07fb2d0626725b680810c681 100644 (file)
--- a/arch/arm64/kernel/machine_kexec_file.c
+++ b/arch/arm64/kernel/machine_kexec_file.c
@@ -127,8 +127,8 @@ 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",
-                        image->elf_load_addr, kbuf.bufsz, kbuf.memsz);
+               kexec_dprintk("Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
+                             image->elf_load_addr, kbuf.bufsz, kbuf.memsz);
        }
 
        /* load initrd */
@@ -148,8 +148,8 @@ 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",
-                               initrd_load_addr, kbuf.bufsz, kbuf.memsz);
+               kexec_dprintk("Loaded initrd at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
+                             initrd_load_addr, kbuf.bufsz, kbuf.memsz);
        }
 
        /* load dtb */
@@ -179,8 +179,8 @@ 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",
-                       kbuf.mem, kbuf.bufsz, kbuf.memsz);
+       kexec_dprintk("Loaded dtb at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
+                     kbuf.mem, kbuf.bufsz, kbuf.memsz);
 
        return 0;