Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio fixes from Michael Tsirkin:
"Very late in the cycle but both risky if left unfixed and more or less
obvious.."
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
vdpa/mlx5: Set err = -ENOMEM in case dma_map_sg_attrs fails
vhost-vdpa: protect concurrent access to vhost device iotlb
+8
-2
+3
-1
drivers/vdpa/mlx5/core/mr.c
+3
-1
drivers/vdpa/mlx5/core/mr.c
···
278
278
mr->log_size = log_entity_size;
279
279
mr->nsg = nsg;
280
280
mr->nent = dma_map_sg_attrs(dma, mr->sg_head.sgl, mr->nsg, DMA_BIDIRECTIONAL, 0);
281
-
if (!mr->nent)
281
+
if (!mr->nent) {
282
+
err = -ENOMEM;
282
283
goto err_map;
284
+
}
283
285
284
286
err = create_direct_mr(mvdev, mr);
285
287
if (err)
+5
-1
drivers/vhost/vdpa.c
+5
-1
drivers/vhost/vdpa.c
···
745
745
const struct vdpa_config_ops *ops = vdpa->config;
746
746
int r = 0;
747
747
748
+
mutex_lock(&dev->mutex);
749
+
748
750
r = vhost_dev_check_owner(dev);
749
751
if (r)
750
-
return r;
752
+
goto unlock;
751
753
752
754
switch (msg->type) {
753
755
case VHOST_IOTLB_UPDATE:
···
770
768
r = -EINVAL;
771
769
break;
772
770
}
771
+
unlock:
772
+
mutex_unlock(&dev->mutex);
773
773
774
774
return r;
775
775
}