moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

Browse Source 
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
This commit is contained in:
Linus Torvalds
2021-04-22 16:28:18 -07:00
parent 90c911ad74 be286f84e3
commit 18a3c5f7ab
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/vdpa/mlx5/core/mr.c
View File

@@ -278,8 +278,10 @@ done:
mr->log_size = log_entity_size; mr->log_size = log_entity_size;
mr->nsg = nsg; mr->nsg = nsg;
mr->nent = dma_map_sg_attrs(dma, mr->sg_head.sgl, mr->nsg, DMA_BIDIRECTIONAL, 0); mr->nent = dma_map_sg_attrs(dma, mr->sg_head.sgl, mr->nsg, DMA_BIDIRECTIONAL, 0);
if (!mr->nent) if (!mr->nent) {
err = -ENOMEM;
goto err_map; goto err_map;
}
err = create_direct_mr(mvdev, mr); err = create_direct_mr(mvdev, mr);
if (err) if (err)

6
drivers/vhost/vdpa.c
View File

@@ -745,9 +745,11 @@ static int vhost_vdpa_process_iotlb_msg(struct vhost_dev *dev,
const struct vdpa_config_ops *ops = vdpa->config; const struct vdpa_config_ops *ops = vdpa->config;
int r = 0; int r = 0;
mutex_lock(&dev->mutex);
r = vhost_dev_check_owner(dev); r = vhost_dev_check_owner(dev);
if (r) if (r)
return r; goto unlock;
switch (msg->type) { switch (msg->type) {
case VHOST_IOTLB_UPDATE: case VHOST_IOTLB_UPDATE:
@@ -768,6 +770,8 @@ static int vhost_vdpa_process_iotlb_msg(struct vhost_dev *dev,
r = -EINVAL; r = -EINVAL;
break; break;
} }
unlock:
mutex_unlock(&dev->mutex);
return r; return r;
} }