linux-kernel - [PATCH] writeback: fix BDI_WRITTEN accounting disturbing bdi->completions

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20110901144041.GA5681@localhost>
Date:	Thu, 1 Sep 2011 22:40:41 +0800
From:	Wu Fengguang <fengguang.wu@...el.com>
To:	Peter Zijlstra <a.p.zijlstra@...llo.nl>
Cc:	Jan Kara <jack@...e.cz>, Dave Chinner <david@...morbit.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	"linux-fsdevel@...r.kernel.org" <linux-fsdevel@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: [PATCH] writeback: fix BDI_WRITTEN accounting disturbing
 bdi->completions

Peter,

This is an amazing bug. I'm not sure how the accounting goes wrong in
some tricky way. But you can compare the exact bdi proportions pattern
before/after patch. The gray "bdi setpoint" lines are vastly different.

---
When increasing BDI_WRITTEN together with bdi->completions inside the
same local irq disabling block, bdi_thresh is found to go wild in the
1 disk + 1 usb stick writeback test case. Fix it by moving BDI_WRITTEN
accounting out.

Signed-off-by: Wu Fengguang <fengguang.wu@...el.com>
---
 mm/page-writeback.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- linux.orig/mm/page-writeback.c	2011-09-01 21:43:45.312000020 +0800
+++ linux/mm/page-writeback.c	2011-09-01 21:46:10.656000006 +0800
@@ -230,7 +230,6 @@ int dirty_bytes_handler(struct ctl_table
  */
 static inline void __bdi_writeout_inc(struct backing_dev_info *bdi)
 {
-	__inc_bdi_stat(bdi, BDI_WRITTEN);
 	__prop_inc_percpu_max(&vm_completions, &bdi->completions,
 			      bdi->max_prop_frac);
 }
@@ -239,6 +238,7 @@ void bdi_writeout_inc(struct backing_dev
 {
 	unsigned long flags;
 
+	inc_bdi_stat(bdi, BDI_WRITTEN);
 	local_irq_save(flags);
 	__bdi_writeout_inc(bdi);
 	local_irq_restore(flags);
@@ -1577,6 +1577,7 @@ int test_clear_page_writeback(struct pag
 						PAGECACHE_TAG_WRITEBACK);
 			if (bdi_cap_account_writeback(bdi)) {
 				__dec_bdi_stat(bdi, BDI_WRITEBACK);
+				__inc_bdi_stat(bdi, BDI_WRITTEN);
 				__bdi_writeout_inc(bdi);
 			}
 		}

Download attachment "xfs-1dd-4k-8p-2948M-20:10-3.1.0-rc1+balance_dirty_pages-pages.png" of type "image/png" (82188 bytes)

Download attachment "xfs-1dd-4k-8p-2948M-20:10-3.1.0-rc4-fixed+balance_dirty_pages-pages.png" of type "image/png" (55013 bytes)