Commit c9cf4dbb authored by Frederic Weisbecker's avatar Frederic Weisbecker
Browse files

x86: Unify dumpstack.h and stacktrace.h 



arch/x86/include/asm/stacktrace.h and arch/x86/kernel/dumpstack.h
declare headers of objects that deal with the same topic.
Actually most of the files that include stacktrace.h also include
dumpstack.h

Although dumpstack.h seems more reserved for internals of stack
traces, those are quite often needed to define specialized stack
trace operations. And perf event arch headers are going to need
access to such low level operations anyway. So don't continue to
bother with dumpstack.h as it's not anymore about isolated deep
internals.

v2: fix struct stack_frame definition conflict in sysprof

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Soeren Sandmann <sandmann@daimi.au.dk>
parent 9dda696f

arch/x86/include/asm/stacktrace.h

+52 −0
Original line number Diff line number Diff line 
/*

 *  Copyright (C) 1991, 1992  Linus Torvalds

 *  Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs

 */



#ifndef _ASM_X86_STACKTRACE_H

#define _ASM_X86_STACKTRACE_H



#include <linux/uaccess.h>



extern int kstack_depth_to_print;



struct thread_info;
@@ -42,4 +49,49 @@ void dump_trace(struct task_struct *tsk, struct pt_regs *regs, 
		unsigned long *stack, unsigned long bp,

		const struct stacktrace_ops *ops, void *data);



#ifdef CONFIG_X86_32

#define STACKSLOTS_PER_LINE 8

#define get_bp(bp) asm("movl %%ebp, %0" : "=r" (bp) :)

#else

#define STACKSLOTS_PER_LINE 4

#define get_bp(bp) asm("movq %%rbp, %0" : "=r" (bp) :)

#endif



extern void

show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,

		unsigned long *stack, unsigned long bp, char *log_lvl);



extern void

show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,

		unsigned long *sp, unsigned long bp, char *log_lvl);



extern unsigned int code_bytes;



/* The form of the top of the frame on the stack */

struct stack_frame {

	struct stack_frame *next_frame;

	unsigned long return_address;

};



struct stack_frame_ia32 {

    u32 next_frame;

    u32 return_address;

};



static inline unsigned long rewind_frame_pointer(int n)

{

	struct stack_frame *frame;



	get_bp(frame);



#ifdef CONFIG_FRAME_POINTER

	while (n--) {

		if (probe_kernel_address(&frame->next_frame, frame))

			break;

	}

#endif



	return (unsigned long)frame;

}



#endif /* _ASM_X86_STACKTRACE_H */

arch/x86/kernel/cpu/perf_event.c

+0 −2
Original line number Diff line number Diff line
@@ -1585,8 +1585,6 @@ static const struct stacktrace_ops backtrace_ops = { 
	.walk_stack		= print_context_stack_bp,

};



#include "../dumpstack.h"



static void

perf_callchain_kernel(struct pt_regs *regs, struct perf_callchain_entry *entry)

{

arch/x86/kernel/dumpstack.c

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 


#include <asm/stacktrace.h>



#include "dumpstack.h"



int panic_on_unrecovered_nmi;

int panic_on_io_nmi;

arch/x86/kernel/dumpstack.h

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
/*

 *  Copyright (C) 1991, 1992  Linus Torvalds

 *  Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs

 */



#ifndef DUMPSTACK_H

#define DUMPSTACK_H



#ifdef CONFIG_X86_32

#define STACKSLOTS_PER_LINE 8

#define get_bp(bp) asm("movl %%ebp, %0" : "=r" (bp) :)

#else

#define STACKSLOTS_PER_LINE 4

#define get_bp(bp) asm("movq %%rbp, %0" : "=r" (bp) :)

#endif



#include <linux/uaccess.h>



extern void

show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,

		unsigned long *stack, unsigned long bp, char *log_lvl);



extern void

show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,

		unsigned long *sp, unsigned long bp, char *log_lvl);



extern unsigned int code_bytes;



/* The form of the top of the frame on the stack */

struct stack_frame {

	struct stack_frame *next_frame;

	unsigned long return_address;

};



struct stack_frame_ia32 {

    u32 next_frame;

    u32 return_address;

};



static inline unsigned long rewind_frame_pointer(int n)

{

	struct stack_frame *frame;



	get_bp(frame);



#ifdef CONFIG_FRAME_POINTER

	while (n--) {

		if (probe_kernel_address(&frame->next_frame, frame))

			break;

	}

#endif



	return (unsigned long)frame;

}



#endif /* DUMPSTACK_H */

arch/x86/kernel/dumpstack_32.c

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


#include <asm/stacktrace.h>



#include "dumpstack.h"





void dump_trace(struct task_struct *task, struct pt_regs *regs,

		unsigned long *stack, unsigned long bp,

CRA Git | Maintained and supported by SUSTech CRA and CCSE