RDMA/rw: fix error flow during RDMA context initialization
PATCH v2 1/2 RDMA/rw: fix error flow during RDMA context initialization
In case the SGL was mapped for P2P DMA operation, we must unmap it using pci_p2pdma_unmap_sg.
--- drivers/infiniband/core/rw.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-)
drivers/infiniband/core/rw.c +21 -11
@@ -273,6 +273,24 @@ static int rdma_rw_init_single_wr(struct rdma_rw_ctx *ctx, struct ib_qp *qp,return 1 ; } +static void rdma_rw_unmap_sg (struct ib_device *dev,struct scatterlist *sg, +u32 sg_cnt,enum dma_data_direction dir) +{ +if (is_pci_p2pdma_page (sg_page (sg))) +pci_p2pdma_unmap_sg (dev->dma_device, sg, sg_cnt, dir); +else +ib_dma_unmap_sg (dev, sg, sg_cnt, dir); +} + +static int rdma_rw_map_sg (struct ib_device *dev,struct scatterlist *sg, +u32 sg_cnt,enum dma_data_direction dir) +{ +if (is_pci_p2pdma_page (sg_page (sg))) +return pci_p2pdma_map_sg (dev->dma_device, sg, sg_cnt, dir); +else +return ib_dma_map_sg (dev, sg, sg_cnt, dir); +} +/** * rdma_rw_ctx_init - initialize a RDMA READ/WRITE context * @ctx: context to initialize
@@ -295,11 +313,7 @@ int rdma_rw_ctx_init(struct rdma_rw_ctx *ctx, struct ib_qp *qp, u8 port_num,struct ib_device *dev = qp->pd->device;int ret; -if (is_pci_p2pdma_page (sg_page (sg))) - ret =pci_p2pdma_map_sg (dev->dma_device, sg, sg_cnt, dir); -else - ret =ib_dma_map_sg (dev, sg, sg_cnt, dir); - + ret =rdma_rw_map_sg (dev, sg, sg_cnt, dir);if (!ret)return -ENOMEM ; sg_cnt = ret;
@@ -338,7 +352,7 @@ int rdma_rw_ctx_init(struct rdma_rw_ctx *ctx, struct ib_qp *qp, u8 port_num,return ret; out_unmap_sg: -ib_dma_unmap_sg (dev, sg, sg_cnt, dir); +rdma_rw_unmap_sg (dev, sg, sg_cnt, dir);return ret; }EXPORT_SYMBOL (rdma_rw_ctx_init);
@@ -588,11 +602,7 @@ void rdma_rw_ctx_destroy(struct rdma_rw_ctx *ctx, struct ib_qp *qp, u8 port_num,break ; } -if (is_pci_p2pdma_page (sg_page (sg))) -pci_p2pdma_unmap_sg (qp->pd->device->dma_device, sg, - sg_cnt, dir); -else -ib_dma_unmap_sg (qp->pd->device, sg, sg_cnt, dir); +rdma_rw_unmap_sg (qp->pd->device, sg, sg_cnt, dir); }EXPORT_SYMBOL (rdma_rw_ctx_destroy);
Signature · 1 line
2.20.1
PATCH v2 2/2 RDMA/rw: map P2P memory correctly for signature operations
Since RDMA rw API support operations with P2P memory sg list, make sure to map/unmap the scatter list for signature operation correctly.
--- drivers/infiniband/core/rw.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/infiniband/core/rw.c +6 -6
@@ -392,13 +392,13 @@ int rdma_rw_ctx_signature_init(struct rdma_rw_ctx *ctx, struct ib_qp *qp,return -EINVAL ; } - ret =ib_dma_map_sg (dev, sg, sg_cnt, dir); + ret =rdma_rw_map_sg (dev, sg, sg_cnt, dir);if (!ret)return -ENOMEM ; sg_cnt = ret;if (prot_sg_cnt) { - ret =ib_dma_map_sg (dev, prot_sg, prot_sg_cnt, dir); + ret =rdma_rw_map_sg (dev, prot_sg, prot_sg_cnt, dir);if (!ret) { ret = -ENOMEM ; goto out_unmap_sg;
@@ -467,9 +467,9 @@ int rdma_rw_ctx_signature_init(struct rdma_rw_ctx *ctx, struct ib_qp *qp,kfree (ctx->reg); out_unmap_prot_sg:if (prot_sg_cnt) -ib_dma_unmap_sg (dev, prot_sg, prot_sg_cnt, dir); +rdma_rw_unmap_sg (dev, prot_sg, prot_sg_cnt, dir); out_unmap_sg: -ib_dma_unmap_sg (dev, sg, sg_cnt, dir); +rdma_rw_unmap_sg (dev, sg, sg_cnt, dir);return ret; }EXPORT_SYMBOL (rdma_rw_ctx_signature_init);
@@ -629,9 +629,9 @@ void rdma_rw_ctx_destroy_signature(struct rdma_rw_ctx *ctx, struct ib_qp *qp,ib_mr_pool_put (qp, &qp->sig_mrs, ctx->reg->mr);kfree (ctx->reg); -ib_dma_unmap_sg (qp->pd->device, sg, sg_cnt, dir);if (prot_sg_cnt) -ib_dma_unmap_sg (qp->pd->device, prot_sg, prot_sg_cnt, dir); +rdma_rw_unmap_sg (qp->pd->device, prot_sg, prot_sg_cnt, dir); +rdma_rw_unmap_sg (qp->pd->device, sg, sg_cnt, dir); }EXPORT_SYMBOL (rdma_rw_ctx_destroy_signature);
Signature · 1 line
2.20.1
Re: [PATCH v2 2/2] RDMA/rw: map P2P memory correctly for signature operations
Quoted 2 lines · Max Gurtovoy
Since RDMA rw API support operations with P2P memory sg list, make sure to map/unmap the scatter list for signature operation correctly.
Does anyone actually use P2P pages with rdma_rw_ctx_signature_init()?
Logan
Quoted 50 lines
Signed-off-by Max Gurtovoy <[email protected]>--- drivers/infiniband/core/rw.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/infiniband/core/rw.c +6
-6@@ -392,13 +392,13 @@ int rdma_rw_ctx_signature_init(struct rdma_rw_ctx *ctx, struct ib_qp *qp,return -EINVAL ; } - ret =ib_dma_map_sg (dev, sg, sg_cnt, dir); + ret =rdma_rw_map_sg (dev, sg, sg_cnt, dir);if (!ret)return -ENOMEM ; sg_cnt = ret;if (prot_sg_cnt) { - ret =ib_dma_map_sg (dev, prot_sg, prot_sg_cnt, dir); + ret =rdma_rw_map_sg (dev, prot_sg, prot_sg_cnt, dir);if (!ret) { ret = -ENOMEM ; goto out_unmap_sg;@@ -467,9 +467,9 @@ int rdma_rw_ctx_signature_init(struct rdma_rw_ctx *ctx, struct ib_qp *qp,kfree (ctx->reg); out_unmap_prot_sg:if (prot_sg_cnt) -ib_dma_unmap_sg (dev, prot_sg, prot_sg_cnt, dir); +rdma_rw_unmap_sg (dev, prot_sg, prot_sg_cnt, dir); out_unmap_sg: -ib_dma_unmap_sg (dev, sg, sg_cnt, dir); +rdma_rw_unmap_sg (dev, sg, sg_cnt, dir);return ret; }EXPORT_SYMBOL (rdma_rw_ctx_signature_init);@@ -629,9 +629,9 @@ void rdma_rw_ctx_destroy_signature(struct rdma_rw_ctx *ctx, struct ib_qp *qp,ib_mr_pool_put (qp, &qp->sig_mrs, ctx->reg->mr);kfree (ctx->reg); -ib_dma_unmap_sg (qp->pd->device, sg, sg_cnt, dir);if (prot_sg_cnt) -ib_dma_unmap_sg (qp->pd->device, prot_sg, prot_sg_cnt, dir); +rdma_rw_unmap_sg (qp->pd->device, prot_sg, prot_sg_cnt, dir); +rdma_rw_unmap_sg (qp->pd->device, sg, sg_cnt, dir); }EXPORT_SYMBOL (rdma_rw_ctx_destroy_signature);
Re: [PATCH v2 2/2] RDMA/rw: map P2P memory correctly for signature operations
Quoted 5 lines · Logan Gunthorpe
Quoted 2 lines · Max Gurtovoy
Since RDMA rw API support operations with P2P memory sg list, make sure to map/unmap the scatter list for signature operation correctly.
Does anyone actually use P2P pages with
rdma_rw_ctx_signature_init()?
We're adding support for NVMf/target in these days.
Nevertheless, the RW API defined as an API that might use P2P pages.
Quoted 53 lines
Logan
Quoted 50 lines
Signed-off-by Max Gurtovoy <[email protected]>--- drivers/infiniband/core/rw.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/infiniband/core/rw.c +6
-6@@ -392,13 +392,13 @@ int rdma_rw_ctx_signature_init(struct rdma_rw_ctx *ctx, struct ib_qp *qp,return -EINVAL ; } - ret =ib_dma_map_sg (dev, sg, sg_cnt, dir); + ret =rdma_rw_map_sg (dev, sg, sg_cnt, dir);if (!ret)return -ENOMEM ; sg_cnt = ret;if (prot_sg_cnt) { - ret =ib_dma_map_sg (dev, prot_sg, prot_sg_cnt, dir); + ret =rdma_rw_map_sg (dev, prot_sg, prot_sg_cnt, dir);if (!ret) { ret = -ENOMEM ; goto out_unmap_sg;@@ -467,9 +467,9 @@ int rdma_rw_ctx_signature_init(struct rdma_rw_ctx *ctx, struct ib_qp *qp,kfree (ctx->reg); out_unmap_prot_sg:if (prot_sg_cnt) -ib_dma_unmap_sg (dev, prot_sg, prot_sg_cnt, dir); +rdma_rw_unmap_sg (dev, prot_sg, prot_sg_cnt, dir); out_unmap_sg: -ib_dma_unmap_sg (dev, sg, sg_cnt, dir); +rdma_rw_unmap_sg (dev, sg, sg_cnt, dir);return ret; }EXPORT_SYMBOL (rdma_rw_ctx_signature_init);@@ -629,9 +629,9 @@ void rdma_rw_ctx_destroy_signature(struct rdma_rw_ctx *ctx, struct ib_qp *qp,ib_mr_pool_put (qp, &qp->sig_mrs, ctx->reg->mr);kfree (ctx->reg); -ib_dma_unmap_sg (qp->pd->device, sg, sg_cnt, dir);if (prot_sg_cnt) -ib_dma_unmap_sg (qp->pd->device, prot_sg, prot_sg_cnt, dir); +rdma_rw_unmap_sg (qp->pd->device, prot_sg, prot_sg_cnt, dir); +rdma_rw_unmap_sg (qp->pd->device, sg, sg_cnt, dir); }EXPORT_SYMBOL (rdma_rw_ctx_destroy_signature);
Jason Gunthorpe
AppliedRe: [PATCH v2 2/2] RDMA/rw: map P2P memory correctly for signature operations
In reply to Max GurtovoyQuoted 7 lines · Max Gurtovoy
Since RDMA rw API support operations with P2P memory sg list, make sure to map/unmap the scatter list for signature operation correctly.
Signed-off-by Max Gurtovoy <[email protected]>--- drivers/infiniband/core/rw.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
Applied to for-next
Thanks,
Jason
Quoted 22 lines · Max Gurtovoy
In case the SGL was mapped for P2P DMA operation, we must unmap it using
pci_p2pdma_unmap_sg.Fixes 7f73eac3a713 ("PCI/P2PDMA: Introduce pci_p2pdma_unmap_sg()")Signed-off-by Max Gurtovoy <[email protected]>--- drivers/infiniband/core/rw.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-)drivers/infiniband/core/rw.c +5
-0@@ -273,6 +273,24 @@ static int rdma_rw_init_single_wr(struct rdma_rw_ctx *ctx, struct ib_qp *qp,return 1 ; } +static void rdma_rw_unmap_sg (struct ib_device *dev,struct scatterlist *sg, +u32 sg_cnt,enum dma_data_direction dir) +{ +if (is_pci_p2pdma_page (sg_page (sg))) +pci_p2pdma_unmap_sg (dev->dma_device, sg, sg_cnt, dir);
drivers/infiniband/core/rw.c static int rdma_rw_init_single_wr(struct rdma_rw_ctx *ctx, struct ib_qp *qp, · line 290
Quoted 10 lines
drivers/infiniband/core/rw.c +10
-0+else +ib_dma_unmap_sg (dev, sg, sg_cnt, dir); +} + +static int rdma_rw_map_sg (struct ib_device *dev,struct scatterlist *sg, +u32 sg_cnt,enum dma_data_direction dir) +{ +if (is_pci_p2pdma_page (sg_page (sg))) +return pci_p2pdma_map_sg (dev->dma_device, sg, sg_cnt, dir); +else
This "else" is not needed.
drivers/infiniband/core/rw.c static int rdma_rw_init_single_wr(struct rdma_rw_ctx *ctx, struct ib_qp *qp, · line 294
Quoted 3 lines
drivers/infiniband/core/rw.c +2
-0+return ib_dma_map_sg (dev, sg, sg_cnt, dir); +}> +/**
Thanks,
Quoted 5 lines · Max Gurtovoy
In case the SGL was mapped for P2P DMA operation, we must unmap it using
pci_p2pdma_unmap_sg.Fixes 7f73eac3a713 ("PCI/P2PDMA: Introduce pci_p2pdma_unmap_sg()")Signed-off-by Max Gurtovoy <[email protected]>
Makes sense to me.
Thanks!
Logan
Jason Gunthorpe
AppliedQuoted 10 lines · Max Gurtovoy
In case the SGL was mapped for P2P DMA operation, we must unmap it using
pci_p2pdma_unmap_sg.Fixes 7f73eac3a713 ("PCI/P2PDMA: Introduce pci_p2pdma_unmap_sg()")Signed-off-by Max Gurtovoy <[email protected]>Reviewed-by Leon Romanovsky <[email protected]>Reviewed-by Logan Gunthorpe <[email protected]>--- drivers/infiniband/core/rw.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-)
Applied to for-rc. The other one can go to -next in a bit as there is no current bug
Jason