Skip to contentSkip to conversation

vdp/mlx5: Fix setting the correct dma_device

PATCH In review Eli Cohen 2 participants 2 messages Jun 6, 2021 – Jun 7, 2021

Subsystems (2)
lore
Share & tools
lore

Eli Cohen

author
#0 lore raw

PATCH 1/1 vdp/mlx5: Fix setting the correct dma_device

Before SF support was introduced, the DMA device was equal to mdev->device which was in essence equal to pdev->dev.

With SF introduction this is no longer true. It has already been handled for vhost_vdpa since the reference to the dma device can from within mlx5_vdpa. With virtio_vdpa this broke. To fix this we set the real dma device when initializing the device.

In addition, for the sake of consistency, previous references in the code to the dma device are changed to vdev->dma_dev.

Fixes d13a15d544ce5 ("vdpa/mlx5: Use the correct dma device when registering memory")

---
v0 --> v1:
Change blamed commit and modify references to the dma device

 drivers/vdpa/mlx5/core/mr.c       | 9 ++-------
 drivers/vdpa/mlx5/net/mlx5_vnet.c | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)
drivers/vdpa/mlx5/core/mr.c +2 -7
index f0b89b62de36..dcee6039e966 100644
@@ -219,11 +219,6 @@ static void destroy_indirect_key(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_m
 	mlx5_vdpa_destroy_mkey(mvdev, &mkey->mkey);
 }
 
-static struct device *get_dma_device(struct mlx5_vdpa_dev *mvdev)
-{
-	return &mvdev->mdev->pdev->dev;
-}
-
 static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr *mr,
 			 struct vhost_iotlb *iotlb)
 {
@@ -239,7 +234,7 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr
 	u64 pa;
 	u64 paend;
 	struct scatterlist *sg;
-	struct device *dma = get_dma_device(mvdev);
+	struct device *dma = mvdev->vdev.dma_dev;
 
 	for (map = vhost_iotlb_itree_first(iotlb, mr->start, mr->end - 1);
 	     map; map = vhost_iotlb_itree_next(map, start, mr->end - 1)) {
@@ -298,7 +293,7 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr
 
 static void unmap_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr *mr)
 {
-	struct device *dma = get_dma_device(mvdev);
+	struct device *dma = mvdev->vdev.dma_dev;
 
 	destroy_direct_mr(mvdev, mr);
 	dma_unmap_sg_attrs(dma, mr->sg_head.sgl, mr->nsg, DMA_BIDIRECTIONAL, 0);
drivers/vdpa/mlx5/net/mlx5_vnet.c +1 -1
index 7e0d1b8ae3d3..a5163d8a4828 100644
@@ -2046,7 +2046,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name)
 	if (err)
 		goto err_mtu;
 
-	mvdev->vdev.dma_dev = mdev->device;
+	mvdev->vdev.dma_dev = &mdev->pdev->dev;
 	err = mlx5_vdpa_alloc_resources(&ndev->mvdev);
 	if (err)
 		goto err_mtu;
Signature · 1 line
2.31.1
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Eli Cohen

Before SF support was introduced, the DMA device was equal to mdev->device which was in essence equal to pdev->dev.

With SF introduction this is no longer true. It has already been handled for vhost_vdpa since the reference to the dma device can from within mlx5_vdpa. With virtio_vdpa this broke. To fix this we set the real dma device when initializing the device.

Quoted 5 lines

In addition, for the sake of consistency, previous references in the code to the dma device are changed to vdev->dma_dev.

Fixes d13a15d544ce5 ("vdpa/mlx5: Use the correct dma device when registering memory")
Quoted 55 lines

---
v0 --> v1:
Change blamed commit and modify references to the dma device

  drivers/vdpa/mlx5/core/mr.c       | 9 ++-------
  drivers/vdpa/mlx5/net/mlx5_vnet.c | 2 +-
  2 files changed, 3 insertions(+), 8 deletions(-)
drivers/vdpa/mlx5/core/mr.c +2 -7
index f0b89b62de36..dcee6039e966 100644
@@ -219,11 +219,6 @@ static void destroy_indirect_key(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_m
  	mlx5_vdpa_destroy_mkey(mvdev, &mkey->mkey);
  }
 
-static struct device *get_dma_device(struct mlx5_vdpa_dev *mvdev)
-{
-	return &mvdev->mdev->pdev->dev;
-}
-
  static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr *mr,
  			 struct vhost_iotlb *iotlb)
  {
@@ -239,7 +234,7 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr
  	u64 pa;
  	u64 paend;
  	struct scatterlist *sg;
-	struct device *dma = get_dma_device(mvdev);
+	struct device *dma = mvdev->vdev.dma_dev;
 
  	for (map = vhost_iotlb_itree_first(iotlb, mr->start, mr->end - 1);
  	     map; map = vhost_iotlb_itree_next(map, start, mr->end - 1)) {
@@ -298,7 +293,7 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr
 
  static void unmap_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr *mr)
  {
-	struct device *dma = get_dma_device(mvdev);
+	struct device *dma = mvdev->vdev.dma_dev;
 
  	destroy_direct_mr(mvdev, mr);
  	dma_unmap_sg_attrs(dma, mr->sg_head.sgl, mr->nsg, DMA_BIDIRECTIONAL, 0);
drivers/vdpa/mlx5/net/mlx5_vnet.c +1 -1
index 7e0d1b8ae3d3..a5163d8a4828 100644
@@ -2046,7 +2046,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name)
  	if (err)
  		goto err_mtu;
 
-	mvdev->vdev.dma_dev = mdev->device;
+	mvdev->vdev.dma_dev = &mdev->pdev->dev;
  	err = mlx5_vdpa_alloc_resources(&ndev->mvdev);
  	if (err)
  		goto err_mtu;