Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

There's a Niagara 2 memcpy fix in this tree and I have
a Kconfig fix from Dave Jones which requires the sparc-next
changes which went upstream yesterday.

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

1 files changed, 61 insertions, 50 deletions

diff --git a/kernel/task_work.c b/kernel/task_work.c
index d320d44903bd..65bd3c92d6f3 100644
--- a/kernel/task_work.c
+++ b/kernel/task_work.c
@@ -2,26 +2,20 @@
 #include <linux/task_work.h>
 #include <linux/tracehook.h>
 
+static struct callback_head work_exited; /* all we need is ->next == NULL */
+
 int
-task_work_add(struct task_struct *task, struct callback_head *twork, bool notify)
+task_work_add(struct task_struct *task, struct callback_head *work, bool notify)
 {
-        struct callback_head *last, *first;
-        unsigned long flags;
+        struct callback_head *head;
 
-        /*
-         * Not inserting the new work if the task has already passed
-         * exit_task_work() is the responisbility of callers.
-         */
-        raw_spin_lock_irqsave(&task->pi_lock, flags);
-        last = task->task_works;
-        first = last ? last->next : twork;
-        twork->next = first;
-        if (last)
-                last->next = twork;
-        task->task_works = twork;
-        raw_spin_unlock_irqrestore(&task->pi_lock, flags);
+        do {
+                head = ACCESS_ONCE(task->task_works);
+                if (unlikely(head == &work_exited))
+                        return -ESRCH;
+                work->next = head;
+        } while (cmpxchg(&task->task_works, head, work) != head);
 
-        /* test_and_set_bit() implies mb(), see tracehook_notify_resume(). */
         if (notify)
                 set_notify_resume(task);
         return 0;
@@ -30,52 +24,69 @@ task_work_add(struct task_struct *task, struct callback_head *twork, bool notify
 struct callback_head *
 task_work_cancel(struct task_struct *task, task_work_func_t func)
 {
+        struct callback_head **pprev = &task->task_works;
+        struct callback_head *work = NULL;
         unsigned long flags;
-        struct callback_head *last, *res = NULL;
-
+        /*
+         * If cmpxchg() fails we continue without updating pprev.
+         * Either we raced with task_work_add() which added the
+         * new entry before this work, we will find it again. Or
+         * we raced with task_work_run(), *pprev == NULL/exited.
+         */
         raw_spin_lock_irqsave(&task->pi_lock, flags);
-        last = task->task_works;
-        if (last) {
-                struct callback_head *q = last, *p = q->next;
-                while (1) {
-                        if (p->func == func) {
-                                q->next = p->next;
-                                if (p == last)
-                                        task->task_works = q == p ? NULL : q;
-                                res = p;
-                                break;
-                        }
-                        if (p == last)
-                                break;
-                        q = p;
-                        p = q->next;
-                }
+        while ((work = ACCESS_ONCE(*pprev))) {
+                read_barrier_depends();
+                if (work->func != func)
+                        pprev = &work->next;
+                else if (cmpxchg(pprev, work, work->next) == work)
+                        break;
         }
         raw_spin_unlock_irqrestore(&task->pi_lock, flags);
-        return res;
+
+        return work;
 }
 
 void task_work_run(void)
 {
         struct task_struct *task = current;
-        struct callback_head *p, *q;
+        struct callback_head *work, *head, *next;
+
+        for (;;) {
+                /*
+                 * work->func() can do task_work_add(), do not set
+                 * work_exited unless the list is empty.
+                 */
+                do {
+                        work = ACCESS_ONCE(task->task_works);
+                        head = !work && (task->flags & PF_EXITING) ?
+                                &work_exited : NULL;
+                } while (cmpxchg(&task->task_works, work, head) != work);
 
-        while (1) {
-                raw_spin_lock_irq(&task->pi_lock);
-                p = task->task_works;
-                task->task_works = NULL;
-                raw_spin_unlock_irq(&task->pi_lock);
+                if (!work)
+                        break;
+                /*
+                 * Synchronize with task_work_cancel(). It can't remove
+                 * the first entry == work, cmpxchg(task_works) should
+                 * fail, but it can play with *work and other entries.
+                 */
+                raw_spin_unlock_wait(&task->pi_lock);
+                smp_mb();
 
-                if (unlikely(!p))
-                        return;
+                /* Reverse the list to run the works in fifo order */
+                head = NULL;
+                do {
+                        next = work->next;
+                        work->next = head;
+                        head = work;
+                        work = next;
+                } while (work);
 
-                q = p->next; /* head */
-                p->next = NULL; /* cut it */
-                while (q) {
-                        p = q->next;
-                        q->func(q);
-                        q = p;
+                work = head;
+                do {
+                        next = work->next;
+                        work->func(work);
+                        work = next;
                         cond_resched();
-                }
+                } while (work);
         }
 }