From patchwork Sat Jun 17 19:59:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 9794395 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 EF327600F6 for ; Sat, 17 Jun 2017 20:00:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E385B27E71 for ; Sat, 17 Jun 2017 20:00:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D822027FAC; Sat, 17 Jun 2017 20:00:29 +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 8CCEE27E71 for ; Sat, 17 Jun 2017 20:00:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752783AbdFQUA1 (ORCPT ); Sat, 17 Jun 2017 16:00:27 -0400 Received: from mail-it0-f52.google.com ([209.85.214.52]:36875 "EHLO mail-it0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752721AbdFQUAM (ORCPT ); Sat, 17 Jun 2017 16:00:12 -0400 Received: by mail-it0-f52.google.com with SMTP id m47so41604183iti.0 for ; Sat, 17 Jun 2017 13:00:12 -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=Vyi+AVwIdlAr4xetry/4fpIcIsK01ldeRXddKQknEIQ=; b=pxIqRDvVMJjbPqZbOmQw8099Fr8mewjsHOXlRTSUCkPzYOV/tbfp24BkREUJ59bSB8 kqO+h+xnEAJ20qjG0R9iAVlvSlbT84CNRwHfkXFmD4+AJ4QaUDAWUOYwF3B+/riWNm75 /9LKKszT6IjVG59keKsttNWGaNvp59qVeEyd4czzg7jhwJs4SZ4ht91QN9tJ7ihmlJas L2FSflcYpgambZf7QIabatP5ju0maBD707qJwdsUWi7U9u9AGAQRtJwOPYhQvbAffSSO /0Y8gGOga6nYM20D7B8bgq2A9AlcMSKLlR3R0gTbbzMeJ6kOXlRpCTNx0wG8I2ggM7kW m49A== 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=Vyi+AVwIdlAr4xetry/4fpIcIsK01ldeRXddKQknEIQ=; b=AVOnjeY8Gf1nLvth8bfjhcHlZm0exKelNSY6OQRrzZg4SDd6Nvm2tluly6BELS96iQ pLMBniWK4AGqU9sukLkQEfPT9B0fiRzIM8a6KT6yip3PrRpLLOvz6ue23N0nLgPjeZDc gA4enncx8O7Yk/kRphrBxJwKhoFEGCONWqjdWKS04biQ8i6tukF31dkBOf49KCtaunl7 QPca/Q9Td1PQKc9YzSFcNPE4Ia43kWG/BD4Rr76kKk+jENi9561i1/Cim/im/51jA4n2 irdWONF4XhUIu4DTiiBOQMe6jfGcR5YjrRlWmvlSVV2Pl0yUaUKHgtfkovdlPAQ8bVUT vVnw== X-Gm-Message-State: AKS2vOyaaqBLynbxS0iW2m9pspjp29fk/Jyo+lClxmDq54sUWX3OySzH z6PbN9MPSnADU1Aa X-Received: by 10.36.99.67 with SMTP id j64mr16664287itc.5.1497729611528; Sat, 17 Jun 2017 13:00:11 -0700 (PDT) Received: from localhost.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id w199sm537049iod.15.2017.06.17.13.00.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 17 Jun 2017 13:00:11 -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: Sat, 17 Jun 2017 13:59:50 -0600 Message-Id: <1497729594-4707-8-git-send-email-axboe@kernel.dk> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497729594-4707-1-git-send-email-axboe@kernel.dk> References: <1497729594-4707-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..187e54fb0382 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 baff8f820c29..e84dcaee6ec7 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 |= write_hint_to_opf(inode_write_hint(inode)); } /*