From patchwork Tue May 29 21:17:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 10437109 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 4BDD0602BF for ; Tue, 29 May 2018 21:18:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3DA4728922 for ; Tue, 29 May 2018 21:18:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 325402892C; Tue, 29 May 2018 21:18:38 +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=unavailable 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 B0CAF28922 for ; Tue, 29 May 2018 21:18:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967317AbeE2VSF (ORCPT ); Tue, 29 May 2018 17:18:05 -0400 Received: from mail-qk0-f194.google.com ([209.85.220.194]:46611 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967316AbeE2VRo (ORCPT ); Tue, 29 May 2018 17:17:44 -0400 Received: by mail-qk0-f194.google.com with SMTP id k86-v6so12703019qkh.13 for ; Tue, 29 May 2018 14:17:44 -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=dSeH7X4eYgqrVPYFT9jUU61dwo0oWIAyu4ovKK1OTIw=; b=gzC1pPvSP0hEhGVLf2VcFIaNOFdI61sTvtzRhrEpvPxCjXgjORFm+h0PuvmZTThrlS ZCYC7SZ87b2w0w0WRrtP7vgT144BumbIv04sBR/hV/JWUAjlFb6E3gDRNUXr9Vyhkgo+ +RBQ458myhWw3uCkodrzKbCUSIhCAeQCoubZoMoTAgxfGZPNRSjC+09hcOhJNJLk+zfg Z4nl+2Z5InY/MQ8R2dbIUNZyvwIfvAeZdXOQ8ExHXKRuC5cuPZuLOqr0T5amWbnzhaFD RdOvGKOqzsr/9h0IjwvksjQyX67E/rpks07VAP6Uh0K25YjTNxXD48WXnof+fmAkEOEw S+qA== 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=dSeH7X4eYgqrVPYFT9jUU61dwo0oWIAyu4ovKK1OTIw=; b=FCbJLNEG7aLVSJevM/VZ7V4H35frcotnCNnPHYoJvn1JfYHAEFDat+NPot0i6GtVSe oHOHFL2yBPI9597RwhEmE0/nUHiwXh8mfAzo8vdsQgXfG4/0C3fC6+ncA1LS5qRNgoKV oFVon1C0vOog8mK5LU+g3yShvH2q1ahoBvg9iGOALj7efHMMZiiblQj31lTaZdk2wzLP wdhC5rXu8GfaVRTXvmdBHm+nqE/kqX2uyAGCBcVqHq3A3I26aMOj5MK9JpjcTKS5KLVF LaYPGWcLpkDRmtAeQTxod+rate0OQieLbhOyDS60zZHWSuki9wxFWp2u5pdRFUqUFheE f6Yg== X-Gm-Message-State: APt69E3Eni58Jaas/gszqXid7nrOvegSf5J2bm+8pPdwgHjGwxjtjFDa nlo93zEwfSHq2DybGbHatU4peQ== X-Google-Smtp-Source: ADUXVKJjNwnL2vOTniGhWp8i5OzfzTwb5rJuVf8/NMRTdCKkZgsfjMm2mvAYjKGk7vVEIiYZvwRBBw== X-Received: by 2002:a37:80c4:: with SMTP id b187-v6mr67643qkd.47.1527628663830; Tue, 29 May 2018 14:17:43 -0700 (PDT) Received: from localhost (cpe-2606-A000-4381-1201-225-22FF-FEB3-E51A.dyn6.twc.com. [2606:a000:4381:1201:225:22ff:feb3:e51a]) by smtp.gmail.com with ESMTPSA id o5-v6sm8372729qtm.60.2018.05.29.14.17.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 May 2018 14:17:43 -0700 (PDT) From: Josef Bacik To: axboe@kernel.dk, kernel-team@fb.com, linux-block@vger.kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, hannes@cmpxchg.org, linux-kernel@vger.kernel.org, tj@kernel.org, linux-fsdevel@vger.kernel.org Cc: Josef Bacik Subject: [PATCH 11/13] rq-qos: introduce dio_bio callback Date: Tue, 29 May 2018 17:17:22 -0400 Message-Id: <20180529211724.4531-12-josef@toxicpanda.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180529211724.4531-1-josef@toxicpanda.com> References: <20180529211724.4531-1-josef@toxicpanda.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@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 57c4b1986e76..5b2afd23be7f 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 @@ -1781,6 +1782,9 @@ void bio_endio(struct bio *bio) if (WARN_ONCE(bio->bi_next, "driver left bi_next not NULL")) bio->bi_next = NULL; + 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 501253676dd8..3874e6ad09f0 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 *); }; @@ -86,6 +87,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 *);