]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
rcutree/rcu_bh_qs: disable irq while calling rcu_preempt_qs()
authorTiejun Chen <tiejun.chen@windriver.com>
Wed, 18 Dec 2013 09:51:49 +0000 (17:51 +0800)
committerMichal Sojka <sojka@merica.cz>
Sun, 13 Sep 2015 07:47:26 +0000 (09:47 +0200)
Any callers to the function rcu_preempt_qs() must disable irqs in
order to protect the assignment to ->rcu_read_unlock_special. In
RT case, rcu_bh_qs() as the wrapper of rcu_preempt_qs() is called
in some scenarios where irq is enabled, like this path,

do_single_softirq()
    |
    + local_irq_enable();
    + handle_softirq()
    |    |
    |    + rcu_bh_qs()
    |        |
    |        + rcu_preempt_qs()
    |
    + local_irq_disable()

So here we'd better disable irq directly inside of rcu_bh_qs() to
fix this, otherwise the kernel may be freezable sometimes as
observed. And especially this way is also kind and safe for the
potential rcu_bh_qs() usage elsewhere in the future.

Cc: stable-rt@vger.kernel.org
Signed-off-by: Tiejun Chen <tiejun.chen@windriver.com>
Signed-off-by: Bin Jiang <bin.jiang@windriver.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
kernel/rcu/tree.c

index 64ccd648ced29bc4c058029e9dd4bd7ff7c2500e..49938046b17a1996150392fcddfde3d9e8858051 100644 (file)
@@ -203,7 +203,12 @@ static void rcu_preempt_qs(void);
 
 void rcu_bh_qs(void)
 {
+       unsigned long flags;
+
+       /* Callers to this function, rcu_preempt_qs(), must disable irqs. */
+       local_irq_save(flags);
        rcu_preempt_qs();
+       local_irq_restore(flags);
 }
 #else
 void rcu_bh_qs(void)