x86/alternatives: Add pr_fmt() to debug macros
Borislav Petkov
maintainerPATCH 1/1 x86/alternatives: Add pr_fmt() to debug macros
From: Borislav Petkov <[email protected]>
... in order to have debug output prefixed with the pr_fmt text "SMP alternatives:" which allows easy grepping:
$ dmesg | grep "SMP alternatives" [ 0.167783] SMP alternatives: alt table ffffffff8272c780, -> ffffffff8272fd6e [ 0.168620] SMP alternatives: feat: 3*32+16, old: (x86_64_start_kernel+0x37/0x73 \ (ffffffff826093f7) len: 5), repl: (ffffffff8272fd6e, len: 5), pad: 0 [ 0.170103] SMP alternatives: ffffffff826093f7: old_insn: e8 54 a8 da fe [ 0.171184] SMP alternatives: ffffffff8272fd6e: rpl_insn: e8 cd 3e c8 fe ...
No functional changes.
Signed-off-by Borislav Petkov <[email protected]>
--- arch/x86/kernel/alternative.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/alternative.c +2 -2
@@ -53,7 +53,7 @@ __setup("noreplace-smp", setup_noreplace_smp); #define DPRINTK(fmt, args...) \ do { \ if (debug_alternative) \ - printk(KERN_DEBUG "%s: " fmt "\n", __func__, ##args); \ + printk(KERN_DEBUG pr_fmt(fmt) "\n", ##args); \ } while (0) #define DUMP_BYTES(buf, len, fmt, args...) \
@@ -64,7 +64,7 @@ do { \if (!(len)) \break ; \ \ - printk(KERN_DEBUG fmt, ##args); \ + printk(KERN_DEBUG pr_fmt(fmt), ##args); \for (j =0 ; j < (len) -1 ; j++) \printk (KERN_CONT "%02hhx " , buf[j]); \printk (KERN_CONT "%02hhx\n" , buf[j]); \
Signature · 1 line
2.21.0
The following commit has been merged into the x86/alternatives branch of tip:
The following commit has been merged into the x86/alternatives branch of tip:
Commit-ID: 1b2e335ebfa2243517e09f99653c78d1936cb6d2 Gitweb: https://git.kernel.org/tip/1b2e335ebfa2243517e09f99653c78d1936cb6d2 Author: Borislav Petkov <[email protected]> AuthorDate: Mon, 15 Jun 2020 19:49:46 +02:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Tue, 16 Jun 2020 20:34:16 +02:00
x86/alternatives: Add pr_fmt() to debug macros
... in order to have debug output prefixed with the pr_fmt text "SMP alternatives:" which allows easy grepping:
$ dmesg | grep "SMP alternatives" [ 0.167783] SMP alternatives: alt table ffffffff8272c780, -> ffffffff8272fd6e [ 0.168620] SMP alternatives: feat: 3*32+16, old: (x86_64_start_kernel+0x37/0x73 \ (ffffffff826093f7) len: 5), repl: (ffffffff8272fd6e, len: 5), pad: 0 [ 0.170103] SMP alternatives: ffffffff826093f7: old_insn: e8 54 a8 da fe [ 0.171184] SMP alternatives: ffffffff8272fd6e: rpl_insn: e8 cd 3e c8 fe ...
Signed-off-by Borislav Petkov <[email protected]>
--- arch/x86/kernel/alternative.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/alternative.c +2 -2
@@ -53,7 +53,7 @@ __setup("noreplace-smp", setup_noreplace_smp); #define DPRINTK(fmt, args...) \ do { \ if (debug_alternative) \ - printk(KERN_DEBUG "%s: " fmt "\n", __func__, ##args); \ + printk(KERN_DEBUG pr_fmt(fmt) "\n", ##args); \ } while (0) #define DUMP_BYTES(buf, len, fmt, args...) \
@@ -64,7 +64,7 @@ do { \if (!(len)) \break ; \ \ - printk(KERN_DEBUG fmt, ##args); \ + printk(KERN_DEBUG pr_fmt(fmt), ##args); \for (j =0 ; j < (len) -1 ; j++) \printk (KERN_CONT "%02hhx " , buf[j]); \printk (KERN_CONT "%02hhx\n" , buf[j]); \