UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf: Fix unsafe frame rewinding with hot regs fetching
This commit is contained in:
Linus Torvalds 2010-04-20 09:20:23 -07:00
parent 186837ca3a ab285f2b52
commit 34388d1c4f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/kernel/dumpstack.h
View File

@ -14,6 +14,8 @@
#define get_bp(bp) asm("movq %%rbp, %0" : "=r" (bp) :) #define get_bp(bp) asm("movq %%rbp, %0" : "=r" (bp) :)
#endif #endif
#include <linux/uaccess.h>
extern void extern void
show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs, show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,
unsigned long *stack, unsigned long bp, char *log_lvl); unsigned long *stack, unsigned long bp, char *log_lvl);
@ -42,8 +44,10 @@ static inline unsigned long rewind_frame_pointer(int n)
get_bp(frame); get_bp(frame);
#ifdef CONFIG_FRAME_POINTER #ifdef CONFIG_FRAME_POINTER
while (n--) while (n--) {
frame = frame->next_frame; if (probe_kernel_address(&frame->next_frame, frame))
break;
}
#endif #endif
return (unsigned long)frame; return (unsigned long)frame;