[PATCH] shrink hash sizes on small machines, take 2

Matt Mackall
2004-04-10T23:27:13Z

The following attempts to cleanly address the low end of the problem,
something like my calc_hash_order or Marcelo's approach should be used
to attack the upper end of the problem.

8<

Shrink hashes on small systems

Base hash sizes on available memory rather than total memory. An
additional 50% above current used memory is considered reserved for
the purposes of hash sizing to compensate for the hashes themselves
and the remainder of kernel and userspace initialization.

Index: tiny/fs/dcache.c
===================================================================
--- tiny.orig/fs/dcache.c 2004-03-25 13:36:09.000000000 -0600
+++ tiny/fs/dcache.c 2004-04-10 18:14:42.000000000 -0500
@@ -28,6 +28,7 @@
#include <asm/uaccess.h>
#include <linux/security.h>
#include <linux/seqlock.h>
+#include <linux/swap.h>

#define DCACHE_PARANOIA 1
/* #define DCACHE_DEBUG 1 */
@@ -1619,13 +1620,21 @@

void __init vfs_caches_init(unsigned long mempages)
{
- names_cachep = kmem_cache_create("names_cache",
- PATH_MAX, 0,
+ unsigned long reserve;
+
+ /* Base hash sizes on available memory, with a reserve equal to
+ 150% of current kernel size */
+
+ reserve = (mempages - nr_free_pages()) * 3/2;
+ mempages -= reserve;
+
+ names_cachep = kmem_cache_create("names_cache",
+ PATH_MAX, 0,
SLAB_HWCACHE_ALIGN, NULL, NULL);
if (!names_cachep)
panic("Cannot create names SLAB cache");

- filp_cachep = kmem_cache_create("filp",
+ filp_cachep = kmem_cache_create("filp",
sizeof(struct file), 0,
SLAB_HWCACHE_ALIGN, filp_ctor, filp_dtor);
if(!filp_cachep)
@@ -1633,7 +1642,7 @@

dcache_init(mempages);
inode_init(mempages);
- files_init(mempages);
+ files_init(mempages);
mnt_init(mempages);
bdev_cache_init();
chrdev_init();

--
Matt Mackall : http://www.selenic.com : Linux development and consulting