hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I99KM6
--------------------------------
"fix deadlock in cgroup1_writeback" will lead to softlockup for deleting cgroup_mutex lead to blkcg->memcg_list unprotected. so revert "cgroup_writeback: fix deadlock in cgroup1_writeback".
Signed-off-by: Chen Ridong chenridong@huawei.com --- mm/backing-dev.c | 2 ++ mm/memcontrol.c | 21 ++++++--------------- 2 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/mm/backing-dev.c b/mm/backing-dev.c index bfb2c50b0354..d70f8420c805 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c @@ -1221,6 +1221,8 @@ void wb_attach_memcg_to_blkcg(struct cgroup_subsys_state *memcg_css, if (!cgroup1_writeback) return;
+ lockdep_assert_held(&cgroup_mutex); + css_get(blkcg_css); memcg->wb_blk_css = blkcg_css; if (pre_blkcss == NULL) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 5613bf6c1d7d..0f1813deb527 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -6042,22 +6042,15 @@ static int wb_blkio_show(struct seq_file *m, void *v) if (!path) return -ENOMEM;
- rcu_read_lock(); + mutex_lock(&cgroup_mutex); blkcg_css = memcg->wb_blk_css; - if (!css_tryget_online(blkcg_css)) { - kfree(path); - rcu_read_unlock(); - - return -EINVAL; - } blkcg_cgroup = blkcg_css->cgroup; blkcg_id = cgroup_ino(blkcg_cgroup); cgroup_path(blkcg_cgroup, path, PATH_MAX); + mutex_unlock(&cgroup_mutex); seq_printf(m, "wb_blkio_path:%s\n", path); seq_printf(m, "wb_blkio_ino:%lu\n", blkcg_id); kfree(path); - css_put(blkcg_css); - rcu_read_unlock();
return 0; } @@ -6080,24 +6073,22 @@ static ssize_t wb_blkio_write(struct kernfs_open_file *of, char *buf, if (ret) return ret;
- rcu_read_lock(); + mutex_lock(&cgroup_mutex); root = blkcg_root_css->cgroup->root; blk_cgroup = __cgroup_get_from_id(root, cgrp_id); if (IS_ERR(blk_cgroup)) { - rcu_read_unlock(); + mutex_unlock(&cgroup_mutex); return -EINVAL; } blkcg_css = cgroup_tryget_css(blk_cgroup, &io_cgrp_subsys); - if (!blkcg_css) { - ret = -EINVAL; + if (!blkcg_css) goto out_unlock; - } wb_attach_memcg_to_blkcg(memcg_css, blkcg_css); css_put(blkcg_css);
out_unlock: cgroup_put(blk_cgroup); - rcu_read_unlock(); + mutex_unlock(&cgroup_mutex);
return ret < 0 ? ret : nbytes; }