Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sched/core: Get rid of 'cpu' argument in wq_worker_sleeping()

Browse source 
Given that wq_worker_sleeping() could only be called for a
CPU it is running on, we do not need passing a CPU ID as an
argument.

Suggested-by: Oleg Nesterov <oleg@redhat.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Alexander Gordeev 2016-03-02 12:53:31 +01:00 • committed by Tejun Heo
parent 23217b443b
commit 9b7f6597f0
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel/sched/core.c
View file

@ -3257,7 +3257,7 @@ static void __sched notrace __schedule(bool preempt)
if (prev->flags & PF_WQ_WORKER) { if (prev->flags & PF_WQ_WORKER) {
struct task_struct *to_wakeup; struct task_struct *to_wakeup;
to_wakeup = wq_worker_sleeping(prev, cpu); to_wakeup = wq_worker_sleeping(prev);
if (to_wakeup) if (to_wakeup)
try_to_wake_up_local(to_wakeup); try_to_wake_up_local(to_wakeup);
} }

5
kernel/workqueue.c
View file

@ -858,7 +858,6 @@ void wq_worker_waking_up(struct task_struct *task, int cpu)
/** /**
* wq_worker_sleeping - a worker is going to sleep * wq_worker_sleeping - a worker is going to sleep
* @task: task going to sleep * @task: task going to sleep
* @cpu: CPU in question, must be the current CPU number
* *
* This function is called during schedule() when a busy worker is * This function is called during schedule() when a busy worker is
* going to sleep. Worker on the same cpu can be woken up by * going to sleep. Worker on the same cpu can be woken up by
@ -870,7 +869,7 @@ void wq_worker_waking_up(struct task_struct *task, int cpu)
* Return: * Return:
* Worker task on @cpu to wake up, %NULL if none. * Worker task on @cpu to wake up, %NULL if none.
*/ */
struct task_struct *wq_worker_sleeping(struct task_struct *task, int cpu) struct task_struct *wq_worker_sleeping(struct task_struct *task)
{ {
struct worker *worker = kthread_data(task), *to_wakeup = NULL; struct worker *worker = kthread_data(task), *to_wakeup = NULL;
struct worker_pool *pool; struct worker_pool *pool;
@ -886,7 +885,7 @@ struct task_struct *wq_worker_sleeping(struct task_struct *task, int cpu)
pool = worker->pool; pool = worker->pool;
/* this can only happen on the local cpu */ /* this can only happen on the local cpu */
if (WARN_ON_ONCE(cpu != raw_smp_processor_id() || pool->cpu != cpu)) if (WARN_ON_ONCE(pool->cpu != raw_smp_processor_id()))
return NULL; return NULL;
/* /*

2
kernel/workqueue_internal.h
View file

@ -69,6 +69,6 @@ static inline struct worker *current_wq_worker(void)
* sched/core.c and workqueue.c. * sched/core.c and workqueue.c.
*/ */
void wq_worker_waking_up(struct task_struct *task, int cpu); void wq_worker_waking_up(struct task_struct *task, int cpu);
struct task_struct *wq_worker_sleeping(struct task_struct *task, int cpu); struct task_struct *wq_worker_sleeping(struct task_struct *task);
#endif /* _KERNEL_WORKQUEUE_INTERNAL_H */ #endif /* _KERNEL_WORKQUEUE_INTERNAL_H */