Merge branch 'akpm' (patches from Andrew)

Merge more updates from Andrew Morton:
 "The rest of MM"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (101 commits)
  mm, compaction: simplify contended compaction handling
  mm, compaction: introduce direct compaction priority
  mm, thp: remove __GFP_NORETRY from khugepaged and madvised allocations
  mm, page_alloc: make THP-specific decisions more generic
  mm, page_alloc: restructure direct compaction handling in slowpath
  mm, page_alloc: don't retry initial attempt in slowpath
  mm, page_alloc: set alloc_flags only once in slowpath
  lib/stackdepot.c: use __GFP_NOWARN for stack allocations
  mm, kasan: switch SLUB to stackdepot, enable memory quarantine for SLUB
  mm, kasan: account for object redzone in SLUB's nearest_obj()
  mm: fix use-after-free if memory allocation failed in vma_adjust()
  zsmalloc: Delete an unnecessary check before the function call "iput"
  mm/memblock.c: fix index adjustment error in __next_mem_range_rev()
  mem-hotplug: alloc new page from a nearest neighbor node when mem-offline
  mm: optimize copy_page_to/from_iter_iovec
  mm: add cond_resched() to generic_swapfile_activate()
  Revert "mm, mempool: only set __GFP_NOMEMALLOC if there are free elements"
  mm, compaction: don't isolate PageWriteback pages in MIGRATE_SYNC_LIGHT mode
  mm: hwpoison: remove incorrect comments
  make __section_nr() more efficient
  ...

3 files changed, 52 insertions, 44 deletions

diff --git a/drivers/base/node.c b/drivers/base/node.c
index 51c7db2c4ee2..29cd96661b30 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -56,6 +56,7 @@ static ssize_t node_read_meminfo(struct device *dev,
 {
         int n;
         int nid = dev->id;
+        struct pglist_data *pgdat = NODE_DATA(nid);
         struct sysinfo i;
 
         si_meminfo_node(&i, nid);
@@ -74,16 +75,16 @@ static ssize_t node_read_meminfo(struct device *dev,
                        nid, K(i.totalram),
                        nid, K(i.freeram),
                        nid, K(i.totalram - i.freeram),
-                       nid, K(node_page_state(nid, NR_ACTIVE_ANON) +
-                                node_page_state(nid, NR_ACTIVE_FILE)),
-                       nid, K(node_page_state(nid, NR_INACTIVE_ANON) +
-                                node_page_state(nid, NR_INACTIVE_FILE)),
-                       nid, K(node_page_state(nid, NR_ACTIVE_ANON)),
-                       nid, K(node_page_state(nid, NR_INACTIVE_ANON)),
-                       nid, K(node_page_state(nid, NR_ACTIVE_FILE)),
-                       nid, K(node_page_state(nid, NR_INACTIVE_FILE)),
-                       nid, K(node_page_state(nid, NR_UNEVICTABLE)),
-                       nid, K(node_page_state(nid, NR_MLOCK)));
+                       nid, K(node_page_state(pgdat, NR_ACTIVE_ANON) +
+                                node_page_state(pgdat, NR_ACTIVE_FILE)),
+                       nid, K(node_page_state(pgdat, NR_INACTIVE_ANON) +
+                                node_page_state(pgdat, NR_INACTIVE_FILE)),
+                       nid, K(node_page_state(pgdat, NR_ACTIVE_ANON)),
+                       nid, K(node_page_state(pgdat, NR_INACTIVE_ANON)),
+                       nid, K(node_page_state(pgdat, NR_ACTIVE_FILE)),
+                       nid, K(node_page_state(pgdat, NR_INACTIVE_FILE)),
+                       nid, K(node_page_state(pgdat, NR_UNEVICTABLE)),
+                       nid, K(sum_zone_node_page_state(nid, NR_MLOCK)));
 
 #ifdef CONFIG_HIGHMEM
         n += sprintf(buf + n,
@@ -117,31 +118,30 @@ static ssize_t node_read_meminfo(struct device *dev,
                        "Node %d ShmemPmdMapped: %8lu kB\n"
 #endif
                         ,
-                       nid, K(node_page_state(nid, NR_FILE_DIRTY)),
-                       nid, K(node_page_state(nid, NR_WRITEBACK)),
-                       nid, K(node_page_state(nid, NR_FILE_PAGES)),
-                       nid, K(node_page_state(nid, NR_FILE_MAPPED)),
-                       nid, K(node_page_state(nid, NR_ANON_PAGES)),
+                       nid, K(node_page_state(pgdat, NR_FILE_DIRTY)),
+                       nid, K(node_page_state(pgdat, NR_WRITEBACK)),
+                       nid, K(node_page_state(pgdat, NR_FILE_PAGES)),
+                       nid, K(node_page_state(pgdat, NR_FILE_MAPPED)),
+                       nid, K(node_page_state(pgdat, NR_ANON_MAPPED)),
                        nid, K(i.sharedram),
-                       nid, node_page_state(nid, NR_KERNEL_STACK) *
-                                THREAD_SIZE / 1024,
-                       nid, K(node_page_state(nid, NR_PAGETABLE)),
-                       nid, K(node_page_state(nid, NR_UNSTABLE_NFS)),
-                       nid, K(node_page_state(nid, NR_BOUNCE)),
-                       nid, K(node_page_state(nid, NR_WRITEBACK_TEMP)),
-                       nid, K(node_page_state(nid, NR_SLAB_RECLAIMABLE) +
-                                node_page_state(nid, NR_SLAB_UNRECLAIMABLE)),
-                       nid, K(node_page_state(nid, NR_SLAB_RECLAIMABLE)),
+                       nid, sum_zone_node_page_state(nid, NR_KERNEL_STACK_KB),
+                       nid, K(sum_zone_node_page_state(nid, NR_PAGETABLE)),
+                       nid, K(node_page_state(pgdat, NR_UNSTABLE_NFS)),
+                       nid, K(sum_zone_node_page_state(nid, NR_BOUNCE)),
+                       nid, K(node_page_state(pgdat, NR_WRITEBACK_TEMP)),
+                       nid, K(sum_zone_node_page_state(nid, NR_SLAB_RECLAIMABLE) +
+                                sum_zone_node_page_state(nid, NR_SLAB_UNRECLAIMABLE)),
+                       nid, K(sum_zone_node_page_state(nid, NR_SLAB_RECLAIMABLE)),
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
-                       nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE)),
-                       nid, K(node_page_state(nid, NR_ANON_THPS) *
+                       nid, K(sum_zone_node_page_state(nid, NR_SLAB_UNRECLAIMABLE)),
+                       nid, K(node_page_state(pgdat, NR_ANON_THPS) *
                                        HPAGE_PMD_NR),
-                       nid, K(node_page_state(nid, NR_SHMEM_THPS) *
+                       nid, K(node_page_state(pgdat, NR_SHMEM_THPS) *
                                        HPAGE_PMD_NR),
-                       nid, K(node_page_state(nid, NR_SHMEM_PMDMAPPED) *
+                       nid, K(node_page_state(pgdat, NR_SHMEM_PMDMAPPED) *
                                        HPAGE_PMD_NR));
 #else
-                       nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE)));
+                       nid, K(sum_zone_node_page_state(nid, NR_SLAB_UNRECLAIMABLE)));
 #endif
         n += hugetlb_report_node_meminfo(nid, buf + n);
         return n;
@@ -160,12 +160,12 @@ static ssize_t node_read_numastat(struct device *dev,
                        "interleave_hit %lu\n"
                        "local_node %lu\n"
                        "other_node %lu\n",
-                       node_page_state(dev->id, NUMA_HIT),
-                       node_page_state(dev->id, NUMA_MISS),
-                       node_page_state(dev->id, NUMA_FOREIGN),
-                       node_page_state(dev->id, NUMA_INTERLEAVE_HIT),
-                       node_page_state(dev->id, NUMA_LOCAL),
-                       node_page_state(dev->id, NUMA_OTHER));
+                       sum_zone_node_page_state(dev->id, NUMA_HIT),
+                       sum_zone_node_page_state(dev->id, NUMA_MISS),
+                       sum_zone_node_page_state(dev->id, NUMA_FOREIGN),
+                       sum_zone_node_page_state(dev->id, NUMA_INTERLEAVE_HIT),
+                       sum_zone_node_page_state(dev->id, NUMA_LOCAL),
+                       sum_zone_node_page_state(dev->id, NUMA_OTHER));
 }
 static DEVICE_ATTR(numastat, S_IRUGO, node_read_numastat, NULL);
 
@@ -173,12 +173,18 @@ static ssize_t node_read_vmstat(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
         int nid = dev->id;
+        struct pglist_data *pgdat = NODE_DATA(nid);
         int i;
         int n = 0;
 
         for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
                 n += sprintf(buf+n, "%s %lu\n", vmstat_text[i],
-                             node_page_state(nid, i));
+                             sum_zone_node_page_state(nid, i));
+
+        for (i = 0; i < NR_VM_NODE_STAT_ITEMS; i++)
+                n += sprintf(buf+n, "%s %lu\n",
+                             vmstat_text[i + NR_VM_ZONE_STAT_ITEMS],
+                             node_page_state(pgdat, i));
 
         return n;
 }
diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
index 24d2745e9437..45a1b4ec4ca3 100644
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@ -72,10 +72,10 @@ static unsigned long lowmem_deathpending_timeout;
 static unsigned long lowmem_count(struct shrinker *s,
                                   struct shrink_control *sc)
 {
-        return global_page_state(NR_ACTIVE_ANON) +
-                global_page_state(NR_ACTIVE_FILE) +
-                global_page_state(NR_INACTIVE_ANON) +
-                global_page_state(NR_INACTIVE_FILE);
+        return global_node_page_state(NR_ACTIVE_ANON) +
+                global_node_page_state(NR_ACTIVE_FILE) +
+                global_node_page_state(NR_INACTIVE_ANON) +
+                global_node_page_state(NR_INACTIVE_FILE);
 }
 
 static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc)
@@ -91,8 +91,8 @@ static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc)
         short selected_oom_score_adj;
         int array_size = ARRAY_SIZE(lowmem_adj);
         int other_free = global_page_state(NR_FREE_PAGES) - totalreserve_pages;
-        int other_file = global_page_state(NR_FILE_PAGES) -
-                                                global_page_state(NR_SHMEM) -
+        int other_file = global_node_page_state(NR_FILE_PAGES) -
+                                                global_node_page_state(NR_SHMEM) -
                                                 total_swapcache_pages();
 
         if (lowmem_adj_size < array_size)
diff --git a/drivers/staging/lustre/lustre/osc/osc_cache.c b/drivers/staging/lustre/lustre/osc/osc_cache.c
index d1a7d6beee60..d011135802d5 100644
--- a/drivers/staging/lustre/lustre/osc/osc_cache.c
+++ b/drivers/staging/lustre/lustre/osc/osc_cache.c
@@ -1864,7 +1864,8 @@ void osc_dec_unstable_pages(struct ptlrpc_request *req)
         LASSERT(page_count >= 0);
 
         for (i = 0; i < page_count; i++)
-                dec_zone_page_state(desc->bd_iov[i].kiov_page, NR_UNSTABLE_NFS);
+                dec_node_page_state(desc->bd_iov[i].kiov_page,
+                                                        NR_UNSTABLE_NFS);
 
         atomic_sub(page_count, &cli->cl_cache->ccc_unstable_nr);
         LASSERT(atomic_read(&cli->cl_cache->ccc_unstable_nr) >= 0);
@@ -1898,7 +1899,8 @@ void osc_inc_unstable_pages(struct ptlrpc_request *req)
         LASSERT(page_count >= 0);
 
         for (i = 0; i < page_count; i++)
-                inc_zone_page_state(desc->bd_iov[i].kiov_page, NR_UNSTABLE_NFS);
+                inc_node_page_state(desc->bd_iov[i].kiov_page,
+                                                        NR_UNSTABLE_NFS);
 
         LASSERT(atomic_read(&cli->cl_cache->ccc_unstable_nr) >= 0);
         atomic_add(page_count, &cli->cl_cache->ccc_unstable_nr);