mm-add-extra-free-kbytes-tunable-update

All the fixes suggested by Andrew Morton.   Not much of a changelog
since the patch should probably be folded into
mm-add-extra-free-kbytes-tunable.patch

Thank you for pointing these out, Andrew.

Signed-off-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 3ac040f1936963e729c3688af5702ec9f97bb977..38401d22089f6f624decdb5b8b7f493828141cd6 100644 (file)
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -785,7 +785,7 @@ static inline int is_dma(struct zone *zone)
 
 /* These two functions are used to setup the per zone pages min values */
 struct ctl_table;
-int min_free_kbytes_sysctl_handler(struct ctl_table *, int,
+int free_kbytes_sysctl_handler(struct ctl_table *, int,
                                        void __user *, size_t *, loff_t *);
 extern int sysctl_lowmem_reserve_ratio[MAX_NR_ZONES-1];
 int lowmem_reserve_ratio_sysctl_handler(struct ctl_table *, int,

diff --git a/include/linux/swap.h b/include/linux/swap.h
index 537102d32210c3cc3296419bd5e6bc693c1a97cf..d782d045a9d99e9e7517805ee013a0408aff9d64 100644 (file)
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -211,6 +211,8 @@ struct swap_list_t {
 /* linux/mm/page_alloc.c */
 extern unsigned long totalram_pages;
 extern unsigned long totalreserve_pages;
+extern int min_free_kbytes;
+extern int extra_free_kbytes;
 extern unsigned int nr_free_buffer_pages(void);
 extern unsigned int nr_free_pagecache_pages(void);
 

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 5612631c849eb80dcb97111706604bd139de7676..a0d30d00fa050a98ae46d348d656847930078cdf 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -96,8 +96,6 @@ extern int suid_dumpable;
 extern char core_pattern[];
 extern unsigned int core_pipe_limit;
 extern int pid_max;
-extern int min_free_kbytes;
-extern int extra_free_kbytes;
 extern int pid_max_min, pid_max_max;
 extern int sysctl_drop_caches;
 extern int percpu_pagelist_fraction;
@@ -1206,7 +1204,7 @@ static struct ctl_table vm_table[] = {
                .data           = &min_free_kbytes,
                .maxlen         = sizeof(min_free_kbytes),
                .mode           = 0644,
-               .proc_handler   = min_free_kbytes_sysctl_handler,
+               .proc_handler   = free_kbytes_sysctl_handler,
                .extra1         = &zero,
        },
        {
@@ -1214,7 +1212,7 @@ static struct ctl_table vm_table[] = {
                .data           = &extra_free_kbytes,
                .maxlen         = sizeof(extra_free_kbytes),
                .mode           = 0644,
-               .proc_handler   = min_free_kbytes_sysctl_handler,
+               .proc_handler   = free_kbytes_sysctl_handler,
                .extra1         = &zero,
        },
        {

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 2a00892cb35a90f0b47b0857887d096af7d81b00..abefb54df4d44e1ab3149e76350a65ff76bad793 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -183,11 +183,12 @@ static char * const zone_names[MAX_NR_ZONES] = {
 int min_free_kbytes = 1024;
 
 /*
- * Extra memory for the system to try freeing. Used to temporarily
- * free memory, to make space for new workloads. Anyone can allocate
- * down to the min watermarks controlled by min_free_kbytes above.
+ * Extra memory for the system to try freeing between the min and
+ * low watermarks.  Useful for workloads that require low latency
+ * memory allocations in bursts larger than the normal gap between
+ * low and min.
  */
-int extra_free_kbytes = 0;
+int extra_free_kbytes;
 
 static unsigned long __meminitdata nr_kernel_pages;
 static unsigned long __meminitdata nr_all_pages;
@@ -4948,11 +4949,11 @@ int __meminit init_per_zone_wmark_min(void)
 module_init(init_per_zone_wmark_min)
 
 /*
- * min_free_kbytes_sysctl_handler - just a wrapper around proc_dointvec() so 
+ * free_kbytes_sysctl_handler - just a wrapper around proc_dointvec() so 
  *     that we can call two helper functions whenever min_free_kbytes
  *     or extra_free_kbytes changes.
  */
-int min_free_kbytes_sysctl_handler(ctl_table *table, int write, 
+int free_kbytes_sysctl_handler(ctl_table *table, int write, 
        void __user *buffer, size_t *length, loff_t *ppos)
 {
        proc_dointvec(table, write, buffer, length, ppos);