Commit ab83f455 authored by Peter Oskolkov's avatar Peter Oskolkov Committed by Kees Cook

sched: add WF_CURRENT_CPU and externise ttwu

Add WF_CURRENT_CPU wake flag that advices the scheduler to
move the wakee to the current CPU. This is useful for fast on-CPU
context switching use cases.

In addition, make ttwu external rather than static so that
the flag could be passed to it from outside of sched/core.c.
Signed-off-by: default avatarPeter Oskolkov <posk@google.com>
Signed-off-by: default avatarAndrei Vagin <avagin@google.com>
Acked-by: default avatar"Peter Zijlstra (Intel)" <peterz@infradead.org>
Link: https://lore.kernel.org/r/20230308073201.3102738-3-avagin@google.comSigned-off-by: default avatarKees Cook <keescook@chromium.org>
parent 4943b66d
...@@ -4193,8 +4193,7 @@ bool ttwu_state_match(struct task_struct *p, unsigned int state, int *success) ...@@ -4193,8 +4193,7 @@ bool ttwu_state_match(struct task_struct *p, unsigned int state, int *success)
* Return: %true if @p->state changes (an actual wakeup was done), * Return: %true if @p->state changes (an actual wakeup was done),
* %false otherwise. * %false otherwise.
*/ */
static int int try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
{ {
unsigned long flags; unsigned long flags;
int cpu, success = 0; int cpu, success = 0;
......
...@@ -7741,6 +7741,10 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int wake_flags) ...@@ -7741,6 +7741,10 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int wake_flags)
if (wake_flags & WF_TTWU) { if (wake_flags & WF_TTWU) {
record_wakee(p); record_wakee(p);
if ((wake_flags & WF_CURRENT_CPU) &&
cpumask_test_cpu(cpu, p->cpus_ptr))
return cpu;
if (sched_energy_enabled()) { if (sched_energy_enabled()) {
new_cpu = find_energy_efficient_cpu(p, prev_cpu); new_cpu = find_energy_efficient_cpu(p, prev_cpu);
if (new_cpu >= 0) if (new_cpu >= 0)
......
...@@ -2131,12 +2131,13 @@ static inline int task_on_rq_migrating(struct task_struct *p) ...@@ -2131,12 +2131,13 @@ static inline int task_on_rq_migrating(struct task_struct *p)
} }
/* Wake flags. The first three directly map to some SD flag value */ /* Wake flags. The first three directly map to some SD flag value */
#define WF_EXEC 0x02 /* Wakeup after exec; maps to SD_BALANCE_EXEC */ #define WF_EXEC 0x02 /* Wakeup after exec; maps to SD_BALANCE_EXEC */
#define WF_FORK 0x04 /* Wakeup after fork; maps to SD_BALANCE_FORK */ #define WF_FORK 0x04 /* Wakeup after fork; maps to SD_BALANCE_FORK */
#define WF_TTWU 0x08 /* Wakeup; maps to SD_BALANCE_WAKE */ #define WF_TTWU 0x08 /* Wakeup; maps to SD_BALANCE_WAKE */
#define WF_SYNC 0x10 /* Waker goes to sleep after wakeup */ #define WF_SYNC 0x10 /* Waker goes to sleep after wakeup */
#define WF_MIGRATED 0x20 /* Internal use, task got migrated */ #define WF_MIGRATED 0x20 /* Internal use, task got migrated */
#define WF_CURRENT_CPU 0x40 /* Prefer to move the wakee to the current CPU. */
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
static_assert(WF_EXEC == SD_BALANCE_EXEC); static_assert(WF_EXEC == SD_BALANCE_EXEC);
...@@ -3229,6 +3230,8 @@ static inline bool is_per_cpu_kthread(struct task_struct *p) ...@@ -3229,6 +3230,8 @@ static inline bool is_per_cpu_kthread(struct task_struct *p)
extern void swake_up_all_locked(struct swait_queue_head *q); extern void swake_up_all_locked(struct swait_queue_head *q);
extern void __prepare_to_swait(struct swait_queue_head *q, struct swait_queue *wait); extern void __prepare_to_swait(struct swait_queue_head *q, struct swait_queue *wait);
extern int try_to_wake_up(struct task_struct *tsk, unsigned int state, int wake_flags);
#ifdef CONFIG_PREEMPT_DYNAMIC #ifdef CONFIG_PREEMPT_DYNAMIC
extern int preempt_dynamic_mode; extern int preempt_dynamic_mode;
extern int sched_dynamic_mode(const char *str); extern int sched_dynamic_mode(const char *str);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment