hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rcu: Expedite first two FQS scans under callback-overload conditions 

Even if some CPUs have excessive numbers of callbacks, RCU's grace-period
kthread will still wait normally between successive force-quiescent-state
scans.  The first two are the most important, as they are the ones that
enlist aid from the scheduler when overloaded.  This commit therefore
omits the wait before the first and the second force-quiescent-state
scan under callback-overload conditions.

This approach was inspired by a discussion with Jeff Roberson.

Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
This commit is contained in:
Paul E. McKenney 2020-02-22 20:07:09 -08:00
parent 53965dbe53
commit 1fca4d12f4
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kernel/rcu/tree.c
View File

@ -1624,12 +1624,16 @@ static bool rcu_gp_fqs_check_wake(int *gfp)
{ {
struct rcu_node *rnp = rcu_get_root(); struct rcu_node *rnp = rcu_get_root();
/* Someone like call_rcu() requested a force-quiescent-state scan. */ // If under overload conditions, force an immediate FQS scan.
if (*gfp & RCU_GP_FLAG_OVLD)
return true;
// Someone like call_rcu() requested a force-quiescent-state scan.
*gfp = READ_ONCE(rcu_state.gp_flags); *gfp = READ_ONCE(rcu_state.gp_flags);
if (*gfp & RCU_GP_FLAG_FQS) if (*gfp & RCU_GP_FLAG_FQS)
return true; return true;
/* The current grace period has completed. */ // The current grace period has completed.
if (!READ_ONCE(rnp->qsmask) && !rcu_preempt_blocked_readers_cgp(rnp)) if (!READ_ONCE(rnp->qsmask) && !rcu_preempt_blocked_readers_cgp(rnp))
return true; return true;
@ -1667,13 +1671,15 @@ static void rcu_gp_fqs(bool first_time)
static void rcu_gp_fqs_loop(void) static void rcu_gp_fqs_loop(void)
{ {
bool first_gp_fqs; bool first_gp_fqs;
int gf; int gf = 0;
unsigned long j; unsigned long j;
int ret; int ret;
struct rcu_node *rnp = rcu_get_root(); struct rcu_node *rnp = rcu_get_root();
first_gp_fqs = true; first_gp_fqs = true;
j = READ_ONCE(jiffies_till_first_fqs); j = READ_ONCE(jiffies_till_first_fqs);
if (rcu_state.cbovld)
gf = RCU_GP_FLAG_OVLD;
ret = 0; ret = 0;
for (;;) { for (;;) {
if (!ret) { if (!ret) {
@ -1698,7 +1704,11 @@ static void rcu_gp_fqs_loop(void)
trace_rcu_grace_period(rcu_state.name, rcu_state.gp_seq, trace_rcu_grace_period(rcu_state.name, rcu_state.gp_seq,
TPS("fqsstart")); TPS("fqsstart"));
rcu_gp_fqs(first_gp_fqs); rcu_gp_fqs(first_gp_fqs);
first_gp_fqs = false; gf = 0;
if (first_gp_fqs) {
first_gp_fqs = false;
gf = rcu_state.cbovld ? RCU_GP_FLAG_OVLD : 0;
}
trace_rcu_grace_period(rcu_state.name, rcu_state.gp_seq, trace_rcu_grace_period(rcu_state.name, rcu_state.gp_seq,
TPS("fqsend")); TPS("fqsend"));
cond_resched_tasks_rcu_qs(); cond_resched_tasks_rcu_qs();
@ -1718,6 +1728,7 @@ static void rcu_gp_fqs_loop(void)
j = 1; j = 1;
else else
j = rcu_state.jiffies_force_qs - j; j = rcu_state.jiffies_force_qs - j;
gf = 0;
} }
} }
} }

1
kernel/rcu/tree.h
View File

@ -359,6 +359,7 @@ struct rcu_state {
/* Values for rcu_state structure's gp_flags field. */ /* Values for rcu_state structure's gp_flags field. */
#define RCU_GP_FLAG_INIT 0x1 /* Need grace-period initialization. */ #define RCU_GP_FLAG_INIT 0x1 /* Need grace-period initialization. */
#define RCU_GP_FLAG_FQS 0x2 /* Need grace-period quiescent-state forcing. */ #define RCU_GP_FLAG_FQS 0x2 /* Need grace-period quiescent-state forcing. */
#define RCU_GP_FLAG_OVLD 0x4 /* Experiencing callback overload. */
/* Values for rcu_state structure's gp_state field. */ /* Values for rcu_state structure's gp_state field. */
#define RCU_GP_IDLE 0 /* Initial state and no GP in progress. */ #define RCU_GP_IDLE 0 /* Initial state and no GP in progress. */