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

Commit ea8df8c5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Fix wrong checksum for split TCP packets on 64-bit MIPS
  [MIPS] Fix BUG(), BUG_ON() handling
  [MIPS] Retry {save,restore}_fp_context if failed in atomic context.
  [MIPS] Disallow CpU exception in kernel again.
  [MIPS] Add missing silicon revisions for BCM112x
parents 241c39b9 1d464c26

arch/mips/kernel/r2300_switch.S

+4 −6
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ LEAF(resume) 
#ifndef CONFIG_CPU_HAS_LLSC

	sw      zero, ll_bit

#endif

	mfc0	t2, CP0_STATUS

	mfc0	t1, CP0_STATUS

	sw	t1, THREAD_STATUS(a0)

	cpu_save_nonscratch a0

	sw	ra, THREAD_REG31(a0)
@@ -59,8 +60,8 @@ LEAF(resume) 
	lw	t3, TASK_THREAD_INFO(a0)

	lw	t0, TI_FLAGS(t3)

	li	t1, _TIF_USEDFPU

	and	t1, t0

	beqz	t1, 1f

	and	t2, t0, t1

	beqz	t2, 1f

	nor	t1, zero, t1



	and	t0, t0, t1
@@ -73,13 +74,10 @@ LEAF(resume) 
	li	t1, ~ST0_CU1

	and	t0, t0, t1

	sw	t0, ST_OFF(t3)

	/* clear thread_struct CU1 bit */

	and	t2, t1



	fpu_save_single a0, t0			# clobbers t0



1:

	sw	t2, THREAD_STATUS(a0)

	/*

	 * The order of restoring the registers takes care of the race

	 * updating $28, $29 and kernelsp without disabling ints.

arch/mips/kernel/r4k_switch.S

+4 −6
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ 
#ifndef CONFIG_CPU_HAS_LLSC

	sw	zero, ll_bit

#endif

	mfc0	t2, CP0_STATUS

	mfc0	t1, CP0_STATUS

	LONG_S	t1, THREAD_STATUS(a0)

	cpu_save_nonscratch a0

	LONG_S	ra, THREAD_REG31(a0)
@@ -58,8 +59,8 @@ 
	PTR_L	t3, TASK_THREAD_INFO(a0)

	LONG_L	t0, TI_FLAGS(t3)

	li	t1, _TIF_USEDFPU

	and	t1, t0

	beqz	t1, 1f

	and	t2, t0, t1

	beqz	t2, 1f

	nor	t1, zero, t1



	and	t0, t0, t1
@@ -72,13 +73,10 @@ 
	li	t1, ~ST0_CU1

	and	t0, t0, t1

	LONG_S	t0, ST_OFF(t3)

	/* clear thread_struct CU1 bit */

	and	t2, t1



	fpu_save_double a0 t0 t1		# c0_status passed in t0

						# clobbers t1

1:

	LONG_S	t2, THREAD_STATUS(a0)



	/*

	 * The order of restoring the registers takes care of the race

arch/mips/kernel/signal-common.h

+9 −0
Original line number Diff line number Diff line
@@ -34,4 +34,13 @@ extern int install_sigtramp(unsigned int __user *tramp, unsigned int syscall); 
/* Check and clear pending FPU exceptions in saved CSR */

extern int fpcsr_pending(unsigned int __user *fpcsr);



/* Make sure we will not lose FPU ownership */

#ifdef CONFIG_PREEMPT

#define lock_fpu_owner()	preempt_disable()

#define unlock_fpu_owner()	preempt_enable()

#else

#define lock_fpu_owner()	pagefault_disable()

#define unlock_fpu_owner()	pagefault_enable()

#endif



#endif	/* __SIGNAL_COMMON_H */

arch/mips/kernel/signal.c

+43 −9
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/ptrace.h>

#include <linux/unistd.h>

#include <linux/compiler.h>

#include <linux/uaccess.h>



#include <asm/abi.h>

#include <asm/asm.h>
@@ -27,7 +28,6 @@ 
#include <asm/cacheflush.h>

#include <asm/fpu.h>

#include <asm/sim.h>

#include <asm/uaccess.h>

#include <asm/ucontext.h>

#include <asm/cpu-features.h>

#include <asm/war.h>
@@ -78,6 +78,46 @@ struct rt_sigframe { 
/*

 * Helper routines

 */

static int protected_save_fp_context(struct sigcontext __user *sc)

{

	int err;

	while (1) {

		lock_fpu_owner();

		own_fpu_inatomic(1);

		err = save_fp_context(sc); /* this might fail */

		unlock_fpu_owner();

		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_context(struct sigcontext __user *sc)

{

	int err, tmp;

	while (1) {

		lock_fpu_owner();

		own_fpu_inatomic(0);

		err = restore_fp_context(sc); /* this might fail */

		unlock_fpu_owner();

		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;

}



int setup_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)

{

	int err = 0;
@@ -113,10 +153,7 @@ int setup_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc) 
		 * Save FPU state to signal context. Signal handler

		 * will "inherit" current FPU state.

		 */

		own_fpu(1);

		enable_fp_in_kernel();

		err |= save_fp_context(sc);

		disable_fp_in_kernel();

		err |= protected_save_fp_context(sc);

	}

	return err;

}
@@ -148,7 +185,7 @@ check_and_restore_fp_context(struct sigcontext __user *sc) 
	err = sig = fpcsr_pending(&sc->sc_fpc_csr);

	if (err > 0)

		err = 0;

	err |= restore_fp_context(sc);

	err |= protected_restore_fp_context(sc);

	return err ?: sig;

}
@@ -187,11 +224,8 @@ int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc) 


	if (used_math) {

		/* restore fpu context if we have used it before */

		own_fpu(0);

		enable_fp_in_kernel();

		if (!err)

			err = check_and_restore_fp_context(sc);

		disable_fp_in_kernel();

	} else {

		/* signal handler may have used FPU.  Give it up. */

		lose_fpu(0);

arch/mips/kernel/signal32.c

+43 −9
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/compat.h>

#include <linux/suspend.h>

#include <linux/compiler.h>

#include <linux/uaccess.h>



#include <asm/abi.h>

#include <asm/asm.h>
@@ -29,7 +30,6 @@ 
#include <linux/bitops.h>

#include <asm/cacheflush.h>

#include <asm/sim.h>

#include <asm/uaccess.h>

#include <asm/ucontext.h>

#include <asm/system.h>

#include <asm/fpu.h>
@@ -176,6 +176,46 @@ struct rt_sigframe32 { 
/*

 * sigcontext handlers

 */

static int protected_save_fp_context32(struct sigcontext32 __user *sc)

{

	int err;

	while (1) {

		lock_fpu_owner();

		own_fpu_inatomic(1);

		err = save_fp_context32(sc); /* this might fail */

		unlock_fpu_owner();

		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;

	while (1) {

		lock_fpu_owner();

		own_fpu_inatomic(0);

		err = restore_fp_context32(sc); /* this might fail */

		unlock_fpu_owner();

		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)

{
@@ -209,10 +249,7 @@ static int setup_sigcontext32(struct pt_regs *regs, 
		 * Save FPU state to signal context.  Signal handler

		 * will "inherit" current FPU state.

		 */

		own_fpu(1);

		enable_fp_in_kernel();

		err |= save_fp_context32(sc);

		disable_fp_in_kernel();

		err |= protected_save_fp_context32(sc);

	}

	return err;

}
@@ -225,7 +262,7 @@ check_and_restore_fp_context32(struct sigcontext32 __user *sc) 
	err = sig = fpcsr_pending(&sc->sc_fpc_csr);

	if (err > 0)

		err = 0;

	err |= restore_fp_context32(sc);

	err |= protected_restore_fp_context32(sc);

	return err ?: sig;

}
@@ -261,11 +298,8 @@ static int restore_sigcontext32(struct pt_regs *regs, 


	if (used_math) {

		/* restore fpu context if we have used it before */

		own_fpu(0);

		enable_fp_in_kernel();

		if (!err)

			err = check_and_restore_fp_context32(sc);

		disable_fp_in_kernel();

	} else {

		/* signal handler may have used FPU.  Give it up. */

		lose_fpu(0);