RDMA/rw: map P2P memory correctly for signature operations
PATCH 1/1 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. while we're here, fix an error flow that doesn't unmap the sg list according to the memory type.
--- drivers/infiniband/core/rw.c | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-)
drivers/infiniband/core/rw.c +27 -17
@@ -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);
@@ -378,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;
@@ -453,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);
@@ -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);
@@ -619,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
1.8.3.1
Quoted 9 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. while we're here, fix an error flow that doesn't unmap the sg list according to the memory type.
Signed-off-by Max Gurtovoy <[email protected]>Signed-off-by Israel Rukshin <[email protected]>drivers/infiniband/core/rw.c | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-)
Can you split the bug fix out please?
Jason
Quoted 11 lines · Jason Gunthorpe
Quoted 9 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. while we're here, fix an error flow that doesn't unmap the sg list according to the memory type.
Signed-off-by Max Gurtovoy <[email protected]>Signed-off-by Israel Rukshin <[email protected]>drivers/infiniband/core/rw.c | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-)Can you split the bug fix out please?
sure,
just sent a v2.
Quoted 2 lines
Jason