]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
rcu: using ACCESS_ONCE() to observe the jiffies_stall/rnp->qsmask value
authorDongdong Deng <dongdong.deng@windriver.com>
Tue, 28 Sep 2010 08:32:43 +0000 (16:32 +0800)
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Thu, 7 Oct 2010 17:41:06 +0000 (10:41 -0700)
Using ACCESS_ONCE() to observe the jiffies_stall/rnp->qsmask value
due to the caller didn't hold the root_rcu/rnp node's lock.  Although
use without ACCESS_ONCE() is safe due to the value loaded being used
but once, the ACCESS_ONCE() is a good documentation aid -- the variables
are being loaded without the services of a lock.

Signed-off-by: Dongdong Deng <dongdong.deng@windriver.com>
CC: Dipankar Sarma <dipankar@in.ibm.com>
CC: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
kernel/rcutree.c

index e75073504a31b7209b24e4e4f0b883af98bf942a..ccdc04c479815addc8dbacea69643174a4636670 100644 (file)
@@ -545,9 +545,9 @@ static void check_cpu_stall(struct rcu_state *rsp, struct rcu_data *rdp)
 
        if (rcu_cpu_stall_suppress)
                return;
-       delta = jiffies - rsp->jiffies_stall;
+       delta = jiffies - ACCESS_ONCE(rsp->jiffies_stall);
        rnp = rdp->mynode;
-       if ((rnp->qsmask & rdp->grpmask) && delta >= 0) {
+       if ((ACCESS_ONCE(rnp->qsmask) & rdp->grpmask) && delta >= 0) {
 
                /* We haven't checked in, so go dump stack. */
                print_cpu_stall(rsp);