aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/vhost
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@gmail.com>2012-07-21 02:55:37 -0400
committerMichael S. Tsirkin <mst@redhat.com>2012-07-21 18:22:23 -0400
commit163049aefdc04323a2d17ec9f2862027b43b0502 (patch)
treeded687502545cabfd46676fe3bcadca6acbd3240 /drivers/vhost
parent0dd05a3b60ddf0e216fbd9e5116a5273966fd9db (diff)
vhost: make vhost work queue visible
The vhost work queue allows processing to be done in vhost worker thread context, which uses the owner process mm. Access to the vring and guest memory is typically only possible from vhost worker context so it is useful to allow work to be queued directly by users. Currently vhost_net only uses the poll wrappers which do not expose the work queue functions. However, for tcm_vhost (vhost_scsi) it will be necessary to queue custom work. Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Cc: Zhi Yong Wu <wuzhy@cn.ibm.com> Cc: Michael S. Tsirkin <mst@redhat.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/vhost')
-rw-r--r--drivers/vhost/vhost.c5
-rw-r--r--drivers/vhost/vhost.h3
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 112156f68afb..ef82a0d18489 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -64,7 +64,7 @@ static int vhost_poll_wakeup(wait_queue_t *wait, unsigned mode, int sync,
64 return 0; 64 return 0;
65} 65}
66 66
67static void vhost_work_init(struct vhost_work *work, vhost_work_fn_t fn) 67void vhost_work_init(struct vhost_work *work, vhost_work_fn_t fn)
68{ 68{
69 INIT_LIST_HEAD(&work->node); 69 INIT_LIST_HEAD(&work->node);
70 work->fn = fn; 70 work->fn = fn;
@@ -137,8 +137,7 @@ void vhost_poll_flush(struct vhost_poll *poll)
137 vhost_work_flush(poll->dev, &poll->work); 137 vhost_work_flush(poll->dev, &poll->work);
138} 138}
139 139
140static inline void vhost_work_queue(struct vhost_dev *dev, 140void vhost_work_queue(struct vhost_dev *dev, struct vhost_work *work)
141 struct vhost_work *work)
142{ 141{
143 unsigned long flags; 142 unsigned long flags;
144 143
diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h
index 07b97631fd34..1125af3d27d1 100644
--- a/drivers/vhost/vhost.h
+++ b/drivers/vhost/vhost.h
@@ -43,6 +43,9 @@ struct vhost_poll {
43 struct vhost_dev *dev; 43 struct vhost_dev *dev;
44}; 44};
45 45
46void vhost_work_init(struct vhost_work *work, vhost_work_fn_t fn);
47void vhost_work_queue(struct vhost_dev *dev, struct vhost_work *work);
48
46void vhost_poll_init(struct vhost_poll *poll, vhost_work_fn_t fn, 49void vhost_poll_init(struct vhost_poll *poll, vhost_work_fn_t fn,
47 unsigned long mask, struct vhost_dev *dev); 50 unsigned long mask, struct vhost_dev *dev);
48void vhost_poll_start(struct vhost_poll *poll, struct file *file); 51void vhost_poll_start(struct vhost_poll *poll, struct file *file);