From: Li Nan <linan122@huawei.com>
To: <tj@kernel.org>, <josef@toxicpanda.com>, <axboe@kernel.dk>
Cc: <cgroups@vger.kernel.org>, <linux-block@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linan122@huawei.com>,
<yukuai3@huawei.com>, <yi.zhang@huawei.com>
Subject: [PATCH -next 4/8] blk-iocost: read params inside lock in sysfs apis
Date: Mon, 28 Nov 2022 23:44:30 +0800 [thread overview]
Message-ID: <20221128154434.4177442-5-linan122@huawei.com> (raw)
In-Reply-To: <20221128154434.4177442-1-linan122@huawei.com>
From: Yu Kuai <yukuai3@huawei.com>
Otherwise, user might get abnormal values if params is updated
concurrently.
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Signed-off-by: Li Nan <linan122@huawei.com>
---
block/blk-iocost.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/block/blk-iocost.c b/block/blk-iocost.c
index 2bfecc511dd9..a645184aba4a 100644
--- a/block/blk-iocost.c
+++ b/block/blk-iocost.c
@@ -3125,6 +3125,7 @@ static u64 ioc_qos_prfill(struct seq_file *sf, struct blkg_policy_data *pd,
if (!dname)
return 0;
+ spin_lock_irq(&ioc->lock);
seq_printf(sf, "%s enable=%d ctrl=%s rpct=%u.%02u rlat=%u wpct=%u.%02u wlat=%u min=%u.%02u max=%u.%02u\n",
dname, ioc->enabled, ioc->user_qos_params ? "user" : "auto",
ioc->params.qos[QOS_RPPM] / 10000,
@@ -3137,6 +3138,7 @@ static u64 ioc_qos_prfill(struct seq_file *sf, struct blkg_policy_data *pd,
ioc->params.qos[QOS_MIN] % 10000 / 100,
ioc->params.qos[QOS_MAX] / 10000,
ioc->params.qos[QOS_MAX] % 10000 / 100);
+ spin_unlock_irq(&ioc->lock);
return 0;
}
@@ -3319,12 +3321,14 @@ static u64 ioc_cost_model_prfill(struct seq_file *sf,
if (!dname)
return 0;
+ spin_lock_irq(&ioc->lock);
seq_printf(sf, "%s ctrl=%s model=linear "
"rbps=%llu rseqiops=%llu rrandiops=%llu "
"wbps=%llu wseqiops=%llu wrandiops=%llu\n",
dname, ioc->user_cost_model ? "user" : "auto",
u[I_LCOEF_RBPS], u[I_LCOEF_RSEQIOPS], u[I_LCOEF_RRANDIOPS],
u[I_LCOEF_WBPS], u[I_LCOEF_WSEQIOPS], u[I_LCOEF_WRANDIOPS]);
+ spin_unlock_irq(&ioc->lock);
return 0;
}
--
2.31.1
next prev parent reply other threads:[~2022-11-28 15:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-28 15:44 [PATCH -next 0/8] iocost bugfix Li Nan
2022-11-28 15:44 ` [PATCH -next 1/8] blk-iocost: cleanup ioc_qos_write() and ioc_cost_model_write() Li Nan
2022-11-28 15:44 ` [PATCH -next 2/8] blk-iocost: improve hanlder of match_u64() Li Nan
2022-11-28 15:44 ` [PATCH -next 3/8] blk-iocost: don't allow to configure bio based device Li Nan
2022-11-28 15:44 ` Li Nan [this message]
2022-11-28 15:44 ` [PATCH -next 5/8] blk-iocost: fix divide by 0 error in calc_lcoefs() Li Nan
2022-11-28 15:44 ` [PATCH -next 6/8] blk-iocost: change div64_u64 to DIV64_U64_ROUND_UP in ioc_refresh_params() Li Nan
2022-11-28 15:44 ` [PATCH -next 7/8] blk-iocost: fix possible UAF in ioc_pd_free Li Nan
2022-11-29 12:18 ` Yu Kuai
2022-11-28 15:44 ` [PATCH -next 8/8] block: fix null-pointer dereference in ioc_pd_init Li Nan
2022-11-29 11:23 ` kernel test robot
2022-11-29 14:25 ` Christoph Hellwig
2022-11-30 1:32 ` Yu Kuai
2022-11-30 15:59 ` Christoph Hellwig
2022-11-30 0:50 ` kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221128154434.4177442-5-linan122@huawei.com \
--to=linan122@huawei.com \
--cc=axboe@kernel.dk \
--cc=cgroups@vger.kernel.org \
--cc=josef@toxicpanda.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tj@kernel.org \
--cc=yi.zhang@huawei.com \
--cc=yukuai3@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).