[15/21] x86/fpu: Use fpstate::size

Message ID	20211013145322.973518954@linutronix.de (mailing list archive)
State	New, archived
Headers	show Return-Path: <kvm-owner@kernel.org> Message-ID: <20211013145322.973518954@linutronix.de> From: Thomas Gleixner <tglx@linutronix.de> To: LKML <linux-kernel@vger.kernel.org> Cc: x86@kernel.org, "Chang S. Bae" <chang.seok.bae@intel.com>, Dave Hansen <dave.hansen@linux.intel.com>, Arjan van de Ven <arjan@linux.intel.com>, kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com> Subject: [patch 15/21] x86/fpu: Use fpstate::size References: <20211013142847.120153383@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Wed, 13 Oct 2021 16:55:48 +0200 (CEST) Precedence: bulk
Series	x86/fpu: Move register state into a container struct (part 2) \| expand [00/21] x86/fpu: Move register state into a container struct (part 2) [01/21] x86/fpu: Provide struct fpstate [02/21] x86/fpu: Convert fpstate_init() to struct fpstate [03/21] x86/fpu: Convert restore_fpregs_from_fpstate() to struct fpstate [04/21] x86/fpu: Replace KVMs xstate component clearing [05/21] x86/KVM: Convert to fpstate [06/21] x86/fpu: Convert tracing to fpstate [07/21] x86/fpu/regset: Convert to fpstate [08/21] x86/fpu/signal: Convert to fpstate [09/21] x86/fpu/core: Convert to fpstate [10/21] x86/math-emu: Convert to fpstate [11/21] x86/fpu: Remove fpu::state [12/21] x86/fpu: Do not leak fpstate pointer on fork [13/21] x86/process: Move arch_thread_struct_whitelist() out of line [14/21] x86/fpu: Add size and mask information to fpstate [15/21] x86/fpu: Use fpstate::size [16/21] x86/fpu/xstate: Use fpstate for os_xsave() [17/21] x86/fpu/xstate: Use fpstate for xsave_to_user_sigframe() [18/21] x86/fpu: Use fpstate in fpu_copy_kvm_uabi_to_fpstate() [19/21] x86/fpu: Use fpstate in __copy_xstate_to_uabi_buf() [20/21] x86/fpu/xstate: Use fpstate for copy_uabi_to_xstate() [21/21] x86/fpu/signal: Use fpstate for size and features

Message ID

20211013145322.973518954@linutronix.de (mailing list archive)

State

New, archived

Headers

Message-ID: <20211013145322.973518954@linutronix.de>
From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: x86@kernel.org, "Chang S. Bae" <chang.seok.bae@intel.com>,
        Dave Hansen <dave.hansen@linux.intel.com>,
        Arjan van de Ven <arjan@linux.intel.com>,
        kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>
Subject: [patch 15/21] x86/fpu: Use fpstate::size
References: <20211013142847.120153383@linutronix.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Date: Wed, 13 Oct 2021 16:55:48 +0200 (CEST)
Precedence: bulk

Series

x86/fpu: Move register state into a container struct (part 2) | expand

Commit Message

Thomas Gleixner Oct. 13, 2021, 2:55 p.m. UTC

Make use of fpstate::size in various places which require the buffer size
information for sanity checks or memcpy() sizing.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/x86/kernel/fpu/core.c   |   13 ++++++-------
 arch/x86/kernel/fpu/signal.c |    7 +++----
 2 files changed, 9 insertions(+), 11 deletions(-)

--- a/arch/x86/kernel/fpu/core.c
+++ b/arch/x86/kernel/fpu/core.c
@@ -166,13 +166,12 @@  void fpu_swap_kvm_fpu(struct fpu *save,
 	fpregs_lock();
 
 	if (save) {
-		if (test_thread_flag(TIF_NEED_FPU_LOAD)) {
-			memcpy(&save->fpstate->regs,
-			       &current->thread.fpu.fpstate->regs,
-			       fpu_kernel_xstate_size);
-		} else {
+		struct fpstate *fpcur = current->thread.fpu.fpstate;
+
+		if (test_thread_flag(TIF_NEED_FPU_LOAD))
+			memcpy(&save->fpstate->regs, &fpcur->regs, fpcur->size);
+		else
 			save_fpregs_to_fpstate(save);
-		}
 	}
 
 	if (rstor) {
@@ -398,7 +397,7 @@  int fpu_clone(struct task_struct *dst)
 	fpregs_lock();
 	if (test_thread_flag(TIF_NEED_FPU_LOAD)) {
 		memcpy(&dst_fpu->fpstate->regs, &src_fpu->fpstate->regs,
-		       fpu_kernel_xstate_size);
+		       dst_fpu->fpstate->size);
 	} else {
 		save_fpregs_to_fpstate(dst_fpu);
 	}
--- a/arch/x86/kernel/fpu/signal.c
+++ b/arch/x86/kernel/fpu/signal.c
@@ -313,15 +313,13 @@  static bool restore_fpregs_from_user(voi
 static bool __fpu_restore_sig(void __user *buf, void __user *buf_fx,
 			      bool ia32_fxstate)
 {
-	int state_size = fpu_kernel_xstate_size;
 	struct task_struct *tsk = current;
 	struct fpu *fpu = &tsk->thread.fpu;
 	struct user_i387_ia32_struct env;
+	bool success, fx_only = false;
 	union fpregs_state *fpregs;
+	unsigned int state_size;
 	u64 user_xfeatures = 0;
-	bool fx_only = false;
-	bool success;
-
 
 	if (use_xsave()) {
 		struct _fpx_sw_bytes fx_sw_user;
@@ -334,6 +332,7 @@  static bool __fpu_restore_sig(void __use
 		user_xfeatures = fx_sw_user.xfeatures;
 	} else {
 		user_xfeatures = XFEATURE_MASK_FPSSE;
+		state_size = fpu->fpstate->size;
 	}
 
 	if (likely(!ia32_fxstate)) {

[15/21] x86/fpu: Use fpstate::size

Commit Message

Patch