On Fri, 2023-11-24 at 11:36 +0800, Baoquan He wrote:
> Replace pr_debug() with the newly added kexec_dprintk() in kexec_file
> loading related codes.
trivia for pr_debug -> kexec_dprintk conversions for
the entire patch set:
> diff --git a/kernel/crash_core.c b/kernel/crash_core.c
[]
> @@ -551,9 +551,12 @@ int crash_prepare_elf64_headers(struct crash_mem *mem,
> int need_kernel_map,
> phdr->p_filesz = phdr->p_memsz = mend - mstart + 1;
> phdr->p_align = 0;
> ehdr->e_phnum++;
> - pr_debug("Crash PT_LOAD ELF header. phdr=%p vaddr=0x%llx,
> paddr=0x%llx, sz=0x%llx e_phnum=%d p_offset=0x%llx\n",
> +#ifdef CONFIG_KEXEC_FILE
> + kexec_dprintk("Crash PT_LOAD ELF header. phdr=%p vaddr=0x%llx,
> paddr=0x%llx, "
> + "sz=0x%llx e_phnum=%d p_offset=0x%llx\n",
> phdr, phdr->p_vaddr, phdr->p_paddr, phdr->p_filesz,
> ehdr->e_phnum, phdr->p_offset);
It's good form to rewrap continuation lines to the open parenthesis
> diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
[]
> @@ -389,11 +391,12 @@ SYSCALL_DEFINE5(kexec_file_load, int, kernel_fd, int,
> initrd_fd,
> if (ret)
> goto out;
>
> + kexec_dprintk("nr_segments = %lu\n", image->nr_segments);
> for (i = 0; i < image->nr_segments; i++) {
> struct kexec_segment *ksegment;
>
> ksegment = &image->segment[i];
> - pr_debug("Loading segment %d: buf=0x%p bufsz=0x%zx mem=0x%lx
> memsz=0x%zx\n",
> + kexec_dprintk("segment[%d]: buf=0x%p bufsz=0x%zx mem=0x%lx
> memsz=0x%zx\n",
> i, ksegment->buf, ksegment->bufsz, ksegment->mem,
> ksegment->memsz);
here too etc...
