MIPS: Use common FP sigcontext code for O32 compat

Make use of the common FP sigcontext code for O32 binaries running on
MIPS64 kernels now that it is taking appropriate offsets into struct
sigcontext(32) from struct mips_abi.

[ralf@linux-mips.org: Fixed reject.]

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Matthew Fortune <matthew.fortune@imgtec.com>
Cc: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: linux-kernel@vger.kernel.org
Cc: Richard Weinberger <richard@nod.at>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Markos Chandras <markos.chandras@imgtec.com>
Cc: Manuel Lauss <manuel.lauss@gmail.com>
Cc: Maciej W. Rozycki <macro@codesourcery.com>
Patchwork: https://patchwork.linux-mips.org/patch/10792/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 6 insertions, 144 deletions

diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c
index da70ea5cf6ec..7c45cb3e075a 100644
--- a/arch/mips/kernel/signal32.c
+++ b/arch/mips/kernel/signal32.c
@@ -36,12 +36,6 @@
 
 #include "signal-common.h"
 
-static int (*save_fp_context32)(struct sigcontext32 __user *sc);
-static int (*restore_fp_context32)(struct sigcontext32 __user *sc);
-
-extern asmlinkage int _save_fp_context32(struct sigcontext32 __user *sc);
-extern asmlinkage int _restore_fp_context32(struct sigcontext32 __user *sc);
-
 /*
  * Including <asm/unistd.h> would give use the 64-bit syscall numbers ...
  */
@@ -74,99 +68,11 @@ struct rt_sigframe32 {
         struct ucontext32 rs_uc;
 };
 
-/*
- * Thread saved context copy to/from a signal context presumed to be on the
- * user stack, and therefore accessed with appropriate macros from uaccess.h.
- */
-static int copy_fp_to_sigcontext32(struct sigcontext32 __user *sc)
-{
-        int i;
-        int err = 0;
-        int inc = test_thread_flag(TIF_32BIT_FPREGS) ? 2 : 1;
-
-        for (i = 0; i < NUM_FPU_REGS; i += inc) {
-                err |=
-                    __put_user(get_fpr64(&current->thread.fpu.fpr[i], 0),
-                               &sc->sc_fpregs[i]);
-        }
-        err |= __put_user(current->thread.fpu.fcr31, &sc->sc_fpc_csr);
-
-        return err;
-}
-
-static int copy_fp_from_sigcontext32(struct sigcontext32 __user *sc)
-{
-        int i;
-        int err = 0;
-        int inc = test_thread_flag(TIF_32BIT_FPREGS) ? 2 : 1;
-        u64 fpr_val;
-
-        for (i = 0; i < NUM_FPU_REGS; i += inc) {
-                err |= __get_user(fpr_val, &sc->sc_fpregs[i]);
-                set_fpr64(&current->thread.fpu.fpr[i], 0, fpr_val);
-        }
-        err |= __get_user(current->thread.fpu.fcr31, &sc->sc_fpc_csr);
-
-        return err;
-}
-
-/*
- * sigcontext handlers
- */
-static int protected_save_fp_context32(struct sigcontext32 __user *sc)
-{
-        int err;
-        while (1) {
-                lock_fpu_owner();
-                if (is_fpu_owner()) {
-                        err = save_fp_context32(sc);
-                        unlock_fpu_owner();
-                } else {
-                        unlock_fpu_owner();
-                        err = copy_fp_to_sigcontext32(sc);
-                }
-                if (likely(!err))
-                        break;
-                /* touch the sigcontext and try again */
-                err = __put_user(0, &sc->sc_fpregs[0]) |
-                        __put_user(0, &sc->sc_fpregs[31]) |
-                        __put_user(0, &sc->sc_fpc_csr);
-                if (err)
-                        break;  /* really bad sigcontext */
-        }
-        return err;
-}
-
-static int protected_restore_fp_context32(struct sigcontext32 __user *sc)
-{
-        int err, tmp __maybe_unused;
-        while (1) {
-                lock_fpu_owner();
-                if (is_fpu_owner()) {
-                        err = restore_fp_context32(sc);
-                        unlock_fpu_owner();
-                } else {
-                        unlock_fpu_owner();
-                        err = copy_fp_from_sigcontext32(sc);
-                }
-                if (likely(!err))
-                        break;
-                /* touch the sigcontext and try again */
-                err = __get_user(tmp, &sc->sc_fpregs[0]) |
-                        __get_user(tmp, &sc->sc_fpregs[31]) |
-                        __get_user(tmp, &sc->sc_fpc_csr);
-                if (err)
-                        break;  /* really bad sigcontext */
-        }
-        return err;
-}
-
 static int setup_sigcontext32(struct pt_regs *regs,
                               struct sigcontext32 __user *sc)
 {
         int err = 0;
         int i;
-        u32 used_math;
 
         err |= __put_user(regs->cp0_epc, &sc->sc_pc);
 
@@ -186,35 +92,18 @@ static int setup_sigcontext32(struct pt_regs *regs,
                 err |= __put_user(mflo3(), &sc->sc_lo3);
         }
 
-        used_math = !!used_math();
-        err |= __put_user(used_math, &sc->sc_used_math);
+        /*
+         * Save FPU state to signal context.  Signal handler
+         * will "inherit" current FPU state.
+         */
+        err |= protected_save_fp_context(sc);
 
-        if (used_math) {
-                /*
-                 * Save FPU state to signal context.  Signal handler
-                 * will "inherit" current FPU state.
-                 */
-                err |= protected_save_fp_context32(sc);
-        }
         return err;
 }
 
-static int
-check_and_restore_fp_context32(struct sigcontext32 __user *sc)
-{
-        int err, sig;
-
-        err = sig = fpcsr_pending(&sc->sc_fpc_csr);
-        if (err > 0)
-                err = 0;
-        err |= protected_restore_fp_context32(sc);
-        return err ?: sig;
-}
-
 static int restore_sigcontext32(struct pt_regs *regs,
                                 struct sigcontext32 __user *sc)
 {
-        u32 used_math;
         int err = 0;
         s32 treg;
         int i;
@@ -238,19 +127,7 @@ static int restore_sigcontext32(struct pt_regs *regs,
         for (i = 1; i < 32; i++)
                 err |= __get_user(regs->regs[i], &sc->sc_regs[i]);
 
-        err |= __get_user(used_math, &sc->sc_used_math);
-        conditional_used_math(used_math);
-
-        if (used_math) {
-                /* restore fpu context if we have used it before */
-                if (!err)
-                        err = check_and_restore_fp_context32(sc);
-        } else {
-                /* signal handler may have used FPU.  Give it up. */
-                lose_fpu(0);
-        }
-
-        return err;
+        return err ?: protected_restore_fp_context(sc);
 }
 
 /*
@@ -591,18 +468,3 @@ struct mips_abi mips_abi_32 = {
         .off_sc_fpc_csr = offsetof(struct sigcontext32, sc_fpc_csr),
         .off_sc_used_math = offsetof(struct sigcontext32, sc_used_math),
 };
-
-static int signal32_init(void)
-{
-        if (cpu_has_fpu) {
-                save_fp_context32 = _save_fp_context32;
-                restore_fp_context32 = _restore_fp_context32;
-        } else {
-                save_fp_context32 = copy_fp_to_sigcontext32;
-                restore_fp_context32 = copy_fp_from_sigcontext32;
-        }
-
-        return 0;
-}
-
-arch_initcall(signal32_init);