From patchwork Tue Mar 24 15:27:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 6080621 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6E57C9F2A9 for ; Tue, 24 Mar 2015 15:29:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6C81420225 for ; Tue, 24 Mar 2015 15:29:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 49093201F2 for ; Tue, 24 Mar 2015 15:29:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753333AbbCXP2v (ORCPT ); Tue, 24 Mar 2015 11:28:51 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:27919 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752179AbbCXP1M (ORCPT ); Tue, 24 Mar 2015 11:27:12 -0400 Received: from pps.filterd (m0004346 [127.0.0.1]) by mx0a-00082601.pphosted.com (8.14.5/8.14.5) with SMTP id t2OEtWXC020332; Tue, 24 Mar 2015 08:27:10 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=facebook; bh=vuBw8fISUrUXxpM0tqm8RpwGtpTqb1lCpiMROYVNTyw=; b=J85A4/5swnt1eHtdy3t7z7mOgJ0tK54kVyAtjs4ckaLT0Ny+C9zaG/YUV21zjk4dnDzb fM9JMgDDsqQ/XwYUeqro8+0u14nh9qrM25fxYjyoRAP+JEf++JIWoijjVMoD4NqUsBmO xNCPObRL5pGqh+6GkvFIlpATniLS5o2556A= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 1tb6qb8c8x-3 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Tue, 24 Mar 2015 08:27:10 -0700 Received: from localhost.localdomain (192.168.54.13) by mail.thefacebook.com (192.168.16.23) with Microsoft SMTP Server (TLS) id 14.3.195.1; Tue, 24 Mar 2015 08:27:08 -0700 From: Jens Axboe To: , , CC: , Jens Axboe Subject: [PATCH 4/6] Add stream ID support for buffered writeback Date: Tue, 24 Mar 2015 09:27:01 -0600 Message-ID: <1427210823-5283-5-git-send-email-axboe@fb.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427210823-5283-1-git-send-email-axboe@fb.com> References: <1427210823-5283-1-git-send-email-axboe@fb.com> MIME-Version: 1.0 X-Originating-IP: [192.168.54.13] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.13.68, 1.0.33, 0.0.0000 definitions=2015-03-24_04:2015-03-24, 2015-03-24, 1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 kscore.is_bulkscore=0 kscore.compositescore=0 circleOfTrustscore=0 compositescore=0.925924926977281 suspectscore=0 recipient_domain_to_sender_totalscore=0 phishscore=0 bulkscore=0 kscore.is_spamscore=0 rbsscore=0.925924926977281 recipient_to_sender_totalscore=0 recipient_domain_to_sender_domain_totalscore=0 spamscore=0 recipient_to_sender_domain_totalscore=0 urlsuspectscore=0.925924926977281 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1402240000 definitions=main-1503240151 X-FB-Internal: deliver Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add a streamid field to the writeback_control structure, and use it for the various parts of buffered writeback. Signed-off-by: Jens Axboe --- fs/buffer.c | 4 ++-- fs/fs-writeback.c | 1 + fs/mpage.c | 1 + include/linux/writeback.h | 2 ++ mm/filemap.c | 1 + mm/migrate.c | 1 + mm/page-writeback.c | 1 + mm/vmscan.c | 1 + 8 files changed, 10 insertions(+), 2 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index 20805db2c987..1ae99868f6fb 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -1774,7 +1774,7 @@ static 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(write_op, bh); + _submit_bh(write_op, bh, streamid_to_flags(wbc->streamid)); nr_underway++; } bh = next; @@ -1828,7 +1828,7 @@ recover: struct buffer_head *next = bh->b_this_page; if (buffer_async_write(bh)) { clear_buffer_dirty(bh); - submit_bh(write_op, bh); + _submit_bh(write_op, bh, streamid_to_flags(wbc->streamid)); nr_underway++; } bh = next; diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index e907052eeadb..0d0a9f6268f5 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c @@ -733,6 +733,7 @@ static long writeback_sb_inodes(struct super_block *sb, * We use I_SYNC to pin the inode in memory. While it is set * evict_inode() will wait so the inode cannot be freed. */ + wbc.streamid = inode->i_streamid; __writeback_single_inode(inode, &wbc); work->nr_pages -= write_chunk - wbc.nr_to_write; diff --git a/fs/mpage.c b/fs/mpage.c index 3e79220babac..ae19d35bdd96 100644 --- a/fs/mpage.c +++ b/fs/mpage.c @@ -605,6 +605,7 @@ alloc_new: bio_get_nr_vecs(bdev), GFP_NOFS|__GFP_HIGH); if (bio == NULL) goto confused; + bio_set_streamid(bio, wbc->streamid); } /* diff --git a/include/linux/writeback.h b/include/linux/writeback.h index 00048339c23e..3ac2ce545dac 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h @@ -78,6 +78,8 @@ struct writeback_control { enum writeback_sync_modes sync_mode; + unsigned int streamid; + unsigned for_kupdate:1; /* A kupdate writeback */ unsigned for_background:1; /* A background writeback */ unsigned tagged_writepages:1; /* tag-and-write to avoid livelock */ diff --git a/mm/filemap.c b/mm/filemap.c index ad7242043bdb..85aa2cc77d67 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -276,6 +276,7 @@ int __filemap_fdatawrite_range(struct address_space *mapping, loff_t start, struct writeback_control wbc = { .sync_mode = sync_mode, .nr_to_write = LONG_MAX, + .streamid = inode_streamid(mapping->host), .range_start = start, .range_end = end, }; diff --git a/mm/migrate.c b/mm/migrate.c index 85e042686031..614407dceb55 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -645,6 +645,7 @@ static int writeout(struct address_space *mapping, struct page *page) struct writeback_control wbc = { .sync_mode = WB_SYNC_NONE, .nr_to_write = 1, + .streamid = inode_streamid(mapping->host), .range_start = 0, .range_end = LLONG_MAX, .for_reclaim = 1 diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 45e187b2d971..47120abe8afb 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2051,6 +2051,7 @@ int write_one_page(struct page *page, int wait) int ret = 0; struct writeback_control wbc = { .sync_mode = WB_SYNC_ALL, + .streamid = inode_streamid(mapping->host), .nr_to_write = 1, }; diff --git a/mm/vmscan.c b/mm/vmscan.c index 5e8eadd71bac..67fcdd082c17 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -546,6 +546,7 @@ static pageout_t pageout(struct page *page, struct address_space *mapping, struct writeback_control wbc = { .sync_mode = WB_SYNC_NONE, .nr_to_write = SWAP_CLUSTER_MAX, + .streamid = inode_streamid(mapping->host), .range_start = 0, .range_end = LLONG_MAX, .for_reclaim = 1,