Commit d015a092 authored by Pekka Enberg's avatar Pekka Enberg Committed by Ingo Molnar
Browse files

x86: Use KERN_DEFAULT log-level in __show_regs() 



Andrew Morton reported a strange looking kmemcheck warning:

  WARNING: kmemcheck: Caught 32-bit read from uninitialized memory (ffff88004fba6c20)
  0000000000000000310000000000000000000000000000002413000000c9ffff
   u u u u u u u u u u u u u u u u i i i i i i i i u u u u u u u u

   [<ffffffff810af3aa>] kmemleak_scan+0x25a/0x540
   [<ffffffff810afbcb>] kmemleak_scan_thread+0x5b/0xe0
   [<ffffffff8104d0fe>] kthread+0x9e/0xb0
   [<ffffffff81003074>] kernel_thread_helper+0x4/0x10
   [<ffffffffffffffff>] 0xffffffffffffffff

The above printout is missing register dump completely. The
problem here is that the output comes from syslog which doesn't
show KERN_INFO log-level messages. We didn't see this before
because both of us were testing on 32-bit kernels which use the
_default_ log-level.

Fix that up by explicitly using KERN_DEFAULT log-level for
__show_regs() printks.

Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Cc: Vegard Nossum <vegard.nossum@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <1261988819.4641.2.camel@penberg-laptop>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 605c1a18

arch/x86/kernel/process.c

+2 −2
Original line number Diff line number Diff line
@@ -103,8 +103,8 @@ void show_regs_common(void) 
	if (!product)

		product = "";



	printk("\n");

	printk(KERN_INFO "Pid: %d, comm: %.20s %s %s %.*s %s/%s\n",

	printk(KERN_CONT "\n");

	printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s %s/%s\n",

		current->pid, current->comm, print_tainted(),

		init_utsname()->release,

		(int)strcspn(init_utsname()->version, " "),

arch/x86/kernel/process_32.c

+7 −7
Original line number Diff line number Diff line
@@ -139,16 +139,16 @@ void __show_regs(struct pt_regs *regs, int all) 


	show_regs_common();



	printk("EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",

	printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",

			(u16)regs->cs, regs->ip, regs->flags,

			smp_processor_id());

	print_symbol("EIP is at %s\n", regs->ip);



	printk("EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",

	printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",

		regs->ax, regs->bx, regs->cx, regs->dx);

	printk("ESI: %08lx EDI: %08lx EBP: %08lx ESP: %08lx\n",

	printk(KERN_DEFAULT "ESI: %08lx EDI: %08lx EBP: %08lx ESP: %08lx\n",

		regs->si, regs->di, regs->bp, sp);

	printk(" DS: %04x ES: %04x FS: %04x GS: %04x SS: %04x\n",

	printk(KERN_DEFAULT " DS: %04x ES: %04x FS: %04x GS: %04x SS: %04x\n",

	       (u16)regs->ds, (u16)regs->es, (u16)regs->fs, gs, ss);



	if (!all)
@@ -158,19 +158,19 @@ void __show_regs(struct pt_regs *regs, int all) 
	cr2 = read_cr2();

	cr3 = read_cr3();

	cr4 = read_cr4_safe();

	printk("CR0: %08lx CR2: %08lx CR3: %08lx CR4: %08lx\n",

	printk(KERN_DEFAULT "CR0: %08lx CR2: %08lx CR3: %08lx CR4: %08lx\n",

			cr0, cr2, cr3, cr4);



	get_debugreg(d0, 0);

	get_debugreg(d1, 1);

	get_debugreg(d2, 2);

	get_debugreg(d3, 3);

	printk("DR0: %08lx DR1: %08lx DR2: %08lx DR3: %08lx\n",

	printk(KERN_DEFAULT "DR0: %08lx DR1: %08lx DR2: %08lx DR3: %08lx\n",

			d0, d1, d2, d3);



	get_debugreg(d6, 6);

	get_debugreg(d7, 7);

	printk("DR6: %08lx DR7: %08lx\n",

	printk(KERN_DEFAULT "DR6: %08lx DR7: %08lx\n",

			d6, d7);

}

arch/x86/kernel/process_64.c

+12 −12
Original line number Diff line number Diff line
@@ -161,19 +161,19 @@ void __show_regs(struct pt_regs *regs, int all) 
	unsigned int ds, cs, es;



	show_regs_common();

	printk(KERN_INFO "RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->ip);

	printk(KERN_DEFAULT "RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->ip);

	printk_address(regs->ip, 1);

	printk(KERN_INFO "RSP: %04lx:%016lx  EFLAGS: %08lx\n", regs->ss,

	printk(KERN_DEFAULT "RSP: %04lx:%016lx  EFLAGS: %08lx\n", regs->ss,

			regs->sp, regs->flags);

	printk(KERN_INFO "RAX: %016lx RBX: %016lx RCX: %016lx\n",

	printk(KERN_DEFAULT "RAX: %016lx RBX: %016lx RCX: %016lx\n",

	       regs->ax, regs->bx, regs->cx);

	printk(KERN_INFO "RDX: %016lx RSI: %016lx RDI: %016lx\n",

	printk(KERN_DEFAULT "RDX: %016lx RSI: %016lx RDI: %016lx\n",

	       regs->dx, regs->si, regs->di);

	printk(KERN_INFO "RBP: %016lx R08: %016lx R09: %016lx\n",

	printk(KERN_DEFAULT "RBP: %016lx R08: %016lx R09: %016lx\n",

	       regs->bp, regs->r8, regs->r9);

	printk(KERN_INFO "R10: %016lx R11: %016lx R12: %016lx\n",

	printk(KERN_DEFAULT "R10: %016lx R11: %016lx R12: %016lx\n",

	       regs->r10, regs->r11, regs->r12);

	printk(KERN_INFO "R13: %016lx R14: %016lx R15: %016lx\n",

	printk(KERN_DEFAULT "R13: %016lx R14: %016lx R15: %016lx\n",

	       regs->r13, regs->r14, regs->r15);



	asm("movl %%ds,%0" : "=r" (ds));
@@ -194,21 +194,21 @@ void __show_regs(struct pt_regs *regs, int all) 
	cr3 = read_cr3();

	cr4 = read_cr4();



	printk(KERN_INFO "FS:  %016lx(%04x) GS:%016lx(%04x) knlGS:%016lx\n",

	printk(KERN_DEFAULT "FS:  %016lx(%04x) GS:%016lx(%04x) knlGS:%016lx\n",

	       fs, fsindex, gs, gsindex, shadowgs);

	printk(KERN_INFO "CS:  %04x DS: %04x ES: %04x CR0: %016lx\n", cs, ds,

	printk(KERN_DEFAULT "CS:  %04x DS: %04x ES: %04x CR0: %016lx\n", cs, ds,

			es, cr0);

	printk(KERN_INFO "CR2: %016lx CR3: %016lx CR4: %016lx\n", cr2, cr3,

	printk(KERN_DEFAULT "CR2: %016lx CR3: %016lx CR4: %016lx\n", cr2, cr3,

			cr4);



	get_debugreg(d0, 0);

	get_debugreg(d1, 1);

	get_debugreg(d2, 2);

	printk(KERN_INFO "DR0: %016lx DR1: %016lx DR2: %016lx\n", d0, d1, d2);

	printk(KERN_DEFAULT "DR0: %016lx DR1: %016lx DR2: %016lx\n", d0, d1, d2);

	get_debugreg(d3, 3);

	get_debugreg(d6, 6);

	get_debugreg(d7, 7);

	printk(KERN_INFO "DR3: %016lx DR6: %016lx DR7: %016lx\n", d3, d6, d7);

	printk(KERN_DEFAULT "DR3: %016lx DR6: %016lx DR7: %016lx\n", d3, d6, d7);

}



void show_regs(struct pt_regs *regs)

CRA Git | Maintained and supported by SUSTech CRA and CCSE