leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rcu: Switch ->tick_nohz_enabled_snap to rcu_data structure

Browse Source 
This commit removes ->tick_nohz_enabled_snap from the rcu_dynticks
structure and updates the code to access it from the rcu_data
structure.

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
This commit is contained in:
Paul E. McKenney 2018-08-03 21:00:38 -07:00
parent cc72046cc3
commit 0fd79e7521
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/rcu/tree.h
View File

@ -53,7 +53,6 @@ struct rcu_dynticks {
/* Last jiffy CBs were accelerated. */ /* Last jiffy CBs were accelerated. */
unsigned long last_advance_all; unsigned long last_advance_all;
/* Last jiffy CBs were all advanced. */ /* Last jiffy CBs were all advanced. */
int tick_nohz_enabled_snap; /* Previously seen value from sysfs. */
#endif /* #ifdef CONFIG_RCU_FAST_NO_HZ */ #endif /* #ifdef CONFIG_RCU_FAST_NO_HZ */
}; };

10
kernel/rcu/tree_plugin.h
View File

@ -1681,7 +1681,7 @@ int rcu_needs_cpu(u64 basemono, u64 *nextevt)
static void rcu_prepare_for_idle(void) static void rcu_prepare_for_idle(void)
{ {
bool needwake; bool needwake;
struct rcu_data *rdp; struct rcu_data *rdp = this_cpu_ptr(&rcu_data);
struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks); struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks);
struct rcu_node *rnp; struct rcu_node *rnp;
int tne; int tne;
@ -1692,10 +1692,10 @@ static void rcu_prepare_for_idle(void)
/* Handle nohz enablement switches conservatively. */ /* Handle nohz enablement switches conservatively. */
tne = READ_ONCE(tick_nohz_active); tne = READ_ONCE(tick_nohz_active);
if (tne != rdtp->tick_nohz_enabled_snap) { if (tne != rdp->tick_nohz_enabled_snap) {
if (rcu_cpu_has_callbacks(NULL)) if (rcu_cpu_has_callbacks(NULL))
invoke_rcu_core(); /* force nohz to see update. */ invoke_rcu_core(); /* force nohz to see update. */
rdtp->tick_nohz_enabled_snap = tne; rdp->tick_nohz_enabled_snap = tne;
return; return;
} }
if (!tne) if (!tne)
@ -1721,7 +1721,6 @@ static void rcu_prepare_for_idle(void)
if (rdtp->last_accelerate == jiffies) if (rdtp->last_accelerate == jiffies)
return; return;
rdtp->last_accelerate = jiffies; rdtp->last_accelerate = jiffies;
rdp = this_cpu_ptr(&rcu_data);
if (rcu_segcblist_pend_cbs(&rdp->cblist)) { if (rcu_segcblist_pend_cbs(&rdp->cblist)) {
rnp = rdp->mynode; rnp = rdp->mynode;
raw_spin_lock_rcu_node(rnp); /* irqs already disabled. */ raw_spin_lock_rcu_node(rnp); /* irqs already disabled. */
@ -1765,6 +1764,7 @@ static void rcu_idle_count_callbacks_posted(void)
static void print_cpu_stall_fast_no_hz(char *cp, int cpu) static void print_cpu_stall_fast_no_hz(char *cp, int cpu)
{ {
struct rcu_data *rdp = &per_cpu(rcu_data, cpu);
struct rcu_dynticks *rdtp = &per_cpu(rcu_dynticks, cpu); struct rcu_dynticks *rdtp = &per_cpu(rcu_dynticks, cpu);
unsigned long nlpd = rdtp->nonlazy_posted - rdtp->nonlazy_posted_snap; unsigned long nlpd = rdtp->nonlazy_posted - rdtp->nonlazy_posted_snap;
@ -1772,7 +1772,7 @@ static void print_cpu_stall_fast_no_hz(char *cp, int cpu)
rdtp->last_accelerate & 0xffff, jiffies & 0xffff, rdtp->last_accelerate & 0xffff, jiffies & 0xffff,
ulong2long(nlpd), ulong2long(nlpd),
rdtp->all_lazy ? 'L' : '.', rdtp->all_lazy ? 'L' : '.',
rdtp->tick_nohz_enabled_snap ? '.' : 'D'); rdp->tick_nohz_enabled_snap ? '.' : 'D');
} }
#else /* #ifdef CONFIG_RCU_FAST_NO_HZ */ #else /* #ifdef CONFIG_RCU_FAST_NO_HZ */