Merge branch 'akpm' (patches from Andrew)

Merge more updates from Andrew Morton:
 "VM:
   - z3fold fixes and enhancements by Henry Burns and Vitaly Wool

   - more accurate reclaimed slab caches calculations by Yafang Shao

   - fix MAP_UNINITIALIZED UAPI symbol to not depend on config, by
     Christoph Hellwig

   - !CONFIG_MMU fixes by Christoph Hellwig

   - new novmcoredd parameter to omit device dumps from vmcore, by
     Kairui Song

   - new test_meminit module for testing heap and pagealloc
     initialization, by Alexander Potapenko

   - ioremap improvements for huge mappings, by Anshuman Khandual

   - generalize kprobe page fault handling, by Anshuman Khandual

   - device-dax hotplug fixes and improvements, by Pavel Tatashin

   - enable synchronous DAX fault on powerpc, by Aneesh Kumar K.V

   - add pte_devmap() support for arm64, by Robin Murphy

   - unify locked_vm accounting with a helper, by Daniel Jordan

   - several misc fixes

  core/lib:
   - new typeof_member() macro including some users, by Alexey Dobriyan

   - make BIT() and GENMASK() available in asm, by Masahiro Yamada

   - changed LIST_POISON2 on x86_64 to 0xdead000000000122 for better
     code generation, by Alexey Dobriyan

   - rbtree code size optimizations, by Michel Lespinasse

   - convert struct pid count to refcount_t, by Joel Fernandes

  get_maintainer.pl:
   - add --no-moderated switch to skip moderated ML's, by Joe Perches

  misc:
   - ptrace PTRACE_GET_SYSCALL_INFO interface

   - coda updates

   - gdb scripts, various"

[ Using merge message suggestion from Vlastimil Babka, with some editing - Linus ]

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (100 commits)
  fs/select.c: use struct_size() in kmalloc()
  mm: add account_locked_vm utility function
  arm64: mm: implement pte_devmap support
  mm: introduce ARCH_HAS_PTE_DEVMAP
  mm: clean up is_device_*_page() definitions
  mm/mmap: move common defines to mman-common.h
  mm: move MAP_SYNC to asm-generic/mman-common.h
  device-dax: "Hotremove" persistent memory that is used like normal RAM
  mm/hotplug: make remove_memory() interface usable
  device-dax: fix memory and resource leak if hotplug fails
  include/linux/lz4.h: fix spelling and copy-paste errors in documentation
  ipc/mqueue.c: only perform resource calculation if user valid
  include/asm-generic/bug.h: fix "cut here" for WARN_ON for __WARN_TAINT architectures
  scripts/gdb: add helpers to find and list devices
  scripts/gdb: add lx-genpd-summary command
  drivers/pps/pps.c: clear offset flags in PPS_SETPARAMS ioctl
  kernel/pid.c: convert struct pid count to refcount_t
  drivers/rapidio/devices/rio_mport_cdev.c: NUL terminate some strings
  select: shift restore_saved_sigmask_unless() into poll_select_copy_remaining()
  select: change do_poll() to return -ERESTARTNOHAND rather than -EINTR
  ...

1 files changed, 25 insertions, 71 deletions

diff --git a/fs/select.c b/fs/select.c
index a4d8f6e8b63c..53a0c149f528 100644
--- a/fs/select.c
+++ b/fs/select.c
@@ -294,12 +294,14 @@ enum poll_time_type {
         PT_OLD_TIMESPEC = 3,
 };
 
-static int poll_select_copy_remaining(struct timespec64 *end_time,
-                                      void __user *p,
-                                      enum poll_time_type pt_type, int ret)
+static int poll_select_finish(struct timespec64 *end_time,
+                              void __user *p,
+                              enum poll_time_type pt_type, int ret)
 {
         struct timespec64 rts;
 
+        restore_saved_sigmask_unless(ret == -ERESTARTNOHAND);
+
         if (!p)
                 return ret;
 
@@ -714,9 +716,7 @@ static int kern_select(int n, fd_set __user *inp, fd_set __user *outp,
         }
 
         ret = core_sys_select(n, inp, outp, exp, to);
-        ret = poll_select_copy_remaining(&end_time, tvp, PT_TIMEVAL, ret);
-
-        return ret;
+        return poll_select_finish(&end_time, tvp, PT_TIMEVAL, ret);
 }
 
 SYSCALL_DEFINE5(select, int, n, fd_set __user *, inp, fd_set __user *, outp,
@@ -730,7 +730,6 @@ static long do_pselect(int n, fd_set __user *inp, fd_set __user *outp,
                        const sigset_t __user *sigmask, size_t sigsetsize,
                        enum poll_time_type type)
 {
-        sigset_t ksigmask, sigsaved;
         struct timespec64 ts, end_time, *to = NULL;
         int ret;
 
@@ -753,15 +752,12 @@ static long do_pselect(int n, fd_set __user *inp, fd_set __user *outp,
                         return -EINVAL;
         }
 
-        ret = set_user_sigmask(sigmask, &ksigmask, &sigsaved, sigsetsize);
+        ret = set_user_sigmask(sigmask, sigsetsize);
         if (ret)
                 return ret;
 
         ret = core_sys_select(n, inp, outp, exp, to);
-        restore_user_sigmask(sigmask, &sigsaved, ret == -ERESTARTNOHAND);
-        ret = poll_select_copy_remaining(&end_time, tsp, type, ret);
-
-        return ret;
+        return poll_select_finish(&end_time, tsp, type, ret);
 }
 
 /*
@@ -926,7 +922,7 @@ static int do_poll(struct poll_list *list, struct poll_wqueues *wait,
                 if (!count) {
                         count = wait->error;
                         if (signal_pending(current))
-                                count = -EINTR;
+                                count = -ERESTARTNOHAND;
                 }
                 if (count || timed_out)
                         break;
@@ -965,7 +961,7 @@ static int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
                 struct timespec64 *end_time)
 {
         struct poll_wqueues table;
-        int err = -EFAULT, fdcount, len, size;
+        int err = -EFAULT, fdcount, len;
         /* Allocate small arguments on the stack to save memory and be
            faster - use long to make sure the buffer is aligned properly
            on 64 bit archs to avoid unaligned access */
@@ -993,8 +989,8 @@ static int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
                         break;
 
                 len = min(todo, POLLFD_PER_PAGE);
-                size = sizeof(struct poll_list) + sizeof(struct pollfd) * len;
-                walk = walk->next = kmalloc(size, GFP_KERNEL);
+                walk = walk->next = kmalloc(struct_size(walk, entries, len),
+                                            GFP_KERNEL);
                 if (!walk) {
                         err = -ENOMEM;
                         goto out_fds;
@@ -1041,7 +1037,7 @@ static long do_restart_poll(struct restart_block *restart_block)
 
         ret = do_sys_poll(ufds, nfds, to);
 
-        if (ret == -EINTR) {
+        if (ret == -ERESTARTNOHAND) {
                 restart_block->fn = do_restart_poll;
                 ret = -ERESTART_RESTARTBLOCK;
         }
@@ -1062,7 +1058,7 @@ SYSCALL_DEFINE3(poll, struct pollfd __user *, ufds, unsigned int, nfds,
 
         ret = do_sys_poll(ufds, nfds, to);
 
-        if (ret == -EINTR) {
+        if (ret == -ERESTARTNOHAND) {
                 struct restart_block *restart_block;
 
                 restart_block = &current->restart_block;
@@ -1086,7 +1082,6 @@ SYSCALL_DEFINE5(ppoll, struct pollfd __user *, ufds, unsigned int, nfds,
                 struct __kernel_timespec __user *, tsp, const sigset_t __user *, sigmask,
                 size_t, sigsetsize)
 {
-        sigset_t ksigmask, sigsaved;
         struct timespec64 ts, end_time, *to = NULL;
         int ret;
 
@@ -1099,20 +1094,12 @@ SYSCALL_DEFINE5(ppoll, struct pollfd __user *, ufds, unsigned int, nfds,
                         return -EINVAL;
         }
 
-        ret = set_user_sigmask(sigmask, &ksigmask, &sigsaved, sigsetsize);
+        ret = set_user_sigmask(sigmask, sigsetsize);
         if (ret)
                 return ret;
 
         ret = do_sys_poll(ufds, nfds, to);
-
-        restore_user_sigmask(sigmask, &sigsaved, ret == -EINTR);
-        /* We can restart this syscall, usually */
-        if (ret == -EINTR)
-                ret = -ERESTARTNOHAND;
-
-        ret = poll_select_copy_remaining(&end_time, tsp, PT_TIMESPEC, ret);
-
-        return ret;
+        return poll_select_finish(&end_time, tsp, PT_TIMESPEC, ret);
 }
 
 #if defined(CONFIG_COMPAT_32BIT_TIME) && !defined(CONFIG_64BIT)
@@ -1121,7 +1108,6 @@ SYSCALL_DEFINE5(ppoll_time32, struct pollfd __user *, ufds, unsigned int, nfds,
                 struct old_timespec32 __user *, tsp, const sigset_t __user *, sigmask,
                 size_t, sigsetsize)
 {
-        sigset_t ksigmask, sigsaved;
         struct timespec64 ts, end_time, *to = NULL;
         int ret;
 
@@ -1134,20 +1120,12 @@ SYSCALL_DEFINE5(ppoll_time32, struct pollfd __user *, ufds, unsigned int, nfds,
                         return -EINVAL;
         }
 
-        ret = set_user_sigmask(sigmask, &ksigmask, &sigsaved, sigsetsize);
+        ret = set_user_sigmask(sigmask, sigsetsize);
         if (ret)
                 return ret;
 
         ret = do_sys_poll(ufds, nfds, to);
-
-        restore_user_sigmask(sigmask, &sigsaved, ret == -EINTR);
-        /* We can restart this syscall, usually */
-        if (ret == -EINTR)
-                ret = -ERESTARTNOHAND;
-
-        ret = poll_select_copy_remaining(&end_time, tsp, PT_OLD_TIMESPEC, ret);
-
-        return ret;
+        return poll_select_finish(&end_time, tsp, PT_OLD_TIMESPEC, ret);
 }
 #endif
 
@@ -1284,9 +1262,7 @@ static int do_compat_select(int n, compat_ulong_t __user *inp,
         }
 
         ret = compat_core_sys_select(n, inp, outp, exp, to);
-        ret = poll_select_copy_remaining(&end_time, tvp, PT_OLD_TIMEVAL, ret);
-
-        return ret;
+        return poll_select_finish(&end_time, tvp, PT_OLD_TIMEVAL, ret);
 }
 
 COMPAT_SYSCALL_DEFINE5(select, int, n, compat_ulong_t __user *, inp,
@@ -1319,7 +1295,6 @@ static long do_compat_pselect(int n, compat_ulong_t __user *inp,
         void __user *tsp, compat_sigset_t __user *sigmask,
         compat_size_t sigsetsize, enum poll_time_type type)
 {
-        sigset_t ksigmask, sigsaved;
         struct timespec64 ts, end_time, *to = NULL;
         int ret;
 
@@ -1342,15 +1317,12 @@ static long do_compat_pselect(int n, compat_ulong_t __user *inp,
                         return -EINVAL;
         }
 
-        ret = set_compat_user_sigmask(sigmask, &ksigmask, &sigsaved, sigsetsize);
+        ret = set_compat_user_sigmask(sigmask, sigsetsize);
         if (ret)
                 return ret;
 
         ret = compat_core_sys_select(n, inp, outp, exp, to);
-        restore_user_sigmask(sigmask, &sigsaved, ret == -ERESTARTNOHAND);
-        ret = poll_select_copy_remaining(&end_time, tsp, type, ret);
-
-        return ret;
+        return poll_select_finish(&end_time, tsp, type, ret);
 }
 
 COMPAT_SYSCALL_DEFINE6(pselect6_time64, int, n, compat_ulong_t __user *, inp,
@@ -1402,7 +1374,6 @@ COMPAT_SYSCALL_DEFINE5(ppoll_time32, struct pollfd __user *, ufds,
         unsigned int,  nfds, struct old_timespec32 __user *, tsp,
         const compat_sigset_t __user *, sigmask, compat_size_t, sigsetsize)
 {
-        sigset_t ksigmask, sigsaved;
         struct timespec64 ts, end_time, *to = NULL;
         int ret;
 
@@ -1415,20 +1386,12 @@ COMPAT_SYSCALL_DEFINE5(ppoll_time32, struct pollfd __user *, ufds,
                         return -EINVAL;
         }
 
-        ret = set_compat_user_sigmask(sigmask, &ksigmask, &sigsaved, sigsetsize);
+        ret = set_compat_user_sigmask(sigmask, sigsetsize);
         if (ret)
                 return ret;
 
         ret = do_sys_poll(ufds, nfds, to);
-
-        restore_user_sigmask(sigmask, &sigsaved, ret == -EINTR);
-        /* We can restart this syscall, usually */
-        if (ret == -EINTR)
-                ret = -ERESTARTNOHAND;
-
-        ret = poll_select_copy_remaining(&end_time, tsp, PT_OLD_TIMESPEC, ret);
-
-        return ret;
+        return poll_select_finish(&end_time, tsp, PT_OLD_TIMESPEC, ret);
 }
 #endif
 
@@ -1437,7 +1400,6 @@ COMPAT_SYSCALL_DEFINE5(ppoll_time64, struct pollfd __user *, ufds,
         unsigned int,  nfds, struct __kernel_timespec __user *, tsp,
         const compat_sigset_t __user *, sigmask, compat_size_t, sigsetsize)
 {
-        sigset_t ksigmask, sigsaved;
         struct timespec64 ts, end_time, *to = NULL;
         int ret;
 
@@ -1450,20 +1412,12 @@ COMPAT_SYSCALL_DEFINE5(ppoll_time64, struct pollfd __user *, ufds,
                         return -EINVAL;
         }
 
-        ret = set_compat_user_sigmask(sigmask, &ksigmask, &sigsaved, sigsetsize);
+        ret = set_compat_user_sigmask(sigmask, sigsetsize);
         if (ret)
                 return ret;
 
         ret = do_sys_poll(ufds, nfds, to);
-
-        restore_user_sigmask(sigmask, &sigsaved, ret == -EINTR);
-        /* We can restart this syscall, usually */
-        if (ret == -EINTR)
-                ret = -ERESTARTNOHAND;
-
-        ret = poll_select_copy_remaining(&end_time, tsp, PT_TIMESPEC, ret);
-
-        return ret;
+        return poll_select_finish(&end_time, tsp, PT_TIMESPEC, ret);
 }
 
 #endif