Skip to contentSkip to conversation

vdpa/mlx5: Set err = -ENOMEM in case dma_map_sg_attrs fails

PATCH In review Eli Cohen 3 participants 3 messages Apr 11, 2021 – Apr 12, 2021

Subsystems (4)
lore
Share & tools
lore

Eli Cohen

author
#0 lore raw

PATCH 1/1 vdpa/mlx5: Set err = -ENOMEM in case dma_map_sg_attrs fails

Set err = -ENOMEM if dma_map_sg_attrs() fails so the function reutrns error.

Fixes 94abbccdf291 ("vdpa/mlx5: Add shared memory registration code")
---
 drivers/vdpa/mlx5/core/mr.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/vdpa/mlx5/core/mr.c +3 -1
index 3908ff28eec0..800cfd1967ad 100644
@@ -278,8 +278,10 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr
 	mr->log_size = log_entity_size;
 	mr->nsg = nsg;
 	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;
+	}
 
 	err = create_direct_mr(mvdev, mr);
 	if (err)
Signature · 1 line
2.30.1
Acked-by on v1 1/1
#1 lore raw
Quoted 17 lines · Eli Cohen

Set err = -ENOMEM if dma_map_sg_attrs() fails so the function reutrns error.

Fixes 94abbccdf291 ("vdpa/mlx5: Add shared memory registration code")
---
  drivers/vdpa/mlx5/core/mr.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
drivers/vdpa/mlx5/core/mr.c +0 -0
index 3908ff28eec0..800cfd1967ad 100644
@@ -278,8 +278,10 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr
  	mr->log_size = log_entity_size;

drivers/vdpa/mlx5/core/mr.c static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr · line 287

Quoted 10 lines
drivers/vdpa/mlx5/core/mr.c +3 -1
  	mr->nsg = nsg;
  	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;
+	}
 
  	err = create_direct_mr(mvdev, mr);
  	if (err)

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

Reviewed-by on v1 1/1
#2 lore raw
In reply to Eli Cohen
Quoted 30 lines · Eli Cohen

Set err = -ENOMEM if dma_map_sg_attrs() fails so the function reutrns error.

Fixes 94abbccdf291 ("vdpa/mlx5: Add shared memory registration code")

---
drivers/vdpa/mlx5/core/mr.c | 4 +++-

1 file changed, 3 insertions(+), 1 deletion(-)
drivers/vdpa/mlx5/core/mr.c +3 -1
index 3908ff28eec0..800cfd1967ad 100644
@@ -278,8 +278,10 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr
 	mr->log_size = log_entity_size;
 	mr->nsg = nsg;
 	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;
+	}
 
 	err = create_direct_mr(mvdev, mr);
 	if (err)
Signature · 1 line
2.30.1