Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

kexec: fix the unexpected kexec_dprintk() macro

Jiri reported that the current kexec_dprintk() always prints out debugging
message whenever kexec/kdmmp loading is triggered. That is not wanted.
The debugging message is supposed to be printed out when 'kexec -s -d' is
specified for kexec/kdump loading.

After investigating, the reason is the current kexec_dprintk() takes
printk(KERN_INFO) or printk(KERN_DEBUG) depending on whether '-d' is
specified. However, distros usually have defaulg log level like below:

[~]# cat /proc/sys/kernel/printk
7 4 1 7

So, even though '-d' is not specified, printk(KERN_DEBUG) also always
prints out. I thought printk(KERN_DEBUG) is equal to pr_debug(), it's
not.

Fix it by changing to use pr_info() instead which are expected to work.

Link: https://lkml.kernel.org/r/20240409042238.1240462-1-bhe@redhat.com
Fixes: cbc2fe9d9cb2 ("kexec_file: add kexec_file flag to control debug printing")
Signed-off-by: Baoquan He <bhe@redhat.com>
Reported-by: Jiri Slaby <jirislaby@kernel.org>
Closes: https://lore.kernel.org/all/4c775fca-5def-4a2d-8437-7130b02722a2@kernel.org
Reviewed-by: Dave Young <dyoung@redhat.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Baoquan He and committed by
Andrew Morton
f4af41bf 4707c13d

+2 -4
+2 -4
include/linux/kexec.h
··· 461 461 462 462 extern bool kexec_file_dbg_print; 463 463 464 - #define kexec_dprintk(fmt, ...) \ 465 - printk("%s" fmt, \ 466 - kexec_file_dbg_print ? KERN_INFO : KERN_DEBUG, \ 467 - ##__VA_ARGS__) 464 + #define kexec_dprintk(fmt, arg...) \ 465 + do { if (kexec_file_dbg_print) pr_info(fmt, ##arg); } while (0) 468 466 469 467 #else /* !CONFIG_KEXEC_CORE */ 470 468 struct pt_regs;