From patchwork Mon Jun 19 17:04:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 9796933 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 961EE6020B for ; Mon, 19 Jun 2017 17:05:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B1881FF20 for ; Mon, 19 Jun 2017 17:05:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6FF5027EE2; Mon, 19 Jun 2017 17:05:34 +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 D6AAB1FF20 for ; Mon, 19 Jun 2017 17:05:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752660AbdFSRFb (ORCPT ); Mon, 19 Jun 2017 13:05:31 -0400 Received: from mail-io0-f174.google.com ([209.85.223.174]:33837 "EHLO mail-io0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752088AbdFSRFR (ORCPT ); Mon, 19 Jun 2017 13:05:17 -0400 Received: by mail-io0-f174.google.com with SMTP id i7so68375673ioe.1 for ; Mon, 19 Jun 2017 10:05:17 -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=if0ZUXzQTjgUiBuTNxBkSBOqPGInsMl4l/p70Bt8PEU=; b=BlLN5rMkgt2s6Cho5fareQkhLYhewdjhhGoavDEQ2H97noyx5Belm/ecziXf9ALce8 hnEd0RjVErM6TLDysNV2jkuG42bXmbj2NZLSN1R+VzFFLeZ2aZqfatx3rUdCrl/BVF7S UPrCT/hzsrCaqN5hcgwQWE4q2ZnQlQ9g8s+yFAwF3o0FlHVzRFOg7cT8jFDCLWMcgrHh IFLyl3aBeYUaUiTRQc5noi4hQyktpw07KBSeNuU+kReXg6fied9g6ofDYuicFd/2WZiK eX82OHCe29NRyYmkqqQD4pb8AXBArKTWCKTi3vUovCRemTitCXuTjXiGCcqNR3A/7Vok 0/yQ== 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=if0ZUXzQTjgUiBuTNxBkSBOqPGInsMl4l/p70Bt8PEU=; b=mOKBdadJStjEliKBEON7hTucioYmj8gTLelfixzifbN7xAte9KGvapIBlhayXKAMut r2Jx16/97SH9G1NbM7z7SoLs6lDxlcp0gc2E9EhJNdmzCk9OVBChz4K2koXo92mVh4sN kThv+KuklA0Kqb+XxI0yqm2WOoUrz18jYXZeA/7Zl/uRpG8zn1zK1YpXubGVss/TyOOV EhDijQau0tycX912w7mNNh8pPVIMMjs8R+PfCf1Q+jIe8/vKQ/No9OI08DNmUPm80yjj Lr8zI0AW5tu5YV3sa0lA4WPbxbLJ7xeDK5pKVsae4pf/S0cZEkv+fNHRpEF3c2f+Kxx1 lR9Q== X-Gm-Message-State: AKS2vOwpttL0IhhYEcmK0/tyjxlfzQyf7pZLDrrZfkclXAz1w8EoXVUE DmkGBdsIugDzarEyIxWtWA== X-Received: by 10.107.130.17 with SMTP id e17mr23113964iod.155.1497891911604; Mon, 19 Jun 2017 10:05:11 -0700 (PDT) Received: from localhost.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id 3sm6770522ith.7.2017.06.19.10.05.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Jun 2017 10:05:10 -0700 (PDT) From: Jens Axboe To: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org Cc: adilger@dilger.ca, hch@infradead.org, martin.petersen@oracle.com, linux-nvme@lists.infradead.org, Jens Axboe Subject: [PATCH 5/9] fs: add support for buffered writeback to pass down write hints Date: Mon, 19 Jun 2017 11:04:58 -0600 Message-Id: <1497891902-25737-6-git-send-email-axboe@kernel.dk> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497891902-25737-1-git-send-email-axboe@kernel.dk> References: <1497891902-25737-1-git-send-email-axboe@kernel.dk> 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 Reviewed-by: Andreas Dilger Signed-off-by: Jens Axboe --- fs/buffer.c | 14 +++++++++----- fs/mpage.c | 1 + 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index 306b720f7383..1259524715c8 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -49,7 +49,7 @@ static int fsync_buffers_list(spinlock_t *lock, struct list_head *list); static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh, - struct writeback_control *wbc); + unsigned int stream, struct writeback_control *wbc); #define BH_ENTRY(list) list_entry((list), struct buffer_head, b_assoc_buffers) @@ -1829,7 +1829,8 @@ int __block_write_full_page(struct inode *inode, struct page *page, do { struct buffer_head *next = bh->b_this_page; if (buffer_async_write(bh)) { - submit_bh_wbc(REQ_OP_WRITE, write_flags, bh, wbc); + submit_bh_wbc(REQ_OP_WRITE, write_flags, bh, + inode_write_hint(inode), wbc); nr_underway++; } bh = next; @@ -1883,7 +1884,8 @@ int __block_write_full_page(struct inode *inode, struct page *page, struct buffer_head *next = bh->b_this_page; if (buffer_async_write(bh)) { clear_buffer_dirty(bh); - submit_bh_wbc(REQ_OP_WRITE, write_flags, bh, wbc); + submit_bh_wbc(REQ_OP_WRITE, write_flags, bh, + inode_write_hint(inode), wbc); nr_underway++; } bh = next; @@ -3091,7 +3093,7 @@ void guard_bio_eod(int op, struct bio *bio) } static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh, - struct writeback_control *wbc) + unsigned int write_hint, struct writeback_control *wbc) { struct bio *bio; @@ -3134,6 +3136,8 @@ static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh, op_flags |= REQ_META; if (buffer_prio(bh)) op_flags |= REQ_PRIO; + + op_flags |= write_hint_to_opf(write_hint); bio_set_op_attrs(bio, op, op_flags); submit_bio(bio); @@ -3142,7 +3146,7 @@ static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh, int submit_bh(int op, int op_flags, struct buffer_head *bh) { - return submit_bh_wbc(op, op_flags, bh, NULL); + return submit_bh_wbc(op, op_flags, bh, 0, NULL); } EXPORT_SYMBOL(submit_bh); diff --git a/fs/mpage.c b/fs/mpage.c index 9524fdde00c2..d8a750873bf4 100644 --- a/fs/mpage.c +++ b/fs/mpage.c @@ -615,6 +615,7 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc, goto confused; wbc_init_bio(wbc, bio); + bio->bi_opf |= write_hint_to_opf(inode_write_hint(inode)); } /*