[PATCH 01/17] x86, fpu: wrap get_xsave_addr() to make it safer

Dave Hansen
2015-03-27T21:52:49Z

Changes from "v17":
* fix s/xstate/xsave_field/ in the function comment
* remove EXPORT_SYMBOL_GPL()

---
From: Dave Hansen <dave.hansen@linux.intel.com>

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.

Note that this requires a patch from Oleg in order to work
properly. It is currently in tip/x86/fpu.

> commit f893959b0898bd876673adbeb6798bdf25c034d7
> Author: Oleg Nesterov <oleg@redhat.com>
> Date: Fri Mar 13 18:30:30 2015 +0100
>
> x86/fpu: Don't abuse drop_init_fpu() in flush_thread()

Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: bp@alien8.de
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>
---

b/arch/x86/include/asm/xsave.h | 1 +
b/arch/x86/kernel/xsave.c | 31 +++++++++++++++++++++++++++++++
2 files changed, 32 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-03-27 14:35:03.883722015 -0700
+++ b/arch/x86/include/asm/xsave.h 2015-03-27 14:35:03.888722240 -0700
@@ -252,6 +252,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-03-27 14:35:03.885722105 -0700
+++ b/arch/x86/kernel/xsave.c 2015-03-27 14:35:03.889722286 -0700
@@ -740,3 +740,34 @@ 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
+ * @xsave_field: 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;
+
+ if (!used_math())
+ return NULL;
+ /*
+ * unlazy_fpu() is poorly named and will actually
+ * save the xstate off in to the memory buffer.
+ */
+ unlazy_fpu(tsk);
+ xstate = tsk->thread.fpu.state;
+
+ return get_xsave_addr(&xstate->xsave, xsave_field);
+}
_