Merge branch 'akpm' (patches from Andrew)

Merge second patch-bomb from Andrew Morton:
 "Almost all of the rest of MM.  There was an unusually large amount of
  MM material this time"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (141 commits)
  zpool: remove no-op module init/exit
  mm: zbud: constify the zbud_ops
  mm: zpool: constify the zpool_ops
  mm: swap: zswap: maybe_preload & refactoring
  zram: unify error reporting
  zsmalloc: remove null check from destroy_handle_cache()
  zsmalloc: do not take class lock in zs_shrinker_count()
  zsmalloc: use class->pages_per_zspage
  zsmalloc: consider ZS_ALMOST_FULL as migrate source
  zsmalloc: partial page ordering within a fullness_list
  zsmalloc: use shrinker to trigger auto-compaction
  zsmalloc: account the number of compacted pages
  zsmalloc/zram: introduce zs_pool_stats api
  zsmalloc: cosmetic compaction code adjustments
  zsmalloc: introduce zs_can_compact() function
  zsmalloc: always keep per-class stats
  zsmalloc: drop unused variable `nr_to_migrate'
  mm/memblock.c: fix comment in __next_mem_range()
  mm/page_alloc.c: fix type information of memoryless node
  memory-hotplug: fix comments in zone_spanned_pages_in_node() and zone_spanned_pages_in_node()
  ...

4 files changed, 9 insertions, 100 deletions

diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile
index 0d6854744b37..d36fab7d8ebd 100644
--- a/tools/testing/selftests/vm/Makefile
+++ b/tools/testing/selftests/vm/Makefile
@@ -4,7 +4,6 @@ CFLAGS = -Wall
 BINARIES = compaction_test
 BINARIES += hugepage-mmap
 BINARIES += hugepage-shm
-BINARIES += hugetlbfstest
 BINARIES += map_hugetlb
 BINARIES += thuge-gen
 BINARIES += transhuge-stress
diff --git a/tools/testing/selftests/vm/hugetlbfstest.c b/tools/testing/selftests/vm/hugetlbfstest.c
deleted file mode 100644
index 02e1072ec187..000000000000
--- a/tools/testing/selftests/vm/hugetlbfstest.c
+++ /dev/null
@@ -1,86 +0,0 @@
-#define _GNU_SOURCE
-#include <assert.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-typedef unsigned long long u64;
-
-static size_t length = 1 << 24;
-
-static u64 read_rss(void)
-{
-        char buf[4096], *s = buf;
-        int i, fd;
-        u64 rss;
-
-        fd = open("/proc/self/statm", O_RDONLY);
-        assert(fd > 2);
-        memset(buf, 0, sizeof(buf));
-        read(fd, buf, sizeof(buf) - 1);
-        for (i = 0; i < 1; i++)
-                s = strchr(s, ' ') + 1;
-        rss = strtoull(s, NULL, 10);
-        return rss << 12; /* assumes 4k pagesize */
-}
-
-static void do_mmap(int fd, int extra_flags, int unmap)
-{
-        int *p;
-        int flags = MAP_PRIVATE | MAP_POPULATE | extra_flags;
-        u64 before, after;
-        int ret;
-
-        before = read_rss();
-        p = mmap(NULL, length, PROT_READ | PROT_WRITE, flags, fd, 0);
-        assert(p != MAP_FAILED ||
-                        !"mmap returned an unexpected error");
-        after = read_rss();
-        assert(llabs(after - before - length) < 0x40000 ||
-                        !"rss didn't grow as expected");
-        if (!unmap)
-                return;
-        ret = munmap(p, length);
-        assert(!ret || !"munmap returned an unexpected error");
-        after = read_rss();
-        assert(llabs(after - before) < 0x40000 ||
-                        !"rss didn't shrink as expected");
-}
-
-static int open_file(const char *path)
-{
-        int fd, err;
-
-        unlink(path);
-        fd = open(path, O_CREAT | O_RDWR | O_TRUNC | O_EXCL
-                        | O_LARGEFILE | O_CLOEXEC, 0600);
-        assert(fd > 2);
-        unlink(path);
-        err = ftruncate(fd, length);
-        assert(!err);
-        return fd;
-}
-
-int main(void)
-{
-        int hugefd, fd;
-
-        fd = open_file("/dev/shm/hugetlbhog");
-        hugefd = open_file("/hugepages/hugetlbhog");
-
-        system("echo 100 > /proc/sys/vm/nr_hugepages");
-        do_mmap(-1, MAP_ANONYMOUS, 1);
-        do_mmap(fd, 0, 1);
-        do_mmap(-1, MAP_ANONYMOUS | MAP_HUGETLB, 1);
-        do_mmap(hugefd, 0, 1);
-        do_mmap(hugefd, MAP_HUGETLB, 1);
-        /* Leak the last one to test do_exit() */
-        do_mmap(-1, MAP_ANONYMOUS | MAP_HUGETLB, 0);
-        printf("oll korrekt.\n");
-        return 0;
-}
diff --git a/tools/testing/selftests/vm/run_vmtests b/tools/testing/selftests/vm/run_vmtests
index 831adeb5fc55..9179ce8df485 100755
--- a/tools/testing/selftests/vm/run_vmtests
+++ b/tools/testing/selftests/vm/run_vmtests
@@ -75,16 +75,9 @@ else
         echo "[PASS]"
 fi
 
-echo "--------------------"
-echo "running hugetlbfstest"
-echo "--------------------"
-./hugetlbfstest
-if [ $? -ne 0 ]; then
-        echo "[FAIL]"
-        exitcode=1
-else
-        echo "[PASS]"
-fi
+echo "NOTE: The above hugetlb tests provide minimal coverage.  Use"
+echo "      https://github.com/libhugetlbfs/libhugetlbfs.git for"
+echo "      hugetlb regression testing."
 
 echo "--------------------"
 echo "running userfaultfd"
diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c
index 76071b14cb93..2c7cca6f26a4 100644
--- a/tools/testing/selftests/vm/userfaultfd.c
+++ b/tools/testing/selftests/vm/userfaultfd.c
@@ -147,7 +147,8 @@ static void *locking_thread(void *arg)
                         if (sizeof(page_nr) > sizeof(rand_nr)) {
                                 if (random_r(&rand, &rand_nr))
                                         fprintf(stderr, "random_r 2 error\n"), exit(1);
-                                page_nr |= ((unsigned long) rand_nr) << 32;
+                                page_nr |= (((unsigned long) rand_nr) << 16) <<
+                                           16;
                         }
                 } else
                         page_nr += 1;
@@ -290,7 +291,8 @@ static void *uffd_poll_thread(void *arg)
                                 msg.event), exit(1);
                 if (msg.arg.pagefault.flags & UFFD_PAGEFAULT_FLAG_WRITE)
                         fprintf(stderr, "unexpected write fault\n"), exit(1);
-                offset = (char *)msg.arg.pagefault.address - area_dst;
+                offset = (char *)(unsigned long)msg.arg.pagefault.address -
+                         area_dst;
                 offset &= ~(page_size-1);
                 if (copy_page(offset))
                         userfaults++;
@@ -327,7 +329,8 @@ static void *uffd_read_thread(void *arg)
                 if (bounces & BOUNCE_VERIFY &&
                     msg.arg.pagefault.flags & UFFD_PAGEFAULT_FLAG_WRITE)
                         fprintf(stderr, "unexpected write fault\n"), exit(1);
-                offset = (char *)msg.arg.pagefault.address - area_dst;
+                offset = (char *)(unsigned long)msg.arg.pagefault.address -
+                         area_dst;
                 offset &= ~(page_size-1);
                 if (copy_page(offset))
                         (*this_cpu_userfaults)++;