summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2022-11-30 08:25:46 -0700
committerJens Axboe <axboe@kernel.dk>2022-11-30 08:25:46 -0700
commitc62256dda37133a48d56cecc15e4a4d527d4cc46 (patch)
treeccc2be0058d65a201ba20d8b297d4e34cb0a9687 /block
parent8d283ee62b077968e218531b24260e1cc51bd484 (diff)
Revert "blk-cgroup: Flush stats at blkgs destruction path"
This reverts commit dae590a6c96c799434e0ff8156ef29b88c257e60. We've had a few reports on this causing a crash at boot time, because of a reference issue. While this problem seemginly did exist before the patch and needs solving separately, this patch makes it a lot easier to trigger. Link: https://lore.kernel.org/linux-block/CA+QYu4oxiRKC6hJ7F27whXy-PRBx=Tvb+-7TQTONN8qTtV3aDA@mail.gmail.com/ Link: https://lore.kernel.org/linux-block/69af7ccb-6901-c84c-0e95-5682ccfb750c@acm.org/ Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/blk-cgroup.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 57941d2a8ba3..3e03c0d13253 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -1084,12 +1084,10 @@ struct list_head *blkcg_get_cgwb_list(struct cgroup_subsys_state *css)
*/
static void blkcg_destroy_blkgs(struct blkcg *blkcg)
{
- int cpu;
-
might_sleep();
- css_get(&blkcg->css);
spin_lock_irq(&blkcg->lock);
+
while (!hlist_empty(&blkcg->blkg_list)) {
struct blkcg_gq *blkg = hlist_entry(blkcg->blkg_list.first,
struct blkcg_gq, blkcg_node);
@@ -1112,17 +1110,6 @@ static void blkcg_destroy_blkgs(struct blkcg *blkcg)
}
spin_unlock_irq(&blkcg->lock);
-
- /*
- * Flush all the non-empty percpu lockless lists.
- */
- for_each_possible_cpu(cpu) {
- struct llist_head *lhead = per_cpu_ptr(blkcg->lhead, cpu);
-
- if (!llist_empty(lhead))
- cgroup_rstat_css_cpu_flush(&blkcg->css, cpu);
- }
- css_put(&blkcg->css);
}
/**