Attachment 295331 Details for Bug 252939 – Fix for this issue.

[patch] Fix for this issue.

rhel4-oom.patch (text/plain), 1.37 KB, created by Larry Woodman on 2008-02-19 20:18:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Larry Woodman

Created: 2008-02-19 20:18:11 UTC

Size: 1.37 KB

patch

obsolete

>--- linux-2.6.9/mm/page_alloc.c.orig	2007-12-22 06:05:51.000000000 -0500
>+++ linux-2.6.9/mm/page_alloc.c	2007-12-22 06:07:10.000000000 -0500
>@@ -683,6 +683,8 @@ __alloc_pages(unsigned int gfp_mask, uns
> 
> rebalance:
> 	/* We now go into synchronous reclaim */
>+	if (p->flags & PF_MEMDIE)
>+		goto nopage;
> 	p->flags |= PF_MEMALLOC;
> 	reclaim_state.reclaimed_slab = 0;
> 	p->reclaim_state = &reclaim_state;
>--- linux-2.6.9/mm/vmscan.c.orig	2007-12-22 06:05:46.000000000 -0500
>+++ linux-2.6.9/mm/vmscan.c	2007-12-22 06:07:10.000000000 -0500
>@@ -847,6 +847,8 @@ shrink_zone(struct zone *zone, struct sc
> 	sc->nr_to_reclaim = SWAP_CLUSTER_MAX;
> 
> 	while (nr_active || nr_inactive) {
>+		if (current->flags & PF_MEMDIE)
>+			break;
> 		/* stop after we are way above pages_high, someone might have exited */
> 		if ((zone->free_pages > zone->pages_high*2) && !sc->order)
> 			break;
>@@ -902,6 +904,9 @@ shrink_caches(struct zone **zones, struc
> 	for (i = 0; zones[i] != NULL; i++) {
> 		struct zone *zone = zones[i];
> 
>+		if (current->flags & PF_MEMDIE)
>+			return NULL;
>+
> 		if (zone->present_pages == 0)
> 			continue;
> 
>@@ -978,6 +983,10 @@ int try_to_free_pages(struct zone **zone
> 		sc.nr_congested = 0;
> 		sc.priority = priority;
> 		sc.nr_ios = 0;
>+
>+		if (current->flags & PF_MEMDIE)
>+			goto out;
>+
> 		shrink_caches(zones, &sc);
> 		shrink_slab(sc.nr_scanned, gfp_mask, lru_pages);
> 		if (reclaim_state) {

Actions: View | Diff

Attachments on bug 252939: 295331