diff options
| -rw-r--r-- | kernel/rcutree.h | 1 | ||||
| -rw-r--r-- | kernel/rcutree_plugin.h | 2 | ||||
| -rw-r--r-- | kernel/rcutree_trace.c | 5 |
3 files changed, 5 insertions, 3 deletions
diff --git a/kernel/rcutree.h b/kernel/rcutree.h index 488f2ec6b663..4b69291b093d 100644 --- a/kernel/rcutree.h +++ b/kernel/rcutree.h | |||
| @@ -287,6 +287,7 @@ struct rcu_data { | |||
| 287 | long qlen_last_fqs_check; | 287 | long qlen_last_fqs_check; |
| 288 | /* qlen at last check for QS forcing */ | 288 | /* qlen at last check for QS forcing */ |
| 289 | unsigned long n_cbs_invoked; /* count of RCU cbs invoked. */ | 289 | unsigned long n_cbs_invoked; /* count of RCU cbs invoked. */ |
| 290 | unsigned long n_nocbs_invoked; /* count of no-CBs RCU cbs invoked. */ | ||
| 290 | unsigned long n_cbs_orphaned; /* RCU cbs orphaned by dying CPU */ | 291 | unsigned long n_cbs_orphaned; /* RCU cbs orphaned by dying CPU */ |
| 291 | unsigned long n_cbs_adopted; /* RCU cbs adopted from dying CPU */ | 292 | unsigned long n_cbs_adopted; /* RCU cbs adopted from dying CPU */ |
| 292 | unsigned long n_force_qs_snap; | 293 | unsigned long n_force_qs_snap; |
diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h index 6cdc372de34c..f6e5ec2932b4 100644 --- a/kernel/rcutree_plugin.h +++ b/kernel/rcutree_plugin.h | |||
| @@ -2406,7 +2406,7 @@ static int rcu_nocb_kthread(void *arg) | |||
| 2406 | trace_rcu_batch_end(rdp->rsp->name, c, !!list, 0, 0, 1); | 2406 | trace_rcu_batch_end(rdp->rsp->name, c, !!list, 0, 0, 1); |
| 2407 | ACCESS_ONCE(rdp->nocb_p_count) -= c; | 2407 | ACCESS_ONCE(rdp->nocb_p_count) -= c; |
| 2408 | ACCESS_ONCE(rdp->nocb_p_count_lazy) -= cl; | 2408 | ACCESS_ONCE(rdp->nocb_p_count_lazy) -= cl; |
| 2409 | rdp->n_cbs_invoked += c; | 2409 | rdp->n_nocbs_invoked += c; |
| 2410 | } | 2410 | } |
| 2411 | return 0; | 2411 | return 0; |
| 2412 | } | 2412 | } |
diff --git a/kernel/rcutree_trace.c b/kernel/rcutree_trace.c index 3189f9aa3e84..0d095dcaa670 100644 --- a/kernel/rcutree_trace.c +++ b/kernel/rcutree_trace.c | |||
| @@ -148,8 +148,9 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp) | |||
| 148 | per_cpu(rcu_cpu_kthread_loops, rdp->cpu) & 0xffff); | 148 | per_cpu(rcu_cpu_kthread_loops, rdp->cpu) & 0xffff); |
| 149 | #endif /* #ifdef CONFIG_RCU_BOOST */ | 149 | #endif /* #ifdef CONFIG_RCU_BOOST */ |
| 150 | seq_printf(m, " b=%ld", rdp->blimit); | 150 | seq_printf(m, " b=%ld", rdp->blimit); |
| 151 | seq_printf(m, " ci=%lu co=%lu ca=%lu\n", | 151 | seq_printf(m, " ci=%lu nci=%lu co=%lu ca=%lu\n", |
| 152 | rdp->n_cbs_invoked, rdp->n_cbs_orphaned, rdp->n_cbs_adopted); | 152 | rdp->n_cbs_invoked, rdp->n_nocbs_invoked, |
| 153 | rdp->n_cbs_orphaned, rdp->n_cbs_adopted); | ||
| 153 | } | 154 | } |
| 154 | 155 | ||
| 155 | static int show_rcudata(struct seq_file *m, void *v) | 156 | static int show_rcudata(struct seq_file *m, void *v) |
