From patchwork Tue Jul 3 15:15:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 10504375 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D090360325 for ; Tue, 3 Jul 2018 15:15:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF773285FE for ; Tue, 3 Jul 2018 15:15:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B399E28B22; Tue, 3 Jul 2018 15:15:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4FE3B285FE for ; Tue, 3 Jul 2018 15:15:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934128AbeGCPPf (ORCPT ); Tue, 3 Jul 2018 11:15:35 -0400 Received: from mail-qk0-f194.google.com ([209.85.220.194]:40028 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933976AbeGCPPZ (ORCPT ); Tue, 3 Jul 2018 11:15:25 -0400 Received: by mail-qk0-f194.google.com with SMTP id b129-v6so1172015qke.7 for ; Tue, 03 Jul 2018 08:15:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rK+g+n++4fj1IWgn3YY+eDm5aFRppdp3RZ5KsDgMXmQ=; b=pq/OeWdht0SZnVaQKzKb89+YHeqPE9j7aHlU02mM8IfiZebQpZrMdXwKLin4NdRfGs vbFr3JVcyhKLV89cwv9xCmnmmKCY7m4P5Vmz27UUtlX0KdbDSzhNuZkgBvdQaH2TgJ5Z sF43uzxEHLALG0ch7WCB0OrHrHjYiKgBXm+1osCnlXD5HvUjwi9C/63EMJK0NRI/jwrT 3DwzeeW6L5941lAohydgXiLU8rp8KcmkDDNQ2jqX2XZK60zrFpcfVmZo6q0TzViIqkU1 5HpQ9+i3q4PbtNkcs4LXR8kbbIuB7ZKVZeNFiz/FKAhkiQCVcGjjYsmxhPIw1XAcs2xC bG9w== 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=rK+g+n++4fj1IWgn3YY+eDm5aFRppdp3RZ5KsDgMXmQ=; b=hWuGOofOv3VrI0+R9pqYgd/w0ZrZB3CX6t5QYppDRmjF82A8Mzb/aIygqLM+u9wP4f tGzIBIAttE0oiTmu+5JTVbMKZWfNDz3V65Gfb5UnohMDbRV3DtWateIkXSr/ZMqdd2zg jsVUi7AI7gszyLj5YS7+DhlUeuTjQhjuXYFXsO8uSbAqK53+XTiTFvYtTt/kRiNPYl8Z QX+L4EtrFS2WTnns67XReZenGJVG2DUbWcGDJ3oIKd5nbqkwPMMHAc7bqlXWecGY3/s3 8ydhDzBH3ntZRYkfZrveGBSUg2rsNLjNqsfHi4C5uhJu9BBl+XDBAVplaswIAQmulXXP g3LA== X-Gm-Message-State: APt69E3JTlbrNdwEcz07QN76RXaFCMDYY11NVwR5C0/DRFXmLomJQ2xA Nwo3cPMAn7VvLKnnrIJnCFY4hA== X-Google-Smtp-Source: AAOMgpdlvnU+a4my6xXGhhITtuQAQH/QXzLDJFIBWmXQTrYy7hF8BCTD998ibeiLcYZx/pPRvgde9A== X-Received: by 2002:a37:9605:: with SMTP id y5-v6mr25232445qkd.236.1530630924302; Tue, 03 Jul 2018 08:15:24 -0700 (PDT) Received: from localhost ([107.15.81.208]) by smtp.gmail.com with ESMTPSA id e63-v6sm905225qkj.62.2018.07.03.08.15.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 08:15:23 -0700 (PDT) From: Josef Bacik To: axboe@kernel.dk, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, hannes@cmpxchg.org, tj@kernel.org, linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, kernel-team@fb.com Cc: Josef Bacik Subject: [PATCH 11/14] rq-qos: introduce dio_bio callback Date: Tue, 3 Jul 2018 11:15:00 -0400 Message-Id: <20180703151503.2549-12-josef@toxicpanda.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180703151503.2549-1-josef@toxicpanda.com> References: <20180703151503.2549-1-josef@toxicpanda.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Josef Bacik wbt cares only about request completion time, but controllers may need information that is on the bio itself, so add a done_bio callback for rq-qos so things like blk-iolatency can use it to have the bio when it completes. Signed-off-by: Josef Bacik --- block/bio.c | 4 ++++ block/blk-rq-qos.c | 10 ++++++++++ block/blk-rq-qos.h | 2 ++ 3 files changed, 16 insertions(+) diff --git a/block/bio.c b/block/bio.c index e09f3626ab5b..5df998515adc 100644 --- a/block/bio.c +++ b/block/bio.c @@ -32,6 +32,7 @@ #include #include "blk.h" +#include "blk-rq-qos.h" /* * Test patch to inline a certain number of bi_io_vec's inside the bio @@ -1808,6 +1809,9 @@ void bio_endio(struct bio *bio) if (!bio_integrity_endio(bio)) return; + if (bio->bi_disk) + rq_qos_done_bio(bio->bi_disk->queue, bio); + /* * Need to have a real endio function for chained bios, otherwise * various corner cases will break (like stacking block devices that diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c index b7b02e04f64f..5134b24482f6 100644 --- a/block/blk-rq-qos.c +++ b/block/blk-rq-qos.c @@ -88,6 +88,16 @@ void rq_qos_track(struct request_queue *q, struct request *rq, struct bio *bio) } } +void rq_qos_done_bio(struct request_queue *q, struct bio *bio) +{ + struct rq_qos *rqos; + + for(rqos = q->rq_qos; rqos; rqos = rqos->next) { + if (rqos->ops->done_bio) + rqos->ops->done_bio(rqos, bio); + } +} + /* * Return true, if we can't increase the depth further by scaling */ diff --git a/block/blk-rq-qos.h b/block/blk-rq-qos.h index a6d13b8ce0dc..d5e2f68fe41e 100644 --- a/block/blk-rq-qos.h +++ b/block/blk-rq-qos.h @@ -30,6 +30,7 @@ struct rq_qos_ops { void (*issue)(struct rq_qos *, struct request *); void (*requeue)(struct rq_qos *, struct request *); void (*done)(struct rq_qos *, struct request *); + void (*done_bio)(struct rq_qos *, struct bio *); void (*cleanup)(struct rq_qos *, struct bio *); void (*exit)(struct rq_qos *); }; @@ -101,6 +102,7 @@ void rq_qos_cleanup(struct request_queue *, struct bio *); void rq_qos_done(struct request_queue *, struct request *); void rq_qos_issue(struct request_queue *, struct request *); void rq_qos_requeue(struct request_queue *, struct request *); +void rq_qos_done_bio(struct request_queue *q, struct bio *bio); void rq_qos_throttle(struct request_queue *, struct bio *, spinlock_t *); void rq_qos_track(struct request_queue *q, struct request *, struct bio *); void rq_qos_exit(struct request_queue *);