[RFC][PATCH 1/2] x86, fpu: wrap get_xsave_addr() to make it safer

* [RFC][PATCH 1/2] x86, fpu: wrap get_xsave_addr() to make it safer
@ 2015-01-30 17:43 Dave Hansen
  2015-01-30 17:43 ` [RFC][PATCH 2/2] x86, mpx: use new tsk_get_xsave_addr() Dave Hansen
  2015-01-30 18:28 ` [RFC][PATCH 1/2] x86, fpu: wrap get_xsave_addr() to make it safer Oleg Nesterov
  0 siblings, 2 replies; 6+ messages in thread
From: Dave Hansen @ 2015-01-30 17:43 UTC (permalink / raw)
  To: oleg
  Cc: Dave Hansen, dave.hansen, riel, sbsiddha, luto, tglx, mingo, hpa,
	fenghua.yu, x86, linux-kernel


The MPX code appears to be saving off the FPU in an unsafe
way.   It does not disable preemption or ensure that the
FPU state has been allocated.

This patch introduces a new helper which will do both of
those things internally to a helper.

Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Suresh Siddha <sbsiddha@gmail.com>
Cc:Andy Lutomirski <luto@amacapital.net>
Cc:Thomas Gleixner <tglx@linutronix.de>
Cc:Ingo Molnar <mingo@redhat.com>
Cc:"H. Peter Anvin" <hpa@zytor.com>
Cc:Fenghua Yu <fenghua.yu@intel.com>
Cc:the arch/x86 maintainers <x86@kernel.org>
Cc:linux-kernel <linux-kernel@vger.kernel.org>
---

 b/arch/x86/include/asm/xsave.h |    1 +
 b/arch/x86/kernel/xsave.c      |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff -puN arch/x86/include/asm/xsave.h~tsk_get_xsave_addr arch/x86/include/asm/xsave.h

--- a/arch/x86/include/asm/xsave.h~tsk_get_xsave_addr	2015-01-30 09:42:15.457555582 -0800
+++ b/arch/x86/include/asm/xsave.h	2015-01-30 09:42:15.462555808 -0800
@@ -258,6 +258,7 @@ static inline int xrestore_user(struct x
 }
 
 void *get_xsave_addr(struct xsave_struct *xsave, int xstate);
+void *tsk_get_xsave_field(struct task_struct *tsk, int xstate_field);
 void setup_xstate_comp(void);
 
 #endif
diff -puN arch/x86/kernel/xsave.c~tsk_get_xsave_addr arch/x86/kernel/xsave.c
--- a/arch/x86/kernel/xsave.c~tsk_get_xsave_addr	2015-01-30 09:42:15.459555673 -0800
+++ b/arch/x86/kernel/xsave.c	2015-01-30 09:42:15.463555853 -0800
@@ -739,3 +739,35 @@ void *get_xsave_addr(struct xsave_struct
 	return (void *)xsave + xstate_comp_offsets[feature];
 }
 EXPORT_SYMBOL_GPL(get_xsave_addr);
+
+/*
+ * This wraps up the common operations that need to occur when retrieving
+ * data from an xsave struct.  It first ensures that the task was actually
+ * using the FPU and retrieves the data in to a buffer.  It then calculates
+ * the offset of the requested field in the buffer.
+ *
+ * This function is safe to call whether the FPU is in use or not.
+ *
+ * Inputs:
+ *	tsk: the task from which we are fetching xsave state
+ *	xstate: state which is defined in xsave.h (e.g. XSTATE_FP, XSTATE_SSE,
+ *	etc.)
+ * Output:
+ *	address of the state in the xsave area.
+ */
+void *tsk_get_xsave_field(struct task_struct *tsk, int xsave_field)
+{
+	union thread_xstate *xstate;
+
+	unlazy_fpu(tsk);
+	xstate = tsk->thread.fpu.state;
+	/*
+	 * This might be unallocated if the FPU
+	 * was never in use.
+	 */
+	if (!xstate)
+		return NULL;
+
+	return get_xsave_addr(&xstate->xsave, xsave_field);
+}
+EXPORT_SYMBOL_GPL(tsk_get_xsave_field);
_

^ permalink raw reply	[flat|nested] 6+ messages in thread