From: Josef Bacik <josef@toxicpanda.com>
To: Dennis Zhou <dennis@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>, Tejun Heo <tj@kernel.org>,
Johannes Weiner <hannes@cmpxchg.org>,
Josef Bacik <josef@toxicpanda.com>,
kernel-team@fb.com, linux-block@vger.kernel.org,
cgroups@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 06/14] blkcg: associate blkg when associating a device
Date: Tue, 4 Dec 2018 14:48:39 -0500 [thread overview]
Message-ID: <20181204194838.ylk546legwikfrik@MacBook-Pro-91.local> (raw)
In-Reply-To: <20181204183600.99746-7-dennis@kernel.org>
On Tue, Dec 04, 2018 at 01:35:52PM -0500, Dennis Zhou wrote:
> Previously, blkg association was handled by controller specific code in
> blk-throttle and blk-iolatency. However, because a blkg represents a
> relationship between a blkcg and a request_queue, it makes sense to keep
> the blkg->q and bio->bi_disk->queue consistent.
>
> This patch moves association into the bio_set_dev macro(). This should
> cover the majority of cases where the device is set/changed keeping the
> two pointers consistent. Fallback code is added to
> blkcg_bio_issue_check() to catch any missing paths.
>
> Signed-off-by: Dennis Zhou <dennis@kernel.org>
> ---
> block/bio.c | 1 +
> block/blk-iolatency.c | 4 +---
> block/blk-throttle.c | 1 -
> include/linux/bio.h | 2 ++
> include/linux/blk-cgroup.h | 11 +++--------
> 5 files changed, 7 insertions(+), 12 deletions(-)
>
> diff --git a/block/bio.c b/block/bio.c
> index 41ebb3f8e2fc..1e852ab904aa 100644
> --- a/block/bio.c
> +++ b/block/bio.c
> @@ -2074,6 +2074,7 @@ void bio_associate_blkg(struct bio *bio)
>
> rcu_read_unlock();
> }
> +EXPORT_SYMBOL_GPL(bio_associate_blkg);
>
> /**
> * bio_disassociate_task - undo bio_associate_current()
> diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c
> index cdbd10564e66..e6b47c255521 100644
> --- a/block/blk-iolatency.c
> +++ b/block/blk-iolatency.c
> @@ -472,14 +472,12 @@ static void check_scale_change(struct iolatency_grp *iolat)
> static void blkcg_iolatency_throttle(struct rq_qos *rqos, struct bio *bio)
> {
> struct blk_iolatency *blkiolat = BLKIOLATENCY(rqos);
> - struct blkcg_gq *blkg;
> + struct blkcg_gq *blkg = bio->bi_blkg;
> bool issue_as_root = bio_issue_as_root_blkg(bio);
>
> if (!blk_iolatency_enabled(blkiolat))
> return;
>
> - bio_associate_blkg(bio);
> - blkg = bio->bi_blkg;
> bio_issue_init(&bio->bi_issue, bio_sectors(bio));
>
> while (blkg && blkg->parent) {
> diff --git a/block/blk-throttle.c b/block/blk-throttle.c
> index 228c3a007ebc..1c6529df2002 100644
> --- a/block/blk-throttle.c
> +++ b/block/blk-throttle.c
> @@ -2118,7 +2118,6 @@ static inline void throtl_update_latency_buckets(struct throtl_data *td)
> static void blk_throtl_assoc_bio(struct bio *bio)
> {
> #ifdef CONFIG_BLK_DEV_THROTTLING_LOW
> - bio_associate_blkg(bio);
> bio_issue_init(&bio->bi_issue, bio_sectors(bio));
> #endif
> }
> diff --git a/include/linux/bio.h b/include/linux/bio.h
> index 62715a5a4f32..6ee2ea8b378a 100644
> --- a/include/linux/bio.h
> +++ b/include/linux/bio.h
> @@ -491,12 +491,14 @@ do { \
> bio_clear_flag(bio, BIO_THROTTLED);\
> (bio)->bi_disk = (bdev)->bd_disk; \
> (bio)->bi_partno = (bdev)->bd_partno; \
> + bio_associate_blkg(bio); \
> } while (0)
>
> #define bio_copy_dev(dst, src) \
> do { \
> (dst)->bi_disk = (src)->bi_disk; \
> (dst)->bi_partno = (src)->bi_partno; \
> + bio_clone_blkcg_association(dst, src); \
> } while (0)
>
> #define bio_dev(bio) \
> diff --git a/include/linux/blk-cgroup.h b/include/linux/blk-cgroup.h
> index c08e96e521ed..3c87ae71156f 100644
> --- a/include/linux/blk-cgroup.h
> +++ b/include/linux/blk-cgroup.h
> @@ -802,21 +802,17 @@ static inline bool blk_throtl_bio(struct request_queue *q, struct blkcg_gq *blkg
> static inline bool blkcg_bio_issue_check(struct request_queue *q,
> struct bio *bio)
> {
> - struct blkcg *blkcg;
> struct blkcg_gq *blkg;
> bool throtl = false;
>
> - rcu_read_lock();
> + if (!bio->bi_blkg)
> + bio_associate_blkg(bio);
>
Should we maybe WARN_ON_ONCE() here since this really shouldn't happen?
Otherwise you can add
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Thanks,
Josef
next prev parent reply other threads:[~2018-12-04 19:48 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-04 18:35 [PATCH v5 00/14] block: always associate blkg and refcount cleanup Dennis Zhou
2018-12-04 18:35 ` [PATCH 01/14] blkcg: fix ref count issue with bio_blkcg() using task_css Dennis Zhou
2018-12-04 18:35 ` [PATCH 02/14] blkcg: update blkg_lookup_create() to do locking Dennis Zhou
2018-12-04 18:35 ` [PATCH 03/14] blkcg: convert blkg_lookup_create() to find closest blkg Dennis Zhou
2018-12-04 18:35 ` [PATCH 04/14] blkcg: introduce common blkg association logic Dennis Zhou
2018-12-04 18:35 ` [PATCH 05/14] dm: set the static flush bio device on demand Dennis Zhou
2018-12-04 20:28 ` Mike Snitzer
2018-12-04 22:15 ` Dennis Zhou
2018-12-04 18:35 ` [PATCH 06/14] blkcg: associate blkg when associating a device Dennis Zhou
2018-12-04 19:48 ` Josef Bacik [this message]
2018-12-04 18:35 ` [PATCH 07/14] blkcg: consolidate bio_issue_init() to be a part of core Dennis Zhou
2018-12-04 19:50 ` Josef Bacik
2018-12-04 18:35 ` [PATCH 08/14] blkcg: associate a blkg for pages being evicted by swap Dennis Zhou
2018-12-04 18:35 ` [PATCH 09/14] blkcg: associate writeback bios with a blkg Dennis Zhou
2018-12-04 18:35 ` [PATCH 10/14] blkcg: remove bio->bi_css and instead use bio->bi_blkg Dennis Zhou
2018-12-04 18:35 ` [PATCH 11/14] blkcg: remove additional reference to the css Dennis Zhou
2018-12-04 19:53 ` Josef Bacik
2018-12-04 18:35 ` [PATCH 12/14] blkcg: remove bio_disassociate_task() Dennis Zhou
2018-12-04 19:53 ` Josef Bacik
2018-12-04 18:35 ` [PATCH 13/14] blkcg: change blkg reference counting to use percpu_ref Dennis Zhou
2018-12-04 19:54 ` Josef Bacik
2018-12-04 18:36 ` [PATCH 14/14] blkcg: rename blkg_try_get() to blkg_tryget() Dennis Zhou
2018-12-05 17:10 [PATCH v6 00/14] block: always associate blkg and refcount cleanup Dennis Zhou
2018-12-05 17:10 ` [PATCH 06/14] blkcg: associate blkg when associating a device Dennis Zhou
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=20181204194838.ylk546legwikfrik@MacBook-Pro-91.local \
--to=josef@toxicpanda.com \
--cc=axboe@kernel.dk \
--cc=cgroups@vger.kernel.org \
--cc=dennis@kernel.org \
--cc=hannes@cmpxchg.org \
--cc=kernel-team@fb.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tj@kernel.org \
/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).