All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To: linux-kernel@vger.kernel.org
Cc: x86@kernel.org, "Andy Lutomirski" <luto@kernel.org>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Radim Krčmář" <rkrcmar@redhat.com>,
	kvm@vger.kernel.org, "Jason A. Donenfeld" <Jason@zx2c4.com>,
	"Rik van Riel" <riel@surriel.com>,
	"Dave Hansen" <dave.hansen@linux.intel.com>,
	"Sebastian Andrzej Siewior" <bigeasy@linutronix.de>
Subject: [PATCH 26/29] x86/fpu: Inline copy_user_to_fpregs_zeroing()
Date: Wed, 28 Nov 2018 23:20:32 +0100	[thread overview]
Message-ID: <20181128222035.2996-27-bigeasy@linutronix.de> (raw)
In-Reply-To: <20181128222035.2996-1-bigeasy@linutronix.de>

Start refactoring __fpu__restore_sig() by inlining
copy_user_to_fpregs_zeroing().

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
 arch/x86/kernel/fpu/signal.c | 42 ++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/arch/x86/kernel/fpu/signal.c b/arch/x86/kernel/fpu/signal.c
index 6e516eeaea328..c66356b168b39 100644
--- a/arch/x86/kernel/fpu/signal.c
+++ b/arch/x86/kernel/fpu/signal.c
@@ -221,28 +221,6 @@ sanitize_restored_xstate(union fpregs_state *state,
 	}
 }
 
-/*
- * Restore the extended state if present. Otherwise, restore the FP/SSE state.
- */
-static inline int copy_user_to_fpregs_zeroing(void __user *buf, u64 xbv, int fx_only)
-{
-	if (use_xsave()) {
-		if ((unsigned long)buf % 64 || fx_only) {
-			u64 init_bv = xfeatures_mask & ~XFEATURE_MASK_FPSSE;
-			copy_kernel_to_xregs(&init_fpstate.xsave, init_bv);
-			return copy_user_to_fxregs(buf);
-		} else {
-			u64 init_bv = xfeatures_mask & ~xbv;
-			if (unlikely(init_bv))
-				copy_kernel_to_xregs(&init_fpstate.xsave, init_bv);
-			return copy_user_to_xregs(buf, xbv);
-		}
-	} else if (use_fxsr()) {
-		return copy_user_to_fxregs(buf);
-	} else
-		return copy_user_to_fregs(buf);
-}
-
 static int __fpu__restore_sig(void __user *buf, void __user *buf_fx, int size)
 {
 	int ia32_fxstate = (buf != buf_fx);
@@ -321,11 +299,29 @@ static int __fpu__restore_sig(void __user *buf, void __user *buf_fx, int size)
 		kfree(tmp);
 		return err;
 	} else {
+		int ret;
+
 		/*
 		 * For 64-bit frames and 32-bit fsave frames, restore the user
 		 * state to the registers directly (with exceptions handled).
 		 */
-		if (copy_user_to_fpregs_zeroing(buf_fx, xfeatures, fx_only)) {
+		if (use_xsave()) {
+			if ((unsigned long)buf_fx % 64 || fx_only) {
+				u64 init_bv = xfeatures_mask & ~XFEATURE_MASK_FPSSE;
+				copy_kernel_to_xregs(&init_fpstate.xsave, init_bv);
+				ret = copy_user_to_fxregs(buf_fx);
+			} else {
+				u64 init_bv = xfeatures_mask & ~xfeatures;
+				if (unlikely(init_bv))
+					copy_kernel_to_xregs(&init_fpstate.xsave, init_bv);
+				ret = copy_user_to_xregs(buf_fx, xfeatures);
+			}
+		} else if (use_fxsr()) {
+			ret = copy_user_to_fxregs(buf_fx);
+		} else
+			ret = copy_user_to_fregs(buf_fx);
+
+		if (ret) {
 			fpu__clear(fpu);
 			return -1;
 		}
-- 
2.20.0.rc1


  parent reply	other threads:[~2018-11-28 22:21 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-28 22:20 [PATCH v5] x86: load FPU registers on return to userland Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 01/29] x86/fpu: Use ULL for shift in xfeature_uncompacted_offset() Sebastian Andrzej Siewior
2018-11-29  1:52   ` Rik van Riel
2018-12-03 21:00   ` [tip:x86/fpu] x86/fpu: Use unsigned long long " tip-bot for Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 02/29] x86/entry/32: Remove asm/math_emu.h include Sebastian Andrzej Siewior
2018-11-29  1:52   ` Rik van Riel
2018-12-03 21:01   ` [tip:x86/fpu] x86/process/32: " tip-bot for Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 03/29] x86/entry: Remove _TIF_ALLWORK_MASK Sebastian Andrzej Siewior
2018-11-29  1:53   ` Rik van Riel
2018-12-03 21:02   ` [tip:x86/fpu] x86/thread_info: " tip-bot for Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 04/29] x86/pkeys: Make init_pkru_value static Sebastian Andrzej Siewior
2018-11-29  1:53   ` Rik van Riel
2018-12-03 21:02   ` [tip:x86/fpu] " tip-bot for Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 05/29] x86/fpu: add might_fault() to user_insn() Sebastian Andrzej Siewior
2018-11-29  1:54   ` Rik van Riel
2018-12-03 21:03   ` [tip:x86/fpu] x86/fpu: Add " tip-bot for Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 06/29] x86/fpu: Update comment for __raw_xsave_addr() Sebastian Andrzej Siewior
2018-11-29  1:56   ` Rik van Riel
2018-12-03 21:03   ` [tip:x86/fpu] " tip-bot for Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 07/29] x86/fpu: don't export __kernel_fpu_{begin|end}() Sebastian Andrzej Siewior
2018-11-29  2:00   ` Rik van Riel
2018-11-29 15:02     ` [PATCH 07/29 v2] " Sebastian Andrzej Siewior
2018-12-03 21:04       ` [tip:x86/fpu] x86/fpu: Don't export __kernel_fpu_{begin,end}() tip-bot for Sebastian Andrzej Siewior
2018-12-03 21:12         ` Ard Biesheuvel
2018-12-03 22:08           ` Borislav Petkov
2018-12-04 11:39             ` Borislav Petkov
2018-12-04 12:15             ` Sebastian Andrzej Siewior
2018-12-04 12:33               ` Borislav Petkov
2018-12-04 11:45       ` tip-bot for Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 08/29] x86/fpu: Remove fpu->initialized usage in __fpu__restore_sig() Sebastian Andrzej Siewior
2018-12-06 20:07   ` Borislav Petkov
2018-12-07  8:17     ` Sebastian Andrzej Siewior
2018-12-07 10:19       ` Borislav Petkov
2018-11-28 22:20 ` [PATCH 09/29] x86/fpu: Remove fpu__restore() Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 10/29] x86/fpu: Remove preempt_disable() in fpu__clear() Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 11/29] x86/fpu: Always init the `state' " Sebastian Andrzej Siewior
2018-12-12 17:11   ` Borislav Petkov
2018-12-13 14:35     ` Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 12/29] x86/fpu: Remove fpu->initialized usage in copy_fpstate_to_sigframe() Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 13/29] x86/fpu: Don't save fxregs for ia32 frames " Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 14/29] x86/fpu: Remove fpu->initialized Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 15/29] x86/fpu: Remove user_fpu_begin() Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 16/29] x86/fpu: Add (__)make_fpregs_active helpers Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 17/29] x86/fpu: Make __raw_xsave_addr() use feature number instead of mask Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 18/29] x86/fpu: Make get_xsave_field_ptr() and get_xsave_addr() " Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 19/29] x86/fpu: Only write PKRU if it is different from current Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 20/29] x86/pkeys: Don't check if PKRU is zero before writting it Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 21/29] x86/fpu: Eager switch PKRU state Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 22/29] x86/entry: Add TIF_NEED_FPU_LOAD Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 23/29] x86/fpu: Always store the registers in copy_fpstate_to_sigframe() Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 24/29] x86/fpu: Prepare copy_fpstate_to_sigframe() for TIF_NEED_FPU_LOAD Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 25/29] x86/fpu: Update xstate's PKRU value on write_pkru() Sebastian Andrzej Siewior
2018-11-28 22:20 ` Sebastian Andrzej Siewior [this message]
2018-11-28 23:09   ` [PATCH 26/29] x86/fpu: Inline copy_user_to_fpregs_zeroing() Joey Pabalinas
2018-11-28 22:20 ` [PATCH 27/29] x86/fpu: Let __fpu__restore_sig() restore the !32bit+fxsr frame from kernel memory Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 28/29] x86/fpu: Merge the two code paths in __fpu__restore_sig() Sebastian Andrzej Siewior
2018-11-28 22:20 ` [PATCH 29/29] x86/fpu: Defer FPU state load until return to userspace Sebastian Andrzej Siewior
2018-11-29 15:00   ` Sebastian Andrzej Siewior
2018-12-10 14:41   ` Sebastian Andrzej Siewior
2018-11-30 11:52 ` [PATCH v5] x86: load FPU registers on return to userland Sebastian Andrzej Siewior

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=20181128222035.2996-27-bigeasy@linutronix.de \
    --to=bigeasy@linutronix.de \
    --cc=Jason@zx2c4.com \
    --cc=dave.hansen@linux.intel.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luto@kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=riel@surriel.com \
    --cc=rkrcmar@redhat.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.