x86: optionally show last exception from/to register contents
PATCH 1/1 x86: optionally show last exception from/to register contents
.. when dumping register state. This is particularly useful when gcc managed to tail-call optimize an indirect call which happens to hit a NULL (or otherwise invalid) pointer.
arch/i386/kernel/cpu/amd.c | 4 ++++ arch/i386/kernel/cpu/common.c | 2 ++ arch/i386/kernel/cpu/intel.c | 20 ++++++++++++++------ arch/i386/kernel/traps.c | 27 +++++++++++++++++++++++++++ arch/x86_64/kernel/setup.c | 23 ++++++++++++++++++----- arch/x86_64/kernel/traps.c | 27 +++++++++++++++++++++++++++ include/asm-i386/msr-index.h | 3 +++ include/asm-i386/processor.h | 4 ++++ include/asm-x86_64/processor.h | 3 +++ 9 files changed, 102 insertions(+), 11 deletions(-)
arch/i386/kernel/cpu/amd.c +4 -0
@@ -238,9 +238,13 @@ static void __cpuinit init_amd(struct cpcase 0x10 :case 0x11 :set_bit (X86_FEATURE_K8 , c->x86_capability); +if (ler_enabled) +__get_cpu_var (ler_msr) =MSR_IA32_LASTINTFROMIP ;break ;case 6 :set_bit (X86_FEATURE_K7 , c->x86_capability); +if (ler_enabled) +__get_cpu_var (ler_msr) =MSR_IA32_LASTINTFROMIP ;break ; }if (c->x86 >=6 )
arch/i386/kernel/cpu/common.c +2 -0
@@ -503,6 +503,8 @@ static void __cpuinit identify_cpu(struc/* Init Machine Check Exception if available. */ mcheck_init (c); + +ler_enable (); }void __init identify_boot_cpu (void )
arch/i386/kernel/cpu/intel.c +14 -6
@@ -188,15 +188,23 @@ static void __cpuinit init_intel(struct }#endif -if (c->x86 ==15 ) { +switch (c->x86) { +case 15 :set_bit (X86_FEATURE_P4 , c->x86_capability);set_bit (X86_FEATURE_SYNC_RDTSC , c->x86_capability); - } -if (c->x86 ==6 ) +if (c->x86_model >=0x03 ) +set_bit (X86_FEATURE_CONSTANT_TSC , c->x86_capability); +if (ler_enabled) +__get_cpu_var (ler_msr) =MSR_P4_LER_FROM_LIP ; +break ; +case 6 :set_bit (X86_FEATURE_P3 , c->x86_capability); -if ((c->x86 ==0xf && c->x86_model >=0x03 ) || - (c->x86 ==0x6 && c->x86_model >=0x0e )) -set_bit (X86_FEATURE_CONSTANT_TSC , c->x86_capability); +if (c->x86_model >=0x0e ) +set_bit (X86_FEATURE_CONSTANT_TSC , c->x86_capability); +if (ler_enabled) +__get_cpu_var (ler_msr) =MSR_IA32_LASTINTFROMIP ; +break ; + }if (cpu_has_ds) {unsigned int l1;
arch/i386/kernel/traps.c +27 -0
@@ -321,6 +321,13 @@ void show_registers(struct pt_regs *regsunsigned int code_len = code_bytes;unsigned char c; +if (__get_cpu_var (ler_msr)) { +u32 from, to, hi; + +rdmsr (__get_cpu_var (ler_msr), from, hi); +rdmsr (__get_cpu_var (ler_msr) +1 , to, hi); +printk ("LER: %08x -> %08x\n" , from, to); + }printk ("\n" KERN_EMERG "Stack: " );show_stack_log_lvl (NULL , regs, (unsigned long *)esp,KERN_EMERG );
@@ -360,6 +367,18 @@ int is_valid_bugaddr(unsigned long eip)return ud2 ==0x0b0f ; } +DEFINE_PER_CPU (u32, ler_msr); +int ler_enabled =0 ; + +void ler_enable (void ) { +if (__get_cpu_var (ler_msr)) { +u64 debugctl; + +rdmsrl (MSR_IA32_DEBUGCTLMSR , debugctl); +wrmsrl (MSR_IA32_DEBUGCTLMSR , debugctl |1 ); + } +} +/* * This is gone through when something in the kernel has done something bad and * is about to be terminated.
@@ -846,6 +865,7 @@ fastcall void __kprobes do_debug(structstruct task_struct *tsk = current;get_debugreg (condition,6 ); +ler_enable ();if (notify_die (DIE_DEBUG ,"debug" , regs, condition, error_code,SIGTRAP ) ==NOTIFY_STOP )
@@ -1239,3 +1259,10 @@ static int __init code_bytes_setup(charreturn 1 ; }__setup ("code_bytes=" , code_bytes_setup); + +static int __init ler_setup (char *s) +{ + ler_enabled =1 ; +return 1 ; +} +__setup ("ler" , ler_setup);
arch/x86_64/kernel/setup.c +18 -5
@@ -617,6 +617,9 @@ static void __cpuinit init_amd(struct cp/* Family 10 doesn't support C states in MWAIT so don't use it */ if (c->x86 ==0x10 && !force_mwait)clear_bit (X86_FEATURE_MWAIT , &c->x86_capability); + +if (ler_enabled && c->x86 <=16 ) +__get_cpu_var (ler_msr) =MSR_IA32_LASTINTFROMIP ; }static void __cpuinit detect_ht (struct cpuinfo_x86 *c)
@@ -736,13 +739,22 @@ static void __cpuinit init_intel(struct c->x86_phys_bits =36 ; } -if (c->x86 ==15 ) +switch (c->x86) { +case 15 : c->x86_cache_alignment = c->x86_clflush_size *2 ; -if ((c->x86 ==0xf && c->x86_model >=0x03 ) || - (c->x86 ==0x6 && c->x86_model >=0x0e )) -set_bit (X86_FEATURE_CONSTANT_TSC , &c->x86_capability); -if (c->x86 ==6 ) +if (c->x86_model >=0x03 ) +set_bit (X86_FEATURE_CONSTANT_TSC , &c->x86_capability); +if (ler_enabled) +__get_cpu_var (ler_msr) =MSR_P4_LER_FROM_LIP ; +break ; +case 6 : +if (c->x86_model >=0x0e ) +set_bit (X86_FEATURE_CONSTANT_TSC , &c->x86_capability);set_bit (X86_FEATURE_REP_GOOD , &c->x86_capability); +if (ler_enabled) +__get_cpu_var (ler_msr) =MSR_IA32_LASTINTFROMIP ; +break ; + }if (c->x86 ==15 )set_bit (X86_FEATURE_SYNC_RDTSC , &c->x86_capability);else
@@ -906,6 +918,7 @@ void __cpuinit identify_cpu(struct cpuin#ifdef CONFIG_NUMA numa_add_cpu (smp_processor_id ());#endif +ler_enable (); }
arch/x86_64/kernel/traps.c +27 -0
@@ -426,6 +426,13 @@ void show_registers(struct pt_regs *regs* time of the fault.. */ if (in_kernel) { +if (__get_cpu_var (ler_msr)) { +u64 from, to; + +rdmsrl (__get_cpu_var (ler_msr), from); +rdmsrl (__get_cpu_var (ler_msr) +1 , to); +printk ("LER: %016Lx -> %016Lx\n" , from, to); + }printk ("Stack: " );_show_stack (NULL , regs, (unsigned long *)rsp);
@@ -464,6 +471,18 @@ void out_of_line_bug(void)EXPORT_SYMBOL (out_of_line_bug);#endif +DEFINE_PER_CPU (u32, ler_msr); +int ler_enabled =0 ; + +void ler_enable (void ) { +if (__get_cpu_var (ler_msr)) { +u64 debugctl; + +rdmsrl (MSR_IA32_DEBUGCTLMSR , debugctl); +wrmsrl (MSR_IA32_DEBUGCTLMSR , debugctl |1 ); + } +} +static DEFINE_SPINLOCK (die_lock);static int die_owner =-1 ;static unsigned int die_nest_count;
@@ -849,6 +868,7 @@ asmlinkage void __kprobes do_debug(strucsiginfo_t info;get_debugreg (condition,6 ); +ler_enable ();if (notify_die (DIE_DEBUG ,"debug" , regs, condition, error_code,SIGTRAP ) ==NOTIFY_STOP )
@@ -1136,3 +1156,10 @@ static int __init kstack_setup(char *s)return 0 ; }early_param ("kstack" , kstack_setup); + +static int __init ler_setup (char *s) +{ + ler_enabled =1 ; +return 1 ; +} +__setup ("ler" , ler_setup);
include/asm-i386/msr-index.h +3 -0
@@ -63,6 +63,9 @@#define MSR_IA32_LASTINTFROMIP 0x000001dd#define MSR_IA32_LASTINTTOIP 0x000001de +#define MSR_P4_LER_FROM_LIP 0x000001d7 +#define MSR_P4_LER_TO_LIP 0x000001d8 +#define MSR_IA32_MC0_CTL 0x00000400#define MSR_IA32_MC0_STATUS 0x00000401#define MSR_IA32_MC0_ADDR 0x00000402
include/asm-i386/processor.h +4 -0
@@ -643,6 +643,10 @@ static inline unsigned int cpuid_edx(unsreturn edx; } +DECLARE_PER_CPU (u32, ler_msr); +extern int ler_enabled; +void ler_enable (void ); +/* generic versions from gas */ #define GENERIC_NOP1 ".byte 0x90\n"#define GENERIC_NOP2 ".byte 0x89,0xf6\n"
include/asm-x86_64/processor.h +3 -0
@@ -333,6 +333,9 @@ struct extended_sigtable {struct extended_signature sigs[0 ]; }; +DECLARE_PER_CPU (u32, ler_msr); +extern int ler_enabled; +void ler_enable (void );#define ASM_NOP1 K8_NOP1#define ASM_NOP2 K8_NOP2
Quoted 6 lines · Jan Beulich
arch/i386/kernel/cpu/intel.c +0
-0if (cpu_has_ds) {unsigned int l1;
arch/i386/kernel/traps.c void show_registers(struct pt_regs *regs · line 330
Quoted 10 lines
arch/i386/kernel/traps.c +7
-0@@ -321,6 +321,13 @@ void show_registers(struct pt_regs *regsunsigned int code_len = code_bytes;unsigned char c; +if (__get_cpu_var (ler_msr)) { +u32 from, to, hi; + +rdmsr (__get_cpu_var (ler_msr), from, hi); +rdmsr (__get_cpu_var (ler_msr) +1 , to, hi); +printk ("LER: %08x -> %08x\n" , from, to); + }
This seems racy -- AFAIK the MSR will record the last branch before an interrupt too, and the trap handlers enable interrupts before coming here.
Can't think of a good way to avoid that for page fault at least without impacting interrupt latency or reading the MSR always.
The other thing is that this should use print_symbol()
Quoted 6 lines
arch/i386/kernel/traps.c +0
-0printk ("\n" KERN_EMERG "Stack: " );show_stack_log_lvl (NULL , regs, (unsigned long *)esp,KERN_EMERG );@@ -360,6 +367,18 @@ int is_valid_bugaddr(unsigned long eip)return ud2 ==0x0b0f ; }
arch/i386/kernel/traps.c int is_valid_bugaddr(unsigned long eip) · line 378
Quoted 10 lines
arch/i386/kernel/traps.c +9
-0+DEFINE_PER_CPU (u32, ler_msr); +int ler_enabled =0 ; + +void ler_enable (void ) { +if (__get_cpu_var (ler_msr)) { +u64 debugctl; + +rdmsrl (MSR_IA32_DEBUGCTLMSR , debugctl); +wrmsrl (MSR_IA32_DEBUGCTLMSR , debugctl |1 );
Better use checking_rd/wrmsrl and disable on fail -- often emulators fake specific CPUs, but don't implement all debugging features.
arch/i386/kernel/traps.c static int __init code_bytes_setup(char · line 1268
Quoted 6 lines
arch/i386/kernel/traps.c +6
-0+static int __init ler_setup (char *s) +{ + ler_enabled =1 ; +return 1 ; +} +__setup ("ler" , ler_setup);
I don't think the option is very useful.
BTW I have a patch somewhere to save/report last branch on exception too, but it never seemed suitable for mainline because of its high overhead. If someone submitted a full BTS driver I would be tempted though :)
-Andi
Quoted 14 lines
Quoted 1 line
Quoted 1 line
Andi Kleen <[email protected]> 13.08.07 15:08 >>>
arch/i386/kernel/traps.c void show_registers(struct pt_regs *regs · line 330
Quoted 7 lines · Jan Beulich
arch/i386/kernel/traps.c +7
-0+if (__get_cpu_var (ler_msr)) { +u32 from, to, hi; + +rdmsr (__get_cpu_var (ler_msr), from, hi); +rdmsr (__get_cpu_var (ler_msr) +1 , to, hi); +printk ("LER: %08x -> %08x\n" , from, to); + }This seems racy -- AFAIK the MSR will record the last branch before an interrupt too, and the trap handlers enable interrupts before coming here.
Quoted 2 lines
Can't think of a good way to avoid that for page fault at least without impacting interrupt latency or reading the MSR always.
That's the problem. Other than either going through interrupt gates *and* keeping interrupts disabled long enough, there's nothing you can do, except turning of tracing before re-enabling interrupts, which in turn you would likely reject because of the performance overhead of the necessary rdmsr/wrmsr pair.
Quoted 1 line
The other thing is that this should use
print_symbol()
I considered this, but decided against it due to the address pair being displayed. But I could certainly change that.
Quoted 4 lines
Quoted 4 lines
arch/i386/kernel/traps.c +0
-0@@ -360,6 +367,18 @@ int is_valid_bugaddr(unsigned long eip)return ud2 ==0x0b0f ; }
Quoted 12 lines
arch/i386/kernel/traps.c int is_valid_bugaddr(unsigned long eip) · line 378
Quoted 9 lines
arch/i386/kernel/traps.c +9
-0+DEFINE_PER_CPU (u32, ler_msr); +int ler_enabled =0 ; + +void ler_enable (void ) { +if (__get_cpu_var (ler_msr)) { +u64 debugctl; + +rdmsrl (MSR_IA32_DEBUGCTLMSR , debugctl); +wrmsrl (MSR_IA32_DEBUGCTLMSR , debugctl |1 );Better use checking_rd/wrmsrl and disable on fail -- often emulators fake specific CPUs, but don't implement all debugging features.
Okay, if you consider emulators important here (this is one of the reasons for having to turn on the feature via command line option).
Quoted 8 lines
arch/i386/kernel/traps.c static int __init code_bytes_setup(char · line 1268
Quoted 6 lines
arch/i386/kernel/traps.c +6
-0+static int __init ler_setup (char *s) +{ + ler_enabled =1 ; +return 1 ; +} +__setup ("ler" , ler_setup);I don't think the option is very useful.
Apart from the above, I assume it's also useful initially to avoid boot problems in case the model->msr mapping isn't fully cooked, yet (obviously I don't have machines with all the different CPU families/models around to test, so the coding of what I wasn't able to test is purely based on the manuals).
Quoted 2 lines
BTW I have a patch somewhere to save/report last branch on exception too, but it never seemed suitable for mainline because of its
I though you did, but since I never saw it appear in any release, I posted this one...
So especially with the first concern of yours - is it worth at all rev-ing this patch to address the other change requests you voiced?
Quoted 2 lines
high overhead. If someone submitted a full BTS driver I would be tempted though :)
That shouldn't be too difficult.
Jan
Quoted 2 lines
I though you did, but since I never saw it appear in any release, I posted this one...
It's a little different (and somewhat hackish I admit) ftp://firstfloor.org/pub/ak/x86_64/debug/last-branch It has far more overhead than yours of course.
The only way to merge something like that would be dynamic patching and I was never quite motivated for that.
Quoted 2 lines
So especially with the first concern of yours - is it worth at all rev-ing this patch to address the other change requests you voiced?
The patch is useful even with the race, just document somewhere that it is unreliable (perhaps in the printk itself) and do the other changes.
I would also suggest to enable it by default.
-Andi
Quoted 10 lines · On Mon, 13 Aug 2007 16:21:10 +0200 Andi Kleen wrote:
Quoted 2 lines
I though you did, but since I never saw it appear in any release, I posted this one...
It's a little different (and somewhat hackish I admit) ftp://firstfloor.org/pub/ak/x86_64/debug/last-branch It has far more overhead than yours of course.
The only way to merge something like that would be dynamic patching and I was never quite motivated for that.
Quoted 6 lines
Quoted 2 lines
So especially with the first concern of yours - is it worth at all rev-ing this patch to address the other change requests you voiced?
The patch is useful even with the race, just document somewhere that it is unreliable (perhaps in the printk itself) and do the other changes.
and add "ler" entry to Documentation/kernel-parameters.txt, please, with what it means.
Quoted 1 line
I would also suggest to enable it by default.
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
Quoted 24 lines · Andi Kleen (on Mon, 13 Aug 2007 15:08:45 +0200) wrote:
Quoted 6 lines · Jan Beulich
arch/i386/kernel/cpu/intel.c +0
-0if (cpu_has_ds) {unsigned int l1;arch/i386/kernel/traps.c void show_registers(struct pt_regs *regs · line 330
Quoted 10 lines
arch/i386/kernel/traps.c +7
-0@@ -321,6 +321,13 @@ void show_registers(struct pt_regs *regsunsigned int code_len = code_bytes;unsigned char c; +if (__get_cpu_var (ler_msr)) { +u32 from, to, hi; + +rdmsr (__get_cpu_var (ler_msr), from, hi); +rdmsr (__get_cpu_var (ler_msr) +1 , to, hi); +printk ("LER: %08x -> %08x\n" , from, to); + }This seems racy -- AFAIK the MSR will record the last branch before an interrupt too, and the trap handlers enable interrupts before coming here.
Quoted 2 lines
Can't think of a good way to avoid that for page fault at least without impacting interrupt latency or reading the MSR always.
KDB used to have a "last branch recording" (lbr) feature. The page fault handler was modified to disable lbr before entering do_page_fault(). Nobody seemed to care about the slight slowdown but also nobody seemed to be using that feature for debugging, we rarely get wild branches into the middle of nowhere. lbr was messy to maintain for very little gain, so I removed it from KDB at 2.6.17-i386-2.