Commit 84ab45b3 authored Jan 30, 2015 by Paul Burton Committed by Ralf Baechle Mar 27, 2015

MIPS: disable FPU if the mode is unsupported



The expected semantics of __enable_fpu are for the FPU to be enabled
in the given mode if possible, otherwise for the FPU to be left
disabled and SIGFPE returned. The FPU was incorrectly being left
enabled in cases where the desired value for FR was unavailable.
Without ensuring the FPU is disabled in this case, it would be
possible for userland to go on to execute further FP instructions
natively in the incorrect mode, rather than those instructions being
trapped & emulated as they need to be.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/9167/


Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

parent ac9ad83b

arch/mips/include/asm/fpu.h

+12 −7

Original line number	Diff line number	Diff line
		@@ -48,6 +48,12 @@ enum fpu_mode {
		#define FPU_FR_MASK 0x1
		};

		#define __disable_fpu() \
		do { \
		clear_c0_status(ST0_CU1); \
		disable_fpu_hazard(); \
		} while (0)

		static inline int __enable_fpu(enum fpu_mode mode)
		{
		int fr;
		@@ -86,7 +92,12 @@ fr_common:
		enable_fpu_hazard();

		/* check FR has the desired value */
		return (!!(read_c0_status() & ST0_FR) == !!fr) ? 0 : SIGFPE;
		if (!!(read_c0_status() & ST0_FR) == !!fr)
		return 0;

		/* unsupported FR value */
		__disable_fpu();
		return SIGFPE;

		default:
		BUG();
		@@ -95,12 +106,6 @@ fr_common:
		return SIGFPE;
		}

		#define __disable_fpu() \
		do { \
		clear_c0_status(ST0_CU1); \
		disable_fpu_hazard(); \
		} while (0)

		#define clear_fpu_owner() clear_thread_flag(TIF_USEDFPU)

		static inline int __is_fpu_owner(void)

Admin message