From: Josef Bacik <josef@toxicpanda.com>
To: Dennis Zhou <dennisszhou@gmail.com>
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 07/15] blkcg: consolidate bio_issue_init and blkg association
Date: Fri, 31 Aug 2018 11:42:26 -0400 [thread overview]
Message-ID: <20180831154225.zoiztxvdvcfaat5r@destiny> (raw)
In-Reply-To: <20180831015356.69796-8-dennisszhou@gmail.com>
On Thu, Aug 30, 2018 at 09:53:48PM -0400, Dennis Zhou wrote:
> From: "Dennis Zhou (Facebook)" <dennisszhou@gmail.com>
>
> This removes the now duplicate association logic in blk-throttle and
> blk-iolatency. bio_issue_init is moved into blkcg_bio_issue_check and
> into the bio clone variants to allow for the future addition of a
> latency moving average for IOs.
>
> Signed-off-by: Dennis Zhou <dennisszhou@gmail.com>
> ---
> block/bio.c | 2 ++
> block/blk-iolatency.c | 24 +-----------------------
> block/blk-throttle.c | 13 +------------
> block/bounce.c | 2 ++
> include/linux/blk-cgroup.h | 2 ++
> 5 files changed, 8 insertions(+), 35 deletions(-)
>
> diff --git a/block/bio.c b/block/bio.c
> index e937f9681188..ab41f5b7eb1f 100644
> --- a/block/bio.c
> +++ b/block/bio.c
> @@ -610,6 +610,8 @@ void __bio_clone_fast(struct bio *bio, struct bio *bio_src)
> bio->bi_io_vec = bio_src->bi_io_vec;
>
> bio_clone_blkcg_association(bio, bio_src);
> +
> + bio_issue_init(&bio->bi_issue, bio_sectors(bio));
> }
> EXPORT_SYMBOL(__bio_clone_fast);
>
> diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c
> index 22b2ff0440cc..9d7052bad6f7 100644
> --- a/block/blk-iolatency.c
> +++ b/block/blk-iolatency.c
> @@ -395,34 +395,12 @@ static void blkcg_iolatency_throttle(struct rq_qos *rqos, struct bio *bio,
> spinlock_t *lock)
> {
> struct blk_iolatency *blkiolat = BLKIOLATENCY(rqos);
> - struct blkcg *blkcg;
> - struct blkcg_gq *blkg;
> - struct request_queue *q = rqos->q;
> + struct blkcg_gq *blkg = bio->bi_blkg;
> bool issue_as_root = bio_issue_as_root_blkg(bio);
>
> if (!blk_iolatency_enabled(blkiolat))
> return;
>
> - rcu_read_lock();
> - bio_associate_blkcg(bio, NULL);
> - blkcg = bio_blkcg(bio);
> - blkg = blkg_lookup(blkcg, q);
> - if (unlikely(!blkg)) {
> - if (!lock)
> - spin_lock_irq(q->queue_lock);
> - blkg = __blkg_lookup_create(blkcg, q);
> - if (IS_ERR(blkg))
> - blkg = NULL;
> - if (!lock)
> - spin_unlock_irq(q->queue_lock);
> - }
> - if (!blkg)
> - goto out;
> -
> - bio_issue_init(&bio->bi_issue, bio_sectors(bio));
> - bio_associate_blkg(bio, blkg);
> -out:
> - rcu_read_unlock();
Move this removal to the previous patch, so you keep this patch soley about the
bio_issue_init. Thanks,
Josef
next prev parent reply other threads:[~2018-08-31 15:42 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-31 1:53 [PATCH 00/15] blkcg ref count refactor/cleanup + blkcg avg_lat Dennis Zhou
2018-08-31 1:53 ` [PATCH 01/15] Revert "blk-throttle: fix race between blkcg_bio_issue_check() and cgroup_rmdir()" Dennis Zhou
2018-08-31 1:53 ` [PATCH 02/15] blkcg: delay blkg destruction until after writeback has finished Dennis Zhou
2018-08-31 15:27 ` Josef Bacik
2018-08-31 20:19 ` Dennis Zhou
2018-08-31 1:53 ` [PATCH 03/15] blkcg: use tryget logic when associating a blkg with a bio Dennis Zhou
2018-08-31 15:30 ` Josef Bacik
2018-08-31 20:20 ` Dennis Zhou
2018-08-31 1:53 ` [PATCH 04/15] blkcg: fix ref count issue with bio_blkcg using task_css Dennis Zhou
2018-08-31 15:35 ` Josef Bacik
2018-08-31 23:04 ` Tejun Heo
2018-09-06 15:21 ` Dennis Zhou
2018-08-31 1:53 ` [PATCH 05/15] blkcg: update blkg_lookup_create to do locking Dennis Zhou
2018-08-31 15:37 ` Josef Bacik
2018-08-31 23:09 ` Tejun Heo
2018-08-31 1:53 ` [PATCH 06/15] blkcg: always associate a bio with a blkg Dennis Zhou
2018-08-31 9:01 ` kbuild test robot
2018-08-31 10:02 ` kbuild test robot
2018-08-31 23:16 ` Tejun Heo
2018-09-06 20:41 ` Dennis Zhou
2018-09-07 3:03 ` [LKP] [blkcg] c02c58dab2: WARNING:at_block/blk-throttle.c:#blk_throtl_bio kernel test robot
2018-08-31 1:53 ` [PATCH 07/15] blkcg: consolidate bio_issue_init and blkg association Dennis Zhou
2018-08-31 9:19 ` kbuild test robot
2018-08-31 11:11 ` kbuild test robot
2018-08-31 15:42 ` Josef Bacik [this message]
2018-09-06 20:43 ` Dennis Zhou
2018-08-31 23:45 ` Tejun Heo
2018-08-31 1:53 ` [PATCH 08/15] blkcg: associate a blkg for pages being evicted by swap Dennis Zhou
2018-08-31 15:44 ` Josef Bacik
2018-08-31 23:47 ` Tejun Heo
2018-08-31 1:53 ` [PATCH 09/15] blkcg: associate writeback bios with a blkg Dennis Zhou
2018-08-31 15:45 ` Josef Bacik
2018-08-31 23:53 ` Tejun Heo
2018-08-31 1:53 ` [PATCH 10/15] blkcg: remove bio->bi_css and instead use bio->bi_blkg Dennis Zhou
2018-08-31 15:46 ` Josef Bacik
2018-09-01 0:13 ` Tejun Heo
2018-08-31 1:53 ` [PATCH 11/15] blkcg: remove additional reference to the css Dennis Zhou
2018-09-01 0:26 ` Tejun Heo
2018-09-06 20:45 ` Dennis Zhou
2018-08-31 1:53 ` [PATCH 12/15] blkcg: cleanup and make blk_get_rl use blkg_lookup_create Dennis Zhou
2018-09-01 0:29 ` Tejun Heo
2018-09-11 2:37 ` [LKP] [blkcg] 22f657e287: general_protection_fault:#[##] kernel test robot
2018-08-31 1:53 ` [PATCH 13/15] blkcg: change blkg reference counting to use percpu_ref Dennis Zhou
2018-08-31 15:49 ` Josef Bacik
2018-09-01 0:31 ` Tejun Heo
2018-09-06 20:46 ` Dennis Zhou
2018-09-07 3:08 ` [LKP] [blkcg] 6ef69a3a0b: WARNING:suspicious_RCU_usage kernel test robot
2018-08-31 1:53 ` [PATCH 14/15] blkcg: rename blkg_try_get to blkg_tryget Dennis Zhou
2018-08-31 15:50 ` Josef Bacik
2018-09-01 0:32 ` Tejun Heo
2018-08-31 1:53 ` [PATCH 15/15] blkcg: add average latency tracking to blk-cgroup Dennis Zhou
2018-08-31 10:22 ` kbuild test robot
2018-08-31 11:38 ` kbuild test robot
2018-09-01 0:35 ` [PATCH 00/15] blkcg ref count refactor/cleanup + blkcg avg_lat Tejun Heo
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=20180831154225.zoiztxvdvcfaat5r@destiny \
--to=josef@toxicpanda.com \
--cc=axboe@kernel.dk \
--cc=cgroups@vger.kernel.org \
--cc=dennisszhou@gmail.com \
--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).