d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a better check for a valid kernel stack address when capturing

Browse Source 
kernel call chains.

Submitted by:	Mark Unangst <mju at panasas.com>
Tested by:	fabient
This commit is contained in:
Joseph Koshy 2009-12-03 14:59:42 +00:00
parent 4f60c0b97d
commit c66e06a2f6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/hwpmc/hwpmc_x86.c
View File

@ -176,7 +176,8 @@ pmc_save_kernel_callchain(uintptr_t *cc, int nframes, struct trapframe *tf)
stackend = (uintptr_t) td->td_kstack + td->td_kstack_pages * PAGE_SIZE; stackend = (uintptr_t) td->td_kstack + td->td_kstack_pages * PAGE_SIZE;
if (PMC_IN_TRAP_HANDLER(pc) || if (PMC_IN_TRAP_HANDLER(pc) ||
!PMC_IN_KERNEL(pc) || !PMC_IN_KERNEL(r) || !PMC_IN_KERNEL(pc) ||
!PMC_IN_KERNEL_STACK(r, stackstart, stackend) ||
!PMC_IN_KERNEL_STACK(sp, stackstart, stackend) || !PMC_IN_KERNEL_STACK(sp, stackstart, stackend) ||
!PMC_IN_KERNEL_STACK(fp, stackstart, stackend)) !PMC_IN_KERNEL_STACK(fp, stackstart, stackend))
return (1); return (1);
@ -221,7 +222,7 @@ pmc_save_kernel_callchain(uintptr_t *cc, int nframes, struct trapframe *tf)
r = fp + sizeof(uintptr_t); r = fp + sizeof(uintptr_t);
if (!PMC_IN_KERNEL_STACK(fp, stackstart, stackend) || if (!PMC_IN_KERNEL_STACK(fp, stackstart, stackend) ||
!PMC_IN_KERNEL(r)) !PMC_IN_KERNEL_STACK(r, stackstart, stackend))
break; break;
pc = *(uintptr_t *) r; pc = *(uintptr_t *) r;
fp = *(uintptr_t *) fp; fp = *(uintptr_t *) fp;