7 files changed, 30 insertions, 142 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index cb66a4648840..b06848a104e6 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1538,30 +1538,6 @@ config NOTIFIER_ERROR_INJECTION
 
           Say N if unsure.
 
-config CPU_NOTIFIER_ERROR_INJECT
-        tristate "CPU notifier error injection module"
-        depends on HOTPLUG_CPU && NOTIFIER_ERROR_INJECTION
-        help
-          This option provides a kernel module that can be used to test
-          the error handling of the cpu notifiers by injecting artificial
-          errors to CPU notifier chain callbacks.  It is controlled through
-          debugfs interface under /sys/kernel/debug/notifier-error-inject/cpu
-
-          If the notifier call chain should be failed with some events
-          notified, write the error code to "actions/<notifier event>/error".
-
-          Example: Inject CPU offline error (-1 == -EPERM)
-
-          # cd /sys/kernel/debug/notifier-error-inject/cpu
-          # echo -1 > actions/CPU_DOWN_PREPARE/error
-          # echo 0 > /sys/devices/system/cpu/cpu1/online
-          bash: echo: write error: Operation not permitted
-
-          To compile this code as a module, choose M here: the module will
-          be called cpu-notifier-error-inject.
-
-          If unsure, say N.
-
 config PM_NOTIFIER_ERROR_INJECT
         tristate "PM notifier error injection module"
         depends on PM && NOTIFIER_ERROR_INJECTION
diff --git a/lib/Makefile b/lib/Makefile
index 50144a3aeebd..bc4073a8cd08 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -128,7 +128,6 @@ obj-$(CONFIG_SWIOTLB) += swiotlb.o
 obj-$(CONFIG_IOMMU_HELPER) += iommu-helper.o iommu-common.o
 obj-$(CONFIG_FAULT_INJECTION) += fault-inject.o
 obj-$(CONFIG_NOTIFIER_ERROR_INJECTION) += notifier-error-inject.o
-obj-$(CONFIG_CPU_NOTIFIER_ERROR_INJECT) += cpu-notifier-error-inject.o
 obj-$(CONFIG_PM_NOTIFIER_ERROR_INJECT) += pm-notifier-error-inject.o
 obj-$(CONFIG_NETDEV_NOTIFIER_ERROR_INJECT) += netdev-notifier-error-inject.o
 obj-$(CONFIG_MEMORY_NOTIFIER_ERROR_INJECT) += memory-notifier-error-inject.o
diff --git a/lib/cpu-notifier-error-inject.c b/lib/cpu-notifier-error-inject.c
deleted file mode 100644
index 0e2c9a1e958a..000000000000
--- a/lib/cpu-notifier-error-inject.c
+++ /dev/null
@@ -1,84 +0,0 @@
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/cpu.h>
-
-#include "notifier-error-inject.h"
-
-static int priority;
-module_param(priority, int, 0);
-MODULE_PARM_DESC(priority, "specify cpu notifier priority");
-
-#define UP_PREPARE 0
-#define UP_PREPARE_FROZEN 0
-#define DOWN_PREPARE 0
-#define DOWN_PREPARE_FROZEN 0
-
-static struct notifier_err_inject cpu_notifier_err_inject = {
-        .actions = {
-                { NOTIFIER_ERR_INJECT_ACTION(UP_PREPARE) },
-                { NOTIFIER_ERR_INJECT_ACTION(UP_PREPARE_FROZEN) },
-                { NOTIFIER_ERR_INJECT_ACTION(DOWN_PREPARE) },
-                { NOTIFIER_ERR_INJECT_ACTION(DOWN_PREPARE_FROZEN) },
-                {}
-        }
-};
-
-static int notf_err_handle(struct notifier_err_inject_action *action)
-{
-        int ret;
-
-        ret = action->error;
-        if (ret)
-                pr_info("Injecting error (%d) to %s\n", ret, action->name);
-        return ret;
-}
-
-static int notf_err_inj_up_prepare(unsigned int cpu)
-{
-        if (!cpuhp_tasks_frozen)
-                return notf_err_handle(&cpu_notifier_err_inject.actions[0]);
-        else
-                return notf_err_handle(&cpu_notifier_err_inject.actions[1]);
-}
-
-static int notf_err_inj_dead(unsigned int cpu)
-{
-        if (!cpuhp_tasks_frozen)
-                return notf_err_handle(&cpu_notifier_err_inject.actions[2]);
-        else
-                return notf_err_handle(&cpu_notifier_err_inject.actions[3]);
-}
-
-static struct dentry *dir;
-
-static int err_inject_init(void)
-{
-        int err;
-
-        dir = notifier_err_inject_init("cpu", notifier_err_inject_dir,
-                                        &cpu_notifier_err_inject, priority);
-        if (IS_ERR(dir))
-                return PTR_ERR(dir);
-
-        err = cpuhp_setup_state_nocalls(CPUHP_NOTF_ERR_INJ_PREPARE,
-                                        "cpu-err-notif:prepare",
-                                        notf_err_inj_up_prepare,
-                                        notf_err_inj_dead);
-        if (err)
-                debugfs_remove_recursive(dir);
-
-        return err;
-}
-
-static void err_inject_exit(void)
-{
-        cpuhp_remove_state_nocalls(CPUHP_NOTF_ERR_INJ_PREPARE);
-        debugfs_remove_recursive(dir);
-}
-
-module_init(err_inject_init);
-module_exit(err_inject_exit);
-
-MODULE_DESCRIPTION("CPU notifier error injection module");
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Akinobu Mita <akinobu.mita@gmail.com>");
diff --git a/lib/extable.c b/lib/extable.c
index 0be02ad561e9..62968daa66a9 100644
--- a/lib/extable.c
+++ b/lib/extable.c
@@ -12,7 +12,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/sort.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 #ifndef ARCH_HAS_RELATIVE_EXTABLE
 #define ex_to_insn(x)   ((x)->insn)
diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index 228892dabba6..25f572303801 100644
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -73,19 +73,21 @@
 }
 
 #define iterate_all_kinds(i, n, v, I, B, K) {                   \
-        size_t skip = i->iov_offset;                            \
-        if (unlikely(i->type & ITER_BVEC)) {                    \
-                struct bio_vec v;                               \
-                struct bvec_iter __bi;                          \
-                iterate_bvec(i, n, v, __bi, skip, (B))          \
-        } else if (unlikely(i->type & ITER_KVEC)) {             \
-                const struct kvec *kvec;                        \
-                struct kvec v;                                  \
-                iterate_kvec(i, n, v, kvec, skip, (K))          \
-        } else {                                                \
-                const struct iovec *iov;                        \
-                struct iovec v;                                 \
-                iterate_iovec(i, n, v, iov, skip, (I))          \
+        if (likely(n)) {                                        \
+                size_t skip = i->iov_offset;                    \
+                if (unlikely(i->type & ITER_BVEC)) {            \
+                        struct bio_vec v;                       \
+                        struct bvec_iter __bi;                  \
+                        iterate_bvec(i, n, v, __bi, skip, (B))  \
+                } else if (unlikely(i->type & ITER_KVEC)) {     \
+                        const struct kvec *kvec;                \
+                        struct kvec v;                          \
+                        iterate_kvec(i, n, v, kvec, skip, (K))  \
+                } else {                                        \
+                        const struct iovec *iov;                \
+                        struct iovec v;                         \
+                        iterate_iovec(i, n, v, iov, skip, (I))  \
+                }                                               \
         }                                                       \
 }
 
@@ -576,7 +578,7 @@ bool copy_from_iter_full(void *addr, size_t bytes, struct iov_iter *i)
                 WARN_ON(1);
                 return false;
         }
-        if (unlikely(i->count < bytes))                         \
+        if (unlikely(i->count < bytes))
                 return false;
 
         iterate_all_kinds(i, bytes, v, ({
@@ -620,7 +622,7 @@ bool copy_from_iter_full_nocache(void *addr, size_t bytes, struct iov_iter *i)
                 WARN_ON(1);
                 return false;
         }
-        if (unlikely(i->count < bytes))                         \
+        if (unlikely(i->count < bytes))
                 return false;
         iterate_all_kinds(i, bytes, v, ({
                 if (__copy_from_user_nocache((to += v.iov_len) - v.iov_len,
@@ -837,11 +839,8 @@ unsigned long iov_iter_alignment(const struct iov_iter *i)
         unsigned long res = 0;
         size_t size = i->count;
 
-        if (!size)
-                return 0;
-
         if (unlikely(i->type & ITER_PIPE)) {
-                if (i->iov_offset && allocated(&i->pipe->bufs[i->idx]))
+                if (size && i->iov_offset && allocated(&i->pipe->bufs[i->idx]))
                         return size | i->iov_offset;
                 return size;
         }
@@ -856,10 +855,8 @@ EXPORT_SYMBOL(iov_iter_alignment);
 
 unsigned long iov_iter_gap_alignment(const struct iov_iter *i)
 {
-        unsigned long res = 0;
+        unsigned long res = 0;
         size_t size = i->count;
-        if (!size)
-                return 0;
 
         if (unlikely(i->type & ITER_PIPE)) {
                 WARN_ON(1);
@@ -874,7 +871,7 @@ unsigned long iov_iter_gap_alignment(const struct iov_iter *i)
                 (res |= (!res ? 0 : (unsigned long)v.iov_base) |
                         (size != v.iov_len ? size : 0))
                 );
-                return res;
+        return res;
 }
 EXPORT_SYMBOL(iov_iter_gap_alignment);
 
@@ -908,6 +905,9 @@ static ssize_t pipe_get_pages(struct iov_iter *i,
         size_t capacity;
         int idx;
 
+        if (!maxsize)
+                return 0;
+
         if (!sanity(i))
                 return -EFAULT;
 
@@ -926,9 +926,6 @@ ssize_t iov_iter_get_pages(struct iov_iter *i,
         if (maxsize > i->count)
                 maxsize = i->count;
 
-        if (!maxsize)
-                return 0;
-
         if (unlikely(i->type & ITER_PIPE))
                 return pipe_get_pages(i, pages, maxsize, maxpages, start);
         iterate_all_kinds(i, maxsize, v, ({
@@ -975,6 +972,9 @@ static ssize_t pipe_get_pages_alloc(struct iov_iter *i,
         int idx;
         int npages;
 
+        if (!maxsize)
+                return 0;
+
         if (!sanity(i))
                 return -EFAULT;
 
@@ -1006,9 +1006,6 @@ ssize_t iov_iter_get_pages_alloc(struct iov_iter *i,
         if (maxsize > i->count)
                 maxsize = i->count;
 
-        if (!maxsize)
-                return 0;
-
         if (unlikely(i->type & ITER_PIPE))
                 return pipe_get_pages_alloc(i, pages, maxsize, start);
         iterate_all_kinds(i, maxsize, v, ({
diff --git a/lib/kstrtox.c b/lib/kstrtox.c
index b8e2080c1a47..bf85e05ce858 100644
--- a/lib/kstrtox.c
+++ b/lib/kstrtox.c
@@ -17,7 +17,7 @@
 #include <linux/math64.h>
 #include <linux/export.h>
 #include <linux/types.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include "kstrtox.h"
 
 const char *_parse_integer_fixup_radix(const char *s, unsigned int *base)
diff --git a/lib/timerqueue.c b/lib/timerqueue.c
index 782ae8ca2c06..adc6ee0a5126 100644
--- a/lib/timerqueue.c
+++ b/lib/timerqueue.c
@@ -48,7 +48,7 @@ bool timerqueue_add(struct timerqueue_head *head, struct timerqueue_node *node)
         while (*p) {
                 parent = *p;
                 ptr = rb_entry(parent, struct timerqueue_node, node);
-                if (node->expires.tv64 < ptr->expires.tv64)
+                if (node->expires < ptr->expires)
                         p = &(*p)->rb_left;
                 else
                         p = &(*p)->rb_right;
@@ -56,7 +56,7 @@ bool timerqueue_add(struct timerqueue_head *head, struct timerqueue_node *node)
         rb_link_node(&node->node, parent, p);
         rb_insert_color(&node->node, &head->head);
 
-        if (!head->next || node->expires.tv64 < head->next->expires.tv64) {
+        if (!head->next || node->expires < head->next->expires) {
                 head->next = node;
                 return true;
         }