diff options
| author | Arve Hjønnevåg <arve@android.com> | 2009-02-17 14:51:02 -0800 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2009-04-07 16:42:54 -0700 |
| commit | d620f695290e4ffb1586420ba1dbbb5b2c8c075d (patch) | |
| tree | 90a70b89030746e6471c4dbb543880f590f3fd42 | |
| parent | e4c9c5d7d6d5deb124083678fe5d839d3133f60a (diff) | |
mm: Add min_free_order_shift tunable.
By default the kernel tries to keep half as much memory free at each
order as it does for one order below. This can be too agressive when
running without swap.
Signed-off-by: Arve Hjønnevåg <arve@android.com>
| -rw-r--r-- | kernel/sysctl.c | 9 | ||||
| -rw-r--r-- | mm/page_alloc.c | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index c5ef44ff850f..0e3d9aa2876e 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -76,6 +76,7 @@ extern int suid_dumpable; extern char core_pattern[]; extern int pid_max; extern int min_free_kbytes; +extern int min_free_order_shift; extern int pid_max_min, pid_max_max; extern int sysctl_drop_caches; extern int percpu_pagelist_fraction; @@ -1097,6 +1098,14 @@ static struct ctl_table vm_table[] = { .extra1 = &zero, }, { + .ctl_name = CTL_UNNUMBERED, + .procname = "min_free_order_shift", + .data = &min_free_order_shift, + .maxlen = sizeof(min_free_order_shift), + .mode = 0644, + .proc_handler = &proc_dointvec + }, + { .ctl_name = VM_PERCPU_PAGELIST_FRACTION, .procname = "percpu_pagelist_fraction", .data = &percpu_pagelist_fraction, diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 5c44ed49ca93..a596bfd766f6 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -119,6 +119,7 @@ static char * const zone_names[MAX_NR_ZONES] = { }; int min_free_kbytes = 1024; +int min_free_order_shift = 1; unsigned long __meminitdata nr_kernel_pages; unsigned long __meminitdata nr_all_pages; @@ -1256,7 +1257,7 @@ int zone_watermark_ok(struct zone *z, int order, unsigned long mark, free_pages -= z->free_area[o].nr_free << o; /* Require fewer higher order pages to be free */ - min >>= 1; + min >>= min_free_order_shift; if (free_pages <= min) return 0; |