waitqueue: Hold a reference to a domain on a waitqueue.

Also allow waitqueues to be dynamically destroyed.

Signed-off-by: Keir Fraser <keir@xen.org>

diff --git a/xen/common/wait.c b/xen/common/wait.c
index a05ac4f57f2bd7c92f7ada45d756946e44e885c7..2fb2309ac0ba8c1a6ebf3ba4bd3d05012f0bf88c 100644 (file)
--- a/xen/common/wait.c
+++ b/xen/common/wait.c
@@ -87,6 +87,11 @@ void init_waitqueue_head(struct waitqueue_head *wq)
     INIT_LIST_HEAD(&wq->list);
 }
 
+void destroy_waitqueue_head(struct waitqueue_head *wq)
+{
+    wake_up_all(wq);
+}
+
 void wake_up_nr(struct waitqueue_head *wq, unsigned int nr)
 {
     struct waitqueue_vcpu *wqv;
@@ -98,6 +103,7 @@ void wake_up_nr(struct waitqueue_head *wq, unsigned int nr)
         wqv = list_entry(wq->list.next, struct waitqueue_vcpu, list);
         list_del_init(&wqv->list);
         vcpu_unpause(wqv->vcpu);
+        put_domain(wqv->vcpu->domain);
     }
 
     spin_unlock(&wq->lock);
@@ -218,6 +224,7 @@ void prepare_to_wait(struct waitqueue_head *wq)
     spin_lock(&wq->lock);
     list_add_tail(&wqv->list, &wq->list);
     vcpu_pause_nosync(curr);
+    get_knownalive_domain(curr->domain);
     spin_unlock(&wq->lock);
 }
 
@@ -236,6 +243,7 @@ void finish_wait(struct waitqueue_head *wq)
     {
         list_del_init(&wqv->list);
         vcpu_unpause(curr);
+        put_domain(curr->domain);
     }
     spin_unlock(&wq->lock);
 }

diff --git a/xen/include/xen/wait.h b/xen/include/xen/wait.h
index f16eb6a114f4fc0eac36a56cf66c76b18f39124a..6eb7667d9c7fbb361a3f4a8dbda819909c1898fd 100644 (file)
--- a/xen/include/xen/wait.h
+++ b/xen/include/xen/wait.h
@@ -25,8 +25,9 @@ struct waitqueue_head {
         .list = LIST_HEAD_INIT((name).list)     \
     }
 
-/* Dynamically initialise a waitqueue. */
+/* Dynamically initialise/destroy a waitqueue. */
 void init_waitqueue_head(struct waitqueue_head *wq);
+void destroy_waitqueue_head(struct waitqueue_head *wq);
 
 /* Wake VCPU(s) waiting on specified waitqueue. */
 void wake_up_nr(struct waitqueue_head *wq, unsigned int nr);