leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/livepatch: small cleanups in save_stack_trace_tsk_reliable()

Browse Source 
Mostly cosmetic changes:

- Group common stack pointer code at the top
- Simplify the first frame logic
- Code stackframe iteration into for...loop construct
- Check for trace->nr_entries overflow before adding any into the array

Suggested-by: Nicolai Stange <nstange@suse.de>
Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Joe Lawrence 2019-01-22 10:57:23 -05:00 committed by Michael Ellerman
parent 18be37603d
commit 29a77bbb0c
1 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
arch/powerpc/kernel/stacktrace.c
View File

@ -95,20 +95,11 @@ save_stack_trace_tsk_reliable(struct task_struct *tsk,
struct stack_trace *trace) struct stack_trace *trace)
{ {
unsigned long sp; unsigned long sp;
unsigned long newsp;
unsigned long stack_page = (unsigned long)task_stack_page(tsk); unsigned long stack_page = (unsigned long)task_stack_page(tsk);
unsigned long stack_end; unsigned long stack_end;
int graph_idx = 0; int graph_idx = 0;
bool firstframe;
/*
* The last frame (unwinding first) may not yet have saved
* its LR onto the stack.
*/
int firstframe = 1;
if (tsk == current)
sp = current_stack_pointer();
else
sp = tsk->thread.ksp;
stack_end = stack_page + THREAD_SIZE; stack_end = stack_page + THREAD_SIZE;
if (!is_idle_task(tsk)) { if (!is_idle_task(tsk)) {
@ -135,14 +126,20 @@ save_stack_trace_tsk_reliable(struct task_struct *tsk,
stack_end -= STACK_FRAME_OVERHEAD; stack_end -= STACK_FRAME_OVERHEAD;
} }
if (tsk == current)
sp = current_stack_pointer();
else
sp = tsk->thread.ksp;
if (sp < stack_page + sizeof(struct thread_struct) || if (sp < stack_page + sizeof(struct thread_struct) ||
sp > stack_end - STACK_FRAME_MIN_SIZE) { sp > stack_end - STACK_FRAME_MIN_SIZE) {
return 1; return 1;
} }
for (;;) { for (firstframe = true; sp != stack_end;
firstframe = false, sp = newsp) {
unsigned long *stack = (unsigned long *) sp; unsigned long *stack = (unsigned long *) sp;
unsigned long newsp, ip; unsigned long ip;
/* sanity check: ABI requires SP to be aligned 16 bytes. */ /* sanity check: ABI requires SP to be aligned 16 bytes. */
if (sp & 0xF) if (sp & 0xF)
@ -163,10 +160,8 @@ save_stack_trace_tsk_reliable(struct task_struct *tsk,
* rest of the frame may be uninitialized, continue to * rest of the frame may be uninitialized, continue to
* the next. * the next.
*/ */
if (firstframe) { if (firstframe)
firstframe = 0; continue;
goto next;
}
/* Mark stacktraces with exception frames as unreliable. */ /* Mark stacktraces with exception frames as unreliable. */
if (sp <= stack_end - STACK_INT_FRAME_SIZE && if (sp <= stack_end - STACK_INT_FRAME_SIZE &&
@ -193,19 +188,12 @@ save_stack_trace_tsk_reliable(struct task_struct *tsk,
return 1; return 1;
#endif #endif
if (trace->nr_entries >= trace->max_entries)
return -E2BIG;
if (!trace->skip) if (!trace->skip)
trace->entries[trace->nr_entries++] = ip; trace->entries[trace->nr_entries++] = ip;
else else
trace->skip--; trace->skip--;
next:
if (newsp == stack_end)
break;
if (trace->nr_entries >= trace->max_entries)
return -E2BIG;
sp = newsp;
} }
return 0; return 0;
} }