From patchwork Mon Oct 24 20:43:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 9393243 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 5847E6077A for ; Mon, 24 Oct 2016 20:44:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48F3D2574A for ; Mon, 24 Oct 2016 20:44:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D34528F40; Mon, 24 Oct 2016 20:44:47 +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=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 510A82574A for ; Mon, 24 Oct 2016 20:44:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965140AbcJXUok (ORCPT ); Mon, 24 Oct 2016 16:44:40 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:54125 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S938700AbcJXUoe (ORCPT ); Mon, 24 Oct 2016 16:44:34 -0400 Received: from pps.filterd (m0044010.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u9OKdH6o027566; Mon, 24 Oct 2016 13:44:12 -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=r2F1OCV/cs9eSudaEKMurXiiB3R9tpXjYTOzsBleBhw=; b=Zbxn/s/37BK5q0097zeYADCzMFNeQGbAjMX/jNQ+CTVNCMQZFBPVrOtcGQ0j22138GFp aX+NsXX3GHzyeZ/jP+Fx2NvLRwCCPcUA2HSrRcJHn+wJZ/zQ0hXh/ZwEQ27JNFel/+GB mO5urVlGiej3rKtoa+M/kMKuLIGFQfZQGzA= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 269r960jkn-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 24 Oct 2016 13:44:12 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (192.168.54.28) by o365-in.thefacebook.com (192.168.16.11) with Microsoft SMTP Server (TLS) id 14.3.294.0; Mon, 24 Oct 2016 13:44:11 -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=sJMOPuNYkanY5oh96g8Sm87SslXSwuN/5+kq+D9krtU=; b=gOzqj0mBJshbXLUrXPTJ1TtwDgZUwigN6VdDJn1wfsm8iiG+X5ON/FNYzJS9xAoz2w7S9AYt9wIQBFAJ/bZ2fmemYfcZfUhdBplrICR9sPVbsUsy5lgExqmrSOXOtvo4kYTVuR4qisDG2dyMyvCi4zflKTeuU1OtInqXx690gSY= Received: from localhost (2606:a000:4381:1201:225:22ff:feb3:e51a) by BN6PR15MB1313.namprd15.prod.outlook.com (10.172.206.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.16; Mon, 24 Oct 2016 20:44:08 +0000 From: Josef Bacik To: , , , , , , , , Subject: [PATCH 2/5] writeback: convert WB_WRITTEN/WB_DIRITED counters to bytes Date: Mon, 24 Oct 2016 16:43:46 -0400 Message-ID: <1477341829-18673-3-git-send-email-jbacik@fb.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477341829-18673-1-git-send-email-jbacik@fb.com> References: <1477341829-18673-1-git-send-email-jbacik@fb.com> MIME-Version: 1.0 X-Originating-IP: [2606:a000:4381:1201:225:22ff:feb3:e51a] X-ClientProxiedBy: DM5PR08CA0003.namprd08.prod.outlook.com (10.175.218.13) To BN6PR15MB1313.namprd15.prod.outlook.com (10.172.206.139) X-MS-Office365-Filtering-Correlation-Id: b3167fcd-2d34-45ee-abdb-08d3fc4e80f0 X-Microsoft-Exchange-Diagnostics: 1; BN6PR15MB1313; 2:TtAX+ov0MM0GoWkHpNIJmVzKi0uY/bpLeHEttX0brH4cey6l1XQGVJ+y78jp6jYrNYhTm5BAAHjCNUri89HboBF7UL56g64jgiGUOozead7bWq2GLEljPXc5sZKFAXLeeWtUE1QLLUheB2MaHv+zLpiIfsTN3VGfTf9De6gRia+plU1kL6E4VeSEyTjtzMU6ZzjppepXLjJ7ad6vge75FA==; 3:lpNqsHfff6AH77F5IHuo+pUOSi4ijJ/fU5371z0J+lI1RRimJ+5ynzyaqsjq89k25jXYkblH5qIB9tD0uh+J2UxRGplThLDiIZKpSuyiae03C0jyUhPQFeQcLDDiUXT4o3ua21k6bEuFE2miEAJzaw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN6PR15MB1313; X-Microsoft-Exchange-Diagnostics: 1; BN6PR15MB1313; 25://o+DMUtLnCweBKRh7aK9SfBNAsHndwzcmF5vOzSDjh2SV33MAQDYIbg2LdvQmPwC48JpP16YQRIoBewJis1xYLanJpKnnI91WeU0usfHU2fN9OSStnNiXCHFxFkk7B8rsmWSLSHte7vqHSdlNtYtTvXuvpQNRtOAvwgVPCpwuEkNbZgAl+hdYSgHWLpToDxlMLRCi4biTCa0TbY9TWho5u7mkJ6QDnTxWt3DBSawnhhy8ShEXxsq5alhDm8qWiMrLWqePAA0xgU4Dssc3BdmEvKHK/hwmdd7tOtKSqHambTpMsE1+7omJ0e3utUXsgNm62c0/ckaWja8pK5FpasfPVKbVaDlTl2Ty/s/zPTWSLmARJkR+Te3vKspcEKla7Be5ZPJfF1G4TG6gEpcQ8XjBlcPdpP50BfINzfbz+hvuEURI142tr25YAn5lHu7N3dLfnA+mEHylInipOCVt2qQqOaLfqImNbAfsCNGKkQeNw4lHF5ltg23kh9jCEGpq7uF/g+g4a6KhU8Aki0vxIh4S1i3vCEJtThm3Jv4/dCaD4AhuCU42bdJjGtLh7ims4iH6HkBXYu1BvskBe4Gg5IDHtKnUIQAKG5xUdOMOO6ENibTzoXUDsou8BYjK7dkHG47nmlDkDyguAybfEKXhbYBayjL0b+0QIADU4/0sHx5rVtgywZVzobuN6nhLxRDL3+4AL8YOOEg0ef6yiZVN4dSR5CuXL6YGaKcJAjw/Ijp0q+B3hKz/LyNqPdFXMVGVu1CCTaJKutFJ+8P2pXzMHHEQ== X-Microsoft-Exchange-Diagnostics: 1; BN6PR15MB1313; 31:p5awqFpbEC14D9+ncp7BDseOVCA1m2Phw/VC2nROxMqV4abVFXJy1UpynEJh81rqISZ7ENdIRSLq54ol0Q3Krkh+OLuvrW5YuCYj6yUnVVs99pyTsBGPdy0vySoB0+wi4GAuKO7LPvEVn5TpBLj5sWf3wybWpWplIDkO+lclV5Vv4XnfoDeyXKVWYkgLf5GN7sEkrr3TAW4yLuHcd+H7uGtVquxm68DRvcefadvUXu6JXp5N+yBK+LUdSVdimV5K; 20:P6Uu2e8J+E+ITp3bEIQlB9Xj4bKzJK+a6760O62xFLoAajEC1ehjif03mTjC5rsKJ8iUJZToN0dcSwXRyKeB2LQS6dsOWMTd4JMVMwWkkwce96pTRgXKDpK9CleBvyk07UDEpiv72N/pmudwdnBUOcyd41u4Uk6UGx7omKH0cew=; 4:NySQ6QvgI0dy51U0Gr1lTRFPMh4k55RUmZnJWgEGRaVgf38Haz4vlq5ERWHqvgkhXf7MewN05OKujYiTKu1wAMGAPkjG3U34jToqNOvvMUs8kFEHshNxJJwZyXAcwuh8lpW8BZ6o9zgVxdHMCaC3ilgVo5Bb8K7BHageG+ctFs9RtJ8JapGiXbCpNtXrT0k+Iyntly9LfvnD7RghZbsI0uWdvOSK7FpBoOtGwkUzBItptG12IDV7brt8AN0UGnm8m+7kVpMce/F69f47oN1jkB2Lei52yg1SZj4JqAWOP5MLdj3ZfC8mwWTfIpV6+vGzG1jGIMhkJQ/ze/LyAWsupksHfN0Tvjfz212z0rdOxGPqJEiLL4XK51Cd2e5emmMojoBckDyiGvDhISWJtofm4cHjUZEJLg4E0gnq50ejhsVEN56qUEfPtF5ShVAD/ls/UbINiXY/QYNRBYca3kkN9Q== 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)(3002001)(10201501046); SRVR:BN6PR15MB1313; BCL:0; PCL:0; RULEID:; SRVR:BN6PR15MB1313; X-Forefront-PRVS: 0105DAA385 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6069001)(6009001)(7916002)(189002)(199003)(42186005)(48376002)(76176999)(50986999)(5003940100001)(229853001)(33646002)(106356001)(105586002)(50466002)(76506005)(2906002)(86362001)(47776003)(101416001)(50226002)(586003)(19580405001)(6116002)(92566002)(81156014)(8676002)(81166006)(305945005)(7736002)(7846002)(6666003)(2950100002)(6636002)(97736004)(107886002)(36756003)(19580395003)(189998001)(5001770100001)(5660300001)(77096005)(68736007)(2201001)(2101003); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR15MB1313; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A: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; BN6PR15MB1313; 23:lZxBIsenpMF82ArDH0+mhvHHwu4hEuJgn2nvWnlKU?= =?us-ascii?Q?8xk35/8euNxYe5TqpmRW7PqeN45WsBSNNGcwC3FkHq7yyKt5j5yFkqchr/zS?= =?us-ascii?Q?nFX/5KO0cdH5+QeSKiKJL8KuT0d0b0J8Dh2rujgH1h6z4RUlZEVmAPIXml6S?= =?us-ascii?Q?cfCfHlvAQBZptli6gIDPnuV9lOACWJxWCQDj+zBs4FygChAHV6W92cWcn3uz?= =?us-ascii?Q?95sKG87q0eAF/OomOf7D2xOnuCxIjRY7Rb5SYsTYloe32WK1H5NNc1xvcYLM?= =?us-ascii?Q?0isy10C2J4EfesWNIK68d5VIPRAB6ah6j7Qb/zijKSp//g5RKmjn3HfjbbJP?= =?us-ascii?Q?uWttJ6WSOPN9eDgnIU7Wo8cQHt2hWoAP6Xi+xfr+YjBpElspXXAK4CqYT66o?= =?us-ascii?Q?n1RwGZDzdtl4uVv78z75xi+lKZYBWUiuKtn4mmuKALfetNgUWukOyvw/vMUg?= =?us-ascii?Q?XIf5x2X40SkCKIqcYZLccPlfLgoXx04Tb7QjiIKufqyNGUJFT78EeNNeeY91?= =?us-ascii?Q?48VcaAoY3y1+fnO7gdYuNDwW3i5PiSo4y+LTnKr3NRpFQ+Ufy/83oj83qANe?= =?us-ascii?Q?Hg18q7hjvcKC0VG5DdZCXXihhoRi0XqoKpk0qnnE7m6ZVpkfp/MGARGVV7qe?= =?us-ascii?Q?aMzjKxUlV/jU2EHEp2DiuB20o/hB015kj74P2+oA3NfkB8WwDCmYdjoaMl7+?= =?us-ascii?Q?/TL9Ge+UNQJ0KIIaSo0JHtUZrQ6bBL1cikEpaiUZH3gcOt5Qd9oNL4OMIkpb?= =?us-ascii?Q?T5+IvTU2b1AFdHopD1BTe9JIIiErVAKKd5V3br52EJGML0/agSnGt1huzNd/?= =?us-ascii?Q?bgKh20OQbnN90vXqVlbwjrsNxJdqoMMgkGDSyElzNMuS9zFC+68YQIAYLO1y?= =?us-ascii?Q?3h2R77A/9P8niT72Q4ePT1oXjYa3ZugIUCgH/MFn2ELXDTuXTwSuAD6BsFRg?= =?us-ascii?Q?FUyE/+1Tq8HDg1cOwssJ2jiaQfC5M6hgyS+Eczt8iuo8FideSIhgXC2nWQNd?= =?us-ascii?Q?VHcvOKGSsHr7jstSZhVPR1qUGQR+k65Rz2tYGprgNq28Bu2Guw5aHmF9MFDe?= =?us-ascii?Q?KlAzaghbdvwuLt58m+r3KtO0w7eAEp6DJ3Dh1nTMkDHc7yJ4WsYFpMnY2mfA?= =?us-ascii?Q?ufrDbfyKBgiGGkBuk8/mNqocs5ctfZRW2Xwgm8MshQATp5OCZNUCg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR15MB1313; 6:R9KKyEXv1ZQYRb8d3f/G0GukOgIjvetjwGzqLPw2K2vN/T/UrJM8wkHHf7gQVzoYfzvzfLgjhE30DPmUCgkgsiMGJNanxf8+5LKFsspr3A2EbA10HfvXWhsRWoIbyUOPnlEj5FRyVhUcawJarW+ZLfxztBKEVNGol8IbK/5PjIBlHVg/WeDNwKMrr6LtrFIdHqeJcEgqq8O/WG+f8aQJBiSgBNnKRskoL/eGFhBaemQzptKp2h6G9sojP+gou8hMZFOJDRXMUaxJ/lTK2GGrXUbaAm7hsCiHYEumtRfKF2QlFzqw0sATqBshRQZ+9cil; 5:ayQcwoa4r0yEaj7f6fPcuxaEdP4vp4x9g7hM1QTBYfVP/dfEfp9v2BtTEWENjhvMGcYTtslJ8rXmLbCi0Buo17tKtY9GQzZ/Ngfvy80wafJ/m10T+mrqmjMiPaW8adNnlgLEwamhoGLvRxZEJhcop+ejH23DiOtRYGWM+ee72h4=; 24:aW+yeP/jwy8ZTLKcjSKgRGUFn/6zvRCUJUAG/6x6U+KrR6ZOsG4QstfM+V2tEOh8pJdhSJrJgR60bK2gARez6QbSvyXWEn3PGuMTutrw0gE=; 7:A9lGFTH1734Nf+Q6KABr0G6+PKK810liHI5do9zbOGpiICuKqperd0snbZuChlb5eVa4crIrcj/B9M6etgAmY1vS1YEwBSlqenx9VSmby1b81nX2NwwB6ese0EVJFK4XXcRl4TMmxZTrT61iMiFf6bSnBaapDrBYq/tjXn+6Z93eNyy7jBXOYF13rQ9q4FUInOY7Pw38sit3JWzHErjW3R8Id4nksOOb/Rbbmxls+BPTaoZEtnbPPr1XpGRLwMwy4FLjdxAiB/p5Yt2st+cKTF3UkPV2k6zNGiKkMorXPoISfdZwiPF3kxFgoFJkDTghUNNGd+vW 3TRusX6fZVRhJqQRhb/+XjfqqatRAsu7za8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR15MB1313; 20:KRi6Uxp42RzAX2pgvfUnhE7aaNo6B6ZQwjwhENSyFwrk5i6OJ68wuobFVbnwy/ORNZkKvTXjG38NdHxBsnVHIHPEjuYW+R7r5XDCun5cjgMdo7YvWYjEDxb6HIpaHUdBvuxSzoUFW51WW6b8ZJUen5GcnEpj3yVRXNJfHrHv0Eg= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2016 20:44:08.7644 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR15MB1313 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-10-24_14:, , 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 | 9 +++++---- mm/page-writeback.c | 26 +++++++++++++++----------- 5 files changed, 25 insertions(+), 20 deletions(-) diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 3988b43..81eee7e 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -1467,7 +1467,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_add(&bdi->wb, PAGE_SIZE); } wake_up(&fi->page_waitq); } @@ -1771,7 +1771,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_add(&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 c357f27..71ea5a6 100644 --- a/include/linux/backing-dev-defs.h +++ b/include/linux/backing-dev-defs.h @@ -34,8 +34,8 @@ typedef int (congested_fn)(void *, int); enum wb_stat_item { WB_RECLAIMABLE, WB_WRITEBACK, - 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 9eb2cf2..edddcb8 100644 --- a/include/linux/backing-dev.h +++ b/include/linux/backing-dev.h @@ -114,7 +114,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_add(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 8fde443..433db42 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c @@ -70,14 +70,15 @@ static int bdi_debug_stats_show(struct seq_file *m, void *v) wb_thresh = wb_calc_thresh(wb, dirty_thresh); #define K(x) ((x) << (PAGE_SHIFT - 10)) +#define BtoK(x) ((x) >> 10) seq_printf(m, "BdiWriteback: %10lu kB\n" "BdiReclaimable: %10lu kB\n" "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" "BdiWriteBandwidth: %10lu kBps\n" "b_dirty: %10lu\n" "b_io: %10lu\n" @@ -90,8 +91,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) K(wb->write_bandwidth), nr_dirty, nr_io, diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 121a6e3..e09b3ad 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -596,11 +596,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); @@ -610,15 +610,15 @@ 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_add(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); +EXPORT_SYMBOL_GPL(wb_writeout_add); /* * On idle system, we can be called long after we scheduled because we use @@ -1362,8 +1362,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]) >> PAGE_SHIFT; + written = percpu_counter_read(&wb->stat[WB_WRITTEN_BYTES]) >> PAGE_SHIFT; /* * Skip quiet periods when disk bandwidth is under-utilized. @@ -2464,7 +2464,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); @@ -2547,12 +2547,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, -(long)PAGE_SIZE); + local_irq_restore(flags); unlocked_inode_to_wb_end(inode, locked); } } @@ -2772,7 +2776,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); } }