The following commit has been merged into the core/rcu branch of tip: Commit-ID: 1b7af295541d75535374325fd617944534853919 Gitweb: https://git.kernel.org/tip/1b7af295541d75535374325fd617944534853919 Author: Peter Zijlstra <pet...@infradead.org> AuthorDate: Sat, 29 Aug 2020 10:22:24 -07:00 Committer: Paul E. McKenney <paul...@kernel.org> CommitterDate: Mon, 04 Jan 2021 15:49:52 -08:00
sched/core: Allow try_invoke_on_locked_down_task() with irqs disabled The try_invoke_on_locked_down_task() function currently requires that interrupts be enabled, but it is called with interrupts disabled from rcu_print_task_stall(), resulting in an "IRQs not enabled as expected" diagnostic. This commit therefore updates try_invoke_on_locked_down_task() to use raw_spin_lock_irqsave() instead of raw_spin_lock_irq(), thus allowing use from either context. Link: https://lore.kernel.org/lkml/000000000000903d5805ab908...@google.com/ Link: https://lore.kernel.org/lkml/20200928075729.gc2...@hirez.programming.kicks-ass.net/ Reported-by: syzbot+cb3b69ae80afd6535...@syzkaller.appspotmail.com Signed-off-by: Peter Zijlstra <pet...@infradead.org> Signed-off-by: Paul E. McKenney <paul...@kernel.org> --- kernel/sched/core.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index e7e4534..f768bb0 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2989,7 +2989,7 @@ out: /** * try_invoke_on_locked_down_task - Invoke a function on task in fixed state - * @p: Process for which the function is to be invoked. + * @p: Process for which the function is to be invoked, can be @current. * @func: Function to invoke. * @arg: Argument to function. * @@ -3007,12 +3007,11 @@ out: */ bool try_invoke_on_locked_down_task(struct task_struct *p, bool (*func)(struct task_struct *t, void *arg), void *arg) { - bool ret = false; struct rq_flags rf; + bool ret = false; struct rq *rq; - lockdep_assert_irqs_enabled(); - raw_spin_lock_irq(&p->pi_lock); + raw_spin_lock_irqsave(&p->pi_lock, rf.flags); if (p->on_rq) { rq = __task_rq_lock(p, &rf); if (task_rq(p) == rq) @@ -3029,7 +3028,7 @@ bool try_invoke_on_locked_down_task(struct task_struct *p, bool (*func)(struct t ret = func(p, arg); } } - raw_spin_unlock_irq(&p->pi_lock); + raw_spin_unlock_irqrestore(&p->pi_lock, rf.flags); return ret; }
