rcu: Make FQS schedule advance only if FQS happened (fcfd0a23) · Commits · 戴 / test

Currently, the force-quiescent-state (FQS) code in rcu_gp_kthread() can advance the next FQS even if one was not executed last time. This can happen due timeout-duration uncertainty. This commit therefore avoids advancing the FQS schedule unless an FQS was just executed. In the corner case where an FQS was not executed, but is due now, the code does a one-jiffy wait. This change prepares for kthread kicking. Signed-off-by:

Paul E. McKenney <paulmck@linux.vnet.ibm.com>

kernel/rcu/tree.c

+15 −8

Original line number	Diff line number	Diff line
		@@ -2146,6 +2146,15 @@ static int __noreturn rcu_gp_kthread(void *arg)
		TPS("fqsend"));
		cond_resched_rcu_qs();
		WRITE_ONCE(rsp->gp_activity, jiffies);
		ret = 0; /* Force full wait till next FQS. */
		j = jiffies_till_next_fqs;
		if (j > HZ) {
		j = HZ;
		jiffies_till_next_fqs = HZ;
		} else if (j < 1) {
		j = 1;
		jiffies_till_next_fqs = 1;
		}
		} else {
		/* Deal with stray signal. */
		cond_resched_rcu_qs();
		@@ -2154,14 +2163,12 @@ static int __noreturn rcu_gp_kthread(void *arg)
		trace_rcu_grace_period(rsp->name,
		READ_ONCE(rsp->gpnum),
		TPS("fqswaitsig"));
		}
		j = jiffies_till_next_fqs;
		if (j > HZ) {
		j = HZ;
		jiffies_till_next_fqs = HZ;
		} else if (j < 1) {
		ret = 1; /* Keep old FQS timing. */
		j = jiffies;
		if (time_after(jiffies, rsp->jiffies_force_qs))
		j = 1;
		jiffies_till_next_fqs = 1;
		else
		j = rsp->jiffies_force_qs - j;
		}
		}

Admin message