Commit c56d3406 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/uprobes' into perf/core 



These bits from Oleg are fully cooked, ship them to Linus.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents b13fa914 a03b1e1c

arch/x86/include/asm/traps.h

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ static inline int get_si_code(unsigned long condition) 


extern int panic_on_unrecovered_nmi;



void math_error(struct pt_regs *, int, int);

void math_emulate(struct math_emu_info *);

#ifndef CONFIG_X86_32

asmlinkage void smp_thermal_interrupt(void);

arch/x86/include/asm/uprobes.h

+5 −5
Original line number Diff line number Diff line
@@ -41,18 +41,18 @@ struct arch_uprobe { 
		u8			ixol[MAX_UINSN_BYTES];

	};



	u16				fixups;

	const struct uprobe_xol_ops	*ops;



	union {

#ifdef CONFIG_X86_64

		unsigned long			rip_rela_target_address;

#endif

		struct {

			s32	offs;

			u8	ilen;

			u8	opc1;

		}			branch;

		struct {

			u8	fixups;

			u8	ilen;

		} 			def;

	};

};

arch/x86/kernel/process_64.c

+4 −3
Original line number Diff line number Diff line
@@ -413,12 +413,11 @@ void set_personality_ia32(bool x32) 
	set_thread_flag(TIF_ADDR32);



	/* Mark the associated mm as containing 32-bit tasks. */

	if (current->mm)

		current->mm->context.ia32_compat = 1;



	if (x32) {

		clear_thread_flag(TIF_IA32);

		set_thread_flag(TIF_X32);

		if (current->mm)

			current->mm->context.ia32_compat = TIF_X32;

		current->personality &= ~READ_IMPLIES_EXEC;

		/* is_compat_task() uses the presence of the x32

		   syscall bit flag to determine compat status */
@@ -426,6 +425,8 @@ void set_personality_ia32(bool x32) 
	} else {

		set_thread_flag(TIF_IA32);

		clear_thread_flag(TIF_X32);

		if (current->mm)

			current->mm->context.ia32_compat = TIF_IA32;

		current->personality |= force_personality32;

		/* Prepare the first "return" to user space */

		current_thread_info()->status |= TS_COMPAT;

arch/x86/kernel/traps.c

+62 −48
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/ptrace.h>

#include <linux/uprobes.h>

#include <linux/string.h>

#include <linux/delay.h>

#include <linux/errno.h>
@@ -136,6 +137,37 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str, 
	return -1;

}



static siginfo_t *fill_trap_info(struct pt_regs *regs, int signr, int trapnr,

				siginfo_t *info)

{

	unsigned long siaddr;

	int sicode;



	switch (trapnr) {

	default:

		return SEND_SIG_PRIV;



	case X86_TRAP_DE:

		sicode = FPE_INTDIV;

		siaddr = uprobe_get_trap_addr(regs);

		break;

	case X86_TRAP_UD:

		sicode = ILL_ILLOPN;

		siaddr = uprobe_get_trap_addr(regs);

		break;

	case X86_TRAP_AC:

		sicode = BUS_ADRALN;

		siaddr = 0;

		break;

	}



	info->si_signo = signr;

	info->si_errno = 0;

	info->si_code = sicode;

	info->si_addr = (void __user *)siaddr;

	return info;

}



static void __kprobes

do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,

	long error_code, siginfo_t *info)
@@ -168,60 +200,42 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs, 
	}

#endif



	if (info)

		force_sig_info(signr, info, tsk);

	else

		force_sig(signr, tsk);

	force_sig_info(signr, info ?: SEND_SIG_PRIV, tsk);

}



static void do_error_trap(struct pt_regs *regs, long error_code, char *str,

			  unsigned long trapnr, int signr)

{

	enum ctx_state prev_state = exception_enter();

	siginfo_t info;



	if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) !=

			NOTIFY_STOP) {

		conditional_sti(regs);

		do_trap(trapnr, signr, str, regs, error_code,

			fill_trap_info(regs, signr, trapnr, &info));

	}



	exception_exit(prev_state);

}



#define DO_ERROR(trapnr, signr, str, name)				\

dotraplinkage void do_##name(struct pt_regs *regs, long error_code)	\

{									\

	enum ctx_state prev_state;					\

									\

	prev_state = exception_enter();					\

	if (notify_die(DIE_TRAP, str, regs, error_code,			\

			trapnr, signr) == NOTIFY_STOP) {		\

		exception_exit(prev_state);				\

		return;							\

	}								\

	conditional_sti(regs);						\

	do_trap(trapnr, signr, str, regs, error_code, NULL);		\

	exception_exit(prev_state);					\

}



#define DO_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr)		\

dotraplinkage void do_##name(struct pt_regs *regs, long error_code)	\

{									\

	siginfo_t info;							\

	enum ctx_state prev_state;					\

									\

	info.si_signo = signr;						\

	info.si_errno = 0;						\

	info.si_code = sicode;						\

	info.si_addr = (void __user *)siaddr;				\

	prev_state = exception_enter();					\

	if (notify_die(DIE_TRAP, str, regs, error_code,			\

			trapnr, signr) == NOTIFY_STOP) {		\

		exception_exit(prev_state);				\

		return;							\

	}								\

	conditional_sti(regs);						\

	do_trap(trapnr, signr, str, regs, error_code, &info);		\

	exception_exit(prev_state);					\

}



DO_ERROR_INFO(X86_TRAP_DE,     SIGFPE,  "divide error",			divide_error,		     FPE_INTDIV, regs->ip )

	do_error_trap(regs, error_code, str, trapnr, signr);		\

}



DO_ERROR(X86_TRAP_DE,     SIGFPE,  "divide error",		divide_error)

DO_ERROR(X86_TRAP_OF,     SIGSEGV, "overflow",			overflow)

DO_ERROR(X86_TRAP_BR,     SIGSEGV, "bounds",			bounds)

DO_ERROR_INFO(X86_TRAP_UD,     SIGILL,  "invalid opcode",		invalid_op,		     ILL_ILLOPN, regs->ip )

DO_ERROR(X86_TRAP_UD,     SIGILL,  "invalid opcode",		invalid_op)

DO_ERROR(X86_TRAP_OLD_MF, SIGFPE,  "coprocessor segment overrun",coprocessor_segment_overrun)

DO_ERROR(X86_TRAP_TS,     SIGSEGV, "invalid TSS",		invalid_TSS)

DO_ERROR(X86_TRAP_NP,     SIGBUS,  "segment not present",	segment_not_present)

#ifdef CONFIG_X86_32

DO_ERROR(X86_TRAP_SS,     SIGBUS,  "stack segment",		stack_segment)

#endif

DO_ERROR_INFO(X86_TRAP_AC,     SIGBUS,  "alignment check",		alignment_check,	     BUS_ADRALN, 0	  )

DO_ERROR(X86_TRAP_AC,     SIGBUS,  "alignment check",		alignment_check)



#ifdef CONFIG_X86_64

/* Runs on IST stack */
@@ -305,7 +319,7 @@ do_general_protection(struct pt_regs *regs, long error_code) 
		pr_cont("\n");

	}



	force_sig(SIGSEGV, tsk);

	force_sig_info(SIGSEGV, SEND_SIG_PRIV, tsk);

exit:

	exception_exit(prev_state);

}
@@ -488,7 +502,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code) 
 * the correct behaviour even in the presence of the asynchronous

 * IRQ13 behaviour

 */

void math_error(struct pt_regs *regs, int error_code, int trapnr)

static void math_error(struct pt_regs *regs, int error_code, int trapnr)

{

	struct task_struct *task = current;

	siginfo_t info;
@@ -518,7 +532,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr) 
	task->thread.error_code = error_code;

	info.si_signo = SIGFPE;

	info.si_errno = 0;

	info.si_addr = (void __user *)regs->ip;

	info.si_addr = (void __user *)uprobe_get_trap_addr(regs);

	if (trapnr == X86_TRAP_MF) {

		unsigned short cwd, swd;

		/*
@@ -645,7 +659,7 @@ void math_state_restore(void) 
	 */

	if (unlikely(restore_fpu_checking(tsk))) {

		drop_init_fpu(tsk);

		force_sig(SIGSEGV, tsk);

		force_sig_info(SIGSEGV, SEND_SIG_PRIV, tsk);

		return;

	}

arch/x86/kernel/uprobes.c

+280 −226

File changed.

Preview size limit exceeded, changes collapsed.