From patchwork Thu Jun 15 03:45:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 9788017 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 A758560231 for ; Thu, 15 Jun 2017 03:45:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D7D923F88 for ; Thu, 15 Jun 2017 03:45:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9276F27C2D; Thu, 15 Jun 2017 03:45: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=-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 3FB6D23F88 for ; Thu, 15 Jun 2017 03:45:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752033AbdFODpe (ORCPT ); Wed, 14 Jun 2017 23:45:34 -0400 Received: from mail-pg0-f41.google.com ([74.125.83.41]:34464 "EHLO mail-pg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752080AbdFODpd (ORCPT ); Wed, 14 Jun 2017 23:45:33 -0400 Received: by mail-pg0-f41.google.com with SMTP id v18so1655962pgb.1 for ; Wed, 14 Jun 2017 20:45:32 -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=Q/MuY6mpAAH45lCwY2+yiKnx6JT5qZiqarBRwpcNiM4=; b=EMtf7Edeyxclm5IcQPjjB8FBy/xgnQOz2gGo42k1A7ML+H1IghosNi4iiux+eCO69W e6WoFwtA57sWB49+VF453OZIfns4JQuznm9udIsOgGhn8f8634g1TuuclM9FaX+jx/mb xutG63VBb92oEl8ESBZr70BS7nD9ZAP3TOKRIik4adsJ3FgtFL+D80gP39tqjMLZ+cke 23tHYCpBrzLAvCjQLbv45qg26UFdVRY3WhC1ZopoU5GIlshZ/+REvmwQlPCsHGT4p7GC opc9tnPToEHyN+9LKBrHW8Fu2A4Hfbfshf/zX52OvDE9GVt9Yxc5KjFLDLbv4eIWerHy yOGA== 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=Q/MuY6mpAAH45lCwY2+yiKnx6JT5qZiqarBRwpcNiM4=; b=dUaK/F7FB7FZ3ABGldGYln6q9yC+hQan6PyuKsFGVGjc2kkWCrjw08OZTSRl+2SG2Y LQn4Hy88AGQoTZAu/BOB5YYlhiMuFCbLY1kqooRK3mpDex2ur6LqWvax0mjxQYG0Pj0w 1JNv3tOaYNOyYQBJm4qQ1dsaK51TzTQ8NqC0dR6cJrfGqYOlrri5pG1LiRumYDo8qpGR yzIIpsgCsl3w/FG/j7DXCPrvZeD2HBXpocza+ZWkNnaABV7H+VdwBY7iJtLaxbwMubsz fec8iCfCTlZ7EfUmqSR26m/eLfhBmMcr1TW3/aGxnYugiwu+rwK8NBtu5yItWpkYosEI fvvw== X-Gm-Message-State: AKS2vOz3gDU3hFz0EkBhdp02hDU4Sn4/GzMJIirnrsZeCH03rNcRSE1s kEofDmh3RspVEVcu X-Received: by 10.99.109.9 with SMTP id i9mr3225880pgc.32.1497498332304; Wed, 14 Jun 2017 20:45:32 -0700 (PDT) Received: from localhost.localdomain (66.29.164.166.static.utbb.net. [66.29.164.166]) by smtp.gmail.com with ESMTPSA id f71sm2532627pfd.98.2017.06.14.20.45.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Jun 2017 20:45:31 -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, Jens Axboe Subject: [PATCH 07/11] fs: add support for buffered writeback to pass down write hints Date: Wed, 14 Jun 2017 21:45:08 -0600 Message-Id: <1497498312-17704-8-git-send-email-axboe@kernel.dk> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497498312-17704-1-git-send-email-axboe@kernel.dk> References: <1497498312-17704-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 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 161be58c5cb0..3faf73a71d4b 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 |= bio_op_write_hint(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 baff8f820c29..df0635c8a512 100644 --- a/fs/mpage.c +++ b/fs/mpage.c @@ -614,6 +614,7 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc, goto confused; wbc_init_bio(wbc, bio); + bio->bi_opf |= bio_op_write_hint(inode_write_hint(inode)); } /*