sched, tile: Remove finish_arch_switch
A message that is not in the archive (sent off-list or not yet received): [email protected]
Ingo,
I already have the appended commit in a modified form in the linux-tile tree ready to be pushed to 4.3. Can you drop it from your series?
Thanks!
Quoted 79 lines · tip-bot for Chris Metcalf
Commit-ID: fe363adb922583bacfbd5a30a4c773ccff9bb393 Gitweb: http://git.kernel.org/tip/fe363adb922583bacfbd5a30a4c773ccff9bb393 Author: Chris Metcalf <[email protected]> AuthorDate: Wed, 29 Jul 2015 13:06:29 -0400 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 4 Aug 2015 09:38:18 +0200sched, tile: Remove
finish_arch_switchMove the simulator bits into
switch_to()and usefinish_arch_post_lock_switch()for the homecache migration bits.Signed-off-by Chris Metcalf <[email protected]>Signed-off-by Peter Zijlstra (Intel) <[email protected]>Cc Linus Torvalds <[email protected]>Cc Mike Galbraith <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Thomas Gleixner <[email protected]>Signed-off-by Ingo Molnar <[email protected]>--- arch/tile/include/asm/switch_to.h | 10 +++------- arch/tile/kernel/process.c | 17 +++++++++++++++-- 2 files changed, 18 insertions(+), 9 deletions(-)arch/tile/include/asm/switch_to.h +3
-7@@ -53,15 +53,11 @@ extern unsigned long get_switch_to_pc(void);* Kernel threads can check to see if they need to migrate their * stack whenever they return from a context switch; for user * threads, we defer until they are returning to user-space. +* We defer homecache migration until the runqueue lock is released. */ -#define finish_arch_switch (prev) do { \ - if (unlikely((prev)->state == TASK_DEAD)) \ - __insn_mtspr(SPR_SIM_CONTROL, SIM_CONTROL_OS_EXIT | \ - ((prev)->pid << _SIM_CONTROL_OPERATOR_BITS)); \ - __insn_mtspr(SPR_SIM_CONTROL, SIM_CONTROL_OS_SWITCH | \ - (current->pid << _SIM_CONTROL_OPERATOR_BITS)); \ +#define finish_arch_post_lock_switch () do { \ if (current->mm == NULL && !kstack_hash && \ - current_thread_info()->homecache_cpu != smp_processor_id()) \ + current_thread_info()->homecache_cpu != raw_smp_processor_id()) \ homecache_migrate_kthread(); \ } while (0)arch/tile/kernel/process.c +15
-2@@ -448,11 +448,24 @@ struct task_struct *__sched _switch_to(struct task_struct *prev,/* * Switch kernel SP, PC, and callee-saved registers. +* Pass the value to use for SYSTEM_SAVE_K_0 when we reset our sp. +* Once we return from this function we will have changed stacks +* and be running with current == next. +*/ +__switch_to (prev, next,next_current_ksp0 (next)); + +/* Notify the simulator of task switch and task exit. */ +if (unlikely (prev->state ==TASK_DEAD )) +__insn_mtspr (SPR_SIM_CONTROL ,SIM_CONTROL_OS_EXIT | + (prev->pid << _SIM_CONTROL_OPERATOR_BITS)); +__insn_mtspr (SPR_SIM_CONTROL ,SIM_CONTROL_OS_SWITCH | + (next->pid << _SIM_CONTROL_OPERATOR_BITS)); + +/* * In the context of the new task, return the old task pointer * (i.e. the task that actually called __switch_to). -* Pass the value to use for SYSTEM_SAVE_K_0 when we reset our sp. */ -return __switch_to (prev, next,next_current_ksp0 (next)); +return prev; }/*
Signature · 2 lines
Chris Metcalf, EZChip Semiconductor http://www.ezchip.com
Quoted 4 lines · Chris Metcalf
Ingo,
I already have the appended commit in a modified form in the linux-tile tree ready to be pushed to 4.3. Can you drop it from your series?
Could you please post the updated patch? I cannot easily drop the patch because that would break the scheduler tree on the tile architecture.
Thanks,
Ingo
PATCH v2 1/1 tile: Remove finish_arch_switch
Move the simulator bits into switch_to() and use finish_arch_post_lock_switch() for the homecache migration bits.
--- arch/tile/include/asm/switch_to.h | 8 +++----- arch/tile/kernel/process.c | 5 +++++ 2 files changed, 8 insertions(+), 5 deletions(-)
arch/tile/include/asm/switch_to.h +3 -5
@@ -53,15 +53,13 @@ extern unsigned long get_switch_to_pc(void);* Kernel threads can check to see if they need to migrate their * stack whenever they return from a context switch; for user * threads, we defer until they are returning to user-space. +* We defer homecache migration until the runqueue lock is released. */ -#define finish_arch_switch (prev) do { \ - if (unlikely((prev)->state == TASK_DEAD)) \ - __insn_mtspr(SPR_SIM_CONTROL, SIM_CONTROL_OS_EXIT | \ - ((prev)->pid << _SIM_CONTROL_OPERATOR_BITS)); \ +#define finish_arch_post_lock_switch () do { \ __insn_mtspr(SPR_SIM_CONTROL, SIM_CONTROL_OS_SWITCH | \ (current->pid << _SIM_CONTROL_OPERATOR_BITS)); \ if (current->mm == NULL && !kstack_hash && \ - current_thread_info()->homecache_cpu != smp_processor_id()) \ + current_thread_info()->homecache_cpu != raw_smp_processor_id()) \ homecache_migrate_kthread(); \ } while (0)
arch/tile/kernel/process.c +5 -0
@@ -446,6 +446,11 @@ struct task_struct *__sched _switch_to(struct task_struct *prev,hardwall_switch_tasks (prev, next);#endif +/* Notify the simulator of task exit. */ +if (unlikely (prev->state ==TASK_DEAD )) +__insn_mtspr (SPR_SIM_CONTROL ,SIM_CONTROL_OS_EXIT | + (prev->pid << _SIM_CONTROL_OPERATOR_BITS)); +/* * Switch kernel SP, PC, and callee-saved registers. * In the context of the new task, return the old task pointer
Signature · 1 line
2.1.2
tip-bot for Chris Metcalf
merge bot[tip:sched/core] tile: Reorganize _switch_to()
tile: Reorganize _switch_to()
Commit-ID: 1eaef888158dc441dcd00c20779251cfa5e756b3 Gitweb: http://git.kernel.org/tip/1eaef888158dc441dcd00c20779251cfa5e756b3 Author: Chris Metcalf <[email protected]> AuthorDate: Wed, 5 Aug 2015 10:03:32 -0400 Committer: Ingo Molnar <[email protected]> CommitDate: Sat, 8 Aug 2015 10:29:21 +0200
tile: Reorganize _switch_to()
Move the simulator bits into finish_arch_post_lock_switch() and properly call __switch_to() from _switch_to().
--- arch/tile/include/asm/switch_to.h | 2 ++ arch/tile/kernel/process.c | 16 ++++------------ 2 files changed, 6 insertions(+), 12 deletions(-)
arch/tile/include/asm/switch_to.h +2 -0
@@ -56,6 +56,8 @@ extern unsigned long get_switch_to_pc(void);* We defer homecache migration until the runqueue lock is released. */ #define finish_arch_post_lock_switch () do { \ + __insn_mtspr(SPR_SIM_CONTROL, SIM_CONTROL_OS_SWITCH | \ + (current->pid << _SIM_CONTROL_OPERATOR_BITS)); \ if (current->mm == NULL && !kstack_hash && \ current_thread_info()->homecache_cpu != raw_smp_processor_id()) \ homecache_migrate_kthread(); \
arch/tile/kernel/process.c +4 -12
@@ -446,26 +446,18 @@ struct task_struct *__sched _switch_to(struct task_struct *prev,hardwall_switch_tasks (prev, next);#endif -/* -* Switch kernel SP, PC, and callee-saved registers. -* Pass the value to use for SYSTEM_SAVE_K_0 when we reset our sp. -* Once we return from this function we will have changed stacks -* and be running with current == next. -*/ -__switch_to (prev, next,next_current_ksp0 (next)); - -/* Notify the simulator of task switch and task exit. */ +/* Notify the simulator of task exit. */ if (unlikely (prev->state ==TASK_DEAD ))__insn_mtspr (SPR_SIM_CONTROL ,SIM_CONTROL_OS_EXIT | (prev->pid << _SIM_CONTROL_OPERATOR_BITS)); -__insn_mtspr (SPR_SIM_CONTROL ,SIM_CONTROL_OS_SWITCH | - (next->pid << _SIM_CONTROL_OPERATOR_BITS));/* +* Switch kernel SP, PC, and callee-saved registers. * In the context of the new task, return the old task pointer * (i.e. the task that actually called __switch_to). +* Pass the value to use for SYSTEM_SAVE_K_0 when we reset our sp. */ -return prev; +return __switch_to (prev, next,next_current_ksp0 (next)); }/*