hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sched, tile: Remove finish_arch_switch 

Move the simulator bits into switch_to() and use
finish_arch_post_lock_switch() for the homecache migration bits.

Signed-off-by: Chris Metcalf <cmetcalf@ezchip.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Chris Metcalf 2015-07-29 13:06:29 -04:00 committed by Ingo Molnar
parent b31fdac2a9
commit fe363adb92
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/tile/include/asm/switch_to.h
View File

@ -53,15 +53,11 @@ extern unsigned long get_switch_to_pc(void);
* Kernel threads can check to see if they need to migrate their * Kernel threads can check to see if they need to migrate their
* stack whenever they return from a context switch; for user * stack whenever they return from a context switch; for user
* threads, we defer until they are returning to user-space. * 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 { \ #define finish_arch_post_lock_switch() 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)); \
if (current->mm == NULL && !kstack_hash && \ 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(); \ homecache_migrate_kthread(); \
} while (0) } while (0)

17
arch/tile/kernel/process.c
View File

@ -448,11 +448,24 @@ struct task_struct *__sched _switch_to(struct task_struct *prev,
/* /*
* Switch kernel SP, PC, and callee-saved registers. * 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 * In the context of the new task, return the old task pointer
* (i.e. the task that actually called __switch_to). * (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;
} }
/* /*