The patch titled
zvc-zone_reclaim-leave-1%-of-unmapped-pagecache-pages-for-file-i-o-tunable-rename
has been removed from the -mm tree. Its filename is
zvc-zone_reclaim-leave-1%-of-unmapped-pagecache-pages-for-file-i-o-tunable-rename.patch
This patch was dropped because it was folded into zvc-zone_reclaim-leave-1%-of-unmapped-pagecache-pages-for-file-i-o.patch
------------------------------------------------------
Subject: zvc-zone_reclaim-leave-1%-of-unmapped-pagecache-pages-for-file-i-o-tunable-rename
From: Andrew Morton <akpm@xxxxxxxx>
Cc: Christoph Lameter <clameter@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
Documentation/sysctl/vm.txt | 12 +++++++-----
include/linux/mmzone.h | 4 ++--
include/linux/swap.h | 2 +-
kernel/sysctl.c | 8 ++++----
mm/page_alloc.c | 8 ++++----
mm/vmscan.c | 10 +++++-----
6 files changed, 23 insertions(+), 21 deletions(-)
diff -puN Documentation/sysctl/vm.txt~zvc-zone_reclaim-leave-1%-of-unmapped-pagecache-pages-for-file-i-o-tunable-rename Documentation/sysctl/vm.txt
--- a/Documentation/sysctl/vm.txt~zvc-zone_reclaim-leave-1%-of-unmapped-pagecache-pages-for-file-i-o-tunable-rename
+++ a/Documentation/sysctl/vm.txt
@@ -28,7 +28,7 @@ Currently, these files are in /proc/sys/
- block_dump
- drop-caches
- zone_reclaim_mode
-- min_unmapped
+- min_unmapped_ratio
- panic_on_oom
==============================================================
@@ -169,12 +169,14 @@ in all nodes of the system.
=============================================================
-min_unmapped:
+min_unmapped_ratio:
-A percentage of the file backed pages in each zone. Zone reclaim will only
+This is available only on NUMA kernels.
+
+A percentage of the file backed pages in each zone. Zone reclaim will only
occur if more than this percentage of pages are file backed and unmapped.
-This is to insure that a minimal amount of local pages is still available
-for file I/O even if the node is overallocated.
+This is to insure that a minimal amount of local pages is still available for
+file I/O even if the node is overallocated.
The default is 1 percent.
diff -puN include/linux/mmzone.h~zvc-zone_reclaim-leave-1%-of-unmapped-pagecache-pages-for-file-i-o-tunable-rename include/linux/mmzone.h
--- a/include/linux/mmzone.h~zvc-zone_reclaim-leave-1%-of-unmapped-pagecache-pages-for-file-i-o-tunable-rename
+++ a/include/linux/mmzone.h
@@ -153,7 +153,7 @@ struct zone {
/*
* zone reclaim becomes active if more unmapped pages exist.
*/
- unsigned long min_unmapped;
+ unsigned long min_unmapped_ratio;
struct per_cpu_pageset *pageset[NR_CPUS];
#else
struct per_cpu_pageset pageset[NR_CPUS];
@@ -418,7 +418,7 @@ int lowmem_reserve_ratio_sysctl_handler(
void __user *, size_t *, loff_t *);
int percpu_pagelist_fraction_sysctl_handler(struct ctl_table *, int, struct file *,
void __user *, size_t *, loff_t *);
-int sysctl_min_unmapped_sysctl_handler(struct ctl_table *, int,
+int sysctl_min_unmapped_ratio_sysctl_handler(struct ctl_table *, int,
struct file *, void __user *, size_t *, loff_t *);
#include <linux/topology.h>
diff -puN include/linux/swap.h~zvc-zone_reclaim-leave-1%-of-unmapped-pagecache-pages-for-file-i-o-tunable-rename include/linux/swap.h
--- a/include/linux/swap.h~zvc-zone_reclaim-leave-1%-of-unmapped-pagecache-pages-for-file-i-o-tunable-rename
+++ a/include/linux/swap.h
@@ -189,7 +189,7 @@ extern long vm_total_pages;
#ifdef CONFIG_NUMA
extern int zone_reclaim_mode;
-extern int sysctl_min_unmapped;
+extern int sysctl_min_unmapped_ratio;
extern int zone_reclaim(struct zone *, gfp_t, unsigned int);
#else
#define zone_reclaim_mode 0
diff -puN kernel/sysctl.c~zvc-zone_reclaim-leave-1%-of-unmapped-pagecache-pages-for-file-i-o-tunable-rename kernel/sysctl.c
--- a/kernel/sysctl.c~zvc-zone_reclaim-leave-1%-of-unmapped-pagecache-pages-for-file-i-o-tunable-rename
+++ a/kernel/sysctl.c
@@ -951,11 +951,11 @@ static ctl_table vm_table[] = {
},
{
.ctl_name = VM_MIN_UNMAPPED,
- .procname = "min_unmapped",
- .data = &sysctl_min_unmapped,
- .maxlen = sizeof(sysctl_min_unmapped),
+ .procname = "min_unmapped_ratio",
+ .data = &sysctl_min_unmapped_ratio,
+ .maxlen = sizeof(sysctl_min_unmapped_ratio),
.mode = 0644,
- .proc_handler = &sysctl_min_unmapped_sysctl_handler,
+ .proc_handler = &sysctl_min_unmapped_ratio_sysctl_handler,
.strategy = &sysctl_intvec,
.extra1 = &zero,
.extra2 = &one_hundred,
diff -puN mm/page_alloc.c~zvc-zone_reclaim-leave-1%-of-unmapped-pagecache-pages-for-file-i-o-tunable-rename mm/page_alloc.c
--- a/mm/page_alloc.c~zvc-zone_reclaim-leave-1%-of-unmapped-pagecache-pages-for-file-i-o-tunable-rename
+++ a/mm/page_alloc.c
@@ -2006,7 +2006,7 @@ static void __meminit free_area_init_cor
zone->spanned_pages = size;
zone->present_pages = realsize;
#ifdef CONFIG_NUMA
- zone->min_unmapped = (realsize * sysctl_min_unmapped)
+ zone->min_unmapped_ratio = (realsize*sysctl_min_unmapped_ratio)
/ 100;
#endif
zone->name = zone_names[j];
@@ -2303,7 +2303,7 @@ int min_free_kbytes_sysctl_handler(ctl_t
}
#ifdef CONFIG_NUMA
-int sysctl_min_unmapped_sysctl_handler(ctl_table *table, int write,
+int sysctl_min_unmapped_ratio_sysctl_handler(ctl_table *table, int write,
struct file *file, void __user *buffer, size_t *length, loff_t *ppos)
{
struct zone *zone;
@@ -2314,8 +2314,8 @@ int sysctl_min_unmapped_sysctl_handler(c
return rc;
for_each_zone(zone)
- zone->min_unmapped = (zone->present_pages *
- sysctl_min_unmapped) / 100;
+ zone->min_unmapped_ratio = (zone->present_pages *
+ sysctl_min_unmapped_ratio) / 100;
return 0;
}
#endif
diff -puN mm/vmscan.c~zvc-zone_reclaim-leave-1%-of-unmapped-pagecache-pages-for-file-i-o-tunable-rename mm/vmscan.c
--- a/mm/vmscan.c~zvc-zone_reclaim-leave-1%-of-unmapped-pagecache-pages-for-file-i-o-tunable-rename
+++ a/mm/vmscan.c
@@ -1520,10 +1520,10 @@ int zone_reclaim_mode __read_mostly;
#define ZONE_RECLAIM_PRIORITY 4
/*
- * Percentile of pages in a zone that must be unmapped
- * for zone_reclaim to occur.
+ * Percentage of pages in a zone that must be unmapped for zone_reclaim to
+ * occur.
*/
-int sysctl_min_unmapped = 1;
+int sysctl_min_unmapped_ratio = 1;
/*
* Try to free up some pages from this zone through reclaim.
@@ -1601,8 +1601,8 @@ int zone_reclaim(struct zone *zone, gfp_
* unmapped file backed pages.
*/
if (zone_page_state(zone, NR_FILE_PAGES) -
- zone_page_state(zone, NR_FILE_MAPPED) <= zone->min_unmapped)
- return 0;
+ zone_page_state(zone, NR_FILE_MAPPED) <= zone->min_unmapped_ratio)
+ return 0;
/*
* Avoid concurrent zone reclaims, do not reclaim in a zone that does
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
genirq-ia64-cleanup.patch
lockdep-add-disable-enable_irq_lockdep-api.patch
lockdep-irqtrace-subsystem-x86_64-support.patch
forcedeth-typecast-cleanup.patch
zvc-zone_reclaim-leave-1%-of-unmapped-pagecache-pages-for-file-i-o.patch
zvc-zone_reclaim-leave-1%-of-unmapped-pagecache-pages-for-file-i-o-tunable-rename.patch
adix-tree-rcu-lockless-readside-update-tidy.patch
mm-tracking-shared-dirty-pages-checks.patch
mm-tracking-shared-dirty-pages-wimp.patch
acx1xx-wireless-driver.patch
tiacx-pci-build-fix.patch
tiacx-ia64-fix.patch
sched-clean-up-fallout-of-recent-changes.patch
deprecate-smbfs-in-favour-of-cifs.patch
edac-new-opteron-athlon64-memory-controller-driver-tidy.patch
valid_mmap_phys_addr_range-cleanup.patch
x86-microcode-microcode-driver-cleanup-tidy.patch
x86-microcode-add-sysfs-and-hotplug-support-fix.patch
reiserfs-on-demand-bitmap-loading.patch
per-task-delay-accounting-taskstats-interface.patch
per-task-delay-accounting-proc-export-of-aggregated-block-i-o-delays.patch
delay-accounting-taskstats-interface-send-tgid-once.patch
swap_prefetch-vs-zoned-counters.patch
ecryptfs-mmap-operations.patch
ecryptfs-alpha-build-fix.patch
ecryptfs-more-elegant-aes-key-size-manipulation.patch
ecryptfs-get_sb_dev-fix.patch
namespaces-add-nsproxy-dont-include-compileh.patch
namespaces-utsname-switch-to-using-uts-namespaces.patch
namespaces-utsname-use-init_utsname-when-appropriate.patch
namespaces-utsname-implement-utsname-namespaces.patch
namespaces-utsname-sysctl-hack.patch
ipc-namespace-core.patch
task-watchers-task-watchers.patch
task-watchers-add-support-for-per-task-watchers.patch
readahead-sysctl-parameters-fix.patch
make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch
reiser4-hardirq-include-fix.patch
reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.patch
reiser4-get_sb_dev-fix.patch
reiser4-vs-zoned-allocator.patch
hpt3xx-rework-rate-filtering-tidy.patch
md-oops-workaround.patch
genirq-convert-the-i386-architecture-to-irq-chips.patch
genirq-x86_64-irq-reenable-migrating-irqs-to-other-cpus.patch
genirq-msi-simplify-msi-enable-and-disable.patch
genirq-ia64-irq-dynamic-irq-support.patch
genirq-i386-irq-remove-the-msi-assumption-that-irq-==-vector.patch
srcu-rcu-variant-permitting-read-side-blocking.patch
srcu-add-srcu-operations-to-rcutorture.patch
srcu-2-add-srcu-operations-to-rcutorture.patch
make-more-file_operation-structs-static.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
revert-tty-buffering-comment-out-debug-code.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
