Merge branch 'akpm' (patches from Andrew)

Merge misc updates from Andrew Morton:

 - a few misc things

 - ocfs2 updates

 - most of MM

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (159 commits)
  tools/testing/selftests/proc/proc-self-syscall.c: remove duplicate include
  proc: more robust bulk read test
  proc: test /proc/*/maps, smaps, smaps_rollup, statm
  proc: use seq_puts() everywhere
  proc: read kernel cpu stat pointer once
  proc: remove unused argument in proc_pid_lookup()
  fs/proc/thread_self.c: code cleanup for proc_setup_thread_self()
  fs/proc/self.c: code cleanup for proc_setup_self()
  proc: return exit code 4 for skipped tests
  mm,mremap: bail out earlier in mremap_to under map pressure
  mm/sparse: fix a bad comparison
  mm/memory.c: do_fault: avoid usage of stale vm_area_struct
  writeback: fix inode cgroup switching comment
  mm/huge_memory.c: fix "orig_pud" set but not used
  mm/hotplug: fix an imbalance with DEBUG_PAGEALLOC
  mm/memcontrol.c: fix bad line in comment
  mm/cma.c: cma_declare_contiguous: correct err handling
  mm/page_ext.c: fix an imbalance with kmemleak
  mm/compaction: pass pgdat to too_many_isolated() instead of zone
  mm: remove zone_lru_lock() function, access ->lru_lock directly
  ...

13 files changed, 81 insertions, 29 deletions

diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index 88e8440e75c3..2f3ee4d6af82 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -40,6 +40,7 @@
 #include <linux/export.h>
 #include <linux/debugfs.h>
 #include <linux/prefetch.h>
+#include <linux/numa.h>
 #include "mtip32xx.h"
 
 #define HW_CMD_SLOT_SZ          (MTIP_MAX_COMMAND_SLOTS * 32)
@@ -4018,9 +4019,9 @@ static int get_least_used_cpu_on_node(int node)
 /* Helper for selecting a node in round robin mode */
 static inline int mtip_get_next_rr_node(void)
 {
-        static int next_node = -1;
+        static int next_node = NUMA_NO_NODE;
 
-        if (next_node == -1) {
+        if (next_node == NUMA_NO_NODE) {
                 next_node = first_online_node;
                 return next_node;
         }
diff --git a/drivers/char/agp/efficeon-agp.c b/drivers/char/agp/efficeon-agp.c
index 7f88490b5479..c53f0f9ef5b0 100644
--- a/drivers/char/agp/efficeon-agp.c
+++ b/drivers/char/agp/efficeon-agp.c
@@ -163,7 +163,6 @@ static int efficeon_free_gatt_table(struct agp_bridge_data *bridge)
                 unsigned long page = efficeon_private.l1_table[index];
                 if (page) {
                         efficeon_private.l1_table[index] = 0;
-                        ClearPageReserved(virt_to_page((char *)page));
                         free_page(page);
                         freed++;
                 }
@@ -219,7 +218,6 @@ static int efficeon_create_gatt_table(struct agp_bridge_data *bridge)
                         efficeon_free_gatt_table(agp_bridge);
                         return -ENOMEM;
                 }
-                SetPageReserved(virt_to_page((char *)page));
 
                 for (offset = 0; offset < PAGE_SIZE; offset += clflush_chunk)
                         clflush((char *)page+offset);
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index f1a441ab395d..3a11b1092e80 100644
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -63,6 +63,7 @@
 #include <linux/acpi_dma.h>
 #include <linux/of_dma.h>
 #include <linux/mempool.h>
+#include <linux/numa.h>
 
 static DEFINE_MUTEX(dma_list_mutex);
 static DEFINE_IDA(dma_ida);
@@ -386,7 +387,8 @@ EXPORT_SYMBOL(dma_issue_pending_all);
 static bool dma_chan_is_local(struct dma_chan *chan, int cpu)
 {
         int node = dev_to_node(chan->device->dev);
-        return node == -1 || cpumask_test_cpu(cpu, cpumask_of_node(node));
+        return node == NUMA_NO_NODE ||
+                cpumask_test_cpu(cpu, cpumask_of_node(node));
 }
 
 /**
diff --git a/drivers/gpu/drm/i915/i915_utils.h b/drivers/gpu/drm/i915/i915_utils.h
index 9726df37c4c4..540e20eb032c 100644
--- a/drivers/gpu/drm/i915/i915_utils.h
+++ b/drivers/gpu/drm/i915/i915_utils.h
@@ -123,12 +123,6 @@ static inline u64 ptr_to_u64(const void *ptr)
 
 #include <linux/list.h>
 
-static inline int list_is_first(const struct list_head *list,
-                                const struct list_head *head)
-{
-        return head->next == list;
-}
-
 static inline void __list_del_many(struct list_head *head,
                                    struct list_head *first)
 {
diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
index 7c6349a50ef1..dd475f3bcc8a 100644
--- a/drivers/hv/hv_balloon.c
+++ b/drivers/hv/hv_balloon.c
@@ -681,8 +681,13 @@ static struct notifier_block hv_memory_nb = {
 /* Check if the particular page is backed and can be onlined and online it. */
 static void hv_page_online_one(struct hv_hotadd_state *has, struct page *pg)
 {
-        if (!has_pfn_is_backed(has, page_to_pfn(pg)))
+        if (!has_pfn_is_backed(has, page_to_pfn(pg))) {
+                if (!PageOffline(pg))
+                        __SetPageOffline(pg);
                 return;
+        }
+        if (PageOffline(pg))
+                __ClearPageOffline(pg);
 
         /* This frame is currently backed; online the page. */
         __online_page_set_limits(pg);
@@ -771,7 +776,7 @@ static void hv_mem_hot_add(unsigned long start, unsigned long size,
         }
 }
 
-static void hv_online_page(struct page *pg)
+static void hv_online_page(struct page *pg, unsigned int order)
 {
         struct hv_hotadd_state *has;
         unsigned long flags;
@@ -780,10 +785,11 @@ static void hv_online_page(struct page *pg)
         spin_lock_irqsave(&dm_device.ha_lock, flags);
         list_for_each_entry(has, &dm_device.ha_region_list, list) {
                 /* The page belongs to a different HAS. */
-                if ((pfn < has->start_pfn) || (pfn >= has->end_pfn))
+                if ((pfn < has->start_pfn) ||
+                                (pfn + (1UL << order) > has->end_pfn))
                         continue;
 
-                hv_page_online_one(has, pg);
+                hv_bring_pgs_online(has, pfn, 1UL << order);
                 break;
         }
         spin_unlock_irqrestore(&dm_device.ha_lock, flags);
@@ -1201,6 +1207,7 @@ static void free_balloon_pages(struct hv_dynmem_device *dm,
 
         for (i = 0; i < num_pages; i++) {
                 pg = pfn_to_page(i + start_frame);
+                __ClearPageOffline(pg);
                 __free_page(pg);
                 dm->num_pages_ballooned--;
         }
@@ -1213,7 +1220,7 @@ static unsigned int alloc_balloon_pages(struct hv_dynmem_device *dm,
                                         struct dm_balloon_response *bl_resp,
                                         int alloc_unit)
 {
-        unsigned int i = 0;
+        unsigned int i, j;
         struct page *pg;
 
         if (num_pages < alloc_unit)
@@ -1245,6 +1252,10 @@ static unsigned int alloc_balloon_pages(struct hv_dynmem_device *dm,
                 if (alloc_unit != 1)
                         split_page(pg, get_order(alloc_unit << PAGE_SHIFT));
 
+                /* mark all pages offline */
+                for (j = 0; j < (1 << get_order(alloc_unit << PAGE_SHIFT)); j++)
+                        __SetPageOffline(pg + j);
+
                 bl_resp->range_count++;
                 bl_resp->range_array[i].finfo.start_page =
                         page_to_pfn(pg);
diff --git a/drivers/infiniband/hw/hfi1/affinity.c b/drivers/infiniband/hw/hfi1/affinity.c
index 2baf38cc1e23..4fe662c3bbc1 100644
--- a/drivers/infiniband/hw/hfi1/affinity.c
+++ b/drivers/infiniband/hw/hfi1/affinity.c
@@ -48,6 +48,7 @@
 #include <linux/cpumask.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
+#include <linux/numa.h>
 
 #include "hfi.h"
 #include "affinity.h"
@@ -777,7 +778,7 @@ void hfi1_dev_affinity_clean_up(struct hfi1_devdata *dd)
         _dev_comp_vect_cpu_mask_clean_up(dd, entry);
 unlock:
         mutex_unlock(&node_affinity.lock);
-        dd->node = -1;
+        dd->node = NUMA_NO_NODE;
 }
 
 /*
diff --git a/drivers/infiniband/hw/hfi1/init.c b/drivers/infiniband/hw/hfi1/init.c
index 7835eb52e7c5..441b06e2a154 100644
--- a/drivers/infiniband/hw/hfi1/init.c
+++ b/drivers/infiniband/hw/hfi1/init.c
@@ -54,6 +54,7 @@
 #include <linux/printk.h>
 #include <linux/hrtimer.h>
 #include <linux/bitmap.h>
+#include <linux/numa.h>
 #include <rdma/rdma_vt.h>
 
 #include "hfi.h"
@@ -1303,7 +1304,7 @@ static struct hfi1_devdata *hfi1_alloc_devdata(struct pci_dev *pdev,
                 dd->unit = ret;
                 list_add(&dd->list, &hfi1_dev_list);
         }
-        dd->node = -1;
+        dd->node = NUMA_NO_NODE;
 
         spin_unlock_irqrestore(&hfi1_devs_lock, flags);
         idr_preload_end();
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index 58dc70bffd5b..9c49300e9fb7 100644
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
@@ -39,6 +39,7 @@
 #include <linux/dmi.h>
 #include <linux/slab.h>
 #include <linux/iommu.h>
+#include <linux/numa.h>
 #include <asm/irq_remapping.h>
 #include <asm/iommu_table.h>
 
@@ -477,7 +478,7 @@ static int dmar_parse_one_rhsa(struct acpi_dmar_header *header, void *arg)
                         int node = acpi_map_pxm_to_node(rhsa->proximity_domain);
 
                         if (!node_online(node))
-                                node = -1;
+                                node = NUMA_NO_NODE;
                         drhd->iommu->node = node;
                         return 0;
                 }
@@ -1062,7 +1063,7 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd)
         iommu->msagaw = msagaw;
         iommu->segment = drhd->segment;
 
-        iommu->node = -1;
+        iommu->node = NUMA_NO_NODE;
 
         ver = readl(iommu->reg + DMAR_VER_REG);
         pr_info("%s: reg_base_addr %llx ver %d:%d cap %llx ecap %llx\n",
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 78188bf7e90d..39a33dec4d0b 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -47,6 +47,7 @@
 #include <linux/dma-contiguous.h>
 #include <linux/dma-direct.h>
 #include <linux/crash_dump.h>
+#include <linux/numa.h>
 #include <asm/irq_remapping.h>
 #include <asm/cacheflush.h>
 #include <asm/iommu.h>
@@ -1716,7 +1717,7 @@ static struct dmar_domain *alloc_domain(int flags)
                 return NULL;
 
         memset(domain, 0, sizeof(*domain));
-        domain->nid = -1;
+        domain->nid = NUMA_NO_NODE;
         domain->flags = flags;
         domain->has_iotlb_device = false;
         INIT_LIST_HEAD(&domain->devices);
diff --git a/drivers/misc/sgi-xp/xpc_uv.c b/drivers/misc/sgi-xp/xpc_uv.c
index 0441abe87880..9e443df44b3b 100644
--- a/drivers/misc/sgi-xp/xpc_uv.c
+++ b/drivers/misc/sgi-xp/xpc_uv.c
@@ -22,6 +22,7 @@
 #include <linux/module.h>
 #include <linux/err.h>
 #include <linux/slab.h>
+#include <linux/numa.h>
 #include <asm/uv/uv_hub.h>
 #if defined CONFIG_X86_64
 #include <asm/uv/bios.h>
@@ -61,7 +62,7 @@ static struct xpc_heartbeat_uv *xpc_heartbeat_uv;
                                          XPC_NOTIFY_MSG_SIZE_UV)
 #define XPC_NOTIFY_IRQ_NAME             "xpc_notify"
 
-static int xpc_mq_node = -1;
+static int xpc_mq_node = NUMA_NO_NODE;
 
 static struct xpc_gru_mq_uv *xpc_activate_mq_uv;
 static struct xpc_gru_mq_uv *xpc_notify_mq_uv;
diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c
index f8240b87df22..869ec842729e 100644
--- a/drivers/misc/vmw_balloon.c
+++ b/drivers/misc/vmw_balloon.c
@@ -557,6 +557,36 @@ vmballoon_page_in_frames(enum vmballoon_page_size_type page_size)
 }
 
 /**
+ * vmballoon_mark_page_offline() - mark a page as offline
+ * @page: pointer for the page.
+ * @page_size: the size of the page.
+ */
+static void
+vmballoon_mark_page_offline(struct page *page,
+                            enum vmballoon_page_size_type page_size)
+{
+        int i;
+
+        for (i = 0; i < vmballoon_page_in_frames(page_size); i++)
+                __SetPageOffline(page + i);
+}
+
+/**
+ * vmballoon_mark_page_online() - mark a page as online
+ * @page: pointer for the page.
+ * @page_size: the size of the page.
+ */
+static void
+vmballoon_mark_page_online(struct page *page,
+                           enum vmballoon_page_size_type page_size)
+{
+        int i;
+
+        for (i = 0; i < vmballoon_page_in_frames(page_size); i++)
+                __ClearPageOffline(page + i);
+}
+
+/**
  * vmballoon_send_get_target() - Retrieve desired balloon size from the host.
  *
  * @b: pointer to the balloon.
@@ -612,6 +642,7 @@ static int vmballoon_alloc_page_list(struct vmballoon *b,
                                          ctl->page_size);
 
                 if (page) {
+                        vmballoon_mark_page_offline(page, ctl->page_size);
                         /* Success. Add the page to the list and continue. */
                         list_add(&page->lru, &ctl->pages);
                         continue;
@@ -850,6 +881,7 @@ static void vmballoon_release_page_list(struct list_head *page_list,
 
         list_for_each_entry_safe(page, tmp, page_list, lru) {
                 list_del(&page->lru);
+                vmballoon_mark_page_online(page, page_size);
                 __free_pages(page, vmballoon_page_order(page_size));
         }
 
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index a4e7584a50cb..e100054a3765 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -27,6 +27,7 @@
 #include <linux/bpf.h>
 #include <linux/bpf_trace.h>
 #include <linux/atomic.h>
+#include <linux/numa.h>
 #include <scsi/fc/fc_fcoe.h>
 #include <net/udp_tunnel.h>
 #include <net/pkt_cls.h>
@@ -6418,7 +6419,7 @@ int ixgbe_setup_tx_resources(struct ixgbe_ring *tx_ring)
 {
         struct device *dev = tx_ring->dev;
         int orig_node = dev_to_node(dev);
-        int ring_node = -1;
+        int ring_node = NUMA_NO_NODE;
         int size;
 
         size = sizeof(struct ixgbe_tx_buffer) * tx_ring->count;
@@ -6512,7 +6513,7 @@ int ixgbe_setup_rx_resources(struct ixgbe_adapter *adapter,
 {
         struct device *dev = rx_ring->dev;
         int orig_node = dev_to_node(dev);
-        int ring_node = -1;
+        int ring_node = NUMA_NO_NODE;
         int size;
 
         size = sizeof(struct ixgbe_rx_buffer) * rx_ring->count;
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index ceb5048de9a7..39b229f9e256 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -369,14 +369,20 @@ static enum bp_state reserve_additional_memory(void)
         return BP_ECANCELED;
 }
 
-static void xen_online_page(struct page *page)
+static void xen_online_page(struct page *page, unsigned int order)
 {
-        __online_page_set_limits(page);
+        unsigned long i, size = (1 << order);
+        unsigned long start_pfn = page_to_pfn(page);
+        struct page *p;
 
+        pr_debug("Online %lu pages starting at pfn 0x%lx\n", size, start_pfn);
         mutex_lock(&balloon_mutex);
-
-        __balloon_append(page);
-
+        for (i = 0; i < size; i++) {
+                p = pfn_to_page(start_pfn + i);
+                __online_page_set_limits(p);
+                __SetPageOffline(p);
+                __balloon_append(p);
+        }
         mutex_unlock(&balloon_mutex);
 }
 
@@ -441,6 +447,7 @@ static enum bp_state increase_reservation(unsigned long nr_pages)
                 xenmem_reservation_va_mapping_update(1, &page, &frame_list[i]);
 
                 /* Relinquish the page back to the allocator. */
+                __ClearPageOffline(page);
                 free_reserved_page(page);
         }
 
@@ -467,6 +474,7 @@ static enum bp_state decrease_reservation(unsigned long nr_pages, gfp_t gfp)
                         state = BP_EAGAIN;
                         break;
                 }
+                __SetPageOffline(page);
                 adjust_managed_page_count(page, -1);
                 xenmem_reservation_scrub_page(page);
                 list_add(&page->lru, &pages);