From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25A81C6778D for ; Tue, 11 Sep 2018 18:42:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B413420865 for ; Tue, 11 Sep 2018 18:42:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Bj66zp2g" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B413420865 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728262AbeIKXmZ (ORCPT ); Tue, 11 Sep 2018 19:42:25 -0400 Received: from mail-yw1-f65.google.com ([209.85.161.65]:39310 "EHLO mail-yw1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726980AbeIKXmY (ORCPT ); Tue, 11 Sep 2018 19:42:24 -0400 Received: by mail-yw1-f65.google.com with SMTP id m62-v6so9618264ywd.6; Tue, 11 Sep 2018 11:41:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GI3MCHL3A7+L+J3rxJiRbY56/62rtOZb0piAM7a57EY=; b=Bj66zp2gN3+rTR3LC8usrQseah6hbuFRqF+Fl2FtJ+bgWtoazQ18dVYdThuOukpu1L WeVYsZFmKa7ib+wHOAD96GJekDCdpd+6jQ6Q8C4H7Jz2/0EyfWdOB5ZdRgNHmcw8Ywhi 6p/SVEoEjNaRyPjr9TGINo6r1oS0/Z9BVFgbj5mR0y2vayC0YY+RNJ4gIFQ5AEQJCyhL IZNCwu4Q8Kb/JzoYEj4UGXnQtFt+KlB7JoXR2e5X3CARfHggQmXhrVCpcwxcfMRWsP7q cRyovgt6rHGGIf3iv/wVz2p16sRZtPalNdQP7opzoqwKjWRpjVKLTalEZu4wlPhpVb1F I2yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GI3MCHL3A7+L+J3rxJiRbY56/62rtOZb0piAM7a57EY=; b=LmUiW9u2z/lvoRlsEa7E30pjcuboHCHG6+KF2L0KinR6ThlZ/C4ScUu6v8yrcoL4TX l/wKzWh889KSWnyiAIMPP4LTXOy8sKr1rrjVP1KJtoybdDgVXicHnV8Z7BKdSqKcM8pK Jsv47reQ+xv4iwVIcEQ/QkEVJY+CqcYJZ9sVMeGWmNUpAC/0CGh7VRTdRSdXXPARw0Bv WCoP4755kTDXtx8ygIMVDQRkcRTk0MYebxiC71NT6a9HQyAJfGgwDaGD1zhYMZcdoWik oViNZvjvWWHKPlHoKG5ay/Tmz+R2vvQrLeYb+vtxWW8/rs0I+AZvOjvcvtlZl3E03Q2R CqNQ== X-Gm-Message-State: APzg51Bad1DFGpNAXpIErxC9if158hh/wRKND0TGkbkE1PMF9sEsHW+A ZFvLFQ1PhKtgPROZDgowh9Y= X-Google-Smtp-Source: ANB0VdZQcqmbwFvv5QEA+wzFUFpts2c87FGwv0D6lbZS2JXiBBbLdAv5id+9C9uwX7ZiDPmmGX1big== X-Received: by 2002:a81:f95:: with SMTP id 143-v6mr12540403ywp.91.1536691308587; Tue, 11 Sep 2018 11:41:48 -0700 (PDT) Received: from dennisz-mbp.thefacebook.com ([199.201.65.129]) by smtp.gmail.com with ESMTPSA id i123-v6sm7902875ywe.14.2018.09.11.11.41.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Sep 2018 11:41:47 -0700 (PDT) From: Dennis Zhou To: Jens Axboe , Tejun Heo , Johannes Weiner , Josef Bacik Cc: kernel-team@fb.com, linux-block@vger.kernel.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, "Dennis Zhou (Facebook)" Subject: [PATCH 05/12] blkcg: consolidate bio_issue_init to be a part of core Date: Tue, 11 Sep 2018 14:41:30 -0400 Message-Id: <20180911184137.35897-6-dennisszhou@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20180911184137.35897-1-dennisszhou@gmail.com> References: <20180911184137.35897-1-dennisszhou@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Dennis Zhou (Facebook)" 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). Signed-off-by: Dennis Zhou Acked-by: Tejun Heo Reviewed-by: Liu Bo --- 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 97c1c4bf8df6..1d28d7ad2342 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