linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dave Hansen <dave@sr71.net>
To: linux-kernel@vger.kernel.org
Cc: x86@kernel.org, tglx@linutronix.de, Dave Hansen <dave@sr71.net>,
	dave.hansen@linux.intel.com, oleg@redhat.com, bp@alien8.de,
	riel@redhat.com, sbsiddha@gmail.com, luto@amacapital.net,
	mingo@redhat.com, hpa@zytor.com, fenghua.yu@intel.com
Subject: [PATCH 01/16] x86, fpu: wrap get_xsave_addr() to make it safer
Date: Tue, 31 Mar 2015 17:46:24 -0700	[thread overview]
Message-ID: <20150401004624.49096AD0@viggo.jf.intel.com> (raw)
In-Reply-To: <20150401004623.894DF37A@viggo.jf.intel.com>


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-31 16:41:55.558249168 -0700
+++ b/arch/x86/include/asm/xsave.h	2015-03-31 16:41:55.563249393 -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-31 16:41:55.559249213 -0700
+++ b/arch/x86/kernel/xsave.c	2015-03-31 16:41:55.563249393 -0700
@@ -722,3 +722,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);
+}
_

  reply	other threads:[~2015-04-01  0:46 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-01  0:46 [PATCH 00/16] x86, mpx updates for 4.1 (take 4) Dave Hansen
2015-04-01  0:46 ` Dave Hansen [this message]
2015-04-22 10:40   ` [PATCH 01/16] x86, fpu: wrap get_xsave_addr() to make it safer Borislav Petkov
2015-04-22 13:16     ` Oleg Nesterov
2015-04-22 13:31       ` Borislav Petkov
2015-04-22 14:56         ` Dave Hansen
2015-04-22 15:17           ` Thomas Gleixner
2015-04-22 15:21             ` Borislav Petkov
2015-04-22 15:26               ` Thomas Gleixner
2015-04-22 16:02             ` Dave Hansen
2015-04-22 15:32         ` Oleg Nesterov
2015-04-22 15:58           ` Borislav Petkov
2015-04-01  0:46 ` [PATCH 02/16] x86, mpx: use new tsk_get_xsave_addr() Dave Hansen
2015-04-01  0:46 ` [PATCH 03/16] x86, mpx: trace #BR exceptions Dave Hansen
2015-04-01  0:46 ` [PATCH 04/16] x86, mpx: trace entry to bounds exception paths Dave Hansen
2015-04-01  0:46 ` [PATCH 05/16] x86, mpx: trace ranged MPX operations Dave Hansen
2015-04-01  0:46 ` [PATCH 06/16] x86, mpx: trace allocation of new bounds tables Dave Hansen
2015-04-01  0:46 ` [PATCH 07/16] x86, mpx: boot-time disable Dave Hansen
2015-04-01  0:46 ` [PATCH 08/16] x86: make is_64bit_mm() widely available Dave Hansen
2015-04-01  0:46 ` [PATCH 09/16] x86: make __VIRTUAL_MASK safe to use on 32 bit Dave Hansen
2015-04-01  0:46 ` [PATCH 10/16] x86, mpx: we do not allocate the bounds directory Dave Hansen
2015-04-01  0:46 ` [PATCH 11/16] x86, mpx: remove redundant MPX_BNDCFG_ADDR_MASK Dave Hansen
2015-04-01  0:46 ` [PATCH 12/16] x86, mpx: Add temporary variable to reduce masking Dave Hansen
2015-04-01  0:46 ` [PATCH 13/16] x86, mpx: new directory entry to addr helper Dave Hansen
2015-04-01  0:46 ` [PATCH 14/16] x86, mpx: do 32-bit-only cmpxchg for 32-bit apps Dave Hansen
2015-04-01  0:46 ` [PATCH 15/16] x86, mpx: support 32-bit binaries on 64-bit kernel Dave Hansen
2015-04-01  0:46 ` [PATCH 16/16] x86, mpx: allow mixed binaries again Dave Hansen
2015-04-21 15:39 ` [PATCH 00/16] x86, mpx updates for 4.1 (take 4) Dave Hansen
2015-04-22 10:49 ` Borislav Petkov
2015-04-22 14:43   ` Dave Hansen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150401004624.49096AD0@viggo.jf.intel.com \
    --to=dave@sr71.net \
    --cc=bp@alien8.de \
    --cc=dave.hansen@linux.intel.com \
    --cc=fenghua.yu@intel.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luto@amacapital.net \
    --cc=mingo@redhat.com \
    --cc=oleg@redhat.com \
    --cc=riel@redhat.com \
    --cc=sbsiddha@gmail.com \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).