Skip to content

Commit

Permalink
sched: Remove pointless preemption disable in sched_submit_work()
Browse files Browse the repository at this point in the history
Neither wq_worker_sleeping() nor io_wq_worker_sleeping() require to be invoked
with preemption disabled:

  - The worker flag checks operations only need to be serialized against
    the worker thread itself.

  - The accounting and worker pool operations are serialized with locks.

which means that disabling preemption has neither a reason nor a
value. Remove it and update the stale comment.

Signed-off-by: Thomas Gleixner <[email protected]>
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Reviewed-by: Lai Jiangshan <[email protected]>
Reviewed-by: Jens Axboe <[email protected]>
Link: https://lkml.kernel.org/r/8735pnafj7.ffs@tglx
  • Loading branch information
KAGA-KOKO authored and Peter Zijlstra committed Oct 5, 2021
1 parent 670721c commit b945efc
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions kernel/sched/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -6251,20 +6251,14 @@ static inline void sched_submit_work(struct task_struct *tsk)

task_flags = tsk->flags;
/*
* If a worker went to sleep, notify and ask workqueue whether
* it wants to wake up a task to maintain concurrency.
* As this function is called inside the schedule() context,
* we disable preemption to avoid it calling schedule() again
* in the possible wakeup of a kworker and because wq_worker_sleeping()
* requires it.
* If a worker goes to sleep, notify and ask workqueue whether it
* wants to wake up a task to maintain concurrency.
*/
if (task_flags & (PF_WQ_WORKER | PF_IO_WORKER)) {
preempt_disable();
if (task_flags & PF_WQ_WORKER)
wq_worker_sleeping(tsk);
else
io_wq_worker_sleeping(tsk);
preempt_enable_no_resched();
}

if (tsk_is_pi_blocked(tsk))
Expand Down

0 comments on commit b945efc

Please sign in to comment.