Merge branch 'perf/uprobes' into perf/core

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

Signed-off-by: Ingo Molnar <mingo@kernel.org>

8 files changed, 402 insertions, 317 deletions

diff --git a/arch/x86/include/asm/traps.h b/arch/x86/include/asm/traps.h
index 58d66fe06b61..a7b212db9e04 100644
--- a/arch/x86/include/asm/traps.h
+++ b/arch/x86/include/asm/traps.h
@@ -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);
diff --git a/arch/x86/include/asm/uprobes.h b/arch/x86/include/asm/uprobes.h
index 93bee7b93854..7be3c079e389 100644
--- a/arch/x86/include/asm/uprobes.h
+++ b/arch/x86/include/asm/uprobes.h
@@ -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;
+                }                       branch;
+                struct {
+                        u8      fixups;
+                        u8      ilen;
+                }                       def;
         };
 };
 
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index 9c0280f93d05..9b53940981b7 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -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;
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 57409f6b8c62..3fdb20548c4b 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -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);
 }
 
-#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);                                     \
+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_INFO(trapnr, signr, str, name, sicode, siaddr)         \
+#define DO_ERROR(trapnr, signr, str, name)                              \
 dotraplinkage void do_##name(struct pt_regs *regs, long error_code)     \
 {                                                                       \