On Sat, Aug 29, 2020 at 09:30:49AM +0200, peterz@xxxxxxxxxxxxx wrote:
> On Sat, Aug 29, 2020 at 11:01:55AM +0900, Masami Hiramatsu wrote:
> > On Fri, 28 Aug 2020 21:29:55 +0900
> > Masami Hiramatsu <mhiramat@xxxxxxxxxx> wrote:
> >
> > > From: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
> >
> > In the next version I will drop this since I will merge the kretprobe_holder
> > things into removing kretporbe hash patch.
> >
> > However, this patch itself seems fixing a bug of commit 2beaf3280e57
> > ("sched/core: Add function to sample state of locked-down task").
> > Peter, could you push this separately?
>
> Yeah, Paul and me have a slightly different version for that, this also
> changes semantics we're still bickering over ;-)
>
> But yes, I'll take care of it.
For whatever it is worth, I ended up back at your original patch with
one change to the header comment, as shown below. Does this work for you?
Thanx, Paul
------------------------------------------------------------------------
commit 3f73a1137f8e999a606357064ebd914cf5f2c897
Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Date: Sat Aug 29 10:22:24 2020 -0700
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/000000000000903d5805ab908fc4@xxxxxxxxxx/
Reported-by: syzbot+cb3b69ae80afd6535b0e@xxxxxxxxxxxxxxxxxxxxxxxxx
Not-signed-off-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 8471a0f..a814028 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2988,7 +2988,7 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
/**
* 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.
*
@@ -3006,12 +3006,11 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
*/
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)
@@ -3028,7 +3027,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;
}
