Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25d30cf4 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

rcu: Adjust for unconditional ->completed assignment 



Now that the rcu_node structures' ->completed fields are unconditionally
assigned at grace-period cleanup time, they should already have the
correct value for the new grace period at grace-period initialization
time.  This commit therefore inserts a WARN_ON_ONCE() to verify this
invariant.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
parent 661a85dc

kernel/rcutree.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -1080,6 +1080,7 @@ static int rcu_gp_init(struct rcu_state *rsp) 
		rcu_preempt_check_blocked_tasks(rnp);

		rcu_preempt_check_blocked_tasks(rnp);

		rnp->qsmask = rnp->qsmaskinit;

		rnp->qsmask = rnp->qsmaskinit;

		rnp->gpnum = rsp->gpnum;

		rnp->gpnum = rsp->gpnum;

		WARN_ON_ONCE(rnp->completed != rsp->completed);

		rnp->completed = rsp->completed;

		rnp->completed = rsp->completed;

		if (rnp == rdp->mynode)

		if (rnp == rdp->mynode)

			rcu_start_gp_per_cpu(rsp, rnp, rdp);

			rcu_start_gp_per_cpu(rsp, rnp, rdp);
@@ -2777,7 +2778,8 @@ static void __init rcu_init_one(struct rcu_state *rsp, 
			raw_spin_lock_init(&rnp->fqslock);

			raw_spin_lock_init(&rnp->fqslock);

			lockdep_set_class_and_name(&rnp->fqslock,

			lockdep_set_class_and_name(&rnp->fqslock,

						   &rcu_fqs_class[i], fqs[i]);

						   &rcu_fqs_class[i], fqs[i]);

			rnp->gpnum = 0;

			rnp->gpnum = rsp->gpnum;

			rnp->completed = rsp->completed;

			rnp->qsmask = 0;

			rnp->qsmask = 0;

			rnp->qsmaskinit = 0;

			rnp->qsmaskinit = 0;

			rnp->grplo = j * cpustride;

			rnp->grplo = j * cpustride;