Skip to contentSkip to conversation

s390/jump_label: Use %*ph to print small buffers

PATCH In review Alexander Kuleshov 2 participants 2 messages Aug 26, 2015 – Aug 27, 2015

Subsystems (2)
s390 Static branch/call
lore
Share & tools
lore

Alexander Kuleshov

author
#0 lore raw

PATCH v2 1/1 s390/jump_label: Use %*ph to print small buffers

printk() supports %*ph format specifier for printing a small buffers, let's use it intead of %02x %02x...

Signed-off-by Alexander Kuleshov <[email protected]>
---
 arch/s390/kernel/jump_label.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
arch/s390/kernel/jump_label.c +3 -6
index a902996..1f615f3 100644
@@ -44,12 +44,9 @@ static void jump_label_bug(struct jump_entry *entry, struct insn *expected,
 	unsigned char *ipn = (unsigned char *)new;
 
 	pr_emerg("Jump label code mismatch at %pS [%p]\n", ipc, ipc);
-	pr_emerg("Found:    %02x %02x %02x %02x %02x %02x\n",
-		 ipc[0], ipc[1], ipc[2], ipc[3], ipc[4], ipc[5]);
-	pr_emerg("Expected: %02x %02x %02x %02x %02x %02x\n",
-		 ipe[0], ipe[1], ipe[2], ipe[3], ipe[4], ipe[5]);
-	pr_emerg("New:      %02x %02x %02x %02x %02x %02x\n",
-		 ipn[0], ipn[1], ipn[2], ipn[3], ipn[4], ipn[5]);
+	pr_emerg("Found:    %6ph\n", ipc);
+	pr_emerg("Expected: %6ph\n", ipe);
+	pr_emerg("New:      %6ph\n", ipn);
 	panic("Corrupted kernel text");
 }
Signature · 1 line
2.5.0
#1 lore raw
Quoted 17 lines · On Thu, 27 Aug 2015 01:17:46 +0600 Alexander Kuleshov <[email protected]>…

printk() supports %*ph format specifier for printing a small buffers, let's use it intead of %02x %02x...

Signed-off-by Alexander Kuleshov <[email protected]>
---
 arch/s390/kernel/jump_label.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
arch/s390/kernel/jump_label.c +0 -1
index a902996..1f615f3 100644
@@ -44,12 +44,9 @@ static void jump_label_bug(struct jump_entry *entry, struct insn *expected,
 	unsigned char *ipn = (unsigned char *)new;
 
 	pr_emerg("Jump label code mismatch at %pS [%p]\n", ipc, ipc);
-	pr_emerg("Found:    %02x %02x %02x %02x %02x %02x\n",

arch/s390/kernel/jump_label.c static void jump_label_bug(struct jump_entry *entry, struct insn *expected, · line 51

Quoted 10 lines
arch/s390/kernel/jump_label.c +3 -5
-		 ipc[0], ipc[1], ipc[2], ipc[3], ipc[4], ipc[5]);
-	pr_emerg("Expected: %02x %02x %02x %02x %02x %02x\n",
-		 ipe[0], ipe[1], ipe[2], ipe[3], ipe[4], ipe[5]);
-	pr_emerg("New:      %02x %02x %02x %02x %02x %02x\n",
-		 ipn[0], ipn[1], ipn[2], ipn[3], ipn[4], ipn[5]);
+	pr_emerg("Found:    %6ph\n", ipc);
+	pr_emerg("Expected: %6ph\n", ipe);
+	pr_emerg("New:      %6ph\n", ipn);
 	panic("Corrupted kernel text");
 }

Nice. Applied to the s390 features branch. Thanks.

Signature · 4 lines
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.