提交 9f64d49e 编写于 作者: Y Yu Kuai 提交者: Yongqiang Liu

block, bfq: switch 'bfqg->ref' to use atomic refcount apis

mainline inclusion
from mainline-v6.2-rc5
commit 216f7647
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I6DZIB
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=216f764716f34fe68cedc7296ae2043a7727e640

--------------------------------

The updating of 'bfqg->ref' should be protected by 'bfqd->lock', however,
during code review, we found that bfq_pd_free() update 'bfqg->ref'
without holding the lock, which is problematic:

1) bfq_pd_free() triggered by removing cgroup is called asynchronously;
2) bfqq will grab bfqg reference, and exit bfqq will drop the reference,
which can concurrent with 1).

Unfortunately, 'bfqd->lock' can't be held here because 'bfqd' might already
be freed in bfq_pd_free(). Fix the problem by using atomic refcount apis.
Signed-off-by: NYu Kuai <yukuai3@huawei.com>
Reviewed-by: NJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20230103084755.1256479-1-yukuai1@huaweicloud.comSigned-off-by: NJens Axboe <axboe@kernel.dk>
Reviewed-by: NHou Tao <houtao1@huawei.com>
Signed-off-by: NYongqiang Liu <liuyongqiang13@huawei.com>
上级 278253ce
...@@ -254,14 +254,12 @@ struct bfq_group *bfqq_group(struct bfq_queue *bfqq) ...@@ -254,14 +254,12 @@ struct bfq_group *bfqq_group(struct bfq_queue *bfqq)
static void bfqg_get(struct bfq_group *bfqg) static void bfqg_get(struct bfq_group *bfqg)
{ {
bfqg->ref++; refcount_inc(&bfqg->ref);
} }
static void bfqg_put(struct bfq_group *bfqg) static void bfqg_put(struct bfq_group *bfqg)
{ {
bfqg->ref--; if (refcount_dec_and_test(&bfqg->ref))
if (bfqg->ref == 0)
kfree(bfqg); kfree(bfqg);
} }
...@@ -448,7 +446,7 @@ static struct blkg_policy_data *bfq_pd_alloc(gfp_t gfp, int node) ...@@ -448,7 +446,7 @@ static struct blkg_policy_data *bfq_pd_alloc(gfp_t gfp, int node)
} }
/* see comments in bfq_bic_update_cgroup for why refcounting */ /* see comments in bfq_bic_update_cgroup for why refcounting */
bfqg_get(bfqg); refcount_set(&bfqg->ref, 1);
return &bfqg->pd; return &bfqg->pd;
} }
......
...@@ -862,7 +862,7 @@ struct bfq_group { ...@@ -862,7 +862,7 @@ struct bfq_group {
char blkg_path[128]; char blkg_path[128];
/* reference counter (see comments in bfq_bic_update_cgroup) */ /* reference counter (see comments in bfq_bic_update_cgroup) */
int ref; refcount_t ref;
struct bfq_entity entity; struct bfq_entity entity;
struct bfq_sched_data sched_data; struct bfq_sched_data sched_data;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册