linux-kernel - Re: [PATCH 06/16] rcu/nocb: Avoid confusing double write of rdp->nocb_cb

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20210128214223.GU2743@paulmck-ThinkPad-P72>
Date:   Thu, 28 Jan 2021 13:42:23 -0800
From:   "Paul E. McKenney" <paulmck@...nel.org>
To:     Frederic Weisbecker <frederic@...nel.org>
Cc:     LKML <linux-kernel@...r.kernel.org>,
        Boqun Feng <boqun.feng@...il.com>,
        Lai Jiangshan <jiangshanlai@...il.com>,
        Neeraj Upadhyay <neeraju@...eaurora.org>,
        Josh Triplett <josh@...htriplett.org>,
        Stable <stable@...r.kernel.org>,
        Joel Fernandes <joel@...lfernandes.org>
Subject: Re: [PATCH 06/16] rcu/nocb: Avoid confusing double write of
 rdp->nocb_cb_sleep

On Thu, Jan 28, 2021 at 06:12:12PM +0100, Frederic Weisbecker wrote:
> rdp->nocb_cb_sleep is first set to true by default after processing
> the callbacks then set back to false if we still find ready callbacks
> to invoke.
> 
> This is confusing and even unsafe if it ever happens to be read
> locklessly at some point. So make sure we write it only once per
> nocb_cb_wait() loop.
> 
> Reported-by: Paul E. McKenney <paulmck@...nel.org>
> Cc: Josh Triplett <josh@...htriplett.org>
> Cc: Lai Jiangshan <jiangshanlai@...il.com>
> Cc: Joel Fernandes <joel@...lfernandes.org>
> Cc: Neeraj Upadhyay <neeraju@...eaurora.org>
> Cc: Boqun Feng <boqun.feng@...il.com>
> Signed-off-by: Frederic Weisbecker <frederic@...nel.org>

Nice, queued, thank you!  The usual wordsmithing &c...

							Thanx, Paul

------------------------------------------------------------------------

commit cbc3fbfe8424edc90668d5878eb493ae2ff1b888
Author: Frederic Weisbecker <frederic@...nel.org>
Date:   Thu Jan 28 18:12:12 2021 +0100

    rcu/nocb: Avoid confusing double write of rdp->nocb_cb_sleep
    
    The nocb_cb_wait() function first sets the rdp->nocb_cb_sleep flag to
    true by after invoking the callbacks, and then sets it back to false if
    it finds more callbacks that are ready to invoke.
    
    This is confusing and will become unsafe if this flag is ever read
    locklessly.  This commit therefore writes it only once, based on the
    state after both callback invocation and checking.
    
    Reported-by: Paul E. McKenney <paulmck@...nel.org>
    Cc: Josh Triplett <josh@...htriplett.org>
    Cc: Lai Jiangshan <jiangshanlai@...il.com>
    Cc: Joel Fernandes <joel@...lfernandes.org>
    Cc: Neeraj Upadhyay <neeraju@...eaurora.org>
    Cc: Boqun Feng <boqun.feng@...il.com>
    Signed-off-by: Frederic Weisbecker <frederic@...nel.org>
    Signed-off-by: Paul E. McKenney <paulmck@...nel.org>

diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
index c61613a..a3db700 100644
--- a/kernel/rcu/tree_plugin.h
+++ b/kernel/rcu/tree_plugin.h
@@ -2229,6 +2229,7 @@ static void nocb_cb_wait(struct rcu_data *rdp)
 	unsigned long flags;
 	bool needwake_state = false;
 	bool needwake_gp = false;
+	bool can_sleep = true;
 	struct rcu_node *rnp = rdp->mynode;
 
 	local_irq_save(flags);
@@ -2252,8 +2253,6 @@ static void nocb_cb_wait(struct rcu_data *rdp)
 		raw_spin_unlock_rcu_node(rnp); /* irqs remain disabled. */
 	}
 
-	WRITE_ONCE(rdp->nocb_cb_sleep, true);
-
 	if (rcu_segcblist_test_flags(cblist, SEGCBLIST_OFFLOADED)) {
 		if (!rcu_segcblist_test_flags(cblist, SEGCBLIST_KTHREAD_CB)) {
 			rcu_segcblist_set_flags(cblist, SEGCBLIST_KTHREAD_CB);
@@ -2261,7 +2260,7 @@ static void nocb_cb_wait(struct rcu_data *rdp)
 				needwake_state = true;
 		}
 		if (rcu_segcblist_ready_cbs(cblist))
-			WRITE_ONCE(rdp->nocb_cb_sleep, false);
+			can_sleep = false;
 	} else {
 		/*
 		 * De-offloading. Clear our flag and notify the de-offload worker.
@@ -2274,6 +2273,8 @@ static void nocb_cb_wait(struct rcu_data *rdp)
 			needwake_state = true;
 	}
 
+	WRITE_ONCE(rdp->nocb_cb_sleep, can_sleep);
+
 	if (rdp->nocb_cb_sleep)
 		trace_rcu_nocb_wake(rcu_state.name, rdp->cpu, TPS("CBSleep"));