Commit 0943aacf authored by Xie Yongji's avatar Xie Yongji Committed by Michael S. Tsirkin

vduse: Fix race condition between resetting and irq injecting

The interrupt might be triggered after a reset since there is
no synchronization between resetting and irq injecting. And it
might break something if the interrupt is delayed until a new
round of device initialization.

Fixes: c8a6153b ("vduse: Introduce VDUSE - vDPA Device in Userspace")
Signed-off-by: default avatarXie Yongji <xieyongji@bytedance.com>
Link: https://lore.kernel.org/r/20210929083050.88-1-xieyongji@bytedance.comSigned-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 1394103f
...@@ -80,6 +80,7 @@ struct vduse_dev { ...@@ -80,6 +80,7 @@ struct vduse_dev {
struct vdpa_callback config_cb; struct vdpa_callback config_cb;
struct work_struct inject; struct work_struct inject;
spinlock_t irq_lock; spinlock_t irq_lock;
struct rw_semaphore rwsem;
int minor; int minor;
bool broken; bool broken;
bool connected; bool connected;
...@@ -410,6 +411,8 @@ static void vduse_dev_reset(struct vduse_dev *dev) ...@@ -410,6 +411,8 @@ static void vduse_dev_reset(struct vduse_dev *dev)
if (domain->bounce_map) if (domain->bounce_map)
vduse_domain_reset_bounce_map(domain); vduse_domain_reset_bounce_map(domain);
down_write(&dev->rwsem);
dev->status = 0; dev->status = 0;
dev->driver_features = 0; dev->driver_features = 0;
dev->generation++; dev->generation++;
...@@ -443,6 +446,8 @@ static void vduse_dev_reset(struct vduse_dev *dev) ...@@ -443,6 +446,8 @@ static void vduse_dev_reset(struct vduse_dev *dev)
flush_work(&vq->inject); flush_work(&vq->inject);
flush_work(&vq->kick); flush_work(&vq->kick);
} }
up_write(&dev->rwsem);
} }
static int vduse_vdpa_set_vq_address(struct vdpa_device *vdpa, u16 idx, static int vduse_vdpa_set_vq_address(struct vdpa_device *vdpa, u16 idx,
...@@ -885,6 +890,23 @@ static void vduse_vq_irq_inject(struct work_struct *work) ...@@ -885,6 +890,23 @@ static void vduse_vq_irq_inject(struct work_struct *work)
spin_unlock_irq(&vq->irq_lock); spin_unlock_irq(&vq->irq_lock);
} }
static int vduse_dev_queue_irq_work(struct vduse_dev *dev,
struct work_struct *irq_work)
{
int ret = -EINVAL;
down_read(&dev->rwsem);
if (!(dev->status & VIRTIO_CONFIG_S_DRIVER_OK))
goto unlock;
ret = 0;
queue_work(vduse_irq_wq, irq_work);
unlock:
up_read(&dev->rwsem);
return ret;
}
static long vduse_dev_ioctl(struct file *file, unsigned int cmd, static long vduse_dev_ioctl(struct file *file, unsigned int cmd,
unsigned long arg) unsigned long arg)
{ {
...@@ -966,12 +988,7 @@ static long vduse_dev_ioctl(struct file *file, unsigned int cmd, ...@@ -966,12 +988,7 @@ static long vduse_dev_ioctl(struct file *file, unsigned int cmd,
break; break;
} }
case VDUSE_DEV_INJECT_CONFIG_IRQ: case VDUSE_DEV_INJECT_CONFIG_IRQ:
ret = -EINVAL; ret = vduse_dev_queue_irq_work(dev, &dev->inject);
if (!(dev->status & VIRTIO_CONFIG_S_DRIVER_OK))
break;
ret = 0;
queue_work(vduse_irq_wq, &dev->inject);
break; break;
case VDUSE_VQ_SETUP: { case VDUSE_VQ_SETUP: {
struct vduse_vq_config config; struct vduse_vq_config config;
...@@ -1049,10 +1066,6 @@ static long vduse_dev_ioctl(struct file *file, unsigned int cmd, ...@@ -1049,10 +1066,6 @@ static long vduse_dev_ioctl(struct file *file, unsigned int cmd,
case VDUSE_VQ_INJECT_IRQ: { case VDUSE_VQ_INJECT_IRQ: {
u32 index; u32 index;
ret = -EINVAL;
if (!(dev->status & VIRTIO_CONFIG_S_DRIVER_OK))
break;
ret = -EFAULT; ret = -EFAULT;
if (get_user(index, (u32 __user *)argp)) if (get_user(index, (u32 __user *)argp))
break; break;
...@@ -1061,9 +1074,8 @@ static long vduse_dev_ioctl(struct file *file, unsigned int cmd, ...@@ -1061,9 +1074,8 @@ static long vduse_dev_ioctl(struct file *file, unsigned int cmd,
if (index >= dev->vq_num) if (index >= dev->vq_num)
break; break;
ret = 0;
index = array_index_nospec(index, dev->vq_num); index = array_index_nospec(index, dev->vq_num);
queue_work(vduse_irq_wq, &dev->vqs[index].inject); ret = vduse_dev_queue_irq_work(dev, &dev->vqs[index].inject);
break; break;
} }
default: default:
...@@ -1144,6 +1156,7 @@ static struct vduse_dev *vduse_dev_create(void) ...@@ -1144,6 +1156,7 @@ static struct vduse_dev *vduse_dev_create(void)
INIT_LIST_HEAD(&dev->send_list); INIT_LIST_HEAD(&dev->send_list);
INIT_LIST_HEAD(&dev->recv_list); INIT_LIST_HEAD(&dev->recv_list);
spin_lock_init(&dev->irq_lock); spin_lock_init(&dev->irq_lock);
init_rwsem(&dev->rwsem);
INIT_WORK(&dev->inject, vduse_dev_irq_inject); INIT_WORK(&dev->inject, vduse_dev_irq_inject);
init_waitqueue_head(&dev->waitq); init_waitqueue_head(&dev->waitq);
......
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