Skip to contentSkip to conversation

Move ARCH specific fpu_counter out of task_struct

PATCH In review Vineet Gupta 3 participants 8 messages Oct 8, 2013 – Oct 10, 2013

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

v2 cover Move ARCH specific fpu_counter out of task_struct

Hi,

When debugging a ARC SMP 3.11 build failure due to a ST insn dealing with task_struct.thread going out of range, I spotted @fpu_counter in task_struct which only SH/x86 happen to use, and can be easily moved out into corresponding ARCH specific thread_struct. This saves 4 bytes per task_struct instantiated, for all the other 18 arches.

While the change is relatively strightforward, I've failed to connect with SH arch folks / Paul Mundt, latter's SH email keeps bouncing back. Hence I'm taking the liberty to use his alternate email (as listed on his github page) and I appologize in advance if this causes any inconvenience.

Changes in v2:
- Rabased to 3.12-rc4
- Added ACK from Ingo on patch 2/3

Version 1 can be found here:
https://lkml.org/lkml/2013/9/17/49

Thx,
-Vineet

Vineet Gupta (3):
sh: Move fpu_counter into ARCH specific thread_struct
x86: Move fpu_counter into ARCH specific thread_struct
sched: Remove ARCH specific fpu_counter from task_struct

 arch/sh/include/asm/fpu.h           |  2 +-
 arch/sh/include/asm/processor_32.h  | 10 ++++++++++
 arch/sh/include/asm/processor_64.h  | 10 ++++++++++
 arch/sh/kernel/cpu/fpu.c            |  2 +-
 arch/sh/kernel/process_32.c         |  6 +++---
 arch/x86/include/asm/fpu-internal.h | 10 +++++-----
 arch/x86/include/asm/processor.h    |  9 +++++++++
 arch/x86/kernel/i387.c              |  2 +-
 arch/x86/kernel/process_32.c        |  4 ++--
 arch/x86/kernel/process_64.c        |  2 +-
 arch/x86/kernel/traps.c             |  2 +-
 include/linux/sched.h               |  9 ---------
 12 files changed, 44 insertions(+), 24 deletions(-)
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH v2 1/3 sh: Move fpu_counter into ARCH specific thread_struct

From: Vineet Gupta <[email protected]>

Only a couple of arches (sh/x86) use fpu_counter in task_struct so it can be moved out into ARCH specific thread_struct, reducing the size of task_struct for other arches.

Compile tested sh defconfig + sh4-linux-gcc (4.6.3)

---
 arch/sh/include/asm/fpu.h          |  2 +-
 arch/sh/include/asm/processor_32.h | 10 ++++++++++
 arch/sh/include/asm/processor_64.h | 10 ++++++++++
 arch/sh/kernel/cpu/fpu.c           |  2 +-
 arch/sh/kernel/process_32.c        |  6 +++---
 5 files changed, 25 insertions(+), 5 deletions(-)
arch/sh/include/asm/fpu.h +1 -1
index 06c4281aab65..09fc2bc8a790 100644
@@ -46,7 +46,7 @@ static inline void __unlazy_fpu(struct task_struct *tsk, struct pt_regs *regs)
 		save_fpu(tsk);
 		release_fpu(regs);
 	} else
-		tsk->fpu_counter = 0;
+		tsk->thread.fpu_counter = 0;
 }
 
 static inline void unlazy_fpu(struct task_struct *tsk, struct pt_regs *regs)
arch/sh/include/asm/processor_32.h +10 -0
index e699a12cdcca..18e0377f72bb 100644
@@ -111,6 +111,16 @@ struct thread_struct {
 
 	/* Extended processor state */
 	union thread_xstate *xstate;
+
+	/*
+	 * fpu_counter contains the number of consecutive context switches
+	 * that the FPU is used. If this is over a threshold, the lazy fpu
+	 * saving becomes unlazy to save the trap. This is an unsigned char
+	 * so that after 256 times the counter wraps and the behavior turns
+	 * lazy again; this to deal with bursty apps that only use FPU for
+	 * a short time
+	 */
+	unsigned char fpu_counter;
 };
 
 #define INIT_THREAD  {						\
arch/sh/include/asm/processor_64.h +10 -0
index 1cc7d3197143..eedd4f625d07 100644
@@ -126,6 +126,16 @@ struct thread_struct {
 
 	/* floating point info */
 	union thread_xstate *xstate;
+
+	/*
+	 * fpu_counter contains the number of consecutive context switches
+	 * that the FPU is used. If this is over a threshold, the lazy fpu
+	 * saving becomes unlazy to save the trap. This is an unsigned char
+	 * so that after 256 times the counter wraps and the behavior turns
+	 * lazy again; this to deal with bursty apps that only use FPU for
+	 * a short time
+	 */
+	unsigned char fpu_counter;
 };
 
 #define INIT_MMAP \
arch/sh/kernel/cpu/fpu.c +1 -1
index f8f7af51c128..4e332244ea75 100644
@@ -44,7 +44,7 @@ void __fpu_state_restore(void)
 	restore_fpu(tsk);
 
 	task_thread_info(tsk)->status |= TS_USEDFPU;
-	tsk->fpu_counter++;
+	tsk->thread.fpu_counter++;
 }
 
 void fpu_state_restore(struct pt_regs *regs)
arch/sh/kernel/process_32.c +3 -3
index ebd3933005b4..2885fc9d9dcd 100644
@@ -156,7 +156,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
 #endif
 		ti->addr_limit = KERNEL_DS;
 		ti->status &= ~TS_USEDFPU;
-		p->fpu_counter = 0;
+		p->thread.fpu_counter = 0;
 		return 0;
 	}
 	*childregs = *current_pt_regs();
@@ -189,7 +189,7 @@ __switch_to(struct task_struct *prev, struct task_struct *next)
 	unlazy_fpu(prev, task_pt_regs(prev));
 
 	/* we're going to use this soon, after a few expensive things */
-	if (next->fpu_counter > 5)
+	if (next->thread.fpu_counter > 5)
 		prefetch(next_t->xstate);
 
 #ifdef CONFIG_MMU
@@ -207,7 +207,7 @@ __switch_to(struct task_struct *prev, struct task_struct *next)
 	 * restore of the math state immediately to avoid the trap; the
 	 * chances of needing FPU soon are obviously high now
 	 */
-	if (next->fpu_counter > 5)
+	if (next->thread.fpu_counter > 5)
 		__fpu_state_restore();
 
 	return prev;
Signature · 1 line
1.8.1.2
#2 lore raw

PATCH v2 2/3 x86: Move fpu_counter into ARCH specific thread_struct

In reply to Vineet Gupta

From: Vineet Gupta <[email protected]>

Only a couple of arches (sh/x86) use fpu_counter in task_struct so it can be moved out into ARCH specific thread_struct, reducing the size of task_struct for other arches.

Compile tested i386_defconfig + gcc 4.7.3

---
 arch/x86/include/asm/fpu-internal.h | 10 +++++-----
 arch/x86/include/asm/processor.h    |  9 +++++++++
 arch/x86/kernel/i387.c              |  2 +-
 arch/x86/kernel/process_32.c        |  4 ++--
 arch/x86/kernel/process_64.c        |  2 +-
 arch/x86/kernel/traps.c             |  2 +-
 6 files changed, 19 insertions(+), 10 deletions(-)
arch/x86/include/asm/fpu-internal.h +5 -5
index 4d0bda7b11e3..c49a613c6452 100644
@@ -365,7 +365,7 @@ static inline void drop_fpu(struct task_struct *tsk)
 	 * Forget coprocessor state..
 	 */
 	preempt_disable();
-	tsk->fpu_counter = 0;
+	tsk->thread.fpu_counter = 0;
 	__drop_fpu(tsk);
 	clear_used_math();
 	preempt_enable();
@@ -424,7 +424,7 @@ static inline fpu_switch_t switch_fpu_prepare(struct task_struct *old, struct ta
 	 * or if the past 5 consecutive context-switches used math.
 	 */
 	fpu.preload = tsk_used_math(new) && (use_eager_fpu() ||
-					     new->fpu_counter > 5);
+					     new->thread.fpu_counter > 5);
 	if (__thread_has_fpu(old)) {
 		if (!__save_init_fpu(old))
 			cpu = ~0;
@@ -433,16 +433,16 @@ static inline fpu_switch_t switch_fpu_prepare(struct task_struct *old, struct ta
 
 		/* Don't change CR0.TS if we just switch! */
 		if (fpu.preload) {
-			new->fpu_counter++;
+			new->thread.fpu_counter++;
 			__thread_set_has_fpu(new);
 			prefetch(new->thread.fpu.state);
 		} else if (!use_eager_fpu())
 			stts();
 	} else {
-		old->fpu_counter = 0;
+		old->thread.fpu_counter = 0;
 		old->thread.fpu.last_cpu = ~0;
 		if (fpu.preload) {
-			new->fpu_counter++;
+			new->thread.fpu_counter++;
 			if (!use_eager_fpu() && fpu_lazy_restore(new, cpu))
 				fpu.preload = 0;
 			else
arch/x86/include/asm/processor.h +9 -0
index 987c75ecc334..7b034a4057f9 100644
@@ -488,6 +488,15 @@ struct thread_struct {
 	unsigned long		iopl;
 	/* Max allowed port in the bitmap, in bytes: */
 	unsigned		io_bitmap_max;
+	/*
+	 * fpu_counter contains the number of consecutive context switches
+	 * that the FPU is used. If this is over a threshold, the lazy fpu
+	 * saving becomes unlazy to save the trap. This is an unsigned char
+	 * so that after 256 times the counter wraps and the behavior turns
+	 * lazy again; this to deal with bursty apps that only use FPU for
+	 * a short time
+	 */
+	unsigned char fpu_counter;
 };
 
 /*
arch/x86/kernel/i387.c +1 -1
index 5d576ab34403..e8368c6dd2a2 100644
@@ -100,7 +100,7 @@ void unlazy_fpu(struct task_struct *tsk)
 		__save_init_fpu(tsk);
 		__thread_fpu_end(tsk);
 	} else
-		tsk->fpu_counter = 0;
+		tsk->thread.fpu_counter = 0;
 	preempt_enable();
 }
 EXPORT_SYMBOL(unlazy_fpu);
arch/x86/kernel/process_32.c +2 -2
index 884f98f69354..6af43b03c8ef 100644
@@ -153,7 +153,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
 		childregs->orig_ax = -1;
 		childregs->cs = __KERNEL_CS | get_kernel_rpl();
 		childregs->flags = X86_EFLAGS_IF | X86_EFLAGS_FIXED;
-		p->fpu_counter = 0;
+		p->thread.fpu_counter = 0;
 		p->thread.io_bitmap_ptr = NULL;
 		memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
 		return 0;
@@ -166,7 +166,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
 	p->thread.ip = (unsigned long) ret_from_fork;
 	task_user_gs(p) = get_user_gs(current_pt_regs());
 
-	p->fpu_counter = 0;
+	p->thread.fpu_counter = 0;
 	p->thread.io_bitmap_ptr = NULL;
 	tsk = current;
 	err = -ENOMEM;
arch/x86/kernel/process_64.c +1 -1
index bb1dc51bab05..bbab295ca558 100644
@@ -163,7 +163,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
 	p->thread.sp = (unsigned long) childregs;
 	p->thread.usersp = me->thread.usersp;
 	set_tsk_thread_flag(p, TIF_FORK);
-	p->fpu_counter = 0;
+	p->thread.fpu_counter = 0;
 	p->thread.io_bitmap_ptr = NULL;
 
 	savesegment(gs, p->thread.gsindex);
arch/x86/kernel/traps.c +1 -1
index 8c8093b146ca..64b980f16660 100644
@@ -653,7 +653,7 @@ void math_state_restore(void)
 		return;
 	}
 
-	tsk->fpu_counter++;
+	tsk->thread.fpu_counter++;
 }
 EXPORT_SYMBOL_GPL(math_state_restore);
 
Signature · 1 line
1.8.1.2
#3 lore raw
In reply to Vineet Gupta
Quoted 10 lines · On Tue, 8 Oct 2013 13:16:26 +0530 Vineet Gupta <[email protected]>…

When debugging a ARC SMP 3.11 build failure due to a ST insn dealing with task_struct.thread going out of range, I spotted @fpu_counter in task_struct which only SH/x86 happen to use, and can be easily moved out into corresponding ARCH specific thread_struct. This saves 4 bytes per task_struct instantiated, for all the other 18 arches.

While the change is relatively strightforward, I've failed to connect with SH arch folks / Paul Mundt, latter's SH email keeps bouncing back. Hence I'm taking the liberty to use his alternate email (as listed on his github page) and I appologize in advance if this causes any inconvenience.

I can't find [patch v2 2/3] anywhere. Resend, please?

#4 lore raw

Hi Andrew,

Quoted 8 lines · Andrew Morton
Quoted 6 lines · On Tue, 8 Oct 2013 13:16:26 +0530 Vineet Gupta <[email protected]>…

When debugging a ARC SMP 3.11 build failure due to a ST insn dealing with task_struct.thread going out of range, I spotted @fpu_counter in task_struct which only SH/x86 happen to use, and can be easily moved out into corresponding ARCH specific thread_struct. This saves 4 bytes per task_struct instantiated, for all the other 18 arches.

Quoted 7 lines
Quoted 4 lines

While the change is relatively strightforward, I've failed to connect with SH arch folks / Paul Mundt, latter's SH email keeps bouncing back. Hence I'm taking the liberty to use his alternate email (as listed on his github page) and I appologize in advance if this causes any inconvenience.

I can't find [patch v2 2/3] anywhere. Resend, please?

Somehow that e-mail was dropped by some fancy "detection" machinery at our email servers ;-) which I got notified of later on.

Patch reposted to lists.

Thx,
-Vineet

#5 lore raw

PATCH v2 3/3 sched: Remove ARCH specific fpu_counter from task_struct

In reply to Vineet Gupta

From: Vineet Gupta <[email protected]>

fpu_counter in task_struct was used only by sh/x86.
Both of these now carry it in ARCH specific thread_struct, hence this can now be removed from generic task_struct, shrinking it slightly for other arches.

---
 include/linux/sched.h | 9 ---------
 1 file changed, 9 deletions(-)
include/linux/sched.h +0 -9
index 6682da36b293..78386c1e04a3 100644
@@ -1046,15 +1046,6 @@ struct task_struct {
 	struct hlist_head preempt_notifiers;
 #endif
 
-	/*
-	 * fpu_counter contains the number of consecutive context switches
-	 * that the FPU is used. If this is over a threshold, the lazy fpu
-	 * saving becomes unlazy to save the trap. This is an unsigned char
-	 * so that after 256 times the counter wraps and the behavior turns
-	 * lazy again; this to deal with bursty apps that only use FPU for
-	 * a short time
-	 */
-	unsigned char fpu_counter;
 #ifdef CONFIG_BLK_DEV_IO_TRACE
 	unsigned int btrace_seq;
 #endif
Signature · 1 line
1.8.1.2
Acked-by on v2 3/3
#6 lore raw

Re: [PATCH v2 3/3] sched: Remove ARCH specific fpu_counter from task_struct

Quoted 8 lines · Vineet Gupta

From: Vineet Gupta <[email protected]>

fpu_counter in task_struct was used only by sh/x86.
Both of these now carry it in ARCH specific thread_struct, hence this can now be removed from generic task_struct, shrinking it slightly for other arches.

Thanks,

Ingo

#7 lore raw
In reply to Vineet Gupta
Quoted 29 lines · Vineet Gupta

Hi,

When debugging a ARC SMP 3.11 build failure due to a ST insn dealing with task_struct.thread going out of range, I spotted @fpu_counter in task_struct which only SH/x86 happen to use, and can be easily moved out into corresponding ARCH specific thread_struct. This saves 4 bytes per task_struct instantiated, for all the other 18 arches.

While the change is relatively strightforward, I've failed to connect with SH arch folks / Paul Mundt, latter's SH email keeps bouncing back. Hence I'm taking the liberty to use his alternate email (as listed on his github page) and I appologize in advance if this causes any inconvenience.

Changes in v2:
- Rabased to 3.12-rc4
- Added ACK from Ingo on patch 2/3

Version 1 can be found here:
https://lkml.org/lkml/2013/9/17/49

Thx,
-Vineet

Vineet Gupta (3):
sh: Move fpu_counter into ARCH specific thread_struct
x86: Move fpu_counter into ARCH specific thread_struct
sched: Remove ARCH specific fpu_counter from task_struct

Quoted 14 lines
 arch/sh/include/asm/fpu.h           |  2 +-
 arch/sh/include/asm/processor_32.h  | 10 ++++++++++
 arch/sh/include/asm/processor_64.h  | 10 ++++++++++
 arch/sh/kernel/cpu/fpu.c            |  2 +-
 arch/sh/kernel/process_32.c         |  6 +++---
 arch/x86/include/asm/fpu-internal.h | 10 +++++-----
 arch/x86/include/asm/processor.h    |  9 +++++++++
 arch/x86/kernel/i387.c              |  2 +-
 arch/x86/kernel/process_32.c        |  4 ++--
 arch/x86/kernel/process_64.c        |  2 +-
 arch/x86/kernel/traps.c             |  2 +-
 include/linux/sched.h               |  9 ---------
 12 files changed, 44 insertions(+), 24 deletions(-)

Ingo, Andrew - do you think this series can be merged for 3.13. Is there anything else I need to do here.

-Vineet