[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20090622182451.GA15682@sgi.com>
Date: Mon, 22 Jun 2009 13:24:51 -0500
From: Dimitri Sivanich <sivanich@....com>
To: akpm@...ux-foundation.org, linux-kernel@...r.kernel.org
Cc: cl@...ux-foundation.org, kosaki.motohiro@...fujitsu.com,
mel@....ul.ie, nickpiggin@...oo.com.au, stable@...nel.org
Subject: [PATCH] Fix handling of pagesets for downed cpus
After downing/upping a cpu, an attempt to set
/proc/sys/vm/percpu_pagelist_fraction results in an oops in
percpu_pagelist_fraction_sysctl_handler().
If a processor is downed then we need to set the pageset pointer back to the
boot pageset.
Updates of the high water marks should not access pagesets of unpopulated zones
(those pointer go to the boot pagesets which would be no longer functional if
their size would be increased beyond zero).
Signed-off-by: Dimitri Sivanich <sivanich@....com>
Signed-off-by: Christoph Lameter <cl@...ux-foundation.org>
---
This patch should go into the -stable tree as well.
mm/page_alloc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Index: linux/mm/page_alloc.c
===================================================================
--- linux.orig/mm/page_alloc.c 2009-06-22 13:06:50.000000000 -0500
+++ linux/mm/page_alloc.c 2009-06-22 13:08:09.000000000 -0500
@@ -3026,7 +3026,7 @@ bad:
if (dzone == zone)
break;
kfree(zone_pcp(dzone, cpu));
- zone_pcp(dzone, cpu) = NULL;
+ zone_pcp(dzone, cpu) = &boot_pageset[cpu];
}
return -ENOMEM;
}
@@ -3041,7 +3041,7 @@ static inline void free_zone_pagesets(in
/* Free per_cpu_pageset if it is slab allocated */
if (pset != &boot_pageset[cpu])
kfree(pset);
- zone_pcp(zone, cpu) = NULL;
+ zone_pcp(zone, cpu) = &boot_pageset[cpu];
}
}
@@ -4659,7 +4659,7 @@ int percpu_pagelist_fraction_sysctl_hand
ret = proc_dointvec_minmax(table, write, file, buffer, length, ppos);
if (!write || (ret == -EINVAL))
return ret;
- for_each_zone(zone) {
+ for_each_populated_zone(zone) {
for_each_online_cpu(cpu) {
unsigned long high;
high = zone->present_pages / percpu_pagelist_fraction;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists