From patchwork Tue Sep 20 20:57:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 9342437 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 321AA601C2 for ; Tue, 20 Sep 2016 20:59:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 22B3F29B21 for ; Tue, 20 Sep 2016 20:59:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1792229B2B; Tue, 20 Sep 2016 20:59:53 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 8D01429B21 for ; Tue, 20 Sep 2016 20:59:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754373AbcITU6o (ORCPT ); Tue, 20 Sep 2016 16:58:44 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:40532 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754049AbcITU6e (ORCPT ); Tue, 20 Sep 2016 16:58:34 -0400 Received: from pps.filterd (m0001255.ppops.net [127.0.0.1]) by mx0b-00082601.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u8KKqg4c023820; Tue, 20 Sep 2016 13:58:24 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fb.com; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=facebook; bh=oS/CwE2koeS8k8BBnlldmlzX4SILqxhCYdgiSGu1f4M=; b=X4ShhU5Rr+2SlLN5ysxbRnMbMmmYaIs/IT2dmn/7lMyYYZ92KsvLO4FJ3AzHAFKoinV2 uZjzAA1oxu5Z6iTeatMOdoM104CfuSM92w4arT7gO4uyUoIfHsZEfGBJbjxcmOgiJtG/ o840g8L6HROHZsXV4KpmCokccae23Xpa3ig= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0b-00082601.pphosted.com with ESMTP id 25k78g9rx8-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 20 Sep 2016 13:58:23 -0700 Received: from NAM03-DM3-obe.outbound.protection.outlook.com (192.168.54.28) by o365-in.thefacebook.com (192.168.16.15) with Microsoft SMTP Server (TLS) id 14.3.294.0; Tue, 20 Sep 2016 13:58:09 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.onmicrosoft.com; s=selector1-fb-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=pv80ORSzVrMI7ifbiiQSsugVphIs2AqiJIJMHULlrUc=; b=T52l/aBSiALH9iqgWDFY2CoP4mzvUXV9SeiXNDAEog2yLxRmnoNhPtRTWiOQhDiH0DYbEl5XnHjJNdDd+RhCl9yHC8tq6kvnWcgmAzXjE6P1hVWnrgysuRfqC0MH/NdFEDV14tD4mMACJUMN+cBZXPo1j9YHcHv1MI9E8STtTzY= Received: from localhost (107.15.72.49) by CY4PR15MB1320.namprd15.prod.outlook.com (10.172.182.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.619.10; Tue, 20 Sep 2016 20:58:07 +0000 From: Josef Bacik To: , , , , , , , , Subject: [PATCH 3/4] writeback: convert WB_WRITTEN/WB_DIRITED counters to bytes Date: Tue, 20 Sep 2016 16:57:47 -0400 Message-ID: <1474405068-27841-4-git-send-email-jbacik@fb.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474405068-27841-1-git-send-email-jbacik@fb.com> References: <1474405068-27841-1-git-send-email-jbacik@fb.com> MIME-Version: 1.0 X-Originating-IP: [107.15.72.49] X-ClientProxiedBy: DM3PR13CA0038.namprd13.prod.outlook.com (10.164.193.48) To CY4PR15MB1320.namprd15.prod.outlook.com (10.172.182.8) X-MS-Office365-Filtering-Correlation-Id: 01829a5a-f63d-4fe6-9750-08d3e198d2b0 X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1320; 2:vkpWxptg9C65wsGzf24K1uXZ2eHQGfbxTzKbYqQWhmLIZOBaq7KlS5PsC+ikIELirOjLUSVx/8GrY+qktqWoDslkKmbkY9l7SSnq3JQFmSsh5XWPUDvuDYzgZqBLebVOzxlfp0qOhp1ghbhgs3IH4DFVqG6w20gPh+hJc2i270LicVmhtO59dMSWsNhBv7Be; 3:qfXO7ViUMP/fgUOjxAai0tjgHlDcN0X2j59K6T3rr+fUDXZ48OO6+fyTdRazxWcGc9Oit/dprjnVjOrtI0+pf94o0Q7QEhFfNLSMD3VL3iFXG/tpZZGglm/BYlqsghIr; 25:q0ChhzzIKzvHWBodIcpN6DYSYdlqme5x2aHHMthuTIe7yZv71jVKxtGXhJ1XLDmHYNthCwbzNtDD6Ht8gOw936dknBJrWLKtCKd5yAwp3JVaDPFlG1MmZ8JkZWHJznLgfG1fbzK6DvQaW3PC4YJ6q0oEs7HiyaytlymfIcBbFIf3LH02Bd6Z3XVv3pv91mChZ9HANUiS9tVnvvOlRlYQyLq81NlG4aIXljhmmf98fKNrzKAF3OnRhlxGV+LpLClT5dJ1QNSWD/FwkJv/KXPUmQkQ42BQh+W2tfTA1y/Sj3SkubjtiXY0/6ruYrDebxY8keLRfCxKmrKYg79BQtz5BZxs4ZF98xf1Ozzmp/KO8zzugBn7xDVEjl7rM7PrvCU8Z19gNCIoZcAHZTYTkhU6cbE7u9PJCSDVlKKGXqdNQvU= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY4PR15MB1320; X-LD-Processed: 8ae927fe-1255-47a7-a2af-5f3a069daaa2,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1320; 31:L1cN67CHimkDJY8cnp8Sf739e0c2eqvvhBu70athJ8A71wGzhTmAtsge4Quzbyb/T4+3Nes5GMVgQ96R660MD2og7llcwQ0v9+mNT/AdACkMY/B2UkvWhQmaRWc12DtcUvEbTxlqYjWa29nuaqwgEK1xaAUH/3P6q9JjPEgdwyephm9EQ/kQSrH+nlPmZpzNXSmbYSpdwTO4JlNnjbINoc9Lfi2cOcGlbDYFaP3EG8E=; 20:5O1e4zKC1Ew3RwMoX27oxMrtcGBaoK5v9LIUiI7AjalPNoAw9IV4uo/fE7xRzLPrmQ7uPycW+YlputpfA1dm+L5FZ1C0xtMrOBaSDl6PwTod8RgUpkkVA0KrX4oUDBJRKxrbtfNmh3vOnh97ccphI5R28qGKUxS7itaiGAicm3k=; 4:5IJCHS2rOzIJ8nUAiN4xzIHsy6HpFguc6UHdIKPUQ4XHzlySHKQZKjJH7L7dwcfq5Fv6AyTZsUBvWHn+5p9Vcuek7yzjDlZdO+4E5rs1V+lSa7KAAtZaGTExv8Jzkav/n2qwiSo8qsUM08t/LhyLXiVmEILQTxfLOi/6cPtUQztH+qVjZIW3HAx4GA0Z9SAq510pupule7XGnKl1XskBa0Lio66prmo+36tx+kh53R/k3OOOxSd/iNiFitlOsEhQLtG1J1nj09KQDujt2Tm5JItJrA2pIChXroiDAOZv7GP9Vckru8NCXkqo3VoRpT5q07rbU6nS+VrjVhxWa7BJDaE+XRBJB8JuV07GHglpUTTFKB1XzXDPZdRG5qwjYnz3BdWam3JYnoFihO2Yk+pCWEmsAO9JU7E6YtJGiMraD90Onw4z0agb9/JhLxZGf1sh X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(67672495146484); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001); SRVR:CY4PR15MB1320; BCL:0; PCL:0; RULEID:; SRVR:CY4PR15MB1320; X-Forefront-PRVS: 0071BFA85B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(6069001)(7916002)(199003)(189002)(229853001)(105586002)(8676002)(81166006)(81156014)(50226002)(106356001)(5003940100001)(2201001)(586003)(86362001)(2950100001)(97736004)(5001770100001)(2906002)(575784001)(6116002)(3846002)(50466002)(50986999)(5660300001)(36756003)(76176999)(48376002)(77096005)(7846002)(305945005)(7736002)(76506005)(42186005)(68736007)(33646002)(19580395003)(19580405001)(92566002)(66066001)(47776003)(107886002)(101416001)(189998001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR15MB1320; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: fb.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR15MB1320; 23:JOCeTY7UpXc9NbWUngN29QXz6Deu5dvXcynRWoE4m?= =?us-ascii?Q?qUkirI7/hcJbOpItDwTPPRmDPzNNAVA5MOcLiUas968P6FEuZvNDXS+x3L7n?= =?us-ascii?Q?aPPvCZ4W9idMeECkh0hFlNyq5lmb9fkQLWmjksABRqx+cbRuobAiaBIHmm/G?= =?us-ascii?Q?yOxRCroApppPOBQ+3RfFhk2mM5rxGdWFWJ1chQuBx7wUbuOTc8gH70nwIjAf?= =?us-ascii?Q?itYPei6sax2soqcIpnsjUaEzu5OQRZHw1qnK7Y94xjTPeeCseXv++qNTekJs?= =?us-ascii?Q?6LlRrBsrg222ej2m8HSo6SOM8gWLRPsOF2kBwBEUgc6+AWbAS5mCJrUZu28r?= =?us-ascii?Q?Aq8YuF+W3kySuQ5mWpNpN5u0lNpC/spwdNa4tF9mlgfDY/UbXllfQpqOlGVI?= =?us-ascii?Q?hoHdCiH2aMT5Kl0UHUhNym9WqyMl2NDhRgoiODlzluFV+Cu4yJhePXFxFsZJ?= =?us-ascii?Q?HhVFO0EvnOUTznXt3uu1CGG3etR9BWpz0vqrWHCR83kTblOXeInFmB9n5iV2?= =?us-ascii?Q?SCTt3NTJKFgJVEYEEb3czHMszjlkH+brl3JUjPazRY+U4aUigO0/cFJ6JENk?= =?us-ascii?Q?gmKfJreFlAYuW+uMaL1UGZQAe3YYmFPCjWru6GyUnxPdtmX2aYzeOxwfIYBv?= =?us-ascii?Q?/cJZcoQzUSZZeV/HjkaIYx23uKCfom3bBSoKcqNuVxyIsUN9ddW7Wz8BeBgf?= =?us-ascii?Q?yYA8JgjEyhAIoPkq4Ivj8aQMRxtj+FsrOrDjEqNfFTbCP4TZdFRfYcndohPT?= =?us-ascii?Q?gkfT+cwFby3MKwbfT6WIU1SByv/Axtb5sscH1MQPbgkMuSp8EEcwXmAjTnm5?= =?us-ascii?Q?3n3vGU/Y/p2VWfEje6ZZDLjs2z0keyJk9ER0hPlCC6GGw6yIueFPZvclisxW?= =?us-ascii?Q?ECcCB/Nnv9DbN0DTB//IA69OB9akMHEBRfw0kX/Yx3PWKo+Nnidk/l953jX8?= =?us-ascii?Q?zrUr5b3sqdxD1nA8S+SKNJZiocOp1wyoewmiK9IuD1KlS1goTOJr46ZchBQO?= =?us-ascii?Q?9jRYMJFb9TPRye8jsYzGcKZkzz4JC5mla73cSMjT1cCfZbqWdjL/JyG+2Si8?= =?us-ascii?Q?M0g3FMJ6B+ib/f+ihGoKL8nTimnYmov3zobhLwXhe6rdjVg7cqp3E2kUR40+?= =?us-ascii?Q?EPOV/WV66w+m7x4fd82g/DryGoEJObf8cf7Xpuqy8yyh9T4NS+lbA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1320; 6:rz7+hoEx5+Zl7vMqXvSlqMSruARw+uW6lJZ4Mcs0mB3UvMUiG53QndZyMBpnZFzQylq8kpESznNsvVNHlLz3LDKaWw9VOnZBDxwktgfFZw+smoh9hodr6hm+xMT4w3bVqDo8wgJ4VLjf+3cdVb2VpMNc6JtkbfqGMAVgYc1F9rdwFnqBNkCIPeV/YN0cte2h9M0H+cDFGNh6QO/5R0kt6TYCPXK8pTDVHBk/2RJeqbrY/y5dR6AVe0A/9rRS/RPE7f8YqSxNY3kGvEMNhHWythjQ7lrjnkbQyFe8XzuEznU=; 5:/jvppmlnTyHVcv8G7aeobfBRzBYOyiw8pKdrEel4UKq3eZORQAbPh8VtPUUAIDGtW4MpNynXjrfL18XQ6kMyCgHqW0EoQZsPmBfyha167P9DEm2yAKKgPq/D665/AtKAyDHvh9AVF9pLn6zBC0MpKA==; 24:43nutMlkdPwT6yvAwL44gr2MHgf2Bwbn/UeBNYNEUfPYaU7QpnBnw7dSDG48+aSlrUOnjhC5vqYnPNwkHMgtTGf1//tIkU9tsDBpnnrWNJY=; 7:dHnqUSxhyPEHFyb3rYkKcpznia+VYuwp2xqdtWzdXO/oKjlpz8bHEbemvFMg9un0a1uYOgbzhwxHAwLPxdtOQspeX32W6v9aUlTFKN9KR5fzei60XC7Ebqlak1V9LtJslLt8Q05SWqOWL2Q7xLsaGEr2Nu3CEldHrGOqHBYeP2hzmLj76nBfuLPeaCgy7nbePU8TAc2362fIDGXNv6veUFu6mlv9fGxqZpOkfnp5pW89lseJebrVFeDT5DNwtlZGCKgq8/nkggMQ3ztkIMpB5B4kGZkD79FZNcxwsljp35x1a+bu7JNVnbZDjWYZGw4l SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1320; 20:5uOas9dddXgs9SY4+P3jbMbYJNTx41HHkNGKyEQZ/H3+xqHRNiyNaGLSUIv9Nw6mCbpw3vQ6lqBQeWN4xrvpFToIZ0u0Hi3cyxufeTxWYo3ygl9o94auFsHABvEGjVbPG+sC9wlekNleBXN3yYDpz9vE7QIgHUvgabQssB25jU0= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2016 20:58:07.3387 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR15MB1320 X-OriginatorOrg: fb.com X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-09-20_08:, , signatures=0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP These are counters that constantly go up in order to do bandwidth calculations. It isn't important what the units are in, as long as they are consistent between the two of them, so convert them to count bytes written/dirtied, and allow the metadata accounting stuff to change the counters as well. Signed-off-by: Josef Bacik --- fs/fuse/file.c | 4 ++-- include/linux/backing-dev-defs.h | 4 ++-- include/linux/backing-dev.h | 2 +- mm/backing-dev.c | 8 ++++---- mm/page-writeback.c | 26 ++++++++++++++++---------- 5 files changed, 25 insertions(+), 19 deletions(-) diff --git a/fs/fuse/file.c b/fs/fuse/file.c index f394aff..3f5991e 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -1466,7 +1466,7 @@ static void fuse_writepage_finish(struct fuse_conn *fc, struct fuse_req *req) for (i = 0; i < req->num_pages; i++) { dec_wb_stat(&bdi->wb, WB_WRITEBACK); dec_node_page_state(req->pages[i], NR_WRITEBACK_TEMP); - wb_writeout_inc(&bdi->wb); + wb_writeout_inc(&bdi->wb, PAGE_SIZE); } wake_up(&fi->page_waitq); } @@ -1770,7 +1770,7 @@ static bool fuse_writepage_in_flight(struct fuse_req *new_req, dec_wb_stat(&bdi->wb, WB_WRITEBACK); dec_node_page_state(page, NR_WRITEBACK_TEMP); - wb_writeout_inc(&bdi->wb); + wb_writeout_inc(&bdi->wb, PAGE_SIZE); fuse_writepage_free(fc, new_req); fuse_request_free(new_req); goto out; diff --git a/include/linux/backing-dev-defs.h b/include/linux/backing-dev-defs.h index 1a7c3c1..cef0f24 100644 --- a/include/linux/backing-dev-defs.h +++ b/include/linux/backing-dev-defs.h @@ -36,8 +36,8 @@ enum wb_stat_item { WB_WRITEBACK, WB_METADATA_DIRTY_BYTES, WB_METADATA_WRITEBACK_BYTES, - WB_DIRTIED, - WB_WRITTEN, + WB_DIRTIED_BYTES, + WB_WRITTEN_BYTES, NR_WB_STAT_ITEMS }; diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h index 089acf6..742238a 100644 --- a/include/linux/backing-dev.h +++ b/include/linux/backing-dev.h @@ -113,7 +113,7 @@ static inline s64 wb_stat_sum(struct bdi_writeback *wb, enum wb_stat_item item) return sum; } -extern void wb_writeout_inc(struct bdi_writeback *wb); +extern void wb_writeout_inc(struct bdi_writeback *wb, long bytes); /* * maximal error of a stat counter. diff --git a/mm/backing-dev.c b/mm/backing-dev.c index d76f432..f0695b0 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c @@ -77,8 +77,8 @@ static int bdi_debug_stats_show(struct seq_file *m, void *v) "BdiDirtyThresh: %10lu kB\n" "DirtyThresh: %10lu kB\n" "BackgroundThresh: %10lu kB\n" - "BdiDirtied: %10lu kB\n" - "BdiWritten: %10lu kB\n" + "BdiDirtiedBytes: %10lu kB\n" + "BdiWrittenBytes: %10lu kB\n" "BdiMetadataDirty: %10lu kB\n" "BdiMetaWriteback: %10lu kB\n" "BdiWriteBandwidth: %10lu kBps\n" @@ -93,8 +93,8 @@ static int bdi_debug_stats_show(struct seq_file *m, void *v) K(wb_thresh), K(dirty_thresh), K(background_thresh), - (unsigned long) K(wb_stat(wb, WB_DIRTIED)), - (unsigned long) K(wb_stat(wb, WB_WRITTEN)), + (unsigned long) BtoK(wb_stat(wb, WB_DIRTIED_BYTES)), + (unsigned long) BtoK(wb_stat(wb, WB_WRITTEN_BYTES)), (unsigned long) BtoK(wb_stat(wb, WB_METADATA_DIRTY_BYTES)), (unsigned long) BtoK(wb_stat(wb, WB_METADATA_WRITEBACK_BYTES)), (unsigned long) K(wb->write_bandwidth), diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 423d2f5..6d08673 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -624,11 +624,11 @@ static void wb_domain_writeout_inc(struct wb_domain *dom, * Increment @wb's writeout completion count and the global writeout * completion count. Called from test_clear_page_writeback(). */ -static inline void __wb_writeout_inc(struct bdi_writeback *wb) +static inline void __wb_writeout_inc(struct bdi_writeback *wb, long bytes) { struct wb_domain *cgdom; - __inc_wb_stat(wb, WB_WRITTEN); + __add_wb_stat(wb, WB_WRITTEN_BYTES, bytes); wb_domain_writeout_inc(&global_wb_domain, &wb->completions, wb->bdi->max_prop_frac); @@ -638,12 +638,12 @@ static inline void __wb_writeout_inc(struct bdi_writeback *wb) wb->bdi->max_prop_frac); } -void wb_writeout_inc(struct bdi_writeback *wb) +void wb_writeout_inc(struct bdi_writeback *wb, long bytes) { unsigned long flags; local_irq_save(flags); - __wb_writeout_inc(wb); + __wb_writeout_inc(wb, bytes); local_irq_restore(flags); } EXPORT_SYMBOL_GPL(wb_writeout_inc); @@ -1390,8 +1390,8 @@ static void __wb_update_bandwidth(struct dirty_throttle_control *gdtc, if (elapsed < BANDWIDTH_INTERVAL) return; - dirtied = percpu_counter_read(&wb->stat[WB_DIRTIED]); - written = percpu_counter_read(&wb->stat[WB_WRITTEN]); + dirtied = percpu_counter_read(&wb->stat[WB_DIRTIED_BYTES]); + written = percpu_counter_read(&wb->stat[WB_WRITTEN_BYTES]); /* * Skip quiet periods when disk bandwidth is under-utilized. @@ -2497,7 +2497,7 @@ void account_page_dirtied(struct page *page, struct address_space *mapping) __inc_zone_page_state(page, NR_ZONE_WRITE_PENDING); __inc_node_page_state(page, NR_DIRTIED); __inc_wb_stat(wb, WB_RECLAIMABLE); - __inc_wb_stat(wb, WB_DIRTIED); + __add_wb_stat(wb, WB_DIRTIED_BYTES, PAGE_SIZE); task_io_account_write(PAGE_SIZE); current->nr_dirtied++; this_cpu_inc(bdp_ratelimits); @@ -2523,6 +2523,7 @@ void account_metadata_dirtied(struct page *page, struct backing_dev_info *bdi, __mod_node_page_state(page_pgdat(page), NR_METADATA_DIRTY_BYTES, bytes); __add_wb_stat(&bdi->wb, WB_METADATA_DIRTY_BYTES, bytes); + __add_wb_stat(&bdi->wb, WB_DIRTIED_BYTES, bytes); current->nr_dirtied++; task_io_account_write(bytes); this_cpu_inc(bdp_ratelimits); @@ -2593,6 +2594,7 @@ void account_metadata_end_writeback(struct page *page, __add_wb_stat(&bdi->wb, WB_METADATA_WRITEBACK_BYTES, -bytes); __mod_node_page_state(page_pgdat(page), NR_METADATA_WRITEBACK_BYTES, -bytes); + __add_wb_stat(&bdi->wb, WB_WRITTEN_BYTES, bytes); local_irq_restore(flags); } EXPORT_SYMBOL(account_metadata_end_writeback); @@ -2672,12 +2674,16 @@ void account_page_redirty(struct page *page) if (mapping && mapping_cap_account_dirty(mapping)) { struct inode *inode = mapping->host; struct bdi_writeback *wb; + unsigned long flags; bool locked; wb = unlocked_inode_to_wb_begin(inode, &locked); current->nr_dirtied--; - dec_node_page_state(page, NR_DIRTIED); - dec_wb_stat(wb, WB_DIRTIED); + + local_irq_save(flags); + __dec_node_page_state(page, NR_DIRTIED); + __add_wb_stat(wb, WB_DIRTIED_BYTES, -PAGE_SIZE); + local_irq_restore(flags); unlocked_inode_to_wb_end(inode, locked); } } @@ -2897,7 +2903,7 @@ int test_clear_page_writeback(struct page *page) struct bdi_writeback *wb = inode_to_wb(inode); __dec_wb_stat(wb, WB_WRITEBACK); - __wb_writeout_inc(wb); + __wb_writeout_inc(wb, PAGE_SIZE); } }