Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Pull sparc fixes from David Miller:
 "Some more sparc fixups, mostly aimed at getting the allmodconfig build
  up and clean again"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Rework xchg() definition to avoid warnings.
  sparc64: Export __node_distance.
  sparc64: Make corrupted user stacks more debuggable.

7 files changed, 44 insertions, 11 deletions

diff --git a/arch/sparc/include/asm/cmpxchg_64.h b/arch/sparc/include/asm/cmpxchg_64.h
index f71ef3729888..316faa0130ba 100644
--- a/arch/sparc/include/asm/cmpxchg_64.h
+++ b/arch/sparc/include/asm/cmpxchg_64.h
@@ -52,7 +52,12 @@ static inline unsigned long xchg64(__volatile__ unsigned long *m, unsigned long
         return val;
 }
 
-#define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
+#define xchg(ptr,x)                                                     \
+({      __typeof__(*(ptr)) __ret;                                       \
+        __ret = (__typeof__(*(ptr)))                                    \
+                __xchg((unsigned long)(x), (ptr), sizeof(*(ptr)));      \
+        __ret;                                                          \
+})
 
 void __xchg_called_with_bad_pointer(void);
 
diff --git a/arch/sparc/include/asm/switch_to_64.h b/arch/sparc/include/asm/switch_to_64.h
index 4ff29b1406a9..b1d4e2e3210f 100644
--- a/arch/sparc/include/asm/switch_to_64.h
+++ b/arch/sparc/include/asm/switch_to_64.h
@@ -67,6 +67,7 @@ do {	save_and_clear_fpu();						\
 } while(0)
 
 void synchronize_user_stack(void);
-void fault_in_user_windows(void);
+struct pt_regs;
+void fault_in_user_windows(struct pt_regs *);
 
 #endif /* __SPARC64_SWITCH_TO_64_H */
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
index 6c086086ca8f..59eaf6227af1 100644
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
@@ -36,6 +36,7 @@
 #include <linux/sysrq.h>
 #include <linux/nmi.h>
 #include <linux/context_tracking.h>
+#include <linux/signal.h>
 
 #include <linux/uaccess.h>
 #include <asm/page.h>
@@ -521,7 +522,12 @@ static void stack_unaligned(unsigned long sp)
         force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *) sp, 0, current);
 }
 
-void fault_in_user_windows(void)
+static const char uwfault32[] = KERN_INFO \
+        "%s[%d]: bad register window fault: SP %08lx (orig_sp %08lx) TPC %08lx O7 %08lx\n";
+static const char uwfault64[] = KERN_INFO \
+        "%s[%d]: bad register window fault: SP %016lx (orig_sp %016lx) TPC %08lx O7 %016lx\n";
+
+void fault_in_user_windows(struct pt_regs *regs)
 {
         struct thread_info *t = current_thread_info();
         unsigned long window;
@@ -534,9 +540,9 @@ void fault_in_user_windows(void)
                 do {
                         struct reg_window *rwin = &t->reg_window[window];
                         int winsize = sizeof(struct reg_window);
-                        unsigned long sp;
+                        unsigned long sp, orig_sp;
 
-                        sp = t->rwbuf_stkptrs[window];
+                        orig_sp = sp = t->rwbuf_stkptrs[window];
 
                         if (test_thread_64bit_stack(sp))
                                 sp += STACK_BIAS;
@@ -547,8 +553,16 @@ void fault_in_user_windows(void)
                                 stack_unaligned(sp);
 
                         if (unlikely(copy_to_user((char __user *)sp,
-                                                  rwin, winsize)))
+                                                  rwin, winsize))) {
+                                if (show_unhandled_signals)
+                                        printk_ratelimited(is_compat_task() ?
+                                                           uwfault32 : uwfault64,
+                                                           current->comm, current->pid,
+                                                           sp, orig_sp,
+                                                           regs->tpc,
+                                                           regs->u_regs[UREG_I7]);
                                 goto barf;
+                        }
                 } while (window--);
         }
         set_thread_wsaved(0);
@@ -556,8 +570,7 @@ void fault_in_user_windows(void)
 
 barf:
         set_thread_wsaved(window + 1);
-        user_exit();
-        do_exit(SIGILL);
+        force_sig(SIGSEGV, current);
 }
 
 asmlinkage long sparc_do_fork(unsigned long clone_flags,
diff --git a/arch/sparc/kernel/rtrap_64.S b/arch/sparc/kernel/rtrap_64.S
index 4073e2b87dd0..29aa34f11720 100644
--- a/arch/sparc/kernel/rtrap_64.S
+++ b/arch/sparc/kernel/rtrap_64.S
@@ -39,6 +39,7 @@ __handle_preemption:
                  wrpr                   %g0, RTRAP_PSTATE_IRQOFF, %pstate
 
 __handle_user_windows:
+                add                     %sp, PTREGS_OFF, %o0
                 call                    fault_in_user_windows
 661:             wrpr                   %g0, RTRAP_PSTATE, %pstate
                 /* If userspace is using ADI, it could potentially pass
diff --git a/arch/sparc/kernel/signal32.c b/arch/sparc/kernel/signal32.c
index 44d379db3f64..4c5b3fcbed94 100644
--- a/arch/sparc/kernel/signal32.c
+++ b/arch/sparc/kernel/signal32.c
@@ -371,7 +371,11 @@ static int setup_frame32(struct ksignal *ksig, struct pt_regs *regs,
                 get_sigframe(ksig, regs, sigframe_size);
         
         if (invalid_frame_pointer(sf, sigframe_size)) {
-                do_exit(SIGILL);
+                if (show_unhandled_signals)
+                        pr_info("%s[%d] bad frame in setup_frame32: %08lx TPC %08lx O7 %08lx\n",
+                                current->comm, current->pid, (unsigned long)sf,
+                                regs->tpc, regs->u_regs[UREG_I7]);
+                force_sigsegv(ksig->sig, current);
                 return -EINVAL;
         }
 
@@ -501,7 +505,11 @@ static int setup_rt_frame32(struct ksignal *ksig, struct pt_regs *regs,
                 get_sigframe(ksig, regs, sigframe_size);
         
         if (invalid_frame_pointer(sf, sigframe_size)) {
-                do_exit(SIGILL);
+                if (show_unhandled_signals)
+                        pr_info("%s[%d] bad frame in setup_rt_frame32: %08lx TPC %08lx O7 %08lx\n",
+                                current->comm, current->pid, (unsigned long)sf,
+                                regs->tpc, regs->u_regs[UREG_I7]);
+                force_sigsegv(ksig->sig, current);
                 return -EINVAL;
         }
 
diff --git a/arch/sparc/kernel/signal_64.c b/arch/sparc/kernel/signal_64.c
index 48366e5eb5b2..e9de1803a22e 100644
--- a/arch/sparc/kernel/signal_64.c
+++ b/arch/sparc/kernel/signal_64.c
@@ -370,7 +370,11 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
                 get_sigframe(ksig, regs, sf_size);
 
         if (invalid_frame_pointer (sf)) {
-                do_exit(SIGILL);        /* won't return, actually */
+                if (show_unhandled_signals)
+                        pr_info("%s[%d] bad frame in setup_rt_frame: %016lx TPC %016lx O7 %016lx\n",
+                                current->comm, current->pid, (unsigned long)sf,
+                                regs->tpc, regs->u_regs[UREG_I7]);
+                force_sigsegv(ksig->sig, current);
                 return -EINVAL;
         }
 
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index f396048a0d68..39822f611c01 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -1383,6 +1383,7 @@ int __node_distance(int from, int to)
         }
         return numa_latency[from][to];
 }
+EXPORT_SYMBOL(__node_distance);
 
 static int __init find_best_numa_node_for_mlgroup(struct mdesc_mlgroup *grp)
 {