Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git] / mm / vmscan.c
index f789212..840092d 100644 (file)
@@ -21,7 +21,6 @@
 #include <linux/highmem.h>
 #include <linux/file.h>
 #include <linux/writeback.h>
-#include <linux/suspend.h>
 #include <linux/blkdev.h>
 #include <linux/buffer_head.h> /* for try_to_release_page(),
                                        buffer_heads_over_limit */
 #include <linux/rmap.h>
 #include <linux/topology.h>
 #include <linux/cpu.h>
+#include <linux/cpuset.h>
 #include <linux/notifier.h>
+#include <linux/rwsem.h>
+#include <linux/delay.h>
 
-#include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 #include <asm/div64.h>
 
 #include <linux/swapops.h>
 
+#include "internal.h"
+
+struct scan_control {
+       /* Incremented by the number of inactive pages that were scanned */
+       unsigned long nr_scanned;
+
+       unsigned long nr_mapped;        /* From page_state */
+
+       /* This context's GFP mask */
+       gfp_t gfp_mask;
+
+       int may_writepage;
+
+       /* Can pages be swapped as part of reclaim? */
+       int may_swap;
+
+       /* This context's SWAP_CLUSTER_MAX. If freeing memory for
+        * suspend, we effectively ignore SWAP_CLUSTER_MAX.
+        * In this context, it doesn't matter that we scan the
+        * whole list at once. */
+       int swap_cluster_max;
+};
+
 /*
- * From 0 .. 100.  Higher means more swappy.
+ * The list of shrinker callbacks used by to apply pressure to
+ * ageable caches.
  */
-int vm_swappiness = 60;
-static long total_memory;
+struct shrinker {
+       shrinker_t              shrinker;
+       struct list_head        list;
+       int                     seeks;  /* seeks to recreate an obj */
+       long                    nr;     /* objs pending delete */
+};
 
 #define lru_to_page(_head) (list_entry((_head)->prev, struct page, lru))
 
@@ -67,7 +96,7 @@ static long total_memory;
                if ((_page)->lru.prev != _base) {                       \
                        struct page *prev;                              \
                                                                        \
-                       prev = lru_to_page(&(_page->lru));                      \
+                       prev = lru_to_page(&(_page->lru));              \
                        prefetchw(&prev->_field);                       \
                }                                                       \
        } while (0)
@@ -76,18 +105,13 @@ static long total_memory;
 #endif
 
 /*
- * The list of shrinker callbacks used by to apply pressure to
- * ageable caches.
+ * From 0 .. 100.  Higher means more swappy.
  */
-struct shrinker {
-       shrinker_t              shrinker;
-       struct list_head        list;
-       int                     seeks;  /* seeks to recreate an obj */
-       long                    nr;     /* objs pending delete */
-};
+int vm_swappiness = 60;
+static long total_memory;
 
 static LIST_HEAD(shrinker_list);
-static DECLARE_MUTEX(shrinker_sem);
+static DECLARE_RWSEM(shrinker_rwsem);
 
 /*
  * Add a shrinker callback to be called from the vm
@@ -101,13 +125,12 @@ struct shrinker *set_shrinker(int seeks, shrinker_t theshrinker)
                shrinker->shrinker = theshrinker;
                shrinker->seeks = seeks;
                shrinker->nr = 0;
-               down(&shrinker_sem);
-               list_add(&shrinker->list, &shrinker_list);
-               up(&shrinker_sem);
+               down_write(&shrinker_rwsem);
+               list_add_tail(&shrinker->list, &shrinker_list);
+               up_write(&shrinker_rwsem);
        }
        return shrinker;
 }
-
 EXPORT_SYMBOL(set_shrinker);
 
 /*
@@ -115,14 +138,13 @@ EXPORT_SYMBOL(set_shrinker);
  */
 void remove_shrinker(struct shrinker *shrinker)
 {
-       down(&shrinker_sem);
+       down_write(&shrinker_rwsem);
        list_del(&shrinker->list);
-       up(&shrinker_sem);
+       up_write(&shrinker_rwsem);
        kfree(shrinker);
 }
-
 EXPORT_SYMBOL(remove_shrinker);
+
 #define SHRINK_BATCH 128
 /*
  * Call the shrink functions to age shrinkable caches
@@ -136,44 +158,75 @@ EXPORT_SYMBOL(remove_shrinker);
  * slab to avoid swapping.
  *
  * We do weird things to avoid (scanned*seeks*entries) overflowing 32 bits.
+ *
+ * `lru_pages' represents the number of on-LRU pages in all the zones which
+ * are eligible for the caller's allocation attempt.  It is used for balancing
+ * slab reclaim versus page reclaim.
+ *
+ * Returns the number of slab objects which we shrunk.
  */
-static int shrink_slab(unsigned long scanned, unsigned int gfp_mask)
+unsigned long shrink_slab(unsigned long scanned, gfp_t gfp_mask,
+                       unsigned long lru_pages)
 {
        struct shrinker *shrinker;
-       long pages;
+       unsigned long ret = 0;
 
-       if (down_trylock(&shrinker_sem))
-               return 0;
+       if (scanned == 0)
+               scanned = SWAP_CLUSTER_MAX;
+
+       if (!down_read_trylock(&shrinker_rwsem))
+               return 1;       /* Assume we'll be able to shrink next time */
 
-       pages = nr_used_zone_pages();
        list_for_each_entry(shrinker, &shrinker_list, list) {
                unsigned long long delta;
+               unsigned long total_scan;
+               unsigned long max_pass = (*shrinker->shrinker)(0, gfp_mask);
 
                delta = (4 * scanned) / shrinker->seeks;
-               delta *= (*shrinker->shrinker)(0, gfp_mask);
-               do_div(delta, pages + 1);
+               delta *= max_pass;
+               do_div(delta, lru_pages + 1);
                shrinker->nr += delta;
-               if (shrinker->nr > SHRINK_BATCH) {
-                       long nr_to_scan = shrinker->nr;
-
-                       shrinker->nr = 0;
-                       mod_page_state(slabs_scanned, nr_to_scan);
-                       while (nr_to_scan) {
-                               long this_scan = nr_to_scan;
-
-                               if (this_scan > 128)
-                                       this_scan = 128;
-                               (*shrinker->shrinker)(this_scan, gfp_mask);
-                               nr_to_scan -= this_scan;
-                               cond_resched();
-                       }
+               if (shrinker->nr < 0) {
+                       printk(KERN_ERR "%s: nr=%ld\n",
+                                       __FUNCTION__, shrinker->nr);
+                       shrinker->nr = max_pass;
                }
+
+               /*
+                * Avoid risking looping forever due to too large nr value:
+                * never try to free more than twice the estimate number of
+                * freeable entries.
+                */
+               if (shrinker->nr > max_pass * 2)
+                       shrinker->nr = max_pass * 2;
+
+               total_scan = shrinker->nr;
+               shrinker->nr = 0;
+
+               while (total_scan >= SHRINK_BATCH) {
+                       long this_scan = SHRINK_BATCH;
+                       int shrink_ret;
+                       int nr_before;
+
+                       nr_before = (*shrinker->shrinker)(0, gfp_mask);
+                       shrink_ret = (*shrinker->shrinker)(this_scan, gfp_mask);
+                       if (shrink_ret == -1)
+                               break;
+                       if (shrink_ret < nr_before)
+                               ret += nr_before - shrink_ret;
+                       mod_page_state(slabs_scanned, this_scan);
+                       total_scan -= this_scan;
+
+                       cond_resched();
+               }
+
+               shrinker->nr += total_scan;
        }
-       up(&shrinker_sem);
-       return 0;
+       up_read(&shrinker_rwsem);
+       return ret;
 }
 
-/* Must be called with page's rmap lock held. */
+/* Called without lock on whether page is mapped, so answer is unstable */
 static inline int page_mapping_inuse(struct page *page)
 {
        struct address_space *mapping;
@@ -201,9 +254,7 @@ static inline int is_page_cache_freeable(struct page *page)
 
 static int may_write_to_queue(struct backing_dev_info *bdi)
 {
-       if (current_is_kswapd())
-               return 1;
-       if (current_is_pdflush())       /* This is unlikely, but why not... */
+       if (current->flags & PF_SWAPWRITE)
                return 1;
        if (!bdi_write_congested(bdi))
                return 1;
@@ -238,143 +289,218 @@ static void handle_write_error(struct address_space *mapping,
 }
 
 /*
- * shrink_list returns the number of reclaimed pages
+ * pageout is called by shrink_page_list() for each dirty page.
+ * Calls ->writepage().
  */
-static int
-shrink_list(struct list_head *page_list, unsigned int gfp_mask,
-               int *nr_scanned, int do_writepage)
+pageout_t pageout(struct page *page, struct address_space *mapping)
+{
+       /*
+        * If the page is dirty, only perform writeback if that write
+        * will be non-blocking.  To prevent this allocation from being
+        * stalled by pagecache activity.  But note that there may be
+        * stalls if we need to run get_block().  We could test
+        * PagePrivate for that.
+        *
+        * If this process is currently in generic_file_write() against
+        * this page's queue, we can perform writeback even if that
+        * will block.
+        *
+        * If the page is swapcache, write it back even if that would
+        * block, for some throttling. This happens by accident, because
+        * swap_backing_dev_info is bust: it doesn't reflect the
+        * congestion state of the swapdevs.  Easy to fix, if needed.
+        * See swapfile.c:page_queue_congested().
+        */
+       if (!is_page_cache_freeable(page))
+               return PAGE_KEEP;
+       if (!mapping) {
+               /*
+                * Some data journaling orphaned pages can have
+                * page->mapping == NULL while being dirty with clean buffers.
+                */
+               if (PagePrivate(page)) {
+                       if (try_to_free_buffers(page)) {
+                               ClearPageDirty(page);
+                               printk("%s: orphaned page\n", __FUNCTION__);
+                               return PAGE_CLEAN;
+                       }
+               }
+               return PAGE_KEEP;
+       }
+       if (mapping->a_ops->writepage == NULL)
+               return PAGE_ACTIVATE;
+       if (!may_write_to_queue(mapping->backing_dev_info))
+               return PAGE_KEEP;
+
+       if (clear_page_dirty_for_io(page)) {
+               int res;
+               struct writeback_control wbc = {
+                       .sync_mode = WB_SYNC_NONE,
+                       .nr_to_write = SWAP_CLUSTER_MAX,
+                       .nonblocking = 1,
+                       .for_reclaim = 1,
+               };
+
+               SetPageReclaim(page);
+               res = mapping->a_ops->writepage(page, &wbc);
+               if (res < 0)
+                       handle_write_error(mapping, page, res);
+               if (res == AOP_WRITEPAGE_ACTIVATE) {
+                       ClearPageReclaim(page);
+                       return PAGE_ACTIVATE;
+               }
+               if (!PageWriteback(page)) {
+                       /* synchronous write or broken a_ops? */
+                       ClearPageReclaim(page);
+               }
+
+               return PAGE_SUCCESS;
+       }
+
+       return PAGE_CLEAN;
+}
+
+int remove_mapping(struct address_space *mapping, struct page *page)
+{
+       if (!mapping)
+               return 0;               /* truncate got there first */
+
+       write_lock_irq(&mapping->tree_lock);
+
+       /*
+        * The non-racy check for busy page.  It is critical to check
+        * PageDirty _after_ making sure that the page is freeable and
+        * not in use by anybody.       (pagecache + us == 2)
+        */
+       if (unlikely(page_count(page) != 2))
+               goto cannot_free;
+       smp_rmb();
+       if (unlikely(PageDirty(page)))
+               goto cannot_free;
+
+       if (PageSwapCache(page)) {
+               swp_entry_t swap = { .val = page_private(page) };
+               __delete_from_swap_cache(page);
+               write_unlock_irq(&mapping->tree_lock);
+               swap_free(swap);
+               __put_page(page);       /* The pagecache ref */
+               return 1;
+       }
+
+       __remove_from_page_cache(page);
+       write_unlock_irq(&mapping->tree_lock);
+       __put_page(page);
+       return 1;
+
+cannot_free:
+       write_unlock_irq(&mapping->tree_lock);
+       return 0;
+}
+
+/*
+ * shrink_page_list() returns the number of reclaimed pages
+ */
+static unsigned long shrink_page_list(struct list_head *page_list,
+                                       struct scan_control *sc)
 {
-       struct address_space *mapping;
        LIST_HEAD(ret_pages);
        struct pagevec freed_pvec;
        int pgactivate = 0;
-       int ret = 0;
+       unsigned long nr_reclaimed = 0;
 
        cond_resched();
 
        pagevec_init(&freed_pvec, 1);
        while (!list_empty(page_list)) {
+               struct address_space *mapping;
                struct page *page;
                int may_enter_fs;
                int referenced;
 
+               cond_resched();
+
                page = lru_to_page(page_list);
                list_del(&page->lru);
 
                if (TestSetPageLocked(page))
                        goto keep;
 
+               BUG_ON(PageActive(page));
+
+               sc->nr_scanned++;
+
+               if (!sc->may_swap && page_mapped(page))
+                       goto keep_locked;
+
                /* Double the slab pressure for mapped and swapcache pages */
                if (page_mapped(page) || PageSwapCache(page))
-                       (*nr_scanned)++;
-
-               BUG_ON(PageActive(page));
+                       sc->nr_scanned++;
 
                if (PageWriteback(page))
                        goto keep_locked;
 
-               rmap_lock(page);
-               referenced = page_referenced(page);
-               if (referenced && page_mapping_inuse(page)) {
-                       /* In active use or really unfreeable.  Activate it. */
-                       rmap_unlock(page);
+               referenced = page_referenced(page, 1);
+               /* In active use or really unfreeable?  Activate it. */
+               if (referenced && page_mapping_inuse(page))
                        goto activate_locked;
-               }
-
-               mapping = page_mapping(page);
-               may_enter_fs = (gfp_mask & __GFP_FS);
 
 #ifdef CONFIG_SWAP
                /*
                 * Anonymous process memory has backing store?
                 * Try to allocate it some swap space here.
-                *
-                * XXX: implement swap clustering ?
                 */
-               if (PageAnon(page) && !PageSwapCache(page)) {
-                       rmap_unlock(page);
-                       if (!add_to_swap(page))
+               if (PageAnon(page) && !PageSwapCache(page))
+                       if (!add_to_swap(page, GFP_ATOMIC))
                                goto activate_locked;
-                       rmap_lock(page);
-               }
-               if (PageSwapCache(page)) {
-                       mapping = &swapper_space;
-                       may_enter_fs = (gfp_mask & __GFP_IO);
-               }
 #endif /* CONFIG_SWAP */
 
+               mapping = page_mapping(page);
+               may_enter_fs = (sc->gfp_mask & __GFP_FS) ||
+                       (PageSwapCache(page) && (sc->gfp_mask & __GFP_IO));
+
                /*
                 * The page is mapped into the page tables of one or more
                 * processes. Try to unmap it here.
                 */
                if (page_mapped(page) && mapping) {
-                       switch (try_to_unmap(page)) {
+                       switch (try_to_unmap(page, 0)) {
                        case SWAP_FAIL:
-                               rmap_unlock(page);
                                goto activate_locked;
                        case SWAP_AGAIN:
-                               rmap_unlock(page);
                                goto keep_locked;
                        case SWAP_SUCCESS:
                                ; /* try to free the page below */
                        }
                }
-               rmap_unlock(page);
 
-               /*
-                * If the page is dirty, only perform writeback if that write
-                * will be non-blocking.  To prevent this allocation from being
-                * stalled by pagecache activity.  But note that there may be
-                * stalls if we need to run get_block().  We could test
-                * PagePrivate for that.
-                *
-                * If this process is currently in generic_file_write() against
-                * this page's queue, we can perform writeback even if that
-                * will block.
-                *
-                * If the page is swapcache, write it back even if that would
-                * block, for some throttling. This happens by accident, because
-                * swap_backing_dev_info is bust: it doesn't reflect the
-                * congestion state of the swapdevs.  Easy to fix, if needed.
-                * See swapfile.c:page_queue_congested().
-                */
                if (PageDirty(page)) {
                        if (referenced)
                                goto keep_locked;
-                       if (!is_page_cache_freeable(page))
-                               goto keep_locked;
-                       if (!mapping)
-                               goto keep_locked;
-                       if (mapping->a_ops->writepage == NULL)
-                               goto activate_locked;
                        if (!may_enter_fs)
                                goto keep_locked;
-                       if (!may_write_to_queue(mapping->backing_dev_info))
+                       if (!sc->may_writepage)
                                goto keep_locked;
-                       if (laptop_mode && !do_writepage)
+
+                       /* Page is dirty, try to write it out here */
+                       switch(pageout(page, mapping)) {
+                       case PAGE_KEEP:
                                goto keep_locked;
-                       if (clear_page_dirty_for_io(page)) {
-                               int res;
-                               struct writeback_control wbc = {
-                                       .sync_mode = WB_SYNC_NONE,
-                                       .nr_to_write = SWAP_CLUSTER_MAX,
-                                       .nonblocking = 1,
-                                       .for_reclaim = 1,
-                               };
-
-                               SetPageReclaim(page);
-                               res = mapping->a_ops->writepage(page, &wbc);
-                               if (res < 0)
-                                       handle_write_error(mapping, page, res);
-                               if (res == WRITEPAGE_ACTIVATE) {
-                                       ClearPageReclaim(page);
-                                       goto activate_locked;
-                               }
-                               if (!PageWriteback(page)) {
-                                       /* synchronous write or broken a_ops? */
-                                       ClearPageReclaim(page);
-                               }
-                               goto keep;
+                       case PAGE_ACTIVATE:
+                               goto activate_locked;
+                       case PAGE_SUCCESS:
+                               if (PageWriteback(page) || PageDirty(page))
+                                       goto keep;
+                               /*
+                                * A synchronous write - probably a ramdisk.  Go
+                                * ahead and try to reclaim the page.
+                                */
+                               if (TestSetPageLocked(page))
+                                       goto keep;
+                               if (PageDirty(page) || PageWriteback(page))
+                                       goto keep_locked;
+                               mapping = page_mapping(page);
+                       case PAGE_CLEAN:
+                               ; /* try to free the page below */
                        }
                }
 
@@ -396,49 +522,22 @@ shrink_list(struct list_head *page_list, unsigned int gfp_mask,
                 * the pages which were not successfully invalidated in
                 * truncate_complete_page().  We try to drop those buffers here
                 * and if that worked, and the page is no longer mapped into
-                * process address space (page_count == 0) it can be freed.
+                * process address space (page_count == 1) it can be freed.
                 * Otherwise, leave the page on the LRU so it is swappable.
                 */
                if (PagePrivate(page)) {
-                       if (!try_to_release_page(page, gfp_mask))
+                       if (!try_to_release_page(page, sc->gfp_mask))
                                goto activate_locked;
                        if (!mapping && page_count(page) == 1)
                                goto free_it;
                }
 
-               if (!mapping)
-                       goto keep_locked;       /* truncate got there first */
-
-               spin_lock_irq(&mapping->tree_lock);
-
-               /*
-                * The non-racy check for busy page.  It is critical to check
-                * PageDirty _after_ making sure that the page is freeable and
-                * not in use by anybody.       (pagecache + us == 2)
-                */
-               if (page_count(page) != 2 || PageDirty(page)) {
-                       spin_unlock_irq(&mapping->tree_lock);
+               if (!remove_mapping(mapping, page))
                        goto keep_locked;
-               }
-
-#ifdef CONFIG_SWAP
-               if (PageSwapCache(page)) {
-                       swp_entry_t swap = { .val = page->private };
-                       __delete_from_swap_cache(page);
-                       spin_unlock_irq(&mapping->tree_lock);
-                       swap_free(swap);
-                       __put_page(page);       /* The pagecache ref */
-                       goto free_it;
-               }
-#endif /* CONFIG_SWAP */
-
-               __remove_from_page_cache(page);
-               spin_unlock_irq(&mapping->tree_lock);
-               __put_page(page);
 
 free_it:
                unlock_page(page);
-               ret++;
+               nr_reclaimed++;
                if (!pagevec_add(&freed_pvec, page))
                        __pagevec_release_nonlru(&freed_pvec);
                continue;
@@ -456,89 +555,112 @@ keep:
        if (pagevec_count(&freed_pvec))
                __pagevec_release_nonlru(&freed_pvec);
        mod_page_state(pgactivate, pgactivate);
-       return ret;
+       return nr_reclaimed;
 }
 
 /*
- * zone->lru_lock is heavily contented.  We relieve it by quickly privatising
- * a batch of pages and working on them outside the lock.  Any pages which were
- * not freed will be added back to the LRU.
+ * zone->lru_lock is heavily contended.  Some of the functions that
+ * shrink the lists perform better by taking out a batch of pages
+ * and working on them outside the LRU lock.
+ *
+ * For pagecache intensive workloads, this function is the hottest
+ * spot in the kernel (apart from copy_*_user functions).
+ *
+ * Appropriate locks must be held before calling this function.
  *
- * shrink_cache() is passed the number of pages to scan and returns the number
- * of pages which were reclaimed.
+ * @nr_to_scan:        The number of pages to look through on the list.
+ * @src:       The LRU list to pull pages off.
+ * @dst:       The temp list to put pages on to.
+ * @scanned:   The number of pages that were scanned.
  *
- * For pagecache intensive workloads, the first loop here is the hottest spot
- * in the kernel (apart from the copy_*_user functions).
+ * returns how many pages were moved onto *@dst.
  */
-static int
-shrink_cache(struct zone *zone, unsigned int gfp_mask,
-               int max_scan, int *total_scanned, int do_writepage)
+static unsigned long isolate_lru_pages(unsigned long nr_to_scan,
+               struct list_head *src, struct list_head *dst,
+               unsigned long *scanned)
+{
+       unsigned long nr_taken = 0;
+       struct page *page;
+       unsigned long scan;
+
+       for (scan = 0; scan < nr_to_scan && !list_empty(src); scan++) {
+               struct list_head *target;
+               page = lru_to_page(src);
+               prefetchw_prev_lru_page(page, src, flags);
+
+               BUG_ON(!PageLRU(page));
+
+               list_del(&page->lru);
+               target = src;
+               if (likely(get_page_unless_zero(page))) {
+                       /*
+                        * Be careful not to clear PageLRU until after we're
+                        * sure the page is not being freed elsewhere -- the
+                        * page release code relies on it.
+                        */
+                       ClearPageLRU(page);
+                       target = dst;
+                       nr_taken++;
+               } /* else it is being freed elsewhere */
+
+               list_add(&page->lru, target);
+       }
+
+       *scanned = scan;
+       return nr_taken;
+}
+
+/*
+ * shrink_inactive_list() is a helper for shrink_zone().  It returns the number
+ * of reclaimed pages
+ */
+static unsigned long shrink_inactive_list(unsigned long max_scan,
+                               struct zone *zone, struct scan_control *sc)
 {
        LIST_HEAD(page_list);
        struct pagevec pvec;
-       int ret = 0;
+       unsigned long nr_scanned = 0;
+       unsigned long nr_reclaimed = 0;
 
        pagevec_init(&pvec, 1);
 
        lru_add_drain();
        spin_lock_irq(&zone->lru_lock);
-       while (max_scan > 0) {
+       do {
                struct page *page;
-               int nr_taken = 0;
-               int nr_scan = 0;
-               int nr_freed;
-
-               while (nr_scan++ < SWAP_CLUSTER_MAX &&
-                               !list_empty(&zone->inactive_list)) {
-                       page = lru_to_page(&zone->inactive_list);
-
-                       prefetchw_prev_lru_page(page,
-                                               &zone->inactive_list, flags);
+               unsigned long nr_taken;
+               unsigned long nr_scan;
+               unsigned long nr_freed;
 
-                       if (!TestClearPageLRU(page))
-                               BUG();
-                       list_del(&page->lru);
-                       if (page_count(page) == 0) {
-                               /* It is currently in pagevec_release() */
-                               SetPageLRU(page);
-                               list_add(&page->lru, &zone->inactive_list);
-                               continue;
-                       }
-                       list_add(&page->lru, &page_list);
-                       page_cache_get(page);
-                       nr_taken++;
-               }
+               nr_taken = isolate_lru_pages(sc->swap_cluster_max,
+                                            &zone->inactive_list,
+                                            &page_list, &nr_scan);
                zone->nr_inactive -= nr_taken;
-               zone->pages_scanned += nr_taken;
+               zone->pages_scanned += nr_scan;
                spin_unlock_irq(&zone->lru_lock);
 
-               if (nr_taken == 0)
-                       goto done;
+               nr_scanned += nr_scan;
+               nr_freed = shrink_page_list(&page_list, sc);
+               nr_reclaimed += nr_freed;
+               local_irq_disable();
+               if (current_is_kswapd()) {
+                       __mod_page_state_zone(zone, pgscan_kswapd, nr_scan);
+                       __mod_page_state(kswapd_steal, nr_freed);
+               } else
+                       __mod_page_state_zone(zone, pgscan_direct, nr_scan);
+               __mod_page_state_zone(zone, pgsteal, nr_freed);
 
-               max_scan -= nr_scan;
-               if (current_is_kswapd())
-                       mod_page_state_zone(zone, pgscan_kswapd, nr_scan);
-               else
-                       mod_page_state_zone(zone, pgscan_direct, nr_scan);
-               nr_freed = shrink_list(&page_list, gfp_mask,
-                                       total_scanned, do_writepage);
-               *total_scanned += nr_taken;
-               if (current_is_kswapd())
-                       mod_page_state(kswapd_steal, nr_freed);
-               mod_page_state_zone(zone, pgsteal, nr_freed);
-
-               ret += nr_freed;
-               if (nr_freed <= 0 && list_empty(&page_list))
+               if (nr_taken == 0)
                        goto done;
 
-               spin_lock_irq(&zone->lru_lock);
+               spin_lock(&zone->lru_lock);
                /*
                 * Put back any unfreeable pages.
                 */
                while (!list_empty(&page_list)) {
                        page = lru_to_page(&page_list);
-                       if (TestSetPageLRU(page))
-                               BUG();
+                       BUG_ON(PageLRU(page));
+                       SetPageLRU(page);
                        list_del(&page->lru);
                        if (PageActive(page))
                                add_page_to_active_list(zone, page);
@@ -550,11 +672,12 @@ shrink_cache(struct zone *zone, unsigned int gfp_mask,
                                spin_lock_irq(&zone->lru_lock);
                        }
                }
-       }
-       spin_unlock_irq(&zone->lru_lock);
+       } while (nr_scanned < max_scan);
+       spin_unlock(&zone->lru_lock);
 done:
+       local_irq_enable();
        pagevec_release(&pvec);
-       return ret;
+       return nr_reclaimed;
 }
 
 /*
@@ -571,103 +694,82 @@ done:
  * It is safe to rely on PG_active against the non-LRU pages in here because
  * nobody will play with that bit on a non-LRU page.
  *
- * The downside is that we have to touch page->count against each page.
+ * The downside is that we have to touch page->_count against each page.
  * But we had to alter page->flags anyway.
  */
-static void
-refill_inactive_zone(struct zone *zone, const int nr_pages_in,
-                       struct page_state *ps)
+static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
+                               struct scan_control *sc)
 {
-       int pgmoved;
+       unsigned long pgmoved;
        int pgdeactivate = 0;
-       int nr_pages = nr_pages_in;
+       unsigned long pgscanned;
        LIST_HEAD(l_hold);      /* The pages which were snipped off */
        LIST_HEAD(l_inactive);  /* Pages to go onto the inactive_list */
        LIST_HEAD(l_active);    /* Pages to go onto the active_list */
        struct page *page;
        struct pagevec pvec;
        int reclaim_mapped = 0;
-       long mapped_ratio;
-       long distress;
-       long swap_tendency;
 
-       lru_add_drain();
-       pgmoved = 0;
-       spin_lock_irq(&zone->lru_lock);
-       while (nr_pages && !list_empty(&zone->active_list)) {
-               page = lru_to_page(&zone->active_list);
-               prefetchw_prev_lru_page(page, &zone->active_list, flags);
-               if (!TestClearPageLRU(page))
-                       BUG();
-               list_del(&page->lru);
-               if (page_count(page) == 0) {
-                       /* It is currently in pagevec_release() */
-                       SetPageLRU(page);
-                       list_add(&page->lru, &zone->active_list);
-               } else {
-                       page_cache_get(page);
-                       list_add(&page->lru, &l_hold);
-                       pgmoved++;
-               }
-               nr_pages--;
-       }
-       zone->nr_active -= pgmoved;
-       spin_unlock_irq(&zone->lru_lock);
+       if (sc->may_swap) {
+               long mapped_ratio;
+               long distress;
+               long swap_tendency;
 
-       /*
-        * `distress' is a measure of how much trouble we're having reclaiming
-        * pages.  0 -> no problems.  100 -> great trouble.
-        */
-       distress = 100 >> zone->prev_priority;
+               /*
+                * `distress' is a measure of how much trouble we're having
+                * reclaiming pages.  0 -> no problems.  100 -> great trouble.
+                */
+               distress = 100 >> zone->prev_priority;
 
-       /*
-        * The point of this algorithm is to decide when to start reclaiming
-        * mapped memory instead of just pagecache.  Work out how much memory
-        * is mapped.
-        */
-       mapped_ratio = (ps->nr_mapped * 100) / total_memory;
+               /*
+                * The point of this algorithm is to decide when to start
+                * reclaiming mapped memory instead of just pagecache.  Work out
+                * how much memory
+                * is mapped.
+                */
+               mapped_ratio = (sc->nr_mapped * 100) / total_memory;
 
-       /*
-        * Now decide how much we really want to unmap some pages.  The mapped
-        * ratio is downgraded - just because there's a lot of mapped memory
-        * doesn't necessarily mean that page reclaim isn't succeeding.
-        *
-        * The distress ratio is important - we don't want to start going oom.
-        *
-        * A 100% value of vm_swappiness overrides this algorithm altogether.
-        */
-       swap_tendency = mapped_ratio / 2 + distress + vm_swappiness;
+               /*
+                * Now decide how much we really want to unmap some pages.  The
+                * mapped ratio is downgraded - just because there's a lot of
+                * mapped memory doesn't necessarily mean that page reclaim
+                * isn't succeeding.
+                *
+                * The distress ratio is important - we don't want to start
+                * going oom.
+                *
+                * A 100% value of vm_swappiness overrides this algorithm
+                * altogether.
+                */
+               swap_tendency = mapped_ratio / 2 + distress + vm_swappiness;
 
-       /*
-        * Now use this metric to decide whether to start moving mapped memory
-        * onto the inactive list.
-        */
-       if (swap_tendency >= 100)
-               reclaim_mapped = 1;
+               /*
+                * Now use this metric to decide whether to start moving mapped
+                * memory onto the inactive list.
+                */
+               if (swap_tendency >= 100)
+                       reclaim_mapped = 1;
+       }
+
+       lru_add_drain();
+       spin_lock_irq(&zone->lru_lock);
+       pgmoved = isolate_lru_pages(nr_pages, &zone->active_list,
+                                   &l_hold, &pgscanned);
+       zone->pages_scanned += pgscanned;
+       zone->nr_active -= pgmoved;
+       spin_unlock_irq(&zone->lru_lock);
 
        while (!list_empty(&l_hold)) {
+               cond_resched();
                page = lru_to_page(&l_hold);
                list_del(&page->lru);
                if (page_mapped(page)) {
-                       if (!reclaim_mapped) {
+                       if (!reclaim_mapped ||
+                           (total_swap_pages == 0 && PageAnon(page)) ||
+                           page_referenced(page, 0)) {
                                list_add(&page->lru, &l_active);
                                continue;
                        }
-                       rmap_lock(page);
-                       if (page_referenced(page)) {
-                               rmap_unlock(page);
-                               list_add(&page->lru, &l_active);
-                               continue;
-                       }
-                       rmap_unlock(page);
-               }
-               /*
-                * FIXME: need to consider page_count(page) here if/when we
-                * reap orphaned pages via the LRU (Daniel's locking stuff)
-                */
-               if (total_swap_pages == 0 && PageAnon(page)) {
-                       list_add(&page->lru, &l_active);
-                       continue;
                }
                list_add(&page->lru, &l_inactive);
        }
@@ -678,10 +780,11 @@ refill_inactive_zone(struct zone *zone, const int nr_pages_in,
        while (!list_empty(&l_inactive)) {
                page = lru_to_page(&l_inactive);
                prefetchw_prev_lru_page(page, &l_inactive, flags);
-               if (TestSetPageLRU(page))
-                       BUG();
-               if (!TestClearPageActive(page))
-                       BUG();
+               BUG_ON(PageLRU(page));
+               SetPageLRU(page);
+               BUG_ON(!PageActive(page));
+               ClearPageActive(page);
+
                list_move(&page->lru, &zone->inactive_list);
                pgmoved++;
                if (!pagevec_add(&pvec, page)) {
@@ -707,8 +810,8 @@ refill_inactive_zone(struct zone *zone, const int nr_pages_in,
        while (!list_empty(&l_active)) {
                page = lru_to_page(&l_active);
                prefetchw_prev_lru_page(page, &l_active, flags);
-               if (TestSetPageLRU(page))
-                       BUG();
+               BUG_ON(PageLRU(page));
+               SetPageLRU(page);
                BUG_ON(!PageActive(page));
                list_move(&page->lru, &zone->active_list);
                pgmoved++;
@@ -721,52 +824,67 @@ refill_inactive_zone(struct zone *zone, const int nr_pages_in,
                }
        }
        zone->nr_active += pgmoved;
-       spin_unlock_irq(&zone->lru_lock);
-       pagevec_release(&pvec);
+       spin_unlock(&zone->lru_lock);
 
-       mod_page_state_zone(zone, pgrefill, nr_pages_in - nr_pages);
-       mod_page_state(pgdeactivate, pgdeactivate);
+       __mod_page_state_zone(zone, pgrefill, pgscanned);
+       __mod_page_state(pgdeactivate, pgdeactivate);
+       local_irq_enable();
+
+       pagevec_release(&pvec);
 }
 
 /*
- * Scan `nr_pages' from this zone.  Returns the number of reclaimed pages.
  * This is a basic per-zone page freer.  Used by both kswapd and direct reclaim.
  */
-static int
-shrink_zone(struct zone *zone, int max_scan, unsigned int gfp_mask,
-               int *total_scanned, struct page_state *ps, int do_writepage)
+static unsigned long shrink_zone(int priority, struct zone *zone,
+                               struct scan_control *sc)
 {
-       unsigned long ratio;
-       int count;
+       unsigned long nr_active;
+       unsigned long nr_inactive;
+       unsigned long nr_to_scan;
+       unsigned long nr_reclaimed = 0;
+
+       atomic_inc(&zone->reclaim_in_progress);
 
        /*
-        * Try to keep the active list 2/3 of the size of the cache.  And
-        * make sure that refill_inactive is given a decent number of pages.
-        *
-        * The "ratio+1" here is important.  With pagecache-intensive workloads
-        * the inactive list is huge, and `ratio' evaluates to zero all the
-        * time.  Which pins the active list memory.  So we add one to `ratio'
-        * just to make sure that the kernel will slowly sift through the
-        * active list.
+        * Add one to `nr_to_scan' just to make sure that the kernel will
+        * slowly sift through the active list.
         */
-       ratio = (unsigned long)SWAP_CLUSTER_MAX * zone->nr_active /
-                               ((zone->nr_inactive | 1) * 2);
-
-       atomic_add(ratio+1, &zone->nr_scan_active);
-       count = atomic_read(&zone->nr_scan_active);
-       if (count >= SWAP_CLUSTER_MAX) {
-               atomic_set(&zone->nr_scan_active, 0);
-               refill_inactive_zone(zone, count, ps);
-       }
+       zone->nr_scan_active += (zone->nr_active >> priority) + 1;
+       nr_active = zone->nr_scan_active;
+       if (nr_active >= sc->swap_cluster_max)
+               zone->nr_scan_active = 0;
+       else
+               nr_active = 0;
+
+       zone->nr_scan_inactive += (zone->nr_inactive >> priority) + 1;
+       nr_inactive = zone->nr_scan_inactive;
+       if (nr_inactive >= sc->swap_cluster_max)
+               zone->nr_scan_inactive = 0;
+       else
+               nr_inactive = 0;
+
+       while (nr_active || nr_inactive) {
+               if (nr_active) {
+                       nr_to_scan = min(nr_active,
+                                       (unsigned long)sc->swap_cluster_max);
+                       nr_active -= nr_to_scan;
+                       shrink_active_list(nr_to_scan, zone, sc);
+               }
 
-       atomic_add(max_scan, &zone->nr_scan_inactive);
-       count = atomic_read(&zone->nr_scan_inactive);
-       if (count >= SWAP_CLUSTER_MAX) {
-               atomic_set(&zone->nr_scan_inactive, 0);
-               return shrink_cache(zone, gfp_mask, count,
-                                       total_scanned, do_writepage);
+               if (nr_inactive) {
+                       nr_to_scan = min(nr_inactive,
+                                       (unsigned long)sc->swap_cluster_max);
+                       nr_inactive -= nr_to_scan;
+                       nr_reclaimed += shrink_inactive_list(nr_to_scan, zone,
+                                                               sc);
+               }
        }
-       return 0;
+
+       throttle_vm_writeout();
+
+       atomic_dec(&zone->reclaim_in_progress);
+       return nr_reclaimed;
 }
 
 /*
@@ -785,28 +903,31 @@ shrink_zone(struct zone *zone, int max_scan, unsigned int gfp_mask,
  * If a zone is deemed to be full of pinned pages then just give it a light
  * scan then give up on it.
  */
-static int
-shrink_caches(struct zone **zones, int priority, int *total_scanned,
-               int gfp_mask, struct page_state *ps, int do_writepage)
+static unsigned long shrink_zones(int priority, struct zone **zones,
+                                       struct scan_control *sc)
 {
-       int ret = 0;
+       unsigned long nr_reclaimed = 0;
        int i;
 
        for (i = 0; zones[i] != NULL; i++) {
                struct zone *zone = zones[i];
-               int max_scan;
 
-               if (zone->free_pages < zone->pages_high)
-                       zone->temp_priority = priority;
+               if (!populated_zone(zone))
+                       continue;
+
+               if (!cpuset_zone_allowed(zone, __GFP_HARDWALL))
+                       continue;
+
+               zone->temp_priority = priority;
+               if (zone->prev_priority > priority)
+                       zone->prev_priority = priority;
 
                if (zone->all_unreclaimable && priority != DEF_PRIORITY)
                        continue;       /* Let kswapd poll it */
 
-               max_scan = zone->nr_inactive >> priority;
-               ret += shrink_zone(zone, max_scan, gfp_mask,
-                                       total_scanned, ps, do_writepage);
+               nr_reclaimed += shrink_zone(priority, zone, sc);
        }
-       return ret;
+       return nr_reclaimed;
 }
  
 /*
@@ -817,49 +938,56 @@ shrink_caches(struct zone **zones, int priority, int *total_scanned,
  *
  * If the caller is !__GFP_FS then the probability of a failure is reasonably
  * high - the zone may be full of dirty or under-writeback pages, which this
- * caller can't do much about.  So for !__GFP_FS callers, we just perform a
- * small LRU walk and if that didn't work out, fail the allocation back to the
- * caller.  GFP_NOFS allocators need to know how to deal with it.  Kicking
- * bdflush, waiting and retrying will work.
- *
- * This is a fairly lame algorithm - it can result in excessive CPU burning and
- * excessive rotation of the inactive list, which is _supposed_ to be an LRU,
- * yes?
+ * caller can't do much about.  We kick pdflush and take explicit naps in the
+ * hope that some of these pages can be written.  But if the allocating task
+ * holds filesystem locks which prevent writeout this might not work, and the
+ * allocation attempt will fail.
  */
-int try_to_free_pages(struct zone **zones,
-               unsigned int gfp_mask, unsigned int order)
+unsigned long try_to_free_pages(struct zone **zones, gfp_t gfp_mask)
 {
        int priority;
        int ret = 0;
-       int nr_reclaimed = 0;
+       unsigned long total_scanned = 0;
+       unsigned long nr_reclaimed = 0;
        struct reclaim_state *reclaim_state = current->reclaim_state;
+       unsigned long lru_pages = 0;
        int i;
-       unsigned long total_scanned = 0;
-       int do_writepage = 0;
+       struct scan_control sc = {
+               .gfp_mask = gfp_mask,
+               .may_writepage = !laptop_mode,
+               .swap_cluster_max = SWAP_CLUSTER_MAX,
+               .may_swap = 1,
+       };
 
        inc_page_state(allocstall);
 
-       for (i = 0; zones[i] != 0; i++)
-               zones[i]->temp_priority = DEF_PRIORITY;
+       for (i = 0; zones[i] != NULL; i++) {
+               struct zone *zone = zones[i];
 
-       for (priority = DEF_PRIORITY; priority >= 0; priority--) {
-               int scanned = 0;
-               struct page_state ps;
+               if (!cpuset_zone_allowed(zone, __GFP_HARDWALL))
+                       continue;
+
+               zone->temp_priority = DEF_PRIORITY;
+               lru_pages += zone->nr_active + zone->nr_inactive;
+       }
 
-               get_page_state(&ps);
-               nr_reclaimed += shrink_caches(zones, priority, &scanned,
-                                               gfp_mask, &ps, do_writepage);
-               shrink_slab(scanned, gfp_mask);
+       for (priority = DEF_PRIORITY; priority >= 0; priority--) {
+               sc.nr_mapped = read_page_state(nr_mapped);
+               sc.nr_scanned = 0;
+               if (!priority)
+                       disable_swap_token();
+               nr_reclaimed += shrink_zones(priority, zones, &sc);
+               shrink_slab(sc.nr_scanned, gfp_mask, lru_pages);
                if (reclaim_state) {
                        nr_reclaimed += reclaim_state->reclaimed_slab;
                        reclaim_state->reclaimed_slab = 0;
                }
-               if (nr_reclaimed >= SWAP_CLUSTER_MAX) {
+               total_scanned += sc.nr_scanned;
+               if (nr_reclaimed >= sc.swap_cluster_max) {
                        ret = 1;
                        goto out;
                }
-               if (!(gfp_mask & __GFP_FS))
-                       break;          /* Let the caller handle it */
+
                /*
                 * Try to write back as many pages as we just scanned.  This
                 * tends to cause slow streaming writers to write data to the
@@ -867,21 +995,25 @@ int try_to_free_pages(struct zone **zones,
                 * that's undesirable in laptop mode, where we *want* lumpy
                 * writeout.  So in laptop mode, write out the whole world.
                 */
-               total_scanned += scanned;
-               if (total_scanned > SWAP_CLUSTER_MAX + SWAP_CLUSTER_MAX/2) {
-                       wakeup_bdflush(laptop_mode ? 0 : total_scanned);
-                       do_writepage = 1;
+               if (total_scanned > sc.swap_cluster_max +
+                                       sc.swap_cluster_max / 2) {
+                       wakeup_pdflush(laptop_mode ? 0 : total_scanned);
+                       sc.may_writepage = 1;
                }
 
                /* Take a nap, wait for some writeback to complete */
-               if (scanned && priority < DEF_PRIORITY - 2)
+               if (sc.nr_scanned && priority < DEF_PRIORITY - 2)
                        blk_congestion_wait(WRITE, HZ/10);
        }
-       if ((gfp_mask & __GFP_FS) && !(gfp_mask & __GFP_NORETRY))
-               out_of_memory();
 out:
-       for (i = 0; zones[i] != 0; i++)
-               zones[i]->prev_priority = zones[i]->temp_priority;
+       for (i = 0; zones[i] != 0; i++) {
+               struct zone *zone = zones[i];
+
+               if (!cpuset_zone_allowed(zone, __GFP_HARDWALL))
+                       continue;
+
+               zone->prev_priority = zone->temp_priority;
+       }
        return ret;
 }
 
@@ -910,15 +1042,27 @@ out:
  * the page allocator fallback scheme to ensure that aging of pages is balanced
  * across the zones.
  */
-static int balance_pgdat(pg_data_t *pgdat, int nr_pages, struct page_state *ps)
+static unsigned long balance_pgdat(pg_data_t *pgdat, unsigned long nr_pages,
+                               int order)
 {
-       int to_free = nr_pages;
+       unsigned long to_free = nr_pages;
+       int all_zones_ok;
        int priority;
        int i;
+       unsigned long total_scanned;
+       unsigned long nr_reclaimed;
        struct reclaim_state *reclaim_state = current->reclaim_state;
-       unsigned long total_scanned = 0;
-       unsigned long total_reclaimed = 0;
-       int do_writepage = 0;
+       struct scan_control sc = {
+               .gfp_mask = GFP_KERNEL,
+               .may_swap = 1,
+               .swap_cluster_max = nr_pages ? nr_pages : SWAP_CLUSTER_MAX,
+       };
+
+loop_again:
+       total_scanned = 0;
+       nr_reclaimed = 0;
+       sc.may_writepage = !laptop_mode;
+       sc.nr_mapped = read_page_state(nr_mapped);
 
        inc_page_state(pageoutrun);
 
@@ -928,10 +1072,15 @@ static int balance_pgdat(pg_data_t *pgdat, int nr_pages, struct page_state *ps)
                zone->temp_priority = DEF_PRIORITY;
        }
 
-       for (priority = DEF_PRIORITY; priority; priority--) {
-               int all_zones_ok = 1;
+       for (priority = DEF_PRIORITY; priority >= 0; priority--) {
                int end_zone = 0;       /* Inclusive.  0 = ZONE_DMA */
+               unsigned long lru_pages = 0;
+
+               /* The swap token gets in the way of swapout... */
+               if (!priority)
+                       disable_swap_token();
 
+               all_zones_ok = 1;
 
                if (nr_pages == 0) {
                        /*
@@ -941,11 +1090,15 @@ static int balance_pgdat(pg_data_t *pgdat, int nr_pages, struct page_state *ps)
                        for (i = pgdat->nr_zones - 1; i >= 0; i--) {
                                struct zone *zone = pgdat->node_zones + i;
 
+                               if (!populated_zone(zone))
+                                       continue;
+
                                if (zone->all_unreclaimable &&
                                                priority != DEF_PRIORITY)
                                        continue;
 
-                               if (zone->free_pages <= zone->pages_high) {
+                               if (!zone_watermark_ok(zone, order,
+                                               zone->pages_high, 0, 0)) {
                                        end_zone = i;
                                        goto scan;
                                }
@@ -955,6 +1108,12 @@ static int balance_pgdat(pg_data_t *pgdat, int nr_pages, struct page_state *ps)
                        end_zone = pgdat->nr_zones - 1;
                }
 scan:
+               for (i = 0; i <= end_zone; i++) {
+                       struct zone *zone = pgdat->node_zones + i;
+
+                       lru_pages += zone->nr_active + zone->nr_inactive;
+               }
+
                /*
                 * Now scan the zone in the dma->highmem direction, stopping
                 * at the last zone which needs scanning.
@@ -966,30 +1125,33 @@ scan:
                 */
                for (i = 0; i <= end_zone; i++) {
                        struct zone *zone = pgdat->node_zones + i;
-                       int max_scan;
-                       int reclaimed;
-                       int scanned = 0;
+                       int nr_slab;
+
+                       if (!populated_zone(zone))
+                               continue;
 
                        if (zone->all_unreclaimable && priority != DEF_PRIORITY)
                                continue;
 
                        if (nr_pages == 0) {    /* Not software suspend */
-                               if (zone->free_pages <= zone->pages_high)
+                               if (!zone_watermark_ok(zone, order,
+                                               zone->pages_high, end_zone, 0))
                                        all_zones_ok = 0;
                        }
                        zone->temp_priority = priority;
-                       max_scan = zone->nr_inactive >> priority;
-                       reclaimed = shrink_zone(zone, max_scan, GFP_KERNEL,
-                                       &scanned, ps, do_writepage);
-                       total_scanned += scanned;
+                       if (zone->prev_priority > priority)
+                               zone->prev_priority = priority;
+                       sc.nr_scanned = 0;
+                       nr_reclaimed += shrink_zone(priority, zone, &sc);
                        reclaim_state->reclaimed_slab = 0;
-                       shrink_slab(scanned, GFP_KERNEL);
-                       reclaimed += reclaim_state->reclaimed_slab;
-                       total_reclaimed += reclaimed;
-                       to_free -= reclaimed;
+                       nr_slab = shrink_slab(sc.nr_scanned, GFP_KERNEL,
+                                               lru_pages);
+                       nr_reclaimed += reclaim_state->reclaimed_slab;
+                       total_scanned += sc.nr_scanned;
                        if (zone->all_unreclaimable)
                                continue;
-                       if (zone->pages_scanned > zone->present_pages * 2)
+                       if (nr_slab == 0 && zone->pages_scanned >=
+                                   (zone->nr_active + zone->nr_inactive) * 4)
                                zone->all_unreclaimable = 1;
                        /*
                         * If we've done a decent amount of scanning and
@@ -997,10 +1159,10 @@ scan:
                         * even in laptop mode
                         */
                        if (total_scanned > SWAP_CLUSTER_MAX * 2 &&
-                           total_scanned > total_reclaimed+total_reclaimed/2)
-                               do_writepage = 1;
+                           total_scanned > nr_reclaimed + nr_reclaimed / 2)
+                               sc.may_writepage = 1;
                }
-               if (nr_pages && to_free > 0)
+               if (nr_pages && to_free > nr_reclaimed)
                        continue;       /* swsusp: need to do more work */
                if (all_zones_ok)
                        break;          /* kswapd: all done */
@@ -1010,6 +1172,15 @@ scan:
                 */
                if (total_scanned && priority < DEF_PRIORITY - 2)
                        blk_congestion_wait(WRITE, HZ/10);
+
+               /*
+                * We do this so kswapd doesn't build up large priorities for
+                * example when it is freeing in parallel with allocators. It
+                * matches the direct reclaim path behaviour in terms of impact
+                * on zone->*_priority.
+                */
+               if ((nr_reclaimed >= SWAP_CLUSTER_MAX) && !nr_pages)
+                       break;
        }
 out:
        for (i = 0; i < pgdat->nr_zones; i++) {
@@ -1017,7 +1188,12 @@ out:
 
                zone->prev_priority = zone->temp_priority;
        }
-       return total_reclaimed;
+       if (!all_zones_ok) {
+               cond_resched();
+               goto loop_again;
+       }
+
+       return nr_reclaimed;
 }
 
 /*
@@ -1033,8 +1209,9 @@ out:
  * If there are applications that are active memory-allocators
  * (most normal use), this basically shouldn't matter.
  */
-int kswapd(void *p)
+static int kswapd(void *p)
 {
+       unsigned long order;
        pg_data_t *pgdat = (pg_data_t*)p;
        struct task_struct *tsk = current;
        DEFINE_WAIT(wait);
@@ -1061,31 +1238,54 @@ int kswapd(void *p)
         * us from recursively trying to free more memory as we're
         * trying to free the first piece of memory in the first place).
         */
-       tsk->flags |= PF_MEMALLOC|PF_KSWAPD;
+       tsk->flags |= PF_MEMALLOC | PF_SWAPWRITE | PF_KSWAPD;
 
+       order = 0;
        for ( ; ; ) {
-               struct page_state ps;
+               unsigned long new_order;
+
+               try_to_freeze();
 
-               if (current->flags & PF_FREEZE)
-                       refrigerator(PF_FREEZE);
                prepare_to_wait(&pgdat->kswapd_wait, &wait, TASK_INTERRUPTIBLE);
-               schedule();
+               new_order = pgdat->kswapd_max_order;
+               pgdat->kswapd_max_order = 0;
+               if (order < new_order) {
+                       /*
+                        * Don't sleep if someone wants a larger 'order'
+                        * allocation
+                        */
+                       order = new_order;
+               } else {
+                       schedule();
+                       order = pgdat->kswapd_max_order;
+               }
                finish_wait(&pgdat->kswapd_wait, &wait);
-               get_page_state(&ps);
-               balance_pgdat(pgdat, 0, &ps);
+
+               balance_pgdat(pgdat, 0, order);
        }
+       return 0;
 }
 
 /*
  * A zone is low on free memory, so wake its kswapd task to service it.
  */
-void wakeup_kswapd(struct zone *zone)
+void wakeup_kswapd(struct zone *zone, int order)
 {
-       if (zone->free_pages > zone->pages_low)
+       pg_data_t *pgdat;
+
+       if (!populated_zone(zone))
+               return;
+
+       pgdat = zone->zone_pgdat;
+       if (zone_watermark_ok(zone, order, zone->pages_low, 0, 0))
+               return;
+       if (pgdat->kswapd_max_order < order)
+               pgdat->kswapd_max_order = order;
+       if (!cpuset_zone_allowed(zone, __GFP_HARDWALL))
                return;
-       if (!waitqueue_active(&zone->zone_pgdat->kswapd_wait))
+       if (!waitqueue_active(&pgdat->kswapd_wait))
                return;
-       wake_up_interruptible(&zone->zone_pgdat->kswapd_wait);
+       wake_up_interruptible(&pgdat->kswapd_wait);
 }
 
 #ifdef CONFIG_PM
@@ -1093,27 +1293,31 @@ void wakeup_kswapd(struct zone *zone)
  * Try to free `nr_pages' of memory, system-wide.  Returns the number of freed
  * pages.
  */
-int shrink_all_memory(int nr_pages)
+unsigned long shrink_all_memory(unsigned long nr_pages)
 {
        pg_data_t *pgdat;
-       int nr_to_free = nr_pages;
-       int ret = 0;
+       unsigned long nr_to_free = nr_pages;
+       unsigned long ret = 0;
+       unsigned retry = 2;
        struct reclaim_state reclaim_state = {
                .reclaimed_slab = 0,
        };
 
        current->reclaim_state = &reclaim_state;
-       for_each_pgdat(pgdat) {
-               int freed;
-               struct page_state ps;
+repeat:
+       for_each_online_pgdat(pgdat) {
+               unsigned long freed;
 
-               get_page_state(&ps);
-               freed = balance_pgdat(pgdat, nr_to_free, &ps);
+               freed = balance_pgdat(pgdat, nr_to_free, 0);
                ret += freed;
                nr_to_free -= freed;
-               if (nr_to_free <= 0)
+               if ((long)nr_to_free <= 0)
                        break;
        }
+       if (retry-- && ret < nr_pages) {
+               blk_congestion_wait(WRITE, HZ/5);
+               goto repeat;
+       }
        current->reclaim_state = NULL;
        return ret;
 }
@@ -1124,15 +1328,14 @@ int shrink_all_memory(int nr_pages)
    not required for correctness.  So if the last cpu in a node goes
    away, we get changed to run anywhere: as the first one comes back,
    restore their cpu bindings. */
-static int __devinit cpu_callback(struct notifier_block *nfb,
-                                 unsigned long action,
-                                 void *hcpu)
+static int cpu_callback(struct notifier_block *nfb,
+                                 unsigned long action, void *hcpu)
 {
        pg_data_t *pgdat;
        cpumask_t mask;
 
        if (action == CPU_ONLINE) {
-               for_each_pgdat(pgdat) {
+               for_each_online_pgdat(pgdat) {
                        mask = node_to_cpumask(pgdat->node_id);
                        if (any_online_cpu(mask) != NR_CPUS)
                                /* One of our CPUs online: restore mask */
@@ -1146,13 +1349,162 @@ static int __devinit cpu_callback(struct notifier_block *nfb,
 static int __init kswapd_init(void)
 {
        pg_data_t *pgdat;
+
        swap_setup();
-       for_each_pgdat(pgdat)
-               pgdat->kswapd
-               = find_task_by_pid(kernel_thread(kswapd, pgdat, CLONE_KERNEL));
+       for_each_online_pgdat(pgdat) {
+               pid_t pid;
+
+               pid = kernel_thread(kswapd, pgdat, CLONE_KERNEL);
+               BUG_ON(pid < 0);
+               read_lock(&tasklist_lock);
+               pgdat->kswapd = find_task_by_real_pid(pid);
+               read_unlock(&tasklist_lock);
+       }
        total_memory = nr_free_pagecache_pages();
        hotcpu_notifier(cpu_callback, 0);
        return 0;
 }
 
 module_init(kswapd_init)
+
+#ifdef CONFIG_NUMA
+/*
+ * Zone reclaim mode
+ *
+ * If non-zero call zone_reclaim when the number of free pages falls below
+ * the watermarks.
+ *
+ * In the future we may add flags to the mode. However, the page allocator
+ * should only have to check that zone_reclaim_mode != 0 before calling
+ * zone_reclaim().
+ */
+int zone_reclaim_mode __read_mostly;
+
+#define RECLAIM_OFF 0
+#define RECLAIM_ZONE (1<<0)    /* Run shrink_cache on the zone */
+#define RECLAIM_WRITE (1<<1)   /* Writeout pages during reclaim */
+#define RECLAIM_SWAP (1<<2)    /* Swap pages out during reclaim */
+#define RECLAIM_SLAB (1<<3)    /* Do a global slab shrink if the zone is out of memory */
+
+/*
+ * Mininum time between zone reclaim scans
+ */
+int zone_reclaim_interval __read_mostly = 30*HZ;
+
+/*
+ * Priority for ZONE_RECLAIM. This determines the fraction of pages
+ * of a node considered for each zone_reclaim. 4 scans 1/16th of
+ * a zone.
+ */
+#define ZONE_RECLAIM_PRIORITY 4
+
+/*
+ * Try to free up some pages from this zone through reclaim.
+ */
+static int __zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order)
+{
+       /* Minimum pages needed in order to stay on node */
+       const unsigned long nr_pages = 1 << order;
+       struct task_struct *p = current;
+       struct reclaim_state reclaim_state;
+       int priority;
+       unsigned long nr_reclaimed = 0;
+       struct scan_control sc = {
+               .may_writepage = !!(zone_reclaim_mode & RECLAIM_WRITE),
+               .may_swap = !!(zone_reclaim_mode & RECLAIM_SWAP),
+               .nr_mapped = read_page_state(nr_mapped),
+               .swap_cluster_max = max_t(unsigned long, nr_pages,
+                                       SWAP_CLUSTER_MAX),
+               .gfp_mask = gfp_mask,
+       };
+
+       disable_swap_token();
+       cond_resched();
+       /*
+        * We need to be able to allocate from the reserves for RECLAIM_SWAP
+        * and we also need to be able to write out pages for RECLAIM_WRITE
+        * and RECLAIM_SWAP.
+        */
+       p->flags |= PF_MEMALLOC | PF_SWAPWRITE;
+       reclaim_state.reclaimed_slab = 0;
+       p->reclaim_state = &reclaim_state;
+
+       /*
+        * Free memory by calling shrink zone with increasing priorities
+        * until we have enough memory freed.
+        */
+       priority = ZONE_RECLAIM_PRIORITY;
+       do {
+               nr_reclaimed += shrink_zone(priority, zone, &sc);
+               priority--;
+       } while (priority >= 0 && nr_reclaimed < nr_pages);
+
+       if (nr_reclaimed < nr_pages && (zone_reclaim_mode & RECLAIM_SLAB)) {
+               /*
+                * shrink_slab() does not currently allow us to determine how
+                * many pages were freed in this zone. So we just shake the slab
+                * a bit and then go off node for this particular allocation
+                * despite possibly having freed enough memory to allocate in
+                * this zone.  If we freed local memory then the next
+                * allocations will be local again.
+                *
+                * shrink_slab will free memory on all zones and may take
+                * a long time.
+                */
+               shrink_slab(sc.nr_scanned, gfp_mask, order);
+       }
+
+       p->reclaim_state = NULL;
+       current->flags &= ~(PF_MEMALLOC | PF_SWAPWRITE);
+
+       if (nr_reclaimed == 0) {
+               /*
+                * We were unable to reclaim enough pages to stay on node.  We
+                * now allow off node accesses for a certain time period before
+                * trying again to reclaim pages from the local zone.
+                */
+               zone->last_unsuccessful_zone_reclaim = jiffies;
+       }
+
+       return nr_reclaimed >= nr_pages;
+}
+
+int zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order)
+{
+       cpumask_t mask;
+       int node_id;
+
+       /*
+        * Do not reclaim if there was a recent unsuccessful attempt at zone
+        * reclaim.  In that case we let allocations go off node for the
+        * zone_reclaim_interval.  Otherwise we would scan for each off-node
+        * page allocation.
+        */
+       if (time_before(jiffies,
+               zone->last_unsuccessful_zone_reclaim + zone_reclaim_interval))
+                       return 0;
+
+       /*
+        * Avoid concurrent zone reclaims, do not reclaim in a zone that does
+        * not have reclaimable pages and if we should not delay the allocation
+        * then do not scan.
+        */
+       if (!(gfp_mask & __GFP_WAIT) ||
+               zone->all_unreclaimable ||
+               atomic_read(&zone->reclaim_in_progress) > 0 ||
+               (current->flags & PF_MEMALLOC))
+                       return 0;
+
+       /*
+        * Only run zone reclaim on the local zone or on zones that do not
+        * have associated processors. This will favor the local processor
+        * over remote processors and spread off node memory allocations
+        * as wide as possible.
+        */
+       node_id = zone->zone_pgdat->node_id;
+       mask = node_to_cpumask(node_id);
+       if (!cpus_empty(mask) && node_id != numa_node_id())
+               return 0;
+       return __zone_reclaim(zone, gfp_mask, order);
+}
+#endif