From patchwork Tue Jun 13 17:15:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 9784421 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 93C4360212 for ; Tue, 13 Jun 2017 17:15:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 798FD2857E for ; Tue, 13 Jun 2017 17:15:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6EC6328676; Tue, 13 Jun 2017 17:15:56 +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=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 146492857E for ; Tue, 13 Jun 2017 17:15:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753498AbdFMRPb (ORCPT ); Tue, 13 Jun 2017 13:15:31 -0400 Received: from mail-io0-f173.google.com ([209.85.223.173]:33359 "EHLO mail-io0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752109AbdFMRP2 (ORCPT ); Tue, 13 Jun 2017 13:15:28 -0400 Received: by mail-io0-f173.google.com with SMTP id t87so57861991ioe.0 for ; Tue, 13 Jun 2017 10:15:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xtPUIwpZhtvy/hbwZsfEjFvz9wUJQv0NT3Qcea1Gv6c=; b=0wOvuVlsFy7CWg0Bq88a05IXY9/a/IvdFegE8abQB5iKi7e8sLMAUTJh/50PXGGE+c +QTDtP0oBVbhmqyP6YDGAAc/InOBnrTT8gxTVGOwIeUQgzPMbK7KMNIgYYWbnLy80AGt jJNa/gO2alHWqyh31znvjFcc5GI4Snl9ambvN2OPNBFjd8ilsr+w2jvFUojWY9rKjzEt PNOwB6jxkiFyDKt0bwzjF38+MBfMygTG/GJ49UtZ+M24gZKWE/N8KmkQJ4Y0QOiQ972o cAphdiXlRvcsF4kuHkpm2nysCYXK4WNL5Q+h2CAxZp3JEO6HRQPMD5Swg5W8QgGtw/N9 U9iQ== 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=xtPUIwpZhtvy/hbwZsfEjFvz9wUJQv0NT3Qcea1Gv6c=; b=tFyah1slBsmzmNTO1W5ISxuCEkyliOZfYYYCxZNb+su8jaKUYd512p0Ufatcdo/zBz b7Tk+bUKLKIdm2Yn7981yfoqYvfTOFX+PWiBcazwih0ryElhb5xuF5FGTWPX8V9l8TSm wRhLAVQkXyhO0BWl2haJE3G/UU9ZLz1s5/ufigLafxrPqgzbx//wC6CQ7DBA42laTjmO 91r3AeSqDIs1uNIX+3n0c7rZML8TLUNdb54R/e765BhndtyDZQpklxB7tLF0i8z6Yaz5 rslFTMxF127xCNF2GAf4qZMI1wsxGhXiVK0sxtVXqPyT/53IAJY/LtH4Mmm1rDPJE3LD qQ4w== X-Gm-Message-State: AKS2vOzZ+cicFjVVo1ZNS6Cuqzi5fLu8shQaaTE/TH4qemZE8ZQf8PM5 EDiUwvy61vUOdqZ8 X-Received: by 10.107.51.201 with SMTP id z192mr1241710ioz.210.1497374127811; Tue, 13 Jun 2017 10:15:27 -0700 (PDT) Received: from localhost.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id y188sm6217526ity.9.2017.06.13.10.15.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Jun 2017 10:15:27 -0700 (PDT) From: Jens Axboe To: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 01/11] block: add support for carrying stream information in a bio Date: Tue, 13 Jun 2017 11:15:13 -0600 Message-Id: <1497374123-15286-2-git-send-email-axboe@kernel.dk> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497374123-15286-1-git-send-email-axboe@kernel.dk> References: <1497374123-15286-1-git-send-email-axboe@kernel.dk> 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 No functional changes in this patch, but it allows each bio to carry a stream ID and disallows merging of bio's with different stream IDs. Signed-off-by: Jens Axboe Reviewed-by: Andreas Dilger --- block/bio.c | 2 ++ block/blk-merge.c | 14 ++++++++++++++ include/linux/blk_types.h | 17 +++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/block/bio.c b/block/bio.c index 888e7801c638..77f4be1f7428 100644 --- a/block/bio.c +++ b/block/bio.c @@ -595,6 +595,7 @@ void __bio_clone_fast(struct bio *bio, struct bio *bio_src) bio->bi_opf = bio_src->bi_opf; bio->bi_iter = bio_src->bi_iter; bio->bi_io_vec = bio_src->bi_io_vec; + bio->bi_stream = bio_src->bi_stream; bio_clone_blkcg_association(bio, bio_src); } @@ -678,6 +679,7 @@ struct bio *bio_clone_bioset(struct bio *bio_src, gfp_t gfp_mask, bio->bi_opf = bio_src->bi_opf; bio->bi_iter.bi_sector = bio_src->bi_iter.bi_sector; bio->bi_iter.bi_size = bio_src->bi_iter.bi_size; + bio->bi_stream = bio_src->bi_stream; switch (bio_op(bio)) { case REQ_OP_DISCARD: diff --git a/block/blk-merge.c b/block/blk-merge.c index 3990ae406341..28998acdd675 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -693,6 +693,13 @@ static struct request *attempt_merge(struct request_queue *q, return NULL; /* + * Don't allow merge of different streams, or for a stream with + * non-stream IO. + */ + if (req->bio->bi_stream != next->bio->bi_stream) + return NULL; + + /* * If we are allowed to merge, then append bio list * from next to rq and release next. merge_requests_fn * will have updated segment counts, update sector @@ -811,6 +818,13 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio) !blk_write_same_mergeable(rq->bio, bio)) return false; + /* + * Don't allow merge of different streams, or for a stream with + * non-stream IO. + */ + if (rq->bio->bi_stream != bio->bi_stream) + return false; + return true; } diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index 61339bc44400..1940876a7fa7 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -36,6 +36,8 @@ struct bio { unsigned short bi_flags; /* status, etc and bvec pool number */ unsigned short bi_ioprio; + unsigned int bi_stream; /* write life time hint */ + struct bvec_iter bi_iter; /* Number of segments in this BIO after @@ -312,4 +314,19 @@ struct blk_rq_stat { u64 batch; }; +static inline void bio_set_streamid(struct bio *bio, unsigned int stream) +{ + bio->bi_stream = stream; +} + +static inline bool bio_stream_valid(struct bio *bio) +{ + return bio->bi_stream != 0; +} + +static inline unsigned int bio_stream(struct bio *bio) +{ + return bio->bi_stream; +} + #endif /* __LINUX_BLK_TYPES_H */