From: Liu Bo <obuil.liubo@gmail.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 05/12] blkcg: consolidate bio_issue_init to be a part of core
Date: Fri, 7 Sep 2018 12:18:18 -0700 [thread overview]
Message-ID: <CANQeFDAx=mVKL-Zxey04V4LfiHDpoEcUiBg=rQXFoAn947UmSg@mail.gmail.com> (raw)
In-Reply-To: <20180906211045.29055-6-dennisszhou@gmail.com>
On Thu, Sep 6, 2018 at 2:10 PM, Dennis Zhou <dennisszhou@gmail.com> wrote:
> From: "Dennis Zhou (Facebook)" <dennisszhou@gmail.com>
>
> bio_issue_init among other things initializes the timestamp for an IO.
> Rather than have this logic handled by policies, this consolidates it to
> be on the init paths (normal, clone, bounce clone).
>
Looks good.
Reviewed-by: Liu Bo <bo.liu@linux.alibaba.com>
thanks,
liubo
> Signed-off-by: Dennis Zhou <dennisszhou@gmail.com>
> Acked-by: Tejun Heo <tj@kernel.org>
> ---
> v2: Association path consolidation was moved to the prior patch.
>
> block/bio.c | 2 ++
> block/blk-iolatency.c | 2 --
> block/blk-throttle.c | 8 --------
> block/bounce.c | 2 ++
> include/linux/blk-cgroup.h | 9 +++++++++
> 5 files changed, 13 insertions(+), 10 deletions(-)
>
> diff --git a/block/bio.c b/block/bio.c
> index b2b3fddfcd6f..a05997bdb967 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);
> +
> + blkcg_bio_issue_init(bio);
> }
> EXPORT_SYMBOL(__bio_clone_fast);
>
> diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c
> index 79a7549e2062..9d7052bad6f7 100644
> --- a/block/blk-iolatency.c
> +++ b/block/blk-iolatency.c
> @@ -401,8 +401,6 @@ static void blkcg_iolatency_throttle(struct rq_qos *rqos, struct bio *bio,
> if (!blk_iolatency_enabled(blkiolat))
> return;
>
> - bio_issue_init(&bio->bi_issue, bio_sectors(bio));
> -
> while (blkg && blkg->parent) {
> struct iolatency_grp *iolat = blkg_to_lat(blkg);
> if (!iolat) {
> diff --git a/block/blk-throttle.c b/block/blk-throttle.c
> index b7b5cc4defc2..f2b355338894 100644
> --- a/block/blk-throttle.c
> +++ b/block/blk-throttle.c
> @@ -2126,13 +2126,6 @@ static inline void throtl_update_latency_buckets(struct throtl_data *td)
> }
> #endif
>
> -static void blk_throtl_assoc_bio(struct throtl_grp *tg, struct bio *bio)
> -{
> -#ifdef CONFIG_BLK_DEV_THROTTLING_LOW
> - bio_issue_init(&bio->bi_issue, bio_sectors(bio));
> -#endif
> -}
> -
> bool blk_throtl_bio(struct request_queue *q, struct blkcg_gq *blkg,
> struct bio *bio)
> {
> @@ -2156,7 +2149,6 @@ bool blk_throtl_bio(struct request_queue *q, struct blkcg_gq *blkg,
> if (unlikely(blk_queue_bypass(q)))
> goto out_unlock;
>
> - blk_throtl_assoc_bio(tg, bio);
> blk_throtl_update_idletime(tg);
>
> sq = &tg->service_queue;
> diff --git a/block/bounce.c b/block/bounce.c
> index bc63b3a2d18c..7a08703b1204 100644
> --- a/block/bounce.c
> +++ b/block/bounce.c
> @@ -259,6 +259,8 @@ static struct bio *bounce_clone_bio(struct bio *bio_src, gfp_t gfp_mask,
>
> bio_clone_blkcg_association(bio, bio_src);
>
> + blkcg_bio_issue_init(bio);
> +
> return bio;
> }
>
> diff --git a/include/linux/blk-cgroup.h b/include/linux/blk-cgroup.h
> index 6e33ad1d92b4..a6b6e741a75e 100644
> --- a/include/linux/blk-cgroup.h
> +++ b/include/linux/blk-cgroup.h
> @@ -897,6 +897,12 @@ static inline bool blk_throtl_bio(struct request_queue *q, struct blkcg_gq *blkg
> struct bio *bio) { return false; }
> #endif
>
> +
> +static inline void blkcg_bio_issue_init(struct bio *bio)
> +{
> + bio_issue_init(&bio->bi_issue, bio_sectors(bio));
> +}
> +
> static inline bool blkcg_bio_issue_check(struct request_queue *q,
> struct bio *bio)
> {
> @@ -922,6 +928,8 @@ static inline bool blkcg_bio_issue_check(struct request_queue *q,
> blkg_rwstat_add(&blkg->stat_ios, bio->bi_opf, 1);
> }
>
> + blkcg_bio_issue_init(bio);
> +
> rcu_read_unlock();
> return !throtl;
> }
> @@ -1034,6 +1042,7 @@ static inline void blk_put_rl(struct request_list *rl) { }
> static inline void blk_rq_set_rl(struct request *rq, struct request_list *rl) { }
> static inline struct request_list *blk_rq_rl(struct request *rq) { return &rq->q->root_rl; }
>
> +static inline void blkcg_bio_issue_init(struct bio *bio) { }
> static inline bool blkcg_bio_issue_check(struct request_queue *q,
> struct bio *bio) { return true; }
>
> --
> 2.17.1
>
next prev parent reply other threads:[~2018-09-07 19:18 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-06 21:10 [PATCH 00/12] block: always associate blkg and refcount cleanup Dennis Zhou
2018-09-06 21:10 ` [PATCH 01/12] blkcg: fix ref count issue with bio_blkcg using task_css Dennis Zhou
2018-09-07 16:52 ` Tejun Heo
2018-09-06 21:10 ` [PATCH 02/12] blkcg: update blkg_lookup_create to do locking Dennis Zhou
2018-09-07 6:17 ` Liu Bo
2018-09-06 21:10 ` [PATCH 03/12] blkcg: convert blkg_lookup_create to find closest blkg Dennis Zhou
2018-09-07 17:27 ` Tejun Heo
2018-09-07 20:33 ` Dennis Zhou
2018-09-06 21:10 ` [PATCH 04/12] blkcg: always associate a bio with a blkg Dennis Zhou
2018-09-06 21:10 ` [PATCH 05/12] blkcg: consolidate bio_issue_init to be a part of core Dennis Zhou
2018-09-07 19:18 ` Liu Bo [this message]
2018-09-06 21:10 ` [PATCH 06/12] blkcg: associate a blkg for pages being evicted by swap Dennis Zhou
2018-09-06 21:10 ` [PATCH 07/12] blkcg: associate writeback bios with a blkg Dennis Zhou
2018-09-06 21:10 ` [PATCH 08/12] blkcg: remove bio->bi_css and instead use bio->bi_blkg Dennis Zhou
2018-09-06 21:10 ` [PATCH 09/12] blkcg: remove additional reference to the css Dennis Zhou
2018-09-07 17:54 ` Tejun Heo
2018-09-07 20:24 ` Dennis Zhou
2018-09-06 21:10 ` [PATCH 10/12] blkcg: cleanup and make blk_get_rl use blkg_lookup_create Dennis Zhou
2018-09-11 5:11 ` [LKP] [blkcg] 1d0e59f90b: BUG:unable_to_handle_kernel kernel test robot
2018-09-06 21:10 ` [PATCH 11/12] blkcg: change blkg reference counting to use percpu_ref Dennis Zhou
2018-09-07 17:59 ` Tejun Heo
2018-09-06 21:10 ` [PATCH 12/12] blkcg: rename blkg_try_get to blkg_tryget Dennis Zhou
2018-09-11 18:41 [PATCH v3 00/12] block: always associate blkg and refcount cleanup Dennis Zhou
2018-09-11 18:41 ` [PATCH 05/12] blkcg: consolidate bio_issue_init to be a part of core 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='CANQeFDAx=mVKL-Zxey04V4LfiHDpoEcUiBg=rQXFoAn947UmSg@mail.gmail.com' \
--to=obuil.liubo@gmail.com \
--cc=axboe@kernel.dk \
--cc=cgroups@vger.kernel.org \
--cc=dennisszhou@gmail.com \
--cc=hannes@cmpxchg.org \
--cc=josef@toxicpanda.com \
--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).