Do dirty page accounting when removing a page from the page cache
Krzysztof Oledzki noticed a dirty page accounting leak on some of his machines, causing the machine to eventually lock up when the kernel decided that there was too much dirty data, but nobody could actually write anything out to fix it. The culprit turns out to be filesystems (cough ext3 with data=journal cough) that re-dirty the page when the "->invalidatepage()" callback is called. Fix it up by doing a final dirty page accounting check when we actually remove the page from the page cache. This fixes bugzilla entry 9182: http://bugzilla.kernel.org/show_bug.cgi?id=9182 Tested-by: Ingo Molnar <mingo@elte.hu> Tested-by: Krzysztof Oledzki <olel@ans.pl> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Nick Piggin <nickpiggin@yahoo.com.au> Cc: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
3e3b3916a9
Коммит
3a6927906f
12
mm/filemap.c
12
mm/filemap.c
|
@ -124,6 +124,18 @@ void __remove_from_page_cache(struct page *page)
|
||||||
mapping->nrpages--;
|
mapping->nrpages--;
|
||||||
__dec_zone_page_state(page, NR_FILE_PAGES);
|
__dec_zone_page_state(page, NR_FILE_PAGES);
|
||||||
BUG_ON(page_mapped(page));
|
BUG_ON(page_mapped(page));
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Some filesystems seem to re-dirty the page even after
|
||||||
|
* the VM has canceled the dirty bit (eg ext3 journaling).
|
||||||
|
*
|
||||||
|
* Fix it up by doing a final dirty accounting check after
|
||||||
|
* having removed the page entirely.
|
||||||
|
*/
|
||||||
|
if (PageDirty(page) && mapping_cap_account_dirty(mapping)) {
|
||||||
|
dec_zone_page_state(page, NR_FILE_DIRTY);
|
||||||
|
dec_bdi_stat(mapping->backing_dev_info, BDI_RECLAIMABLE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void remove_from_page_cache(struct page *page)
|
void remove_from_page_cache(struct page *page)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче