Commit f1e84eb3 authored by David S. Miller's avatar David S. Miller
parents 8c6b0865 ea5d4046
...@@ -588,7 +588,7 @@ static int vhost_net_release(struct inode *inode, struct file *f) ...@@ -588,7 +588,7 @@ static int vhost_net_release(struct inode *inode, struct file *f)
vhost_net_stop(n, &tx_sock, &rx_sock); vhost_net_stop(n, &tx_sock, &rx_sock);
vhost_net_flush(n); vhost_net_flush(n);
vhost_dev_cleanup(&n->dev); vhost_dev_cleanup(&n->dev, false);
if (tx_sock) if (tx_sock)
fput(tx_sock->file); fput(tx_sock->file);
if (rx_sock) if (rx_sock)
......
...@@ -222,6 +222,8 @@ static int vhost_worker(void *data) ...@@ -222,6 +222,8 @@ static int vhost_worker(void *data)
if (work) { if (work) {
__set_current_state(TASK_RUNNING); __set_current_state(TASK_RUNNING);
work->fn(work); work->fn(work);
if (need_resched())
schedule();
} else } else
schedule(); schedule();
...@@ -403,7 +405,7 @@ long vhost_dev_reset_owner(struct vhost_dev *dev) ...@@ -403,7 +405,7 @@ long vhost_dev_reset_owner(struct vhost_dev *dev)
if (!memory) if (!memory)
return -ENOMEM; return -ENOMEM;
vhost_dev_cleanup(dev); vhost_dev_cleanup(dev, true);
memory->nregions = 0; memory->nregions = 0;
RCU_INIT_POINTER(dev->memory, memory); RCU_INIT_POINTER(dev->memory, memory);
...@@ -434,8 +436,8 @@ int vhost_zerocopy_signal_used(struct vhost_virtqueue *vq) ...@@ -434,8 +436,8 @@ int vhost_zerocopy_signal_used(struct vhost_virtqueue *vq)
return j; return j;
} }
/* Caller should have device mutex */ /* Caller should have device mutex if and only if locked is set */
void vhost_dev_cleanup(struct vhost_dev *dev) void vhost_dev_cleanup(struct vhost_dev *dev, bool locked)
{ {
int i; int i;
...@@ -472,6 +474,7 @@ void vhost_dev_cleanup(struct vhost_dev *dev) ...@@ -472,6 +474,7 @@ void vhost_dev_cleanup(struct vhost_dev *dev)
dev->log_file = NULL; dev->log_file = NULL;
/* No one will access memory at this point */ /* No one will access memory at this point */
kfree(rcu_dereference_protected(dev->memory, kfree(rcu_dereference_protected(dev->memory,
locked ==
lockdep_is_held(&dev->mutex))); lockdep_is_held(&dev->mutex)));
RCU_INIT_POINTER(dev->memory, NULL); RCU_INIT_POINTER(dev->memory, NULL);
WARN_ON(!list_empty(&dev->work_list)); WARN_ON(!list_empty(&dev->work_list));
......
...@@ -163,7 +163,7 @@ struct vhost_dev { ...@@ -163,7 +163,7 @@ struct vhost_dev {
long vhost_dev_init(struct vhost_dev *, struct vhost_virtqueue *vqs, int nvqs); long vhost_dev_init(struct vhost_dev *, struct vhost_virtqueue *vqs, int nvqs);
long vhost_dev_check_owner(struct vhost_dev *); long vhost_dev_check_owner(struct vhost_dev *);
long vhost_dev_reset_owner(struct vhost_dev *); long vhost_dev_reset_owner(struct vhost_dev *);
void vhost_dev_cleanup(struct vhost_dev *); void vhost_dev_cleanup(struct vhost_dev *, bool locked);
long vhost_dev_ioctl(struct vhost_dev *, unsigned int ioctl, unsigned long arg); long vhost_dev_ioctl(struct vhost_dev *, unsigned int ioctl, unsigned long arg);
int vhost_vq_access_ok(struct vhost_virtqueue *vq); int vhost_vq_access_ok(struct vhost_virtqueue *vq);
int vhost_log_access_ok(struct vhost_dev *); int vhost_log_access_ok(struct vhost_dev *);
......
...@@ -181,6 +181,9 @@ struct virtqueue { ...@@ -181,6 +181,9 @@ struct virtqueue {
#define smp_mb() mb() #define smp_mb() mb()
# define smp_rmb() barrier() # define smp_rmb() barrier()
# define smp_wmb() barrier() # define smp_wmb() barrier()
/* Weak barriers should be used. If not - it's a bug */
# define rmb() abort()
# define wmb() abort()
#else #else
#error Please fill in barrier macros #error Please fill in barrier macros
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment