Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25c74b10 authored by Seiji Aguchi's avatar Seiji Aguchi Committed by H. Peter Anvin
Browse files

x86, trace: Register exception handler to trace IDT 



This patch registers exception handlers for tracing to a trace IDT.

To implemented it in set_intr_gate(), this patch does followings.
 - Register the exception handlers to
   the trace IDT by prepending "trace_" to the handler's names.
 - Also, newly introduce trace_page_fault() to add tracepoints
   in a subsequent patch.

Signed-off-by: default avatarSeiji Aguchi <seiji.aguchi@hds.com>
Link: http://lkml.kernel.org/r/52716DEC.5050204@hds.com


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 959c071f

arch/x86/include/asm/desc.h

+23 −5
Original line number Diff line number Diff line
@@ -327,10 +327,25 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate) 
{

	write_idt_entry(trace_idt_table, entry, gate);

}



static inline void _trace_set_gate(int gate, unsigned type, void *addr,

				   unsigned dpl, unsigned ist, unsigned seg)

{

	gate_desc s;



	pack_gate(&s, type, (unsigned long)addr, dpl, ist, seg);

	/*

	 * does not need to be atomic because it is only done once at

	 * setup time

	 */

	write_trace_idt_entry(gate, &s);

}

#else

static inline void write_trace_idt_entry(int entry, const gate_desc *gate)

{

}



#define _trace_set_gate(gate, type, addr, dpl, ist, seg)

#endif



static inline void _set_gate(int gate, unsigned type, void *addr,
@@ -353,11 +368,14 @@ static inline void _set_gate(int gate, unsigned type, void *addr, 
 * Pentium F0 0F bugfix can have resulted in the mapped

 * IDT being write-protected.

 */

static inline void set_intr_gate(unsigned int n, void *addr)

{

	BUG_ON((unsigned)n > 0xFF);

	_set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS);

}

#define set_intr_gate(n, addr)						\

	do {								\

		BUG_ON((unsigned)n > 0xFF);				\

		_set_gate(n, GATE_INTERRUPT, (void *)addr, 0, 0,	\

			  __KERNEL_CS);					\

		_trace_set_gate(n, GATE_INTERRUPT, (void *)trace_##addr,\

				0, 0, __KERNEL_CS);			\

	} while (0)



extern int first_system_vector;

/* used_vectors is BITMAP for irq is not managed by percpu vector_irq */

arch/x86/include/asm/hw_irq.h

+3 −0
Original line number Diff line number Diff line
@@ -187,6 +187,9 @@ extern __visible void smp_invalidate_interrupt(struct pt_regs *); 
#endif



extern void (*__initconst interrupt[NR_VECTORS-FIRST_EXTERNAL_VECTOR])(void);

#ifdef CONFIG_TRACING

#define trace_interrupt interrupt

#endif



typedef int vector_irq_t[NR_VECTORS];

DECLARE_PER_CPU(vector_irq_t, vector_irq);

arch/x86/include/asm/segment.h

+3 −0
Original line number Diff line number Diff line
@@ -214,6 +214,9 @@ 
#ifdef __KERNEL__

#ifndef __ASSEMBLY__

extern const char early_idt_handlers[NUM_EXCEPTION_VECTORS][2+2+5];

#ifdef CONFIG_TRACING

#define trace_early_idt_handlers early_idt_handlers

#endif



/*

 * Load a segment. Fall back on loading the zero

arch/x86/include/asm/traps.h

+20 −0
Original line number Diff line number Diff line
@@ -37,6 +37,23 @@ asmlinkage void machine_check(void); 
#endif /* CONFIG_X86_MCE */

asmlinkage void simd_coprocessor_error(void);



#ifdef CONFIG_TRACING

asmlinkage void trace_page_fault(void);

#define trace_divide_error divide_error

#define trace_bounds bounds

#define trace_invalid_op invalid_op

#define trace_device_not_available device_not_available

#define trace_coprocessor_segment_overrun coprocessor_segment_overrun

#define trace_invalid_TSS invalid_TSS

#define trace_segment_not_present segment_not_present

#define trace_general_protection general_protection

#define trace_spurious_interrupt_bug spurious_interrupt_bug

#define trace_coprocessor_error coprocessor_error

#define trace_alignment_check alignment_check

#define trace_simd_coprocessor_error simd_coprocessor_error

#define trace_async_page_fault async_page_fault

#endif



dotraplinkage void do_divide_error(struct pt_regs *, long);

dotraplinkage void do_debug(struct pt_regs *, long);

dotraplinkage void do_nmi(struct pt_regs *, long);
@@ -55,6 +72,9 @@ asmlinkage __kprobes struct pt_regs *sync_regs(struct pt_regs *); 
#endif

dotraplinkage void do_general_protection(struct pt_regs *, long);

dotraplinkage void do_page_fault(struct pt_regs *, unsigned long);

#ifdef CONFIG_TRACING

dotraplinkage void trace_do_page_fault(struct pt_regs *, unsigned long);

#endif

dotraplinkage void do_spurious_interrupt_bug(struct pt_regs *, long);

dotraplinkage void do_coprocessor_error(struct pt_regs *, long);

dotraplinkage void do_alignment_check(struct pt_regs *, long);

arch/x86/kernel/entry_32.S

+10 −0
Original line number Diff line number Diff line
@@ -1247,6 +1247,16 @@ return_to_handler: 
 */

	.pushsection .kprobes.text, "ax"



#ifdef CONFIG_TRACING

ENTRY(trace_page_fault)

	RING0_EC_FRAME

	ASM_CLAC

	pushl_cfi $trace_do_page_fault

	jmp error_code

	CFI_ENDPROC

END(trace_page_fault)

#endif



ENTRY(page_fault)

	RING0_EC_FRAME

	ASM_CLAC