x86, boot: add hex output for debugging
PATCH v2 1/1 x86, boot: add hex output for debugging
This is useful for reporting various addresses or other values while debugging early boot. For example, when CONFIG_X86_VERBOSE_BOOTUP is set, this is now visible at boot time:
early console in setup code early console in decompress_kernel input_data: 0x0000000001e1526e input_len: 0x0000000000732236 output: 0x0000000001000000 output_len: 0x0000000001535640 run_size: 0x00000000021fb000 KASLR using RDTSC...
---
Since this displays run_size, this patch depends on Junjie Mao's patch "x86, kaslr: Prevent .bss from overlaping initrd"
--- arch/x86/boot/compressed/misc.c | 24 ++++++++++++++++++++++++ arch/x86/boot/compressed/misc.h | 11 +++++++++++ 2 files changed, 35 insertions(+)
arch/x86/boot/compressed/misc.c +24 -0
@@ -220,6 +220,23 @@ void __putstr(const char *s)outb (0xff & (pos >>1 ), vidport+1 ); } +void __puthex (unsigned long value) +{ +char alpha[2 ] ="0" ; +int bits; + +for (bits =sizeof (value) *8 -4 ; bits >=0 ; bits -=4 ) { +unsigned long digit = (value >> bits) &0xf ; + +if (digit <0xA ) + alpha[0 ] ='0' + digit; +else + alpha[0 ] ='a' + (digit -0xA ); + +__putstr (alpha); + } +} +static void error (char *x) {error_putstr ("\n\n" );
@@ -382,6 +399,13 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap, free_mem_ptr = heap;/* Heap */ free_mem_end_ptr = heap +BOOT_HEAP_SIZE ; +/* Report initial kernel position details. */ +debug_putaddr (input_data); +debug_putaddr (input_len); +debug_putaddr (output); +debug_putaddr (output_len); +debug_putaddr (run_size); +/* * The memory hole needed for the kernel is the larger of either * the entire decompressed kernel plus relocation table, or the
arch/x86/boot/compressed/misc.h +11 -0
@@ -34,16 +34,27 @@ extern memptr free_mem_ptr;extern memptr free_mem_end_ptr;extern struct boot_params *real_mode;/* Pointer to real-mode data */ void __putstr (const char *s); +void __puthex (unsigned long value);#define error_putstr (__x) __putstr(__x) +#define error_puthex (__x) __puthex(__x)#ifdef CONFIG_X86_VERBOSE_BOOTUP #define debug_putstr (__x) __putstr(__x) +#define debug_puthex (__x) __puthex(__x) +#define debug_putaddr (__x) { \ + debug_putstr(#__x ": 0x"); \ + debug_puthex((unsigned long)(__x)); \ + debug_putstr("\n"); \ + }#else static inline void debug_putstr (const char *s) { } +static inline void debug_puthex (const char *s) +{ } +#define debug_putaddr (x)/* */ #endif
Signature · 6 lines
1.9.1 -- Kees Cook Chrome OS Security
Quoted 13 lines · Kees Cook
This is useful for reporting various addresses or other values while debugging early boot. For example, when
CONFIG_X86_VERBOSE_BOOTUPis set, this is now visible at boot time:early console in setup code early console in decompress_kernel input_data: 0x0000000001e1526e input_len: 0x0000000000732236 output: 0x0000000001000000 output_len: 0x0000000001535640 run_size: 0x00000000021fb000 KASLR using RDTSC...
Quoted 5 lines
Signed-off-by Kees Cook <[email protected]>---
Since this displaysrun_size, this patch depends on Junjie Mao's patch "x86, kaslr: Prevent .bss from overlaping initrd"
This reminds me: I have a patch to add an early-boot IDT that can report #GP and #PF in this code if CONFIG_X86_VERBOSE_BOOTUP is set. I can dust it off if anyone thinks it'll be useful, even though I won't end up needed it for the thing I wrote it for.
--Andy
Quoted 80 lines
--- arch/x86/boot/compressed/misc.c | 24 ++++++++++++++++++++++++ arch/x86/boot/compressed/misc.h | 11 +++++++++++ 2 files changed, 35 insertions(+)arch/x86/boot/compressed/misc.c +24
-0@@ -220,6 +220,23 @@ void __putstr(const char *s)outb (0xff & (pos >>1 ), vidport+1 ); } +void __puthex (unsigned long value) +{ +char alpha[2 ] ="0" ; +int bits; + +for (bits =sizeof (value) *8 -4 ; bits >=0 ; bits -=4 ) { +unsigned long digit = (value >> bits) &0xf ; + +if (digit <0xA ) + alpha[0 ] ='0' + digit; +else + alpha[0 ] ='a' + (digit -0xA ); + +__putstr (alpha); + } +} +static void error (char *x) {error_putstr ("\n\n" );@@ -382,6 +399,13 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap, free_mem_ptr = heap;/* Heap */ free_mem_end_ptr = heap +BOOT_HEAP_SIZE ; +/* Report initial kernel position details. */ +debug_putaddr (input_data); +debug_putaddr (input_len); +debug_putaddr (output); +debug_putaddr (output_len); +debug_putaddr (run_size); +/* * The memory hole needed for the kernel is the larger of either * the entire decompressed kernel plus relocation table, or the arch/x86/boot/compressed/misc.h +11
-0@@ -34,16 +34,27 @@ extern memptr free_mem_ptr;extern memptr free_mem_end_ptr;extern struct boot_params *real_mode;/* Pointer to real-mode data */ void __putstr (const char *s); +void __puthex (unsigned long value);#define error_putstr (__x) __putstr(__x) +#define error_puthex (__x) __puthex(__x)#ifdef CONFIG_X86_VERBOSE_BOOTUP #define debug_putstr (__x) __putstr(__x) +#define debug_puthex (__x) __puthex(__x) +#define debug_putaddr (__x) { \ + debug_putstr(#__x ": 0x"); \ + debug_puthex((unsigned long)(__x)); \ + debug_putstr("\n"); \ + }#else static inline void debug_putstr (const char *s) { } +static inline void debug_puthex (const char *s) +{ } +#define debug_putaddr (x)/* */ #endif
Quoted 14 lines · Kees Cook
This is useful for reporting various addresses or other values while debugging early boot. For example, when
CONFIG_X86_VERBOSE_BOOTUPis set, this is now visible at boot time:early console in setup code early console in decompress_kernel input_data: 0x0000000001e1526e input_len: 0x0000000000732236 output: 0x0000000001000000 output_len: 0x0000000001535640 run_size: 0x00000000021fb000 KASLR using RDTSC...Signed-off-by Kees Cook <[email protected]>
Quoted 8 lines
---
Since this displaysrun_size, this patch depends on Junjie Mao's patch "x86, kaslr: Prevent .bss from overlaping initrd"--- arch/x86/boot/compressed/misc.c | 24 ++++++++++++++++++++++++ arch/x86/boot/compressed/misc.h | 11 +++++++++++ 2 files changed, 35 insertions(+)
...
We can reuse printf.c in arch/x86/boot.
I had attached one in local tree for a while. or even sent it before several years ago.
Thanks
Yinghai
Subject: [PATCH] x86, boot: Add printf support for early console in compressed/misc.c
Reuse printf.c in x86 setup code.
And print out decompress_kernel input and output info.
Later decompresser code could print out more info for debug info.
--- arch/x86/boot/compressed/Makefile | 2 +- arch/x86/boot/compressed/misc.c | 8 ++++++++ arch/x86/boot/compressed/misc.h | 7 +++++++ arch/x86/boot/compressed/printf.c | 5 +++++ 4 files changed, 21 insertions(+), 1 deletion(-)
arch/x86/boot/compressed/Makefile +1 -1
@@ -28,7 +28,7 @@ HOST_EXTRACFLAGS += -I$(srctree)/tools/i vmlinux-objs-y := $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \ $(obj)/string.o $(obj)/cmdline.o \ - $(obj)/piggy.o $(obj)/cpuflags.o + $(obj)/printf.o $(obj)/piggy.o $(obj)/cpuflags.o vmlinux-objs-$(CONFIG_EARLY_PRINTK) += $(obj)/early_serial_console.o vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/aslr.o
arch/x86/boot/compressed/printf.c new file +5 -0
@@ -0,0 +1,5 @@ +#include "misc.h" + +#define puts (__x) __putstr(__x) + +#include "../printf.c"
arch/x86/boot/compressed/misc.c +2 -0
@@ -390,6 +390,14 @@ asmlinkage __visible void *decompress_ke output =choose_kernel_location (input_data, input_len, output, output_len); +debug_putstr ("decompress_kernel:\n" ); + debug_printf(" input: [0x%lx-0x%lx], output: 0x%lx, heap:
[0x%lx-0x%lx]\n",
+ (unsigned long)input_data,
+ (unsigned long)input_data + input_len - 1,
+ (unsigned long)output,
+ (unsigned long)heap,
+ (unsigned long)heap + BOOT_HEAP_SIZE - 1);
+
/* Validate memory location choices. */
if ((unsigned long)output & (MIN_KERNEL_ALIGN - 1))
error("Destination address inappropriately aligned");arch/x86/boot/compressed/misc.h +7 -0
@@ -36,14 +36,21 @@ extern struct boot_params *real_mode; /void __putstr (const char *s);#define error_putstr (__x) __putstr(__x) +/* printf.c */ +int sprintf (char *buf,const char *fmt, ...); +int printf (const char *fmt, ...); +#ifdef CONFIG_X86_VERBOSE_BOOTUP #define debug_putstr (__x) __putstr(__x) +#define debug_printf printf#else static inline void debug_putstr (const char *s) { } +static inline int debug_printf (const char *fmt, ...) +{ }#endif
Subject: [PATCH] x86, boot: Add printf support for early console in compressed/misc.c
Reuse printf.c in x86 setup code.
And print out decompress_kernel input and output info.
Later decompresser code could print out more info for debug info.
--- arch/x86/boot/compressed/Makefile | 2 +- arch/x86/boot/compressed/misc.c | 8 ++++++++ arch/x86/boot/compressed/misc.h | 7 +++++++ arch/x86/boot/compressed/printf.c | 5 +++++ 4 files changed, 21 insertions(+), 1 deletion(-)
arch/x86/boot/compressed/Makefile +1 -1
@@ -28,7 +28,7 @@ HOST_EXTRACFLAGS += -I$(srctree)/tools/i vmlinux-objs-y := $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \ $(obj)/string.o $(obj)/cmdline.o \ - $(obj)/piggy.o $(obj)/cpuflags.o + $(obj)/printf.o $(obj)/piggy.o $(obj)/cpuflags.o vmlinux-objs-$(CONFIG_EARLY_PRINTK) += $(obj)/early_serial_console.o vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/aslr.o
arch/x86/boot/compressed/printf.c new file +5 -0
@@ -0,0 +1,5 @@ +#include "misc.h" + +#define puts (__x) __putstr(__x) + +#include "../printf.c"
arch/x86/boot/compressed/misc.c +8 -0
@@ -390,6 +390,14 @@ asmlinkage __visible void *decompress_ke output =choose_kernel_location (input_data, input_len, output, output_len); +debug_putstr ("decompress_kernel:\n" ); +debug_printf (" input: [0x%lx-0x%lx], output: 0x%lx, heap: [0x%lx-0x%lx]\n" , + (unsigned long )input_data, + (unsigned long )input_data + input_len -1 , + (unsigned long )output, + (unsigned long )heap, + (unsigned long )heap +BOOT_HEAP_SIZE -1 ); +/* Validate memory location choices. */ if ((unsigned long )output & (MIN_KERNEL_ALIGN -1 ))error ("Destination address inappropriately aligned" );
arch/x86/boot/compressed/misc.h +7 -0
@@ -36,14 +36,21 @@ extern struct boot_params *real_mode; /void __putstr (const char *s);#define error_putstr (__x) __putstr(__x) +/* printf.c */ +int sprintf (char *buf,const char *fmt, ...); +int printf (const char *fmt, ...); +#ifdef CONFIG_X86_VERBOSE_BOOTUP #define debug_putstr (__x) __putstr(__x) +#define debug_printf printf#else static inline void debug_putstr (const char *s) { } +static inline int debug_printf (const char *fmt, ...) +{ }#endif
Quoted 23 lines · Yinghai Lu
Quoted 14 lines · Kees Cook
This is useful for reporting various addresses or other values while debugging early boot. For example, when
CONFIG_X86_VERBOSE_BOOTUPis set, this is now visible at boot time:early console in setup code early console in decompress_kernel input_data: 0x0000000001e1526e input_len: 0x0000000000732236 output: 0x0000000001000000 output_len: 0x0000000001535640 run_size: 0x00000000021fb000 KASLR using RDTSC...Signed-off-by Kees Cook <[email protected]>Quoted 8 lines
---
Since this displaysrun_size, this patch depends on Junjie Mao's patch "x86, kaslr: Prevent .bss from overlaping initrd"--- arch/x86/boot/compressed/misc.c | 24 ++++++++++++++++++++++++ arch/x86/boot/compressed/misc.h | 11 +++++++++++ 2 files changed, 35 insertions(+)
Quoted 6 lines
...
We can reuse
printf.cinarch/x86/boot.I had attached one in local tree for a while. or even sent it before several years ago.
I don't think we need the full generality of printf in the decompression stub. I prefer Kees' patch, though I'd still like to see __puthex made conditional.
- Josh Triplett
Quoted 3 lines · Josh Triplett
I don't think we need the full generality of printf in the decompression stub. I prefer Kees' patch, though I'd still like to see
__puthexmade conditional.
Maybe use a statement expression macro instead?
Something like this could emit the right number of bits for any type
#define __puthex(val) \
({ \
typeof(val) value = val; \
char alpha[2] = {}; \
int bits; \
\
__putstr("0x"); \
for (bits = sizeof(value) * 8 - 4; bits >= 0; bits -= 4) { \
int digit = (value >> bits) & 0xf; \
\
if (digit < 10) \
alpha[0] = '0' + digit; \
else \
alpha[0] = 'a' + (digit - 10); \
\
__putstr(alpha); \
} \
})