| Message ID | 20220602192020.166940-4-longman@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | blk-cgroup: Optimize blkcg_rstat_flush() | expand |
Hi Waiman, On Thu, Jun 02, 2022 at 03:20:20PM -0400, Waiman Long wrote: > For a system with many CPUs and block devices, the time to do > blkcg_rstat_flush() from cgroup_rstat_flush() can be rather long. It > can be especially problematic as interrupt is disabled during the flush. > It was reported that it might take seconds to complete in some extreme > cases leading to hard lockup messages. > > As it is likely that not all the percpu blkg_iostat_set's has been > updated since the last flush, those stale blkg_iostat_set's don't need > to be flushed in this case. This patch optimizes blkcg_rstat_flush() > by keeping a lockless list of recently updated blkg_iostat_set's in a > newly added percpu blkcg->lhead pointer. > > The blkg_iostat_set is added to the lockless list on the update side > in blk_cgroup_bio_start(). It is removed from the lockless list when > flushed in blkcg_rstat_flush(). Due to racing, it is possible that > blk_iostat_set's in the lockless list may have no new IO stats to be > flushed. To protect against destruction of blkg, a percpu reference is > gotten when putting into the lockless list and put back when removed. > > A blkg_iostat_set can determine if it is in a lockless list by checking > the content of its lnode.next pointer which will be non-NULL when in > a lockless list. This requires the presence of a special llist_last > sentinel node to be put at the end of the lockless list. > > When booting up an instrumented test kernel with this patch on a > 2-socket 96-thread system with cgroup v2, out of the 2051 calls to > cgroup_rstat_flush() after bootup, 1788 of the calls were exited > immediately because of empty lockless list. After an all-cpu kernel > build, the ratio became 6295424/6340513. That was more than 99%. > > Signed-off-by: Waiman Long <longman@redhat.com> > Acked-by: Tejun Heo <tj@kernel.org> > --- > block/blk-cgroup.c | 100 ++++++++++++++++++++++++++++++++++++++++++--- > block/blk-cgroup.h | 9 ++++ > 2 files changed, 103 insertions(+), 6 deletions(-) > > diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c > index 9021f75fc752..963a779c4cab 100644 > --- a/block/blk-cgroup.c > +++ b/block/blk-cgroup.c > @@ -59,6 +59,71 @@ static struct workqueue_struct *blkcg_punt_bio_wq; > > #define BLKG_DESTROY_BATCH_SIZE 64 > > +/* > + * Lockless lists for tracking IO stats update > + * > + * New IO stats are stored in the percpu iostat_cpu within blkcg_gq (blkg). > + * There are multiple blkg's (one for each block device) attached to each > + * blkcg. The rstat code keeps track of which cpu has IO stats updated, > + * but it doesn't know which blkg has the updated stats. If there are many > + * block devices in a system, the cost of iterating all the blkg's to flush > + * out the IO stats can be high. To reduce such overhead, a set of percpu > + * lockless lists (lhead) per blkcg are used to track the set of recently > + * updated iostat_cpu's since the last flush. An iostat_cpu will be put > + * onto the lockless list on the update side [blk_cgroup_bio_start()] if > + * not there yet and then removed when being flushed [blkcg_rstat_flush()]. > + * References to blkg are gotten and then put back in the process to > + * protect against blkg removal. > + * > + * lnode.next of the last entry in a lockless list is NULL. To enable us to > + * use lnode.next as a boolean flag to indicate its presence in a lockless > + * list, we have to make it non-NULL for all. This is done by using a > + * sentinel node at the end of the lockless list. All the percpu lhead's > + * are initialized to point to that sentinel node as being empty. > + */ > +static struct llist_node llist_last; > + > +static bool blkcg_llist_empty(struct llist_head *lhead) > +{ > + return lhead->first == &llist_last; > +} > + > +static void init_blkcg_llists(struct blkcg *blkcg) > +{ > + int cpu; > + > + for_each_possible_cpu(cpu) > + per_cpu_ptr(blkcg->lhead, cpu)->first = &llist_last; > +} > + > +static struct llist_node *fetch_delete_blkcg_llist(struct llist_head *lhead) > +{ > + return xchg(&lhead->first, &llist_last); > +} > + > +static struct llist_node *fetch_delete_lnode_next(struct llist_node *lnode) > +{ > + struct llist_node *next = READ_ONCE(lnode->next); > + struct blkcg_gq *blkg = llist_entry(lnode, struct blkg_iostat_set, > + lnode)->blkg; > + > + WRITE_ONCE(lnode->next, NULL); > + percpu_ref_put(&blkg->refcnt); > + return next; > +} > + > +/* > + * The retrieved blkg_iostat_set is immediately marked as not in the > + * lockless list by clearing its node->next pointer. It could be put > + * back into the list by a parallel update before the iostat's are > + * finally flushed including probably the new update. > + */ > +#define blkcg_llist_for_each_entry_safe(pos, node, nxt) \ > + for (; (node != &llist_last) && \ > + (pos = llist_entry(node, struct blkg_iostat_set, lnode), \ > + nxt = fetch_delete_lnode_next(node), true); \ > + node = nxt) > + > /** > * blkcg_css - find the current css > * > @@ -236,8 +301,10 @@ static struct blkcg_gq *blkg_alloc(struct blkcg *blkcg, struct request_queue *q, > blkg->blkcg = blkcg; > > u64_stats_init(&blkg->iostat.sync); > - for_each_possible_cpu(cpu) > + for_each_possible_cpu(cpu) { > u64_stats_init(&per_cpu_ptr(blkg->iostat_cpu, cpu)->sync); > + per_cpu_ptr(blkg->iostat_cpu, cpu)->blkg = blkg; > + } > > for (i = 0; i < BLKCG_MAX_POLS; i++) { > struct blkcg_policy *pol = blkcg_policy[i]; > @@ -852,17 +919,23 @@ static void blkg_iostat_sub(struct blkg_iostat *dst, struct blkg_iostat *src) > static void blkcg_rstat_flush(struct cgroup_subsys_state *css, int cpu) > { > struct blkcg *blkcg = css_to_blkcg(css); > - struct blkcg_gq *blkg; > + struct llist_head *lhead = per_cpu_ptr(blkcg->lhead, cpu); > + struct llist_node *lnode, *lnext; > + struct blkg_iostat_set *bisc; > > /* Root-level stats are sourced from system-wide IO stats */ > if (!cgroup_parent(css->cgroup)) > return; > > + if (blkcg_llist_empty(lhead)) > + return; > + > rcu_read_lock(); > > - hlist_for_each_entry_rcu(blkg, &blkcg->blkg_list, blkcg_node) { > + lnode = fetch_delete_blkcg_llist(lhead); > + blkcg_llist_for_each_entry_safe(bisc, lnode, lnext) { > + struct blkcg_gq *blkg = bisc->blkg; > struct blkcg_gq *parent = blkg->parent; > - struct blkg_iostat_set *bisc = per_cpu_ptr(blkg->iostat_cpu, cpu); > struct blkg_iostat cur, delta; > unsigned long flags; > unsigned int seq; > @@ -1170,6 +1243,7 @@ static void blkcg_css_free(struct cgroup_subsys_state *css) > > mutex_unlock(&blkcg_pol_mutex); > > + free_percpu(blkcg->lhead); > kfree(blkcg); > } > > @@ -1189,6 +1263,11 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css) > goto unlock; > } > > + blkcg->lhead = alloc_percpu_gfp(struct llist_head, GFP_KERNEL); > + if (!blkcg->lhead) > + goto free_blkcg; > + init_blkcg_llists(blkcg); > + > for (i = 0; i < BLKCG_MAX_POLS ; i++) { > struct blkcg_policy *pol = blkcg_policy[i]; > struct blkcg_policy_data *cpd; > @@ -1229,7 +1308,8 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css) > for (i--; i >= 0; i--) > if (blkcg->cpd[i]) > blkcg_policy[i]->cpd_free_fn(blkcg->cpd[i]); > - > + free_percpu(blkcg->lhead); > +free_blkcg: > if (blkcg != &blkcg_root) > kfree(blkcg); > unlock: > @@ -1993,6 +2073,7 @@ static int blk_cgroup_io_type(struct bio *bio) > > void blk_cgroup_bio_start(struct bio *bio) > { > + struct blkcg *blkcg = bio->bi_blkg->blkcg; > int rwd = blk_cgroup_io_type(bio), cpu; > struct blkg_iostat_set *bis; > unsigned long flags; > @@ -2011,9 +2092,16 @@ void blk_cgroup_bio_start(struct bio *bio) > } > bis->cur.ios[rwd]++; > > + if (!READ_ONCE(bis->lnode.next)) { > + struct llist_head *lhead = per_cpu_ptr(blkcg->lhead, cpu); > + > + llist_add(&bis->lnode, lhead); > + percpu_ref_get(&bis->blkg->refcnt); > + } The above still adds cost in fast io path. > + > u64_stats_update_end_irqrestore(&bis->sync, flags); > if (cgroup_subsys_on_dfl(io_cgrp_subsys)) > - cgroup_rstat_updated(bio->bi_blkg->blkcg->css.cgroup, cpu); > + cgroup_rstat_updated(blkcg->css.cgroup, cpu); > put_cpu(); > } IMO, it seems one cgroup generic issue. More importantly, the percpu lock of cgroup_rstat_cpu_lock is held in both cgroup_rstat_updated() and cgroup_rstat_flush_locked(), which can provide enough sync with zero extra cost, meantime other cgroups can benefit from this kind of much simpler improvement. So what do you think of the following approach? BTW, the cpumask can be replaced with one plain percpu variable for avoiding cache conflict. diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 23ec30f50cca..f8287fced726 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -858,6 +858,11 @@ static void blkcg_rstat_flush(struct cgroup_subsys_state *css, int cpu) if (!cgroup_parent(css->cgroup)) return; + if (!cpumask_test_cpu(cpu, blkcg->iostat_cpumask)) + return; + + cpumask_clear_cpu(cpu, blkcg->iostat_cpumask); + rcu_read_lock(); hlist_for_each_entry_rcu(blkg, &blkcg->blkg_list, blkcg_node) { @@ -1170,6 +1175,7 @@ static void blkcg_css_free(struct cgroup_subsys_state *css) mutex_unlock(&blkcg_pol_mutex); + free_cpumask_var(blkcg->iostat_cpumask); kfree(blkcg); } @@ -1213,6 +1219,9 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css) pol->cpd_init_fn(cpd); } + if (!zalloc_cpumask_var(&blkcg->iostat_cpumask, GFP_KERNEL)) + goto free_pd_blkcg; + spin_lock_init(&blkcg->lock); refcount_set(&blkcg->online_pin, 1); INIT_RADIX_TREE(&blkcg->blkg_tree, GFP_NOWAIT | __GFP_NOWARN); @@ -2009,7 +2018,8 @@ void blk_cgroup_bio_start(struct bio *bio) u64_stats_update_end_irqrestore(&bis->sync, flags); if (cgroup_subsys_on_dfl(io_cgrp_subsys)) - cgroup_rstat_updated(bio->bi_blkg->blkcg->css.cgroup, cpu); + cgroup_rstat_updated(bio->bi_blkg->blkcg->css.cgroup, cpu, + bio->bi_blkg->blkcg->iostat_cpumask); put_cpu(); } diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h index d4de0a35e066..458b40ca045a 100644 --- a/block/blk-cgroup.h +++ b/block/blk-cgroup.h @@ -103,6 +103,7 @@ struct blkcg { #ifdef CONFIG_CGROUP_WRITEBACK struct list_head cgwb_list; #endif + cpumask_var_t iostat_cpumask; }; static inline struct blkcg *css_to_blkcg(struct cgroup_subsys_state *css) diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 0d1ada8968d7..4fa5dde3a62c 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h @@ -763,7 +763,7 @@ static inline struct cgroup *cgroup_get_from_id(u64 id) /* * cgroup scalable recursive statistics. */ -void cgroup_rstat_updated(struct cgroup *cgrp, int cpu); +void cgroup_rstat_updated(struct cgroup *cgrp, int cpu, cpumask_var_t cpumask); void cgroup_rstat_flush(struct cgroup *cgrp); void cgroup_rstat_flush_irqsafe(struct cgroup *cgrp); void cgroup_rstat_flush_hold(struct cgroup *cgrp); diff --git a/kernel/cgroup/rstat.c b/kernel/cgroup/rstat.c index 24b5c2ab5598..f4eb63b86e56 100644 --- a/kernel/cgroup/rstat.c +++ b/kernel/cgroup/rstat.c @@ -22,7 +22,7 @@ static struct cgroup_rstat_cpu *cgroup_rstat_cpu(struct cgroup *cgrp, int cpu) * rstat_cpu->updated_children list. See the comment on top of * cgroup_rstat_cpu definition for details. */ -void cgroup_rstat_updated(struct cgroup *cgrp, int cpu) +void cgroup_rstat_updated(struct cgroup *cgrp, int cpu, cpumask_var_t cpumask) { raw_spinlock_t *cpu_lock = per_cpu_ptr(&cgroup_rstat_cpu_lock, cpu); unsigned long flags; @@ -40,6 +40,9 @@ void cgroup_rstat_updated(struct cgroup *cgrp, int cpu) raw_spin_lock_irqsave(cpu_lock, flags); + if (cpumask) + cpumask_set_cpu(cpu, cpumask); + /* put @cgrp and all ancestors on the corresponding updated lists */ while (true) { struct cgroup_rstat_cpu *rstatc = cgroup_rstat_cpu(cgrp, cpu); @@ -366,7 +369,7 @@ static void cgroup_base_stat_cputime_account_end(struct cgroup *cgrp, unsigned long flags) { u64_stats_update_end_irqrestore(&rstatc->bsync, flags); - cgroup_rstat_updated(cgrp, smp_processor_id()); + cgroup_rstat_updated(cgrp, smp_processor_id(), NULL); put_cpu_ptr(rstatc); } diff --git a/mm/memcontrol.c b/mm/memcontrol.c index abec50f31fe6..8c4f204dbf5b 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -622,7 +622,7 @@ static inline void memcg_rstat_updated(struct mem_cgroup *memcg, int val) { unsigned int x; - cgroup_rstat_updated(memcg->css.cgroup, smp_processor_id()); + cgroup_rstat_updated(memcg->css.cgroup, smp_processor_id(), NULL); x = __this_cpu_add_return(stats_updates, abs(val)); if (x > MEMCG_CHARGE_BATCH) { Thanks, Ming
On 6/3/22 23:58, Ming Lei wrote: > Hi Waiman, > > On Thu, Jun 02, 2022 at 03:20:20PM -0400, Waiman Long wrote: >> For a system with many CPUs and block devices, the time to do >> blkcg_rstat_flush() from cgroup_rstat_flush() can be rather long. It >> can be especially problematic as interrupt is disabled during the flush. >> It was reported that it might take seconds to complete in some extreme >> cases leading to hard lockup messages. >> >> As it is likely that not all the percpu blkg_iostat_set's has been >> updated since the last flush, those stale blkg_iostat_set's don't need >> to be flushed in this case. This patch optimizes blkcg_rstat_flush() >> by keeping a lockless list of recently updated blkg_iostat_set's in a >> newly added percpu blkcg->lhead pointer. >> >> The blkg_iostat_set is added to the lockless list on the update side >> in blk_cgroup_bio_start(). It is removed from the lockless list when >> flushed in blkcg_rstat_flush(). Due to racing, it is possible that >> blk_iostat_set's in the lockless list may have no new IO stats to be >> flushed. To protect against destruction of blkg, a percpu reference is >> gotten when putting into the lockless list and put back when removed. >> >> A blkg_iostat_set can determine if it is in a lockless list by checking >> the content of its lnode.next pointer which will be non-NULL when in >> a lockless list. This requires the presence of a special llist_last >> sentinel node to be put at the end of the lockless list. >> >> When booting up an instrumented test kernel with this patch on a >> 2-socket 96-thread system with cgroup v2, out of the 2051 calls to >> cgroup_rstat_flush() after bootup, 1788 of the calls were exited >> immediately because of empty lockless list. After an all-cpu kernel >> build, the ratio became 6295424/6340513. That was more than 99%. >> >> Signed-off-by: Waiman Long <longman@redhat.com> >> Acked-by: Tejun Heo <tj@kernel.org> >> --- >> block/blk-cgroup.c | 100 ++++++++++++++++++++++++++++++++++++++++++--- >> block/blk-cgroup.h | 9 ++++ >> 2 files changed, 103 insertions(+), 6 deletions(-) >> >> diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c >> index 9021f75fc752..963a779c4cab 100644 >> --- a/block/blk-cgroup.c >> +++ b/block/blk-cgroup.c >> @@ -59,6 +59,71 @@ static struct workqueue_struct *blkcg_punt_bio_wq; >> >> #define BLKG_DESTROY_BATCH_SIZE 64 >> >> +/* >> + * Lockless lists for tracking IO stats update >> + * >> + * New IO stats are stored in the percpu iostat_cpu within blkcg_gq (blkg). >> + * There are multiple blkg's (one for each block device) attached to each >> + * blkcg. The rstat code keeps track of which cpu has IO stats updated, >> + * but it doesn't know which blkg has the updated stats. If there are many >> + * block devices in a system, the cost of iterating all the blkg's to flush >> + * out the IO stats can be high. To reduce such overhead, a set of percpu >> + * lockless lists (lhead) per blkcg are used to track the set of recently >> + * updated iostat_cpu's since the last flush. An iostat_cpu will be put >> + * onto the lockless list on the update side [blk_cgroup_bio_start()] if >> + * not there yet and then removed when being flushed [blkcg_rstat_flush()]. >> + * References to blkg are gotten and then put back in the process to >> + * protect against blkg removal. >> + * >> + * lnode.next of the last entry in a lockless list is NULL. To enable us to >> + * use lnode.next as a boolean flag to indicate its presence in a lockless >> + * list, we have to make it non-NULL for all. This is done by using a >> + * sentinel node at the end of the lockless list. All the percpu lhead's >> + * are initialized to point to that sentinel node as being empty. >> + */ >> +static struct llist_node llist_last; >> + >> +static bool blkcg_llist_empty(struct llist_head *lhead) >> +{ >> + return lhead->first == &llist_last; >> +} >> + >> +static void init_blkcg_llists(struct blkcg *blkcg) >> +{ >> + int cpu; >> + >> + for_each_possible_cpu(cpu) >> + per_cpu_ptr(blkcg->lhead, cpu)->first = &llist_last; >> +} >> + >> +static struct llist_node *fetch_delete_blkcg_llist(struct llist_head *lhead) >> +{ >> + return xchg(&lhead->first, &llist_last); >> +} >> + >> +static struct llist_node *fetch_delete_lnode_next(struct llist_node *lnode) >> +{ >> + struct llist_node *next = READ_ONCE(lnode->next); >> + struct blkcg_gq *blkg = llist_entry(lnode, struct blkg_iostat_set, >> + lnode)->blkg; >> + >> + WRITE_ONCE(lnode->next, NULL); >> + percpu_ref_put(&blkg->refcnt); >> + return next; >> +} >> + >> +/* >> + * The retrieved blkg_iostat_set is immediately marked as not in the >> + * lockless list by clearing its node->next pointer. It could be put >> + * back into the list by a parallel update before the iostat's are >> + * finally flushed including probably the new update. >> + */ >> +#define blkcg_llist_for_each_entry_safe(pos, node, nxt) \ >> + for (; (node != &llist_last) && \ >> + (pos = llist_entry(node, struct blkg_iostat_set, lnode), \ >> + nxt = fetch_delete_lnode_next(node), true); \ >> + node = nxt) >> + >> /** >> * blkcg_css - find the current css >> * >> @@ -236,8 +301,10 @@ static struct blkcg_gq *blkg_alloc(struct blkcg *blkcg, struct request_queue *q, >> blkg->blkcg = blkcg; >> >> u64_stats_init(&blkg->iostat.sync); >> - for_each_possible_cpu(cpu) >> + for_each_possible_cpu(cpu) { >> u64_stats_init(&per_cpu_ptr(blkg->iostat_cpu, cpu)->sync); >> + per_cpu_ptr(blkg->iostat_cpu, cpu)->blkg = blkg; >> + } >> >> for (i = 0; i < BLKCG_MAX_POLS; i++) { >> struct blkcg_policy *pol = blkcg_policy[i]; >> @@ -852,17 +919,23 @@ static void blkg_iostat_sub(struct blkg_iostat *dst, struct blkg_iostat *src) >> static void blkcg_rstat_flush(struct cgroup_subsys_state *css, int cpu) >> { >> struct blkcg *blkcg = css_to_blkcg(css); >> - struct blkcg_gq *blkg; >> + struct llist_head *lhead = per_cpu_ptr(blkcg->lhead, cpu); >> + struct llist_node *lnode, *lnext; >> + struct blkg_iostat_set *bisc; >> >> /* Root-level stats are sourced from system-wide IO stats */ >> if (!cgroup_parent(css->cgroup)) >> return; >> >> + if (blkcg_llist_empty(lhead)) >> + return; >> + >> rcu_read_lock(); >> >> - hlist_for_each_entry_rcu(blkg, &blkcg->blkg_list, blkcg_node) { >> + lnode = fetch_delete_blkcg_llist(lhead); >> + blkcg_llist_for_each_entry_safe(bisc, lnode, lnext) { >> + struct blkcg_gq *blkg = bisc->blkg; >> struct blkcg_gq *parent = blkg->parent; >> - struct blkg_iostat_set *bisc = per_cpu_ptr(blkg->iostat_cpu, cpu); >> struct blkg_iostat cur, delta; >> unsigned long flags; >> unsigned int seq; >> @@ -1170,6 +1243,7 @@ static void blkcg_css_free(struct cgroup_subsys_state *css) >> >> mutex_unlock(&blkcg_pol_mutex); >> >> + free_percpu(blkcg->lhead); >> kfree(blkcg); >> } >> >> @@ -1189,6 +1263,11 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css) >> goto unlock; >> } >> >> + blkcg->lhead = alloc_percpu_gfp(struct llist_head, GFP_KERNEL); >> + if (!blkcg->lhead) >> + goto free_blkcg; >> + init_blkcg_llists(blkcg); >> + >> for (i = 0; i < BLKCG_MAX_POLS ; i++) { >> struct blkcg_policy *pol = blkcg_policy[i]; >> struct blkcg_policy_data *cpd; >> @@ -1229,7 +1308,8 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css) >> for (i--; i >= 0; i--) >> if (blkcg->cpd[i]) >> blkcg_policy[i]->cpd_free_fn(blkcg->cpd[i]); >> - >> + free_percpu(blkcg->lhead); >> +free_blkcg: >> if (blkcg != &blkcg_root) >> kfree(blkcg); >> unlock: >> @@ -1993,6 +2073,7 @@ static int blk_cgroup_io_type(struct bio *bio) >> >> void blk_cgroup_bio_start(struct bio *bio) >> { >> + struct blkcg *blkcg = bio->bi_blkg->blkcg; >> int rwd = blk_cgroup_io_type(bio), cpu; >> struct blkg_iostat_set *bis; >> unsigned long flags; >> @@ -2011,9 +2092,16 @@ void blk_cgroup_bio_start(struct bio *bio) >> } >> bis->cur.ios[rwd]++; >> >> + if (!READ_ONCE(bis->lnode.next)) { >> + struct llist_head *lhead = per_cpu_ptr(blkcg->lhead, cpu); >> + >> + llist_add(&bis->lnode, lhead); >> + percpu_ref_get(&bis->blkg->refcnt); >> + } > The above still adds cost in fast io path. That is true, but it depends on how often is cgroup_rstat_flush*() is called. There is a one time setup cost after a flush. Subsequent IO ops on the same device and cpu will have negligible cost. > >> + >> u64_stats_update_end_irqrestore(&bis->sync, flags); >> if (cgroup_subsys_on_dfl(io_cgrp_subsys)) >> - cgroup_rstat_updated(bio->bi_blkg->blkcg->css.cgroup, cpu); >> + cgroup_rstat_updated(blkcg->css.cgroup, cpu); >> put_cpu(); >> } > IMO, it seems one cgroup generic issue. More importantly, the percpu > lock of cgroup_rstat_cpu_lock is held in both cgroup_rstat_updated() > and cgroup_rstat_flush_locked(), which can provide enough sync with > zero extra cost, meantime other cgroups can benefit from this kind of > much simpler improvement. > > So what do you think of the following approach? > > BTW, the cpumask can be replaced with one plain percpu variable for avoiding > cache conflict. > > diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c > index 23ec30f50cca..f8287fced726 100644 > --- a/block/blk-cgroup.c > +++ b/block/blk-cgroup.c > @@ -858,6 +858,11 @@ static void blkcg_rstat_flush(struct cgroup_subsys_state *css, int cpu) > if (!cgroup_parent(css->cgroup)) > return; > > + if (!cpumask_test_cpu(cpu, blkcg->iostat_cpumask)) > + return; > + > + cpumask_clear_cpu(cpu, blkcg->iostat_cpumask); > + > rcu_read_lock(); > > hlist_for_each_entry_rcu(blkg, &blkcg->blkg_list, blkcg_node) { > @@ -1170,6 +1175,7 @@ static void blkcg_css_free(struct cgroup_subsys_state *css) > > mutex_unlock(&blkcg_pol_mutex); > > + free_cpumask_var(blkcg->iostat_cpumask); > kfree(blkcg); > } > > @@ -1213,6 +1219,9 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css) > pol->cpd_init_fn(cpd); > } > > + if (!zalloc_cpumask_var(&blkcg->iostat_cpumask, GFP_KERNEL)) > + goto free_pd_blkcg; > + > spin_lock_init(&blkcg->lock); > refcount_set(&blkcg->online_pin, 1); > INIT_RADIX_TREE(&blkcg->blkg_tree, GFP_NOWAIT | __GFP_NOWARN); > @@ -2009,7 +2018,8 @@ void blk_cgroup_bio_start(struct bio *bio) > > u64_stats_update_end_irqrestore(&bis->sync, flags); > if (cgroup_subsys_on_dfl(io_cgrp_subsys)) > - cgroup_rstat_updated(bio->bi_blkg->blkcg->css.cgroup, cpu); > + cgroup_rstat_updated(bio->bi_blkg->blkcg->css.cgroup, cpu, > + bio->bi_blkg->blkcg->iostat_cpumask); > put_cpu(); > } > > diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h > index d4de0a35e066..458b40ca045a 100644 > --- a/block/blk-cgroup.h > +++ b/block/blk-cgroup.h > @@ -103,6 +103,7 @@ struct blkcg { > #ifdef CONFIG_CGROUP_WRITEBACK > struct list_head cgwb_list; > #endif > + cpumask_var_t iostat_cpumask; > }; > > static inline struct blkcg *css_to_blkcg(struct cgroup_subsys_state *css) > diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h > index 0d1ada8968d7..4fa5dde3a62c 100644 > --- a/include/linux/cgroup.h > +++ b/include/linux/cgroup.h > @@ -763,7 +763,7 @@ static inline struct cgroup *cgroup_get_from_id(u64 id) > /* > * cgroup scalable recursive statistics. > */ > -void cgroup_rstat_updated(struct cgroup *cgrp, int cpu); > +void cgroup_rstat_updated(struct cgroup *cgrp, int cpu, cpumask_var_t cpumask); > void cgroup_rstat_flush(struct cgroup *cgrp); > void cgroup_rstat_flush_irqsafe(struct cgroup *cgrp); > void cgroup_rstat_flush_hold(struct cgroup *cgrp); > diff --git a/kernel/cgroup/rstat.c b/kernel/cgroup/rstat.c > index 24b5c2ab5598..f4eb63b86e56 100644 > --- a/kernel/cgroup/rstat.c > +++ b/kernel/cgroup/rstat.c > @@ -22,7 +22,7 @@ static struct cgroup_rstat_cpu *cgroup_rstat_cpu(struct cgroup *cgrp, int cpu) > * rstat_cpu->updated_children list. See the comment on top of > * cgroup_rstat_cpu definition for details. > */ > -void cgroup_rstat_updated(struct cgroup *cgrp, int cpu) > +void cgroup_rstat_updated(struct cgroup *cgrp, int cpu, cpumask_var_t cpumask) > { > raw_spinlock_t *cpu_lock = per_cpu_ptr(&cgroup_rstat_cpu_lock, cpu); > unsigned long flags; > @@ -40,6 +40,9 @@ void cgroup_rstat_updated(struct cgroup *cgrp, int cpu) > > raw_spin_lock_irqsave(cpu_lock, flags); > > + if (cpumask) > + cpumask_set_cpu(cpu, cpumask); > + > /* put @cgrp and all ancestors on the corresponding updated lists */ > while (true) { > struct cgroup_rstat_cpu *rstatc = cgroup_rstat_cpu(cgrp, cpu); > @@ -366,7 +369,7 @@ static void cgroup_base_stat_cputime_account_end(struct cgroup *cgrp, > unsigned long flags) > { > u64_stats_update_end_irqrestore(&rstatc->bsync, flags); > - cgroup_rstat_updated(cgrp, smp_processor_id()); > + cgroup_rstat_updated(cgrp, smp_processor_id(), NULL); > put_cpu_ptr(rstatc); > } > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index abec50f31fe6..8c4f204dbf5b 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -622,7 +622,7 @@ static inline void memcg_rstat_updated(struct mem_cgroup *memcg, int val) > { > unsigned int x; > > - cgroup_rstat_updated(memcg->css.cgroup, smp_processor_id()); > + cgroup_rstat_updated(memcg->css.cgroup, smp_processor_id(), NULL); > > x = __this_cpu_add_return(stats_updates, abs(val)); > if (x > MEMCG_CHARGE_BATCH) { I think the rstat set of functions are doing that already. So flush will only call CPUs that have called cgroup_rstat_updated() before. However, one deficiency that I am aware of is that there is no bitmap of which controller have update. The problem that I saw in cgroup v2 is that in a cgroup with both memory controller and block controller enabled, a cgroup_rstat_updated() call from memory cgroup later causes the rstat function to call into block cgroup flush method even though there is no update in the block controller. This is an area that needs improvement. Your code does allow the block controller to be aware of that and avoid further action, but I think it has to be done in the rstat code to be applicable to all controllers instead of just specific to block controller. There is another problem that this approach. Suppose the system have 20 block devices and one of them has an IO operation. Now the flush method still needs to iterate all the 20 blkg's to do an update. The block controller is kind of special that the number of per-cgroup IO stats depends on the number of block devices present. Other controllers just have one set of stats per cgroup. Thanks, Longman
On Sun, Jun 05, 2022 at 07:15:27PM -0400, Waiman Long wrote: > On 6/3/22 23:58, Ming Lei wrote: > > Hi Waiman, > > > > On Thu, Jun 02, 2022 at 03:20:20PM -0400, Waiman Long wrote: > > > For a system with many CPUs and block devices, the time to do > > > blkcg_rstat_flush() from cgroup_rstat_flush() can be rather long. It > > > can be especially problematic as interrupt is disabled during the flush. > > > It was reported that it might take seconds to complete in some extreme > > > cases leading to hard lockup messages. > > > > > > As it is likely that not all the percpu blkg_iostat_set's has been > > > updated since the last flush, those stale blkg_iostat_set's don't need > > > to be flushed in this case. This patch optimizes blkcg_rstat_flush() > > > by keeping a lockless list of recently updated blkg_iostat_set's in a > > > newly added percpu blkcg->lhead pointer. > > > > > > The blkg_iostat_set is added to the lockless list on the update side > > > in blk_cgroup_bio_start(). It is removed from the lockless list when > > > flushed in blkcg_rstat_flush(). Due to racing, it is possible that > > > blk_iostat_set's in the lockless list may have no new IO stats to be > > > flushed. To protect against destruction of blkg, a percpu reference is > > > gotten when putting into the lockless list and put back when removed. > > > > > > A blkg_iostat_set can determine if it is in a lockless list by checking > > > the content of its lnode.next pointer which will be non-NULL when in > > > a lockless list. This requires the presence of a special llist_last > > > sentinel node to be put at the end of the lockless list. > > > > > > When booting up an instrumented test kernel with this patch on a > > > 2-socket 96-thread system with cgroup v2, out of the 2051 calls to > > > cgroup_rstat_flush() after bootup, 1788 of the calls were exited > > > immediately because of empty lockless list. After an all-cpu kernel > > > build, the ratio became 6295424/6340513. That was more than 99%. > > > > > > Signed-off-by: Waiman Long <longman@redhat.com> > > > Acked-by: Tejun Heo <tj@kernel.org> > > > --- > > > block/blk-cgroup.c | 100 ++++++++++++++++++++++++++++++++++++++++++--- > > > block/blk-cgroup.h | 9 ++++ > > > 2 files changed, 103 insertions(+), 6 deletions(-) > > > > > > diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c > > > index 9021f75fc752..963a779c4cab 100644 > > > --- a/block/blk-cgroup.c > > > +++ b/block/blk-cgroup.c > > > @@ -59,6 +59,71 @@ static struct workqueue_struct *blkcg_punt_bio_wq; > > > #define BLKG_DESTROY_BATCH_SIZE 64 > > > +/* > > > + * Lockless lists for tracking IO stats update > > > + * > > > + * New IO stats are stored in the percpu iostat_cpu within blkcg_gq (blkg). > > > + * There are multiple blkg's (one for each block device) attached to each > > > + * blkcg. The rstat code keeps track of which cpu has IO stats updated, > > > + * but it doesn't know which blkg has the updated stats. If there are many > > > + * block devices in a system, the cost of iterating all the blkg's to flush > > > + * out the IO stats can be high. To reduce such overhead, a set of percpu > > > + * lockless lists (lhead) per blkcg are used to track the set of recently > > > + * updated iostat_cpu's since the last flush. An iostat_cpu will be put > > > + * onto the lockless list on the update side [blk_cgroup_bio_start()] if > > > + * not there yet and then removed when being flushed [blkcg_rstat_flush()]. > > > + * References to blkg are gotten and then put back in the process to > > > + * protect against blkg removal. > > > + * > > > + * lnode.next of the last entry in a lockless list is NULL. To enable us to > > > + * use lnode.next as a boolean flag to indicate its presence in a lockless > > > + * list, we have to make it non-NULL for all. This is done by using a > > > + * sentinel node at the end of the lockless list. All the percpu lhead's > > > + * are initialized to point to that sentinel node as being empty. > > > + */ > > > +static struct llist_node llist_last; > > > + > > > +static bool blkcg_llist_empty(struct llist_head *lhead) > > > +{ > > > + return lhead->first == &llist_last; > > > +} > > > + > > > +static void init_blkcg_llists(struct blkcg *blkcg) > > > +{ > > > + int cpu; > > > + > > > + for_each_possible_cpu(cpu) > > > + per_cpu_ptr(blkcg->lhead, cpu)->first = &llist_last; > > > +} > > > + > > > +static struct llist_node *fetch_delete_blkcg_llist(struct llist_head *lhead) > > > +{ > > > + return xchg(&lhead->first, &llist_last); > > > +} > > > + > > > +static struct llist_node *fetch_delete_lnode_next(struct llist_node *lnode) > > > +{ > > > + struct llist_node *next = READ_ONCE(lnode->next); > > > + struct blkcg_gq *blkg = llist_entry(lnode, struct blkg_iostat_set, > > > + lnode)->blkg; > > > + > > > + WRITE_ONCE(lnode->next, NULL); > > > + percpu_ref_put(&blkg->refcnt); > > > + return next; > > > +} > > > + > > > +/* > > > + * The retrieved blkg_iostat_set is immediately marked as not in the > > > + * lockless list by clearing its node->next pointer. It could be put > > > + * back into the list by a parallel update before the iostat's are > > > + * finally flushed including probably the new update. > > > + */ > > > +#define blkcg_llist_for_each_entry_safe(pos, node, nxt) \ > > > + for (; (node != &llist_last) && \ > > > + (pos = llist_entry(node, struct blkg_iostat_set, lnode), \ > > > + nxt = fetch_delete_lnode_next(node), true); \ > > > + node = nxt) > > > + > > > /** > > > * blkcg_css - find the current css > > > * > > > @@ -236,8 +301,10 @@ static struct blkcg_gq *blkg_alloc(struct blkcg *blkcg, struct request_queue *q, > > > blkg->blkcg = blkcg; > > > u64_stats_init(&blkg->iostat.sync); > > > - for_each_possible_cpu(cpu) > > > + for_each_possible_cpu(cpu) { > > > u64_stats_init(&per_cpu_ptr(blkg->iostat_cpu, cpu)->sync); > > > + per_cpu_ptr(blkg->iostat_cpu, cpu)->blkg = blkg; > > > + } > > > for (i = 0; i < BLKCG_MAX_POLS; i++) { > > > struct blkcg_policy *pol = blkcg_policy[i]; > > > @@ -852,17 +919,23 @@ static void blkg_iostat_sub(struct blkg_iostat *dst, struct blkg_iostat *src) > > > static void blkcg_rstat_flush(struct cgroup_subsys_state *css, int cpu) > > > { > > > struct blkcg *blkcg = css_to_blkcg(css); > > > - struct blkcg_gq *blkg; > > > + struct llist_head *lhead = per_cpu_ptr(blkcg->lhead, cpu); > > > + struct llist_node *lnode, *lnext; > > > + struct blkg_iostat_set *bisc; > > > /* Root-level stats are sourced from system-wide IO stats */ > > > if (!cgroup_parent(css->cgroup)) > > > return; > > > + if (blkcg_llist_empty(lhead)) > > > + return; > > > + > > > rcu_read_lock(); > > > - hlist_for_each_entry_rcu(blkg, &blkcg->blkg_list, blkcg_node) { > > > + lnode = fetch_delete_blkcg_llist(lhead); > > > + blkcg_llist_for_each_entry_safe(bisc, lnode, lnext) { > > > + struct blkcg_gq *blkg = bisc->blkg; > > > struct blkcg_gq *parent = blkg->parent; > > > - struct blkg_iostat_set *bisc = per_cpu_ptr(blkg->iostat_cpu, cpu); > > > struct blkg_iostat cur, delta; > > > unsigned long flags; > > > unsigned int seq; > > > @@ -1170,6 +1243,7 @@ static void blkcg_css_free(struct cgroup_subsys_state *css) > > > mutex_unlock(&blkcg_pol_mutex); > > > + free_percpu(blkcg->lhead); > > > kfree(blkcg); > > > } > > > @@ -1189,6 +1263,11 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css) > > > goto unlock; > > > } > > > + blkcg->lhead = alloc_percpu_gfp(struct llist_head, GFP_KERNEL); > > > + if (!blkcg->lhead) > > > + goto free_blkcg; > > > + init_blkcg_llists(blkcg); > > > + > > > for (i = 0; i < BLKCG_MAX_POLS ; i++) { > > > struct blkcg_policy *pol = blkcg_policy[i]; > > > struct blkcg_policy_data *cpd; > > > @@ -1229,7 +1308,8 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css) > > > for (i--; i >= 0; i--) > > > if (blkcg->cpd[i]) > > > blkcg_policy[i]->cpd_free_fn(blkcg->cpd[i]); > > > - > > > + free_percpu(blkcg->lhead); > > > +free_blkcg: > > > if (blkcg != &blkcg_root) > > > kfree(blkcg); > > > unlock: > > > @@ -1993,6 +2073,7 @@ static int blk_cgroup_io_type(struct bio *bio) > > > void blk_cgroup_bio_start(struct bio *bio) > > > { > > > + struct blkcg *blkcg = bio->bi_blkg->blkcg; > > > int rwd = blk_cgroup_io_type(bio), cpu; > > > struct blkg_iostat_set *bis; > > > unsigned long flags; > > > @@ -2011,9 +2092,16 @@ void blk_cgroup_bio_start(struct bio *bio) > > > } > > > bis->cur.ios[rwd]++; > > > + if (!READ_ONCE(bis->lnode.next)) { > > > + struct llist_head *lhead = per_cpu_ptr(blkcg->lhead, cpu); > > > + > > > + llist_add(&bis->lnode, lhead); > > > + percpu_ref_get(&bis->blkg->refcnt); > > > + } > > The above still adds cost in fast io path. > > That is true, but it depends on how often is cgroup_rstat_flush*() is > called. There is a one time setup cost after a flush. Subsequent IO ops on > the same device and cpu will have negligible cost. OK. > > > > > > > + > > > u64_stats_update_end_irqrestore(&bis->sync, flags); > > > if (cgroup_subsys_on_dfl(io_cgrp_subsys)) > > > - cgroup_rstat_updated(bio->bi_blkg->blkcg->css.cgroup, cpu); > > > + cgroup_rstat_updated(blkcg->css.cgroup, cpu); > > > put_cpu(); > > > } > > IMO, it seems one cgroup generic issue. More importantly, the percpu > > lock of cgroup_rstat_cpu_lock is held in both cgroup_rstat_updated() > > and cgroup_rstat_flush_locked(), which can provide enough sync with > > zero extra cost, meantime other cgroups can benefit from this kind of > > much simpler improvement. > > > > So what do you think of the following approach? > > > > BTW, the cpumask can be replaced with one plain percpu variable for avoiding > > cache conflict. > > > > diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c > > index 23ec30f50cca..f8287fced726 100644 > > --- a/block/blk-cgroup.c > > +++ b/block/blk-cgroup.c > > @@ -858,6 +858,11 @@ static void blkcg_rstat_flush(struct cgroup_subsys_state *css, int cpu) > > if (!cgroup_parent(css->cgroup)) > > return; > > + if (!cpumask_test_cpu(cpu, blkcg->iostat_cpumask)) > > + return; > > + > > + cpumask_clear_cpu(cpu, blkcg->iostat_cpumask); > > + > > rcu_read_lock(); > > hlist_for_each_entry_rcu(blkg, &blkcg->blkg_list, blkcg_node) { > > @@ -1170,6 +1175,7 @@ static void blkcg_css_free(struct cgroup_subsys_state *css) > > mutex_unlock(&blkcg_pol_mutex); > > + free_cpumask_var(blkcg->iostat_cpumask); > > kfree(blkcg); > > } > > @@ -1213,6 +1219,9 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css) > > pol->cpd_init_fn(cpd); > > } > > + if (!zalloc_cpumask_var(&blkcg->iostat_cpumask, GFP_KERNEL)) > > + goto free_pd_blkcg; > > + > > spin_lock_init(&blkcg->lock); > > refcount_set(&blkcg->online_pin, 1); > > INIT_RADIX_TREE(&blkcg->blkg_tree, GFP_NOWAIT | __GFP_NOWARN); > > @@ -2009,7 +2018,8 @@ void blk_cgroup_bio_start(struct bio *bio) > > u64_stats_update_end_irqrestore(&bis->sync, flags); > > if (cgroup_subsys_on_dfl(io_cgrp_subsys)) > > - cgroup_rstat_updated(bio->bi_blkg->blkcg->css.cgroup, cpu); > > + cgroup_rstat_updated(bio->bi_blkg->blkcg->css.cgroup, cpu, > > + bio->bi_blkg->blkcg->iostat_cpumask); > > put_cpu(); > > } > > diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h > > index d4de0a35e066..458b40ca045a 100644 > > --- a/block/blk-cgroup.h > > +++ b/block/blk-cgroup.h > > @@ -103,6 +103,7 @@ struct blkcg { > > #ifdef CONFIG_CGROUP_WRITEBACK > > struct list_head cgwb_list; > > #endif > > + cpumask_var_t iostat_cpumask; > > }; > > static inline struct blkcg *css_to_blkcg(struct cgroup_subsys_state *css) > > diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h > > index 0d1ada8968d7..4fa5dde3a62c 100644 > > --- a/include/linux/cgroup.h > > +++ b/include/linux/cgroup.h > > @@ -763,7 +763,7 @@ static inline struct cgroup *cgroup_get_from_id(u64 id) > > /* > > * cgroup scalable recursive statistics. > > */ > > -void cgroup_rstat_updated(struct cgroup *cgrp, int cpu); > > +void cgroup_rstat_updated(struct cgroup *cgrp, int cpu, cpumask_var_t cpumask); > > void cgroup_rstat_flush(struct cgroup *cgrp); > > void cgroup_rstat_flush_irqsafe(struct cgroup *cgrp); > > void cgroup_rstat_flush_hold(struct cgroup *cgrp); > > diff --git a/kernel/cgroup/rstat.c b/kernel/cgroup/rstat.c > > index 24b5c2ab5598..f4eb63b86e56 100644 > > --- a/kernel/cgroup/rstat.c > > +++ b/kernel/cgroup/rstat.c > > @@ -22,7 +22,7 @@ static struct cgroup_rstat_cpu *cgroup_rstat_cpu(struct cgroup *cgrp, int cpu) > > * rstat_cpu->updated_children list. See the comment on top of > > * cgroup_rstat_cpu definition for details. > > */ > > -void cgroup_rstat_updated(struct cgroup *cgrp, int cpu) > > +void cgroup_rstat_updated(struct cgroup *cgrp, int cpu, cpumask_var_t cpumask) > > { > > raw_spinlock_t *cpu_lock = per_cpu_ptr(&cgroup_rstat_cpu_lock, cpu); > > unsigned long flags; > > @@ -40,6 +40,9 @@ void cgroup_rstat_updated(struct cgroup *cgrp, int cpu) > > raw_spin_lock_irqsave(cpu_lock, flags); > > + if (cpumask) > > + cpumask_set_cpu(cpu, cpumask); > > + > > /* put @cgrp and all ancestors on the corresponding updated lists */ > > while (true) { > > struct cgroup_rstat_cpu *rstatc = cgroup_rstat_cpu(cgrp, cpu); > > @@ -366,7 +369,7 @@ static void cgroup_base_stat_cputime_account_end(struct cgroup *cgrp, > > unsigned long flags) > > { > > u64_stats_update_end_irqrestore(&rstatc->bsync, flags); > > - cgroup_rstat_updated(cgrp, smp_processor_id()); > > + cgroup_rstat_updated(cgrp, smp_processor_id(), NULL); > > put_cpu_ptr(rstatc); > > } > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > > index abec50f31fe6..8c4f204dbf5b 100644 > > --- a/mm/memcontrol.c > > +++ b/mm/memcontrol.c > > @@ -622,7 +622,7 @@ static inline void memcg_rstat_updated(struct mem_cgroup *memcg, int val) > > { > > unsigned int x; > > - cgroup_rstat_updated(memcg->css.cgroup, smp_processor_id()); > > + cgroup_rstat_updated(memcg->css.cgroup, smp_processor_id(), NULL); > > x = __this_cpu_add_return(stats_updates, abs(val)); > > if (x > MEMCG_CHARGE_BATCH) { > > I think the rstat set of functions are doing that already. So flush will > only call CPUs that have called cgroup_rstat_updated() before. However, one Yeah, I guess the detail is in cgroup_rstat_cpu_pop_updated(), but the percpu lock(raw_spin_lock_irqsave) is still required, and cgroup_rstat_cpu_pop_updated() is still called even through there isn't any update on this CPU. > deficiency that I am aware of is that there is no bitmap of which controller > have update. The problem that I saw in cgroup v2 is that in a cgroup with > both memory controller and block controller enabled, a > cgroup_rstat_updated() call from memory cgroup later causes the rstat > function to call into block cgroup flush method even though there is no > update in the block controller. This is an area that needs improvement. > > Your code does allow the block controller to be aware of that and avoid > further action, but I think it has to be done in the rstat code to be > applicable to all controllers instead of just specific to block controller. I guess it can be done by adding one percpu variable to 'struct cgroup'. > > There is another problem that this approach. Suppose the system have 20 > block devices and one of them has an IO operation. Now the flush method > still needs to iterate all the 20 blkg's to do an update. The block > controller is kind of special that the number of per-cgroup IO stats depends > on the number of block devices present. Other controllers just have one set > of stats per cgroup. Yeah, and this one is really blkio specific issue, and your patch does cover this one. Maybe you can add one callback to cgroup_rstat_updated(), so the "blkg_iostat_set" instance is added into percpu list under percpu lock of cgroup_rstat_cpu_lock, then the lockless list isn't needed. Thanks, Ming
On 6/5/22 21:39, Ming Lei wrote: > On Sun, Jun 05, 2022 at 07:15:27PM -0400, Waiman Long wrote: >> On 6/3/22 23:58, Ming Lei wrote: >> >>> diff --git a/mm/memcontrol.c b/mm/memcontrol.c >>> index abec50f31fe6..8c4f204dbf5b 100644 >>> --- a/mm/memcontrol.c >>> +++ b/mm/memcontrol.c >>> @@ -622,7 +622,7 @@ static inline void memcg_rstat_updated(struct mem_cgroup *memcg, int val) >>> { >>> unsigned int x; >>> - cgroup_rstat_updated(memcg->css.cgroup, smp_processor_id()); >>> + cgroup_rstat_updated(memcg->css.cgroup, smp_processor_id(), NULL); >>> x = __this_cpu_add_return(stats_updates, abs(val)); >>> if (x > MEMCG_CHARGE_BATCH) { >> I think the rstat set of functions are doing that already. So flush will >> only call CPUs that have called cgroup_rstat_updated() before. However, one > Yeah, I guess the detail is in cgroup_rstat_cpu_pop_updated(), but the > percpu lock(raw_spin_lock_irqsave) is still required, and cgroup_rstat_cpu_pop_updated() > is still called even through there isn't any update on this CPU. Yes, I think we may need to add a bitmask of what controllers have updates in cgroup_rstat_cpu structure. > >> deficiency that I am aware of is that there is no bitmap of which controller >> have update. The problem that I saw in cgroup v2 is that in a cgroup with >> both memory controller and block controller enabled, a >> cgroup_rstat_updated() call from memory cgroup later causes the rstat >> function to call into block cgroup flush method even though there is no >> update in the block controller. This is an area that needs improvement. >> >> Your code does allow the block controller to be aware of that and avoid >> further action, but I think it has to be done in the rstat code to be >> applicable to all controllers instead of just specific to block controller. > I guess it can be done by adding one percpu variable to 'struct cgroup'. > >> There is another problem that this approach. Suppose the system have 20 >> block devices and one of them has an IO operation. Now the flush method >> still needs to iterate all the 20 blkg's to do an update. The block >> controller is kind of special that the number of per-cgroup IO stats depends >> on the number of block devices present. Other controllers just have one set >> of stats per cgroup. > Yeah, and this one is really blkio specific issue, and your patch does > cover this one. Maybe you can add one callback to > cgroup_rstat_updated(), so the "blkg_iostat_set" instance is added into > percpu list under percpu lock of cgroup_rstat_cpu_lock, then the lockless > list isn't needed. The rstat API is generic. It may not be a good idea to put controller specific information into it. Yes, cgroup_rstat_cpu_lock is taken at the read side (flush). It may not taken on the write side (update). So it may not be easy to rely on this lock for synchronization between the read and write side. Cheers, Longman
On Sun, Jun 05, 2022 at 09:59:50PM -0400, Waiman Long wrote: > On 6/5/22 21:39, Ming Lei wrote: > > On Sun, Jun 05, 2022 at 07:15:27PM -0400, Waiman Long wrote: > > > On 6/3/22 23:58, Ming Lei wrote: > > > > > > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > > > > index abec50f31fe6..8c4f204dbf5b 100644 > > > > --- a/mm/memcontrol.c > > > > +++ b/mm/memcontrol.c > > > > @@ -622,7 +622,7 @@ static inline void memcg_rstat_updated(struct mem_cgroup *memcg, int val) > > > > { > > > > unsigned int x; > > > > - cgroup_rstat_updated(memcg->css.cgroup, smp_processor_id()); > > > > + cgroup_rstat_updated(memcg->css.cgroup, smp_processor_id(), NULL); > > > > x = __this_cpu_add_return(stats_updates, abs(val)); > > > > if (x > MEMCG_CHARGE_BATCH) { > > > I think the rstat set of functions are doing that already. So flush will > > > only call CPUs that have called cgroup_rstat_updated() before. However, one > > Yeah, I guess the detail is in cgroup_rstat_cpu_pop_updated(), but the > > percpu lock(raw_spin_lock_irqsave) is still required, and cgroup_rstat_cpu_pop_updated() > > is still called even through there isn't any update on this CPU. > Yes, I think we may need to add a bitmask of what controllers have updates > in cgroup_rstat_cpu structure. > > > > > deficiency that I am aware of is that there is no bitmap of which controller > > > have update. The problem that I saw in cgroup v2 is that in a cgroup with > > > both memory controller and block controller enabled, a > > > cgroup_rstat_updated() call from memory cgroup later causes the rstat > > > function to call into block cgroup flush method even though there is no > > > update in the block controller. This is an area that needs improvement. > > > > > > Your code does allow the block controller to be aware of that and avoid > > > further action, but I think it has to be done in the rstat code to be > > > applicable to all controllers instead of just specific to block controller. > > I guess it can be done by adding one percpu variable to 'struct cgroup'. > > > > > There is another problem that this approach. Suppose the system have 20 > > > block devices and one of them has an IO operation. Now the flush method > > > still needs to iterate all the 20 blkg's to do an update. The block > > > controller is kind of special that the number of per-cgroup IO stats depends > > > on the number of block devices present. Other controllers just have one set > > > of stats per cgroup. > > Yeah, and this one is really blkio specific issue, and your patch does > > cover this one. Maybe you can add one callback to > > cgroup_rstat_updated(), so the "blkg_iostat_set" instance is added into > > percpu list under percpu lock of cgroup_rstat_cpu_lock, then the lockless > > list isn't needed. > > The rstat API is generic. It may not be a good idea to put controller > specific information into it. Yes, cgroup_rstat_cpu_lock is taken at the > read side (flush). It may not taken on the write side (update). So it may Both cgroup_rstat_flush_locked()/cgroup_rstat_updated() take the percpu cgroup_rstat_cpu_lock, so the new invented lockless list can be replaced with plain list. Thanks, Ming
On 6/5/22 22:23, Ming Lei wrote: > On Sun, Jun 05, 2022 at 09:59:50PM -0400, Waiman Long wrote: >> On 6/5/22 21:39, Ming Lei wrote: >>> On Sun, Jun 05, 2022 at 07:15:27PM -0400, Waiman Long wrote: >>>> On 6/3/22 23:58, Ming Lei wrote: >>>> >>>>> diff --git a/mm/memcontrol.c b/mm/memcontrol.c >>>>> index abec50f31fe6..8c4f204dbf5b 100644 >>>>> --- a/mm/memcontrol.c >>>>> +++ b/mm/memcontrol.c >>>>> @@ -622,7 +622,7 @@ static inline void memcg_rstat_updated(struct mem_cgroup *memcg, int val) >>>>> { >>>>> unsigned int x; >>>>> - cgroup_rstat_updated(memcg->css.cgroup, smp_processor_id()); >>>>> + cgroup_rstat_updated(memcg->css.cgroup, smp_processor_id(), NULL); >>>>> x = __this_cpu_add_return(stats_updates, abs(val)); >>>>> if (x > MEMCG_CHARGE_BATCH) { >>>> I think the rstat set of functions are doing that already. So flush will >>>> only call CPUs that have called cgroup_rstat_updated() before. However, one >>> Yeah, I guess the detail is in cgroup_rstat_cpu_pop_updated(), but the >>> percpu lock(raw_spin_lock_irqsave) is still required, and cgroup_rstat_cpu_pop_updated() >>> is still called even through there isn't any update on this CPU. >> Yes, I think we may need to add a bitmask of what controllers have updates >> in cgroup_rstat_cpu structure. >>>> deficiency that I am aware of is that there is no bitmap of which controller >>>> have update. The problem that I saw in cgroup v2 is that in a cgroup with >>>> both memory controller and block controller enabled, a >>>> cgroup_rstat_updated() call from memory cgroup later causes the rstat >>>> function to call into block cgroup flush method even though there is no >>>> update in the block controller. This is an area that needs improvement. >>>> >>>> Your code does allow the block controller to be aware of that and avoid >>>> further action, but I think it has to be done in the rstat code to be >>>> applicable to all controllers instead of just specific to block controller. >>> I guess it can be done by adding one percpu variable to 'struct cgroup'. >>> >>>> There is another problem that this approach. Suppose the system have 20 >>>> block devices and one of them has an IO operation. Now the flush method >>>> still needs to iterate all the 20 blkg's to do an update. The block >>>> controller is kind of special that the number of per-cgroup IO stats depends >>>> on the number of block devices present. Other controllers just have one set >>>> of stats per cgroup. >>> Yeah, and this one is really blkio specific issue, and your patch does >>> cover this one. Maybe you can add one callback to >>> cgroup_rstat_updated(), so the "blkg_iostat_set" instance is added into >>> percpu list under percpu lock of cgroup_rstat_cpu_lock, then the lockless >>> list isn't needed. >> The rstat API is generic. It may not be a good idea to put controller >> specific information into it. Yes, cgroup_rstat_cpu_lock is taken at the >> read side (flush). It may not taken on the write side (update). So it may > Both cgroup_rstat_flush_locked()/cgroup_rstat_updated() take the percpu > cgroup_rstat_cpu_lock, so the new invented lockless list can be > replaced with plain list. cgroup_rstat_updated() should only take the percpu cgroup_rstat_cpu_lock the first time it transition from "!updated" to "updated". After that, it returns immediately without the the lock. With a regular list, you will have to take the lock every time a new block device has an update. So there isn't much saving on the update side. In general, the lock/unlock sequence has a bit more overhead than the lockless insertion. On the flush side, there may be a bit of saving, but it is not the fast path. Cheers, Longman
On Sun, Jun 05, 2022 at 10:58:15PM -0400, Waiman Long wrote: > On 6/5/22 22:23, Ming Lei wrote: > > On Sun, Jun 05, 2022 at 09:59:50PM -0400, Waiman Long wrote: > > > On 6/5/22 21:39, Ming Lei wrote: > > > > On Sun, Jun 05, 2022 at 07:15:27PM -0400, Waiman Long wrote: > > > > > On 6/3/22 23:58, Ming Lei wrote: > > > > > > > > > > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > > > > > > index abec50f31fe6..8c4f204dbf5b 100644 > > > > > > --- a/mm/memcontrol.c > > > > > > +++ b/mm/memcontrol.c > > > > > > @@ -622,7 +622,7 @@ static inline void memcg_rstat_updated(struct mem_cgroup *memcg, int val) > > > > > > { > > > > > > unsigned int x; > > > > > > - cgroup_rstat_updated(memcg->css.cgroup, smp_processor_id()); > > > > > > + cgroup_rstat_updated(memcg->css.cgroup, smp_processor_id(), NULL); > > > > > > x = __this_cpu_add_return(stats_updates, abs(val)); > > > > > > if (x > MEMCG_CHARGE_BATCH) { > > > > > I think the rstat set of functions are doing that already. So flush will > > > > > only call CPUs that have called cgroup_rstat_updated() before. However, one > > > > Yeah, I guess the detail is in cgroup_rstat_cpu_pop_updated(), but the > > > > percpu lock(raw_spin_lock_irqsave) is still required, and cgroup_rstat_cpu_pop_updated() > > > > is still called even through there isn't any update on this CPU. > > > Yes, I think we may need to add a bitmask of what controllers have updates > > > in cgroup_rstat_cpu structure. > > > > > deficiency that I am aware of is that there is no bitmap of which controller > > > > > have update. The problem that I saw in cgroup v2 is that in a cgroup with > > > > > both memory controller and block controller enabled, a > > > > > cgroup_rstat_updated() call from memory cgroup later causes the rstat > > > > > function to call into block cgroup flush method even though there is no > > > > > update in the block controller. This is an area that needs improvement. > > > > > > > > > > Your code does allow the block controller to be aware of that and avoid > > > > > further action, but I think it has to be done in the rstat code to be > > > > > applicable to all controllers instead of just specific to block controller. > > > > I guess it can be done by adding one percpu variable to 'struct cgroup'. > > > > > > > > > There is another problem that this approach. Suppose the system have 20 > > > > > block devices and one of them has an IO operation. Now the flush method > > > > > still needs to iterate all the 20 blkg's to do an update. The block > > > > > controller is kind of special that the number of per-cgroup IO stats depends > > > > > on the number of block devices present. Other controllers just have one set > > > > > of stats per cgroup. > > > > Yeah, and this one is really blkio specific issue, and your patch does > > > > cover this one. Maybe you can add one callback to > > > > cgroup_rstat_updated(), so the "blkg_iostat_set" instance is added into > > > > percpu list under percpu lock of cgroup_rstat_cpu_lock, then the lockless > > > > list isn't needed. > > > The rstat API is generic. It may not be a good idea to put controller > > > specific information into it. Yes, cgroup_rstat_cpu_lock is taken at the > > > read side (flush). It may not taken on the write side (update). So it may > > Both cgroup_rstat_flush_locked()/cgroup_rstat_updated() take the percpu > > cgroup_rstat_cpu_lock, so the new invented lockless list can be > > replaced with plain list. > > cgroup_rstat_updated() should only take the percpu cgroup_rstat_cpu_lock the > first time it transition from "!updated" to "updated". After that, it > returns immediately without the the lock. With a regular list, you will have > to take the lock every time a new block device has an update. So there isn't > much saving on the update side. In general, the lock/unlock sequence has a > bit more overhead than the lockless insertion. On the flush side, there may > be a bit of saving, but it is not the fast path. OK, got it, looks I misunderstood cgroup_rstat_updated(), and still the point of N queue vs. 1 cgroup, then looks your patch is good. Thanks, Ming
On Thu, Jun 02, 2022 at 03:20:20PM -0400, Waiman Long wrote: > For a system with many CPUs and block devices, the time to do > blkcg_rstat_flush() from cgroup_rstat_flush() can be rather long. It > can be especially problematic as interrupt is disabled during the flush. > It was reported that it might take seconds to complete in some extreme > cases leading to hard lockup messages. > > As it is likely that not all the percpu blkg_iostat_set's has been > updated since the last flush, those stale blkg_iostat_set's don't need > to be flushed in this case. This patch optimizes blkcg_rstat_flush() > by keeping a lockless list of recently updated blkg_iostat_set's in a > newly added percpu blkcg->lhead pointer. > > The blkg_iostat_set is added to the lockless list on the update side > in blk_cgroup_bio_start(). It is removed from the lockless list when > flushed in blkcg_rstat_flush(). Due to racing, it is possible that > blk_iostat_set's in the lockless list may have no new IO stats to be > flushed. To protect against destruction of blkg, a percpu reference is > gotten when putting into the lockless list and put back when removed. > > A blkg_iostat_set can determine if it is in a lockless list by checking > the content of its lnode.next pointer which will be non-NULL when in > a lockless list. This requires the presence of a special llist_last > sentinel node to be put at the end of the lockless list. > > When booting up an instrumented test kernel with this patch on a > 2-socket 96-thread system with cgroup v2, out of the 2051 calls to > cgroup_rstat_flush() after bootup, 1788 of the calls were exited > immediately because of empty lockless list. After an all-cpu kernel > build, the ratio became 6295424/6340513. That was more than 99%. > > Signed-off-by: Waiman Long <longman@redhat.com> > Acked-by: Tejun Heo <tj@kernel.org> Reviewed-by: Ming Lei <ming.lei@redhat.com> Thanks, Ming
Hello. On Thu, Jun 02, 2022 at 03:20:20PM -0400, Waiman Long <longman@redhat.com> wrote: > As it is likely that not all the percpu blkg_iostat_set's has been > updated since the last flush, those stale blkg_iostat_set's don't need > to be flushed in this case. Yes, there's no point to flush stats for idle devices if there can be many of them. Good idea. > +static struct llist_node *fetch_delete_blkcg_llist(struct llist_head *lhead) > +{ > + return xchg(&lhead->first, &llist_last); > +} > + > +static struct llist_node *fetch_delete_lnode_next(struct llist_node *lnode) > +{ > + struct llist_node *next = READ_ONCE(lnode->next); > + struct blkcg_gq *blkg = llist_entry(lnode, struct blkg_iostat_set, > + lnode)->blkg; > + > + WRITE_ONCE(lnode->next, NULL); > + percpu_ref_put(&blkg->refcnt); > + return next; > +} Idea/just asking: would it make sense to generalize this into llist.c (this is basically llist_del_first() + llist_del_all() with a sentinel)? For the sake of reusability. > +#define blkcg_llist_for_each_entry_safe(pos, node, nxt) \ > + for (; (node != &llist_last) && \ > + (pos = llist_entry(node, struct blkg_iostat_set, lnode), \ > + nxt = fetch_delete_lnode_next(node), true); \ > + node = nxt) > + It's good hygiene to parenthesize the args. > @@ -2011,9 +2092,16 @@ void blk_cgroup_bio_start(struct bio *bio) > } > bis->cur.ios[rwd]++; > > + if (!READ_ONCE(bis->lnode.next)) { > + struct llist_head *lhead = per_cpu_ptr(blkcg->lhead, cpu); > + > + llist_add(&bis->lnode, lhead); > + percpu_ref_get(&bis->blkg->refcnt); > + } > + When a blkg's cgroup is rmdir'd, what happens with the lhead list? We have cgroup_rstat_exit() in css_free_rwork_fn() that ultimately flushes rstats. init_and_link_css however adds reference form blkcg->css to cgroup->css. The blkcg->css would be (transitively) pinned by the lhead list and hence would prevent the final flush (when refs drop to zero). Seems like a cyclic dependency. Luckily, there's also per-subsys flushing in css_release which could be moved after rmdir (offlining) but before last ref is gone: diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index adb820e98f24..d830e6a8fb3b 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -5165,11 +5165,6 @@ static void css_release_work_fn(struct work_struct *work) if (ss) { /* css release path */ - if (!list_empty(&css->rstat_css_node)) { - cgroup_rstat_flush(cgrp); - list_del_rcu(&css->rstat_css_node); - } - cgroup_idr_replace(&ss->css_idr, NULL, css->id); if (ss->css_released) ss->css_released(css); @@ -5279,6 +5274,11 @@ static void offline_css(struct cgroup_subsys_state *css) css->flags &= ~CSS_ONLINE; RCU_INIT_POINTER(css->cgroup->subsys[ss->id], NULL); + if (!list_empty(&css->rstat_css_node)) { + cgroup_rstat_flush(css->cgrp); + list_del_rcu(&css->rstat_css_node); + } + wake_up_all(&css->cgroup->offline_waitq); } (not tested) > u64_stats_update_end_irqrestore(&bis->sync, flags); > if (cgroup_subsys_on_dfl(io_cgrp_subsys)) > - cgroup_rstat_updated(bio->bi_blkg->blkcg->css.cgroup, cpu); > + cgroup_rstat_updated(blkcg->css.cgroup, cpu); Maybe bundle the lhead list maintenace with cgroup_rstat_updated() under cgroup_subsys_on_dfl()? The stats can be read on v1 anyway. Thanks, Michal
On 6/8/22 12:57, Michal Koutný wrote: > Hello. > > On Thu, Jun 02, 2022 at 03:20:20PM -0400, Waiman Long <longman@redhat.com> wrote: >> As it is likely that not all the percpu blkg_iostat_set's has been >> updated since the last flush, those stale blkg_iostat_set's don't need >> to be flushed in this case. > Yes, there's no point to flush stats for idle devices if there can be > many of them. Good idea. > >> +static struct llist_node *fetch_delete_blkcg_llist(struct llist_head *lhead) >> +{ >> + return xchg(&lhead->first, &llist_last); >> +} >> + >> +static struct llist_node *fetch_delete_lnode_next(struct llist_node *lnode) >> +{ >> + struct llist_node *next = READ_ONCE(lnode->next); >> + struct blkcg_gq *blkg = llist_entry(lnode, struct blkg_iostat_set, >> + lnode)->blkg; >> + >> + WRITE_ONCE(lnode->next, NULL); >> + percpu_ref_put(&blkg->refcnt); >> + return next; >> +} > Idea/just asking: would it make sense to generalize this into llist.c > (this is basically llist_del_first() + llist_del_all() with a sentinel)? > For the sake of reusability. I have thought about that. It can be done as a follow-up patch to add a sentinel version into llist and use that instead. Of course, I can also update this patchset to include that. > >> +#define blkcg_llist_for_each_entry_safe(pos, node, nxt) \ >> + for (; (node != &llist_last) && \ >> + (pos = llist_entry(node, struct blkg_iostat_set, lnode), \ >> + nxt = fetch_delete_lnode_next(node), true); \ >> + node = nxt) >> + > It's good hygiene to parenthesize the args. I am aware of that. I will certainly add that if it is a generic macro that can have many users. > >> @@ -2011,9 +2092,16 @@ void blk_cgroup_bio_start(struct bio *bio) >> } >> bis->cur.ios[rwd]++; >> >> + if (!READ_ONCE(bis->lnode.next)) { >> + struct llist_head *lhead = per_cpu_ptr(blkcg->lhead, cpu); >> + >> + llist_add(&bis->lnode, lhead); >> + percpu_ref_get(&bis->blkg->refcnt); >> + } >> + > When a blkg's cgroup is rmdir'd, what happens with the lhead list? > We have cgroup_rstat_exit() in css_free_rwork_fn() that ultimately flushes rstats. > init_and_link_css however adds reference form blkcg->css to cgroup->css. > The blkcg->css would be (transitively) pinned by the lhead list and > hence would prevent the final flush (when refs drop to zero). Seems like > a cyclic dependency. > > Luckily, there's also per-subsys flushing in css_release which could be > moved after rmdir (offlining) but before last ref is gone: > > diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c > index adb820e98f24..d830e6a8fb3b 100644 > --- a/kernel/cgroup/cgroup.c > +++ b/kernel/cgroup/cgroup.c > @@ -5165,11 +5165,6 @@ static void css_release_work_fn(struct work_struct *work) > > if (ss) { > /* css release path */ > - if (!list_empty(&css->rstat_css_node)) { > - cgroup_rstat_flush(cgrp); > - list_del_rcu(&css->rstat_css_node); > - } > - > cgroup_idr_replace(&ss->css_idr, NULL, css->id); > if (ss->css_released) > ss->css_released(css); > @@ -5279,6 +5274,11 @@ static void offline_css(struct cgroup_subsys_state *css) > css->flags &= ~CSS_ONLINE; > RCU_INIT_POINTER(css->cgroup->subsys[ss->id], NULL); > > + if (!list_empty(&css->rstat_css_node)) { > + cgroup_rstat_flush(css->cgrp); > + list_del_rcu(&css->rstat_css_node); > + } > + > wake_up_all(&css->cgroup->offline_waitq); > } > > (not tested) Good point. Your change may not be enough since there could be update after the flush which will pin the blkg and hence blkcg. I guess one possible solution may be to abandon the llist and revert back to list iteration when offline. I need to think a bit more about that. > > >> u64_stats_update_end_irqrestore(&bis->sync, flags); >> if (cgroup_subsys_on_dfl(io_cgrp_subsys)) >> - cgroup_rstat_updated(bio->bi_blkg->blkcg->css.cgroup, cpu); >> + cgroup_rstat_updated(blkcg->css.cgroup, cpu); > Maybe bundle the lhead list maintenace with cgroup_rstat_updated() under > cgroup_subsys_on_dfl()? The stats can be read on v1 anyway. I don't quite understand here. The change is not specific to v1 or v2. What do you mean by the stat is readable on v1? Cheers, Longman
On Wed, Jun 08, 2022 at 02:16:45PM -0400, Waiman Long <longman@redhat.com> wrote: > I have thought about that. It can be done as a follow-up patch to add a > sentinel version into llist and use that instead. Of course, I can also > update this patchset to include that. Nothing against the current form, really just an idea for a followup or prequel. > Your change may not be enough since there could be update after the flush > which will pin the blkg and hence blkcg. Wouldn't that mean submitting a bio from offlined blkcg? blkg_tryget_closest() should prevent that. > I guess one possible solution may be to abandon the llist and revert > back to list iteration when offline. I need to think a bit more about > that. > > Maybe bundle the lhead list maintenace with cgroup_rstat_updated() under > > cgroup_subsys_on_dfl()? The stats can be read on v1 anyway. > > I don't quite understand here. The change is not specific to v1 or v2. What > do you mean by the stat is readable on v1? Apologies, the critical "not" fell out. ...can not be read on v1... IOW, the rstat data are only kept when attached to v2 hierarchy, so the list of active devices needn't be maintained on v1. Michal
On Wed, Jun 08, 2022 at 11:12:55PM +0200, Michal Koutný <mkoutny@suse.com> wrote: > Wouldn't that mean submitting a bio from offlined blkcg? > blkg_tryget_closest() should prevent that. Self-correction -- no, forgot blkg_tryget_closest() gets any non-zero reference, not just a live one (percpu_ref_tryget_live()), furthermore, I can see that offlined blkcg may still issue writeback bios for instance. > > I guess one possible solution may be to abandon the llist and revert > > back to list iteration when offline. I need to think a bit more about > > that. Since blkcg stats are only used for io.stat of an online blkcg, the update may be skipped on an offlined blkcg. (Which of course breaks when something starts to depend on the stats of an offlined blkcg.) Michal
On 6/8/22 12:57, Michal Koutný wrote: > @@ -2011,9 +2092,16 @@ void blk_cgroup_bio_start(struct bio *bio) >> } >> bis->cur.ios[rwd]++; >> >> + if (!READ_ONCE(bis->lnode.next)) { >> + struct llist_head *lhead = per_cpu_ptr(blkcg->lhead, cpu); >> + >> + llist_add(&bis->lnode, lhead); >> + percpu_ref_get(&bis->blkg->refcnt); >> + } >> + > When a blkg's cgroup is rmdir'd, what happens with the lhead list? > We have cgroup_rstat_exit() in css_free_rwork_fn() that ultimately flushes rstats. > init_and_link_css however adds reference form blkcg->css to cgroup->css. > The blkcg->css would be (transitively) pinned by the lhead list and > hence would prevent the final flush (when refs drop to zero). Seems like > a cyclic dependency. That is not true. The percpu lhead list is embedded in blkcg but it does not pin blkcg. What the code does is to pin the blkg from being freed while it is on the lockless list. I do need to move the percpu_ref_put() in blkcg_rstat_flush() later to avoid use-after-free though. > > Luckily, there's also per-subsys flushing in css_release which could be > moved after rmdir (offlining) but before last ref is gone: > > diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c > index adb820e98f24..d830e6a8fb3b 100644 > --- a/kernel/cgroup/cgroup.c > +++ b/kernel/cgroup/cgroup.c > @@ -5165,11 +5165,6 @@ static void css_release_work_fn(struct work_struct *work) > > if (ss) { > /* css release path */ > - if (!list_empty(&css->rstat_css_node)) { > - cgroup_rstat_flush(cgrp); > - list_del_rcu(&css->rstat_css_node); > - } > - > cgroup_idr_replace(&ss->css_idr, NULL, css->id); > if (ss->css_released) > ss->css_released(css); > @@ -5279,6 +5274,11 @@ static void offline_css(struct cgroup_subsys_state *css) > css->flags &= ~CSS_ONLINE; > RCU_INIT_POINTER(css->cgroup->subsys[ss->id], NULL); > > + if (!list_empty(&css->rstat_css_node)) { > + cgroup_rstat_flush(css->cgrp); > + list_del_rcu(&css->rstat_css_node); > + } > + > wake_up_all(&css->cgroup->offline_waitq); > } > > (not tested) I don't think that code is necessary. Anyway, I am planning go make a parallel set of helpers for a lockless list with sentinel variant as suggested. Thanks, Longman
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 9021f75fc752..963a779c4cab 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -59,6 +59,71 @@ static struct workqueue_struct *blkcg_punt_bio_wq; #define BLKG_DESTROY_BATCH_SIZE 64 +/* + * Lockless lists for tracking IO stats update + * + * New IO stats are stored in the percpu iostat_cpu within blkcg_gq (blkg). + * There are multiple blkg's (one for each block device) attached to each + * blkcg. The rstat code keeps track of which cpu has IO stats updated, + * but it doesn't know which blkg has the updated stats. If there are many + * block devices in a system, the cost of iterating all the blkg's to flush + * out the IO stats can be high. To reduce such overhead, a set of percpu + * lockless lists (lhead) per blkcg are used to track the set of recently + * updated iostat_cpu's since the last flush. An iostat_cpu will be put + * onto the lockless list on the update side [blk_cgroup_bio_start()] if + * not there yet and then removed when being flushed [blkcg_rstat_flush()]. + * References to blkg are gotten and then put back in the process to + * protect against blkg removal. + * + * lnode.next of the last entry in a lockless list is NULL. To enable us to + * use lnode.next as a boolean flag to indicate its presence in a lockless + * list, we have to make it non-NULL for all. This is done by using a + * sentinel node at the end of the lockless list. All the percpu lhead's + * are initialized to point to that sentinel node as being empty. + */ +static struct llist_node llist_last; + +static bool blkcg_llist_empty(struct llist_head *lhead) +{ + return lhead->first == &llist_last; +} + +static void init_blkcg_llists(struct blkcg *blkcg) +{ + int cpu; + + for_each_possible_cpu(cpu) + per_cpu_ptr(blkcg->lhead, cpu)->first = &llist_last; +} + +static struct llist_node *fetch_delete_blkcg_llist(struct llist_head *lhead) +{ + return xchg(&lhead->first, &llist_last); +} + +static struct llist_node *fetch_delete_lnode_next(struct llist_node *lnode) +{ + struct llist_node *next = READ_ONCE(lnode->next); + struct blkcg_gq *blkg = llist_entry(lnode, struct blkg_iostat_set, + lnode)->blkg; + + WRITE_ONCE(lnode->next, NULL); + percpu_ref_put(&blkg->refcnt); + return next; +} + +/* + * The retrieved blkg_iostat_set is immediately marked as not in the + * lockless list by clearing its node->next pointer. It could be put + * back into the list by a parallel update before the iostat's are + * finally flushed including probably the new update. + */ +#define blkcg_llist_for_each_entry_safe(pos, node, nxt) \ + for (; (node != &llist_last) && \ + (pos = llist_entry(node, struct blkg_iostat_set, lnode), \ + nxt = fetch_delete_lnode_next(node), true); \ + node = nxt) + /** * blkcg_css - find the current css * @@ -236,8 +301,10 @@ static struct blkcg_gq *blkg_alloc(struct blkcg *blkcg, struct request_queue *q, blkg->blkcg = blkcg; u64_stats_init(&blkg->iostat.sync); - for_each_possible_cpu(cpu) + for_each_possible_cpu(cpu) { u64_stats_init(&per_cpu_ptr(blkg->iostat_cpu, cpu)->sync); + per_cpu_ptr(blkg->iostat_cpu, cpu)->blkg = blkg; + } for (i = 0; i < BLKCG_MAX_POLS; i++) { struct blkcg_policy *pol = blkcg_policy[i]; @@ -852,17 +919,23 @@ static void blkg_iostat_sub(struct blkg_iostat *dst, struct blkg_iostat *src) static void blkcg_rstat_flush(struct cgroup_subsys_state *css, int cpu) { struct blkcg *blkcg = css_to_blkcg(css); - struct blkcg_gq *blkg; + struct llist_head *lhead = per_cpu_ptr(blkcg->lhead, cpu); + struct llist_node *lnode, *lnext; + struct blkg_iostat_set *bisc; /* Root-level stats are sourced from system-wide IO stats */ if (!cgroup_parent(css->cgroup)) return; + if (blkcg_llist_empty(lhead)) + return; + rcu_read_lock(); - hlist_for_each_entry_rcu(blkg, &blkcg->blkg_list, blkcg_node) { + lnode = fetch_delete_blkcg_llist(lhead); + blkcg_llist_for_each_entry_safe(bisc, lnode, lnext) { + struct blkcg_gq *blkg = bisc->blkg; struct blkcg_gq *parent = blkg->parent; - struct blkg_iostat_set *bisc = per_cpu_ptr(blkg->iostat_cpu, cpu); struct blkg_iostat cur, delta; unsigned long flags; unsigned int seq; @@ -1170,6 +1243,7 @@ static void blkcg_css_free(struct cgroup_subsys_state *css) mutex_unlock(&blkcg_pol_mutex); + free_percpu(blkcg->lhead); kfree(blkcg); } @@ -1189,6 +1263,11 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css) goto unlock; } + blkcg->lhead = alloc_percpu_gfp(struct llist_head, GFP_KERNEL); + if (!blkcg->lhead) + goto free_blkcg; + init_blkcg_llists(blkcg); + for (i = 0; i < BLKCG_MAX_POLS ; i++) { struct blkcg_policy *pol = blkcg_policy[i]; struct blkcg_policy_data *cpd; @@ -1229,7 +1308,8 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css) for (i--; i >= 0; i--) if (blkcg->cpd[i]) blkcg_policy[i]->cpd_free_fn(blkcg->cpd[i]); - + free_percpu(blkcg->lhead); +free_blkcg: if (blkcg != &blkcg_root) kfree(blkcg); unlock: @@ -1993,6 +2073,7 @@ static int blk_cgroup_io_type(struct bio *bio) void blk_cgroup_bio_start(struct bio *bio) { + struct blkcg *blkcg = bio->bi_blkg->blkcg; int rwd = blk_cgroup_io_type(bio), cpu; struct blkg_iostat_set *bis; unsigned long flags; @@ -2011,9 +2092,16 @@ void blk_cgroup_bio_start(struct bio *bio) } bis->cur.ios[rwd]++; + if (!READ_ONCE(bis->lnode.next)) { + struct llist_head *lhead = per_cpu_ptr(blkcg->lhead, cpu); + + llist_add(&bis->lnode, lhead); + percpu_ref_get(&bis->blkg->refcnt); + } + u64_stats_update_end_irqrestore(&bis->sync, flags); if (cgroup_subsys_on_dfl(io_cgrp_subsys)) - cgroup_rstat_updated(bio->bi_blkg->blkcg->css.cgroup, cpu); + cgroup_rstat_updated(blkcg->css.cgroup, cpu); put_cpu(); } diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h index d4de0a35e066..2c36362a332e 100644 --- a/block/blk-cgroup.h +++ b/block/blk-cgroup.h @@ -18,6 +18,7 @@ #include <linux/cgroup.h> #include <linux/kthread.h> #include <linux/blk-mq.h> +#include <linux/llist.h> struct blkcg_gq; struct blkg_policy_data; @@ -43,6 +44,8 @@ struct blkg_iostat { struct blkg_iostat_set { struct u64_stats_sync sync; + struct llist_node lnode; + struct blkcg_gq *blkg; struct blkg_iostat cur; struct blkg_iostat last; }; @@ -97,6 +100,12 @@ struct blkcg { struct blkcg_policy_data *cpd[BLKCG_MAX_POLS]; struct list_head all_blkcgs_node; + + /* + * List of updated percpu blkg_iostat_set's since the last flush. + */ + struct llist_head __percpu *lhead; + #ifdef CONFIG_BLK_CGROUP_FC_APPID char fc_app_id[FC_APPID_LEN]; #endif