From patchwork Tue Jun 13 17:15:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 9784393 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 8EEFC60212 for ; Tue, 13 Jun 2017 17:15:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 747612853F for ; Tue, 13 Jun 2017 17:15:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 696F02858F; Tue, 13 Jun 2017 17:15:39 +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=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 1860F2853F for ; Tue, 13 Jun 2017 17:15:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753535AbdFMRPh (ORCPT ); Tue, 13 Jun 2017 13:15:37 -0400 Received: from mail-io0-f172.google.com ([209.85.223.172]:36456 "EHLO mail-io0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753524AbdFMRPe (ORCPT ); Tue, 13 Jun 2017 13:15:34 -0400 Received: by mail-io0-f172.google.com with SMTP id y77so77591200ioe.3 for ; Tue, 13 Jun 2017 10:15:34 -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=23baSPA5/62H+CPCfpwn8uYdvQ7xp2GTFjVomJdDk0w=; b=EdNSNLebcolkrYm8mrmngRAD+7yTKQ/E/ITSfzrDbicDUSjDMZ5kZ+uPJL4bv2HNol Us8dElgfg4vKuXamKt50n+kcrA7qu77ZTZ9ikuEjL1JJ5AwRWigk/G42iBJm4MLu9pvs RV3cQGS5UUqbxE0XppHQnW2wShDIz0LQkb3KlGaaHWjcE5C2yODuvdEVpFyF673gTpW0 r5CjOu42+IWZAAZrT8DVWnwxib6s24FBLhoAiRcOh2O9EwgLg4ZljxBpFecQAkmBx2Rc cTYCqs9vMjWYLOUG/1dmOK6kDRCqv9k2+xBncCndv+qgr5QP6QClPbMgn+lXJGKpfFC/ ka3w== 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=23baSPA5/62H+CPCfpwn8uYdvQ7xp2GTFjVomJdDk0w=; b=BedNzkPjZXkas9PBPiwwU11fbhbCIzPUetZ5zxSS/cdHoh7Na1YkKU8J2JYyaW+b4W Bx48LnXAL3u+sjtWRkAn6rsQszviQVbKx8uU8zJOqVchfOHwR/zqtUeGDV08ITxV72nz 5rhWk55PyWfw70IY9ofdD0kkFj5gMqsrk0pGOBMYi0oQ5QtBmWjJ9lgHHVgsHUzXh6n8 wZFRjVNmH0BbsvjjpOSovMdQLMjqhMyIwg/TAfZflykVLT3iy9l6URWtzU0eftX/P+pP hfwVmzqOD0cvEzyBQ5wkcQLPHlSOZwKkp5W9CjREfs+FJ6fk/d/J5R7+oChRg63BvSTz Tuog== X-Gm-Message-State: AKS2vOz+KCWnF+Cax6c+bXncYSNGKBFObCBjqLFfTXQwSxNAHf18Rbpp tFJDoT0cGn0KU+uexlL3wg== X-Received: by 10.107.16.65 with SMTP id y62mr1272767ioi.105.1497374133542; Tue, 13 Jun 2017 10:15:33 -0700 (PDT) Received: from localhost.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id y188sm6217526ity.9.2017.06.13.10.15.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Jun 2017 10:15:32 -0700 (PDT) From: Jens Axboe To: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 06/11] fs: add O_DIRECT support for sending down bio stream information Date: Tue, 13 Jun 2017 11:15:18 -0600 Message-Id: <1497374123-15286-7-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 Signed-off-by: Jens Axboe Reviewed-by: Andreas Dilger --- fs/block_dev.c | 2 ++ fs/direct-io.c | 2 ++ fs/iomap.c | 1 + 3 files changed, 5 insertions(+) diff --git a/fs/block_dev.c b/fs/block_dev.c index 519599dddd36..284b8a786283 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -227,6 +227,7 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter, bio.bi_iter.bi_sector = pos >> 9; bio.bi_private = current; bio.bi_end_io = blkdev_bio_end_io_simple; + bio.bi_stream = iocb_streamid(iocb); ret = bio_iov_iter_get_pages(&bio, iter); if (unlikely(ret)) @@ -360,6 +361,7 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages) bio->bi_iter.bi_sector = pos >> 9; bio->bi_private = dio; bio->bi_end_io = blkdev_bio_end_io; + bio->bi_stream = iocb_streamid(iocb); ret = bio_iov_iter_get_pages(bio, iter); if (unlikely(ret)) { diff --git a/fs/direct-io.c b/fs/direct-io.c index a04ebea77de8..c9c8b9fd4329 100644 --- a/fs/direct-io.c +++ b/fs/direct-io.c @@ -386,6 +386,8 @@ dio_bio_alloc(struct dio *dio, struct dio_submit *sdio, else bio->bi_end_io = dio_bio_end_io; + bio->bi_stream = iocb_streamid(dio->iocb); + sdio->bio = bio; sdio->logical_offset_in_bio = sdio->cur_page_fs_offset; } diff --git a/fs/iomap.c b/fs/iomap.c index 4b10892967a5..fa7d29632fbc 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -804,6 +804,7 @@ iomap_dio_actor(struct inode *inode, loff_t pos, loff_t length, if (dio->flags & IOMAP_DIO_WRITE) { bio_set_op_attrs(bio, REQ_OP_WRITE, REQ_SYNC | REQ_IDLE); + bio_set_streamid(bio, inode_streamid(inode)); task_io_account_write(bio->bi_iter.bi_size); } else { bio_set_op_attrs(bio, REQ_OP_READ, 0);