Wake up work->done waiters even if the TIF_NEED_RESCHED task flag
has been set. This patch fixes a regression introduced in commit
d550dda (kernel v3.4).

Signed-off-by: Bart Van Assche <[email protected]>
Reference: https://bugzilla.kernel.org/show_bug.cgi?id=60505
Cc: Michael S. Tsirkin <[email protected]>
Cc: Asias He <[email protected]>
Cc: Nadav Har'El <[email protected]>
Cc: Abel Gordon <[email protected]>
Cc: <[email protected]> # v3.4+
---
 drivers/vhost/vhost.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 60aa5ad..cd544ae 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -227,8 +227,16 @@ static int vhost_worker(void *data)
                if (work) {
                        __set_current_state(TASK_RUNNING);
                        work->fn(work);
-                       if (need_resched())
+                       if (need_resched()) {
+                               spin_lock_irq(&dev->work_lock);
+                               work->done_seq = seq;
+                               if (work->flushing)
+                                       wake_up_all(&work->done);
+                               spin_unlock_irq(&dev->work_lock);
+
+                               work = NULL;
                                schedule();
+                       }
                } else
                        schedule();
 
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to