[PATCH] use total_highpages when calculating lowmem-only allocation sizes (core)

From: Jan Beulich
Date: Mon Dec 06 2010 - 11:41:22 EST


For those (large) table allocations that come only from lowmem, the
total amount of memory shouldn't really matter.

For vfs_caches_init(), in the same spirit also replace the use of
nr_free_pages() by nr_free_buffer_pages().

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

---
fs/dcache.c | 4 ++--
init/main.c | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)

--- linux-2.6.37-rc4/fs/dcache.c
+++ 2.6.37-rc4-use-totalhigh_pages/fs/dcache.c
@@ -2474,10 +2474,10 @@ void __init vfs_caches_init(unsigned lon
{
unsigned long reserve;

- /* Base hash sizes on available memory, with a reserve equal to
+ /* Base hash sizes on available lowmem memory, with a reserve equal to
150% of current kernel size */

- reserve = min((mempages - nr_free_pages()) * 3/2, mempages - 1);
+ reserve = min((mempages - nr_free_buffer_pages()) * 3/2, mempages - 1);
mempages -= reserve;

names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
--- linux-2.6.37-rc4/init/main.c
+++ 2.6.37-rc4-use-totalhigh_pages/init/main.c
@@ -22,6 +22,7 @@
#include <linux/init.h>
#include <linux/initrd.h>
#include <linux/bootmem.h>
+#include <linux/highmem.h>
#include <linux/acpi.h>
#include <linux/tty.h>
#include <linux/percpu.h>
@@ -673,13 +674,13 @@ asmlinkage void __init start_kernel(void
#endif
thread_info_cache_init();
cred_init();
- fork_init(totalram_pages);
+ fork_init(totalram_pages - totalhigh_pages);
proc_caches_init();
buffer_init();
key_init();
security_init();
dbg_late_init();
- vfs_caches_init(totalram_pages);
+ vfs_caches_init(totalram_pages - totalhigh_pages);
signals_init();
/* rootfs populating might need page-writeback */
page_writeback_init();



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/