Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

In netdevice.h we removed the structure in net-next that is being
changes in 'net'.  In macsec.c and rtnetlink.c we have overlaps
between fixes in 'net' and the u64 attribute changes in 'net-next'.

The mlx5 conflicts have to do with vxlan support dependencies.

Signed-off-by: David S. Miller <davem@davemloft.net>

6 files changed, 20 insertions, 25 deletions

diff --git a/mm/compaction.c b/mm/compaction.c
index ccf97b02b85f..8fa254043801 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -852,16 +852,8 @@ isolate_migratepages_range(struct compact_control *cc, unsigned long start_pfn,
                 pfn = isolate_migratepages_block(cc, pfn, block_end_pfn,
                                                         ISOLATE_UNEVICTABLE);
 
-                /*
-                 * In case of fatal failure, release everything that might
-                 * have been isolated in the previous iteration, and signal
-                 * the failure back to caller.
-                 */
-                if (!pfn) {
-                        putback_movable_pages(&cc->migratepages);
-                        cc->nr_migratepages = 0;
+                if (!pfn)
                         break;
-                }
 
                 if (cc->nr_migratepages == COMPACT_CLUSTER_MAX)
                         break;
@@ -1741,7 +1733,7 @@ void compaction_unregister_node(struct node *node)
 
 static inline bool kcompactd_work_requested(pg_data_t *pgdat)
 {
-        return pgdat->kcompactd_max_order > 0;
+        return pgdat->kcompactd_max_order > 0 || kthread_should_stop();
 }
 
 static bool kcompactd_node_suitable(pg_data_t *pgdat)
@@ -1805,6 +1797,8 @@ static void kcompactd_do_work(pg_data_t *pgdat)
                 INIT_LIST_HEAD(&cc.freepages);
                 INIT_LIST_HEAD(&cc.migratepages);
 
+                if (kthread_should_stop())
+                        return;
                 status = compact_zone(zone, &cc);
 
                 if (zone_watermark_ok(zone, cc.order, low_wmark_pages(zone),
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index df67b53ae3c5..f7daa7de8f48 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -3452,7 +3452,7 @@ next:
                 }
         }
 
-        pr_info("%lu of %lu THP split", split, total);
+        pr_info("%lu of %lu THP split\n", split, total);
 
         return 0;
 }
@@ -3463,7 +3463,7 @@ static int __init split_huge_pages_debugfs(void)
 {
         void *ret;
 
-        ret = debugfs_create_file("split_huge_pages", 0644, NULL, NULL,
+        ret = debugfs_create_file("split_huge_pages", 0200, NULL, NULL,
                         &split_huge_pages_fops);
         if (!ret)
                 pr_warn("Failed to create split_huge_pages in debugfs");
diff --git a/mm/memory.c b/mm/memory.c
index 305537fc8640..52c218e2b724 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1222,15 +1222,8 @@ static inline unsigned long zap_pmd_range(struct mmu_gather *tlb,
                 next = pmd_addr_end(addr, end);
                 if (pmd_trans_huge(*pmd) || pmd_devmap(*pmd)) {
                         if (next - addr != HPAGE_PMD_SIZE) {
-#ifdef CONFIG_DEBUG_VM
-                                if (!rwsem_is_locked(&tlb->mm->mmap_sem)) {
-                                        pr_err("%s: mmap_sem is unlocked! addr=0x%lx end=0x%lx vma->vm_start=0x%lx vma->vm_end=0x%lx\n",
-                                                __func__, addr, end,
-                                                vma->vm_start,
-                                                vma->vm_end);
-                                        BUG();
-                                }
-#endif
+                                VM_BUG_ON_VMA(vma_is_anonymous(vma) &&
+                                    !rwsem_is_locked(&tlb->mm->mmap_sem), vma);
                                 split_huge_pmd(vma, pmd, addr);
                         } else if (zap_huge_pmd(tlb, vma, pmd, addr))
                                 goto next;
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 999792d35ccc..bc5149d5ec38 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -1910,7 +1910,8 @@ bool wb_over_bg_thresh(struct bdi_writeback *wb)
         if (gdtc->dirty > gdtc->bg_thresh)
                 return true;
 
-        if (wb_stat(wb, WB_RECLAIMABLE) > __wb_calc_thresh(gdtc))
+        if (wb_stat(wb, WB_RECLAIMABLE) >
+            wb_calc_thresh(gdtc->wb, gdtc->bg_thresh))
                 return true;
 
         if (mdtc) {
@@ -1924,7 +1925,8 @@ bool wb_over_bg_thresh(struct bdi_writeback *wb)
                 if (mdtc->dirty > mdtc->bg_thresh)
                         return true;
 
-                if (wb_stat(wb, WB_RECLAIMABLE) > __wb_calc_thresh(mdtc))
+                if (wb_stat(wb, WB_RECLAIMABLE) >
+                    wb_calc_thresh(mdtc->wb, mdtc->bg_thresh))
                         return true;
         }
 
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 59de90d5d3a3..c1069efcc4d7 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -6485,7 +6485,7 @@ int __meminit init_per_zone_wmark_min(void)
         setup_per_zone_inactive_ratio();
         return 0;
 }
-module_init(init_per_zone_wmark_min)
+core_initcall(init_per_zone_wmark_min)
 
 /*
  * min_free_kbytes_sysctl_handler - just a wrapper around proc_dointvec() so
diff --git a/mm/zswap.c b/mm/zswap.c
index 91dad80d068b..de0f119b1780 100644
--- a/mm/zswap.c
+++ b/mm/zswap.c
@@ -170,6 +170,8 @@ static struct zswap_tree *zswap_trees[MAX_SWAPFILES];
 static LIST_HEAD(zswap_pools);
 /* protects zswap_pools list modification */
 static DEFINE_SPINLOCK(zswap_pools_lock);
+/* pool counter to provide unique names to zpool */
+static atomic_t zswap_pools_count = ATOMIC_INIT(0);
 
 /* used by param callback function */
 static bool zswap_init_started;
@@ -565,6 +567,7 @@ static struct zswap_pool *zswap_pool_find_get(char *type, char *compressor)
 static struct zswap_pool *zswap_pool_create(char *type, char *compressor)
 {
         struct zswap_pool *pool;
+        char name[38]; /* 'zswap' + 32 char (max) num + \0 */
         gfp_t gfp = __GFP_NORETRY | __GFP_NOWARN | __GFP_KSWAPD_RECLAIM;
 
         pool = kzalloc(sizeof(*pool), GFP_KERNEL);
@@ -573,7 +576,10 @@ static struct zswap_pool *zswap_pool_create(char *type, char *compressor)
                 return NULL;
         }
 
-        pool->zpool = zpool_create_pool(type, "zswap", gfp, &zswap_zpool_ops);
+        /* unique name for each pool specifically required by zsmalloc */
+        snprintf(name, 38, "zswap%x", atomic_inc_return(&zswap_pools_count));
+
+        pool->zpool = zpool_create_pool(type, name, gfp, &zswap_zpool_ops);
         if (!pool->zpool) {
                 pr_err("%s zpool not available\n", type);
                 goto error;