Commit ec2227e0 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/fpu: Push 'fpu' pointer calculation into the fpu__drop() call 



This encapsulates the fpu__drop() functionality better, and it
will also enable other changes that want to check a task for
PF_KTHREAD before calling x86_task_fpu().

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Chang S. Bae <chang.seok.bae@intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20250409211127.3544993-6-mingo@kernel.org
parent 55bc30f2

arch/x86/include/asm/fpu/sched.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <asm/trace/fpu.h>



extern void save_fpregs_to_fpstate(struct fpu *fpu);

extern void fpu__drop(struct fpu *fpu);

extern void fpu__drop(struct task_struct *tsk);

extern int  fpu_clone(struct task_struct *dst, unsigned long clone_flags, bool minimal,

		      unsigned long shstk_addr);

extern void fpu_flush_thread(void);

arch/x86/kernel/fpu/core.c

+3 −1
Original line number Diff line number Diff line
@@ -681,8 +681,10 @@ int fpu_clone(struct task_struct *dst, unsigned long clone_flags, bool minimal, 
 * a state-restore is coming: either an explicit one,

 * or a reschedule.

 */

void fpu__drop(struct fpu *fpu)

void fpu__drop(struct task_struct *tsk)

{

	struct fpu *fpu = x86_task_fpu(tsk);



	preempt_disable();



	if (fpu == x86_task_fpu(current)) {

arch/x86/kernel/process.c

+1 −2
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ void arch_release_task_struct(struct task_struct *tsk) 
void exit_thread(struct task_struct *tsk)

{

	struct thread_struct *t = &tsk->thread;

	struct fpu *fpu = x86_task_fpu(tsk);



	if (test_thread_flag(TIF_IO_BITMAP))

		io_bitmap_exit(tsk);
@@ -128,7 +127,7 @@ void exit_thread(struct task_struct *tsk) 
	free_vm86(t);



	shstk_free(tsk);

	fpu__drop(fpu);

	fpu__drop(tsk);

}



static int set_new_tls(struct task_struct *p, unsigned long tls)