Skip to contentSkip to conversation

kexec-fix-the-unexpected-kexec_dprintk-macro.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message May 6, 2024 Stable branch

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: kexec: fix the unexpected kexec_dprintk() macro
has been removed from the -mm tree. Its filename was
kexec-fix-the-unexpected-kexec_dprintk-macro.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Baoquan He <[email protected]>
Subject: kexec: fix the unexpected kexec_dprintk() macro
Date: Tue, 9 Apr 2024 12:22:38 +0800

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.

---

 include/linux/kexec.h |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
include/linux/kexec.h renamed from include/linux/kexec.h~kexec-fix-the-unexpected-kexec_dprintk-macro +2 -4
@@ -461,10 +461,8 @@ static inline void arch_kexec_pre_free_p
 
 extern bool kexec_file_dbg_print;
 
-#define kexec_dprintk(fmt, ...)					\
-	printk("%s" fmt,					\
-	       kexec_file_dbg_print ? KERN_INFO : KERN_DEBUG,	\
-	       ##__VA_ARGS__)
+#define kexec_dprintk(fmt, arg...) \
+        do { if (kexec_file_dbg_print) pr_info(fmt, ##arg); } while (0)
 
 #else /* !CONFIG_KEXEC_CORE */
 struct pt_regs;

_

Patches currently in -mm which might be from [email protected] are