Attachment 149667 Details for Bug 230535 – AKPM's patch

[patch] AKPM's patch

throttle_vm_writeout-dont-loop-on-gfp_nofs-and-gfp_noio-allocations.patch (text/plain), 2.00 KB, created by Pete Zaitcev on 2007-03-09 02:14:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pete Zaitcev

Created: 2007-03-09 02:14:17 UTC

Size: 2.00 KB

patch

obsolete

>Subject: throttle_vm_writeout(): don't loop on GFP_NOFS and GFP_NOIO allocations
>From: Andrew Morton <akpm@linux-foundation.org>
>
>throttle_vm_writeout() is designed to wait for the dirty levels to subside. 
>But if the caller holds IO or FS locks, we might be holding up that writeout.
>
>So change it to take a single nap to give other devices a chance to clean some
>memory, then return.
>
>Cc: Nick Piggin <nickpiggin@yahoo.com.au>
>Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
>Cc: Kumar Gala <galak@kernel.crashing.org>
>Cc: Pete Zaitcev <zaitcev@redhat.com>
>Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
>---
>
> linux/writeback.h   |    0 
> mm/page-writeback.c |   13 +++++++++++--
> mm/vmscan.c         |    2 +-
> 3 files changed, 12 insertions(+), 3 deletions(-)
>
>diff -puN mm/vmscan.c~throttle_vm_writeout-dont-loop-on-gfp_nofs-and-gfp_noio-allocations mm/vmscan.c
>--- a/mm/vmscan.c~throttle_vm_writeout-dont-loop-on-gfp_nofs-and-gfp_noio-allocations
>+++ a/mm/vmscan.c
>@@ -952,7 +952,7 @@ static unsigned long shrink_zone(int pri
> 		}
> 	}
> 
>-	throttle_vm_writeout();
>+	throttle_vm_writeout(sc->gfp_mask);
> 
> 	atomic_dec(&zone->reclaim_in_progress);
> 	return nr_reclaimed;
>diff -puN mm/page-writeback.c~throttle_vm_writeout-dont-loop-on-gfp_nofs-and-gfp_noio-allocations mm/page-writeback.c
>--- a/mm/page-writeback.c~throttle_vm_writeout-dont-loop-on-gfp_nofs-and-gfp_noio-allocations
>+++ a/mm/page-writeback.c
>@@ -296,11 +296,21 @@ void balance_dirty_pages_ratelimited_nr(
> }
> EXPORT_SYMBOL(balance_dirty_pages_ratelimited_nr);
> 
>-void throttle_vm_writeout(void)
>+void throttle_vm_writeout(gfp_t gfp_mask)
> {
> 	long background_thresh;
> 	long dirty_thresh;
> 
>+	if ((gfp_mask & (__GFP_FS|__GFP_IO)) != __GFP_FS|__GFP_IO) {
>+		/*
>+		 * The caller might hold locks which can prevert IO completion
>+		 * or progress in the filesystem.  So we cannot just sit here
>+		 * waiting for IO to complete.
>+		 */
>+		congestion_wait(WRITE, HZ/10);
>+		return;
>+	}
>+
>         for ( ; ; ) {
> 		get_dirty_limits(&background_thresh, &dirty_thresh, NULL);
>

Actions: View | Diff

Attachments on bug 230535: 149667