RDMA/mana_ib: Improve dma region creation
Subsystems (2)
v3 cover RDMA/mana_ib: Improve dma region creation
From: Konstantin Taranov <[email protected]>
This patch series fixes an incorrect offset calculation for dma regions and adds new functions to create dma regions:
1) with iova
2) without iova but with zero dma offset
Changes:v1->v2:
Split the patch into 2 commits
In 1/2, Improved commit messages and added "Fixes:"
In 2/2, Used correct helpers to get page size for iova and no-iova cases In 2/2, Introduced mana helpers to work with iova and no-iova cases
v2->v3:
In 2/2, Return -EINVAL on failed ib_umem_find_best_pgoff In 2/2, Improved commit message and added "Fixes:"
Konstantin Taranov (2):
RDMA/mana_ib: Fix bug in creation of dma regions RDMA/mana_ib: Use virtual address in dma regions for MRs
drivers/infiniband/hw/mana/cq.c | 4 +-- drivers/infiniband/hw/mana/main.c | 42 +++++++++++++++++++++------- drivers/infiniband/hw/mana/mana_ib.h | 7 +++-- drivers/infiniband/hw/mana/mr.c | 4 +-- drivers/infiniband/hw/mana/qp.c | 6 ++-- drivers/infiniband/hw/mana/wq.c | 4 +-- 6 files changed, 46 insertions(+), 21 deletions(-)
base-commit: 14b526f55ba5916856126f9793309fd6de5c5e7e
Signature · 1 line
2.43.0
PATCH v3 1/2 RDMA/mana_ib: Fix bug in creation of dma regions
From: Konstantin Taranov <[email protected]>
Use ib_umem_dma_offset() helper to calculate correct dma offset.
--- drivers/infiniband/hw/mana/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/mana/main.c +1 -1
@@ -348,7 +348,7 @@ int mana_ib_gd_create_dma_region(struct mana_ib_dev *dev, struct ib_umem *umem, sizeof(struct gdma_create_dma_region_resp)); create_req->length = umem->length; - create_req->offset_in_page = umem->address & (page_sz -1 ); + create_req->offset_in_page =ib_umem_dma_offset (umem, page_sz); create_req->gdma_page_type =order_base_2 (page_sz) -PAGE_SHIFT ; create_req->page_count = num_pages_total;
Signature · 1 line
2.43.0
PATCH v3 2/2 RDMA/mana_ib: Use virtual address in dma regions for MRs
In reply to Konstantin TaranovFrom: Konstantin Taranov <[email protected]>
Introduce mana_ib_create_dma_region() to create dma regions with iova for MRs. It allows creating MRs with any page offset. Previously, only page-aligned addresses worked.
For dma regions that must have a zero dma offset (e.g., for queues), mana_ib_create_zero_offset_dma_region() is added.
To get the zero offset, ib_umem_find_best_pgoff() is used with zero pgoff_bitmask.
--- drivers/infiniband/hw/mana/cq.c | 4 +-- drivers/infiniband/hw/mana/main.c | 40 +++++++++++++++++++++------- drivers/infiniband/hw/mana/mana_ib.h | 7 +++-- drivers/infiniband/hw/mana/mr.c | 4 +-- drivers/infiniband/hw/mana/qp.c | 6 ++--- drivers/infiniband/hw/mana/wq.c | 4 +-- 6 files changed, 45 insertions(+), 20 deletions(-)
drivers/infiniband/hw/mana/cq.c +2 -2
@@ -48,7 +48,7 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,return err; } - err =mana_ib_gd_create_dma_region (mdev, cq->umem, &cq->gdma_region); + err =mana_ib_create_zero_offset_dma_region (mdev, cq->umem, &cq->gdma_region);if (err) { ibdev_dbg(ibdev, "Failed to create dma region for create cq, %d\n",
@@ -57,7 +57,7 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, }ibdev_dbg (ibdev, -"mana_ib_gd_create_dma_region ret %d gdma_region 0x%llx\n" , +"create_dma_region ret %d gdma_region 0x%llx\n" , err, cq->gdma_region);/*
drivers/infiniband/hw/mana/main.c +31 -9
@@ -301,8 +301,8 @@ mana_ib_gd_add_dma_region(struct mana_ib_dev *dev, struct gdma_context *gc,return 0 ; } -int mana_ib_gd_create_dma_region (struct mana_ib_dev *dev,struct ib_umem *umem, -mana_handle_t *gdma_region) +static int mana_ib_gd_create_dma_region (struct mana_ib_dev *dev,struct ib_umem *umem, +mana_handle_t *gdma_region,unsigned long page_sz) {struct gdma_dma_region_add_pages_req *add_req =NULL ;size_t num_pages_processed =0 , num_pages_to_handle;
@@ -314,7 +314,6 @@ int mana_ib_gd_create_dma_region(struct mana_ib_dev *dev, struct ib_umem *umem,size_t max_pgs_create_cmd;struct gdma_context *gc;size_t num_pages_total; -unsigned long page_sz;unsigned int tail =0 ;u64 *page_addr_list;void *request_buf;
@@ -323,12 +322,6 @@ int mana_ib_gd_create_dma_region(struct mana_ib_dev *dev, struct ib_umem *umem, gc =mdev_to_gc (dev); hwc = gc->hwc.driver_data; -/* Hardware requires dma region to align to chosen page size */ - page_sz =ib_umem_find_best_pgsz (umem,PAGE_SZ_BM ,0 ); -if (!page_sz) { -ibdev_dbg (&dev->ib_dev,"failed to find page size.\n" ); -return -ENOMEM ; - } num_pages_total =ib_umem_num_dma_blocks (umem, page_sz); max_pgs_create_cmd =
@@ -414,6 +407,35 @@ int mana_ib_gd_create_dma_region(struct mana_ib_dev *dev, struct ib_umem *umem,return err; } +int mana_ib_create_dma_region (struct mana_ib_dev *dev,struct ib_umem *umem, +mana_handle_t *gdma_region,u64 virt) +{ +unsigned long page_sz; + + page_sz =ib_umem_find_best_pgsz (umem,PAGE_SZ_BM , virt); +if (!page_sz) { +ibdev_dbg (&dev->ib_dev,"Failed to find page size.\n" ); +return -EINVAL ; + } + +return mana_ib_gd_create_dma_region (dev, umem, gdma_region, page_sz); +} + +int mana_ib_create_zero_offset_dma_region (struct mana_ib_dev *dev,struct ib_umem *umem, +mana_handle_t *gdma_region) +{ +unsigned long page_sz; + +/* Hardware requires dma region to align to chosen page size */ + page_sz =ib_umem_find_best_pgoff (umem,PAGE_SZ_BM ,0 ); +if (!page_sz) { +ibdev_dbg (&dev->ib_dev,"Failed to find page size.\n" ); +return -EINVAL ; + } + +return mana_ib_gd_create_dma_region (dev, umem, gdma_region, page_sz); +} +int mana_ib_gd_destroy_dma_region (struct mana_ib_dev *dev,u64 gdma_region) {struct gdma_context *gc =mdev_to_gc (dev);
drivers/infiniband/hw/mana/mana_ib.h +5 -2
@@ -160,8 +160,11 @@ static inline struct net_device *mana_ib_get_netdev(struct ib_device *ibdev, u32int mana_ib_install_cq_cb (struct mana_ib_dev *mdev,struct mana_ib_cq *cq); -int mana_ib_gd_create_dma_region (struct mana_ib_dev *dev,struct ib_umem *umem, -mana_handle_t *gdma_region); +int mana_ib_create_zero_offset_dma_region (struct mana_ib_dev *dev,struct ib_umem *umem, +mana_handle_t *gdma_region); + +int mana_ib_create_dma_region (struct mana_ib_dev *dev,struct ib_umem *umem, +mana_handle_t *gdma_region,u64 virt);int mana_ib_gd_destroy_dma_region (struct mana_ib_dev *dev,mana_handle_t gdma_region);
drivers/infiniband/hw/mana/mr.c +2 -2
@@ -127,7 +127,7 @@ struct ib_mr *mana_ib_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 length, goto err_free; } - err =mana_ib_gd_create_dma_region (dev, mr->umem, &dma_region_handle); + err =mana_ib_create_dma_region (dev, mr->umem, &dma_region_handle, iova);if (err) {ibdev_dbg (ibdev,"Failed create dma region for user-mr, %d\n" , err);
@@ -135,7 +135,7 @@ struct ib_mr *mana_ib_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 length, }ibdev_dbg (ibdev, -"mana_ib_gd_create_dma_region ret %d gdma_region %llx\n" , err, +"create_dma_region ret %d gdma_region %llx\n" , err, dma_region_handle); mr_params.pd_handle = pd->pd_handle;
drivers/infiniband/hw/mana/qp.c +3 -3
@@ -357,8 +357,8 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp, struct ib_pd *ibpd, } qp->sq_umem = umem; - err =mana_ib_gd_create_dma_region (mdev, qp->sq_umem, - &qp->sq_gdma_region); + err =mana_ib_create_zero_offset_dma_region (mdev, qp->sq_umem, + &qp->sq_gdma_region);if (err) { ibdev_dbg(&mdev->ib_dev, "Failed to create dma region for create qp-raw, %d\n",
@@ -367,7 +367,7 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp, struct ib_pd *ibpd, }ibdev_dbg (&mdev->ib_dev, -"mana_ib_gd_create_dma_region ret %d gdma_region 0x%llx\n" , +"create_dma_region ret %d gdma_region 0x%llx\n" , err, qp->sq_gdma_region);/* Create a WQ on the same port handle used by the Ethernet */
drivers/infiniband/hw/mana/wq.c +2 -2
@@ -46,7 +46,7 @@ struct ib_wq *mana_ib_create_wq(struct ib_pd *pd, wq->wq_buf_size = ucmd.wq_buf_size; wq->rx_object =INVALID_MANA_HANDLE ; - err =mana_ib_gd_create_dma_region (mdev, wq->umem, &wq->gdma_region); + err =mana_ib_create_zero_offset_dma_region (mdev, wq->umem, &wq->gdma_region);if (err) { ibdev_dbg(&mdev->ib_dev, "Failed to create dma region for create wq, %d\n",
@@ -55,7 +55,7 @@ struct ib_wq *mana_ib_create_wq(struct ib_pd *pd, }ibdev_dbg (&mdev->ib_dev, -"mana_ib_gd_create_dma_region ret %d gdma_region 0x%llx\n" , +"create_dma_region ret %d gdma_region 0x%llx\n" , err, wq->gdma_region);/* WQ ID is returned at wq_create time, doesn't know the value yet */
Signature · 1 line
2.43.0
Re: [PATCH rdma-next v3 2/2] RDMA/mana_ib: Use virtual address in dma regions for MRs
Quoted 99 lines · Konstantin Taranov
From: Konstantin Taranov <[email protected]>
Introduce
mana_ib_create_dma_region()to create dma regions with iova for MRs. It allows creating MRs with any page offset. Previously, only page-aligned addresses worked.For dma regions that must have a zero dma offset (e.g., for queues),
mana_ib_create_zero_offset_dma_region()is added.
To get the zero offset,ib_umem_find_best_pgoff()is used with zeropgoff_bitmask.Fixes 0266a177631d ("RDMA/mana_ib: Add a driver for Microsoft Azure Network Adapter")Signed-off-by Konstantin Taranov <[email protected]>--- drivers/infiniband/hw/mana/cq.c | 4 +-- drivers/infiniband/hw/mana/main.c | 40 +++++++++++++++++++++------- drivers/infiniband/hw/mana/mana_ib.h | 7 +++-- drivers/infiniband/hw/mana/mr.c | 4 +-- drivers/infiniband/hw/mana/qp.c | 6 ++--- drivers/infiniband/hw/mana/wq.c | 4 +-- 6 files changed, 45 insertions(+), 20 deletions(-)drivers/infiniband/hw/mana/cq.c +2
-2@@ -48,7 +48,7 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,return err; } - err =mana_ib_gd_create_dma_region (mdev, cq->umem, &cq->gdma_region); + err =mana_ib_create_zero_offset_dma_region (mdev, cq->umem, &cq->gdma_region);if (err) { ibdev_dbg(ibdev, "Failed to create dma region for create cq, %d\n",@@ -57,7 +57,7 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, }ibdev_dbg (ibdev, -"mana_ib_gd_create_dma_region ret %d gdma_region 0x%llx\n" , +"create_dma_region ret %d gdma_region 0x%llx\n" , err, cq->gdma_region);/* drivers/infiniband/hw/mana/main.c +17
-9@@ -301,8 +301,8 @@ mana_ib_gd_add_dma_region(struct mana_ib_dev *dev, struct gdma_context *gc,return 0 ; } -int mana_ib_gd_create_dma_region (struct mana_ib_dev *dev,struct ib_umem *umem, -mana_handle_t *gdma_region) +static int mana_ib_gd_create_dma_region (struct mana_ib_dev *dev,struct ib_umem *umem, +mana_handle_t *gdma_region,unsigned long page_sz) {struct gdma_dma_region_add_pages_req *add_req =NULL ;size_t num_pages_processed =0 , num_pages_to_handle;@@ -314,7 +314,6 @@ int mana_ib_gd_create_dma_region(struct mana_ib_dev *dev, struct ib_umem *umem,size_t max_pgs_create_cmd;struct gdma_context *gc;size_t num_pages_total; -unsigned long page_sz;unsigned int tail =0 ;u64 *page_addr_list;void *request_buf;@@ -323,12 +322,6 @@ int mana_ib_gd_create_dma_region(struct mana_ib_dev *dev, struct ib_umem *umem, gc =mdev_to_gc (dev); hwc = gc->hwc.driver_data; -/* Hardware requires dma region to align to chosen page size */ - page_sz =ib_umem_find_best_pgsz (umem,PAGE_SZ_BM ,0 ); -if (!page_sz) { -ibdev_dbg (&dev->ib_dev,"failed to find page size.\n" ); -return -ENOMEM ; - } num_pages_total =ib_umem_num_dma_blocks (umem, page_sz); max_pgs_create_cmd =@@ -414,6 +407,35 @@ int mana_ib_gd_create_dma_region(struct mana_ib_dev *dev, struct ib_umem *umem,return err; } +int mana_ib_create_dma_region (struct mana_ib_dev *dev,struct ib_umem *umem, +mana_handle_t *gdma_region,u64 virt) +{ +unsigned long page_sz; + + page_sz =ib_umem_find_best_pgsz (umem,PAGE_SZ_BM , virt); +if (!page_sz) { +ibdev_dbg (&dev->ib_dev,"Failed to find page size.\n" ); +return -EINVAL ; + } + +return mana_ib_gd_create_dma_region (dev, umem, gdma_region, page_sz); +} + +int mana_ib_create_zero_offset_dma_region(struct mana_ib_dev *dev, struct ib_umem *umem,
drivers/infiniband/hw/mana/main.c int mana_ib_gd_create_dma_region(struct mana_ib_dev *dev, struct ib_umem *umem, · line 434
Quoted 10 lines
drivers/infiniband/hw/mana/main.c +10
-0+ mana_handle_t *gdma_region) +{ +unsigned long page_sz; + +/* Hardware requires dma region to align to chosen page size */ + page_sz =ib_umem_find_best_pgoff (umem,PAGE_SZ_BM ,0 ); +if (!page_sz) { +ibdev_dbg (&dev->ib_dev,"Failed to find page size.\n" ); +return -EINVAL ; + }
Thanks a lot. I am fine with it.
Zhu Yanjun
Quoted 93 lines
drivers/infiniband/hw/mana/main.c +4
-0+ +return mana_ib_gd_create_dma_region (dev, umem, gdma_region, page_sz); +} +int mana_ib_gd_destroy_dma_region (struct mana_ib_dev *dev,u64 gdma_region) {struct gdma_context *gc =mdev_to_gc (dev);drivers/infiniband/hw/mana/mana_ib.h +5
-2@@ -160,8 +160,11 @@ static inline struct net_device *mana_ib_get_netdev(struct ib_device *ibdev, u32int mana_ib_install_cq_cb (struct mana_ib_dev *mdev,struct mana_ib_cq *cq); -int mana_ib_gd_create_dma_region (struct mana_ib_dev *dev,struct ib_umem *umem, -mana_handle_t *gdma_region); +int mana_ib_create_zero_offset_dma_region (struct mana_ib_dev *dev,struct ib_umem *umem, +mana_handle_t *gdma_region); + +int mana_ib_create_dma_region (struct mana_ib_dev *dev,struct ib_umem *umem, +mana_handle_t *gdma_region,u64 virt);int mana_ib_gd_destroy_dma_region (struct mana_ib_dev *dev,mana_handle_t gdma_region);drivers/infiniband/hw/mana/mr.c +2
-2@@ -127,7 +127,7 @@ struct ib_mr *mana_ib_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 length, goto err_free; } - err =mana_ib_gd_create_dma_region (dev, mr->umem, &dma_region_handle); + err =mana_ib_create_dma_region (dev, mr->umem, &dma_region_handle, iova);if (err) {ibdev_dbg (ibdev,"Failed create dma region for user-mr, %d\n" , err);@@ -135,7 +135,7 @@ struct ib_mr *mana_ib_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 length, }ibdev_dbg (ibdev, -"mana_ib_gd_create_dma_region ret %d gdma_region %llx\n" , err, +"create_dma_region ret %d gdma_region %llx\n" , err, dma_region_handle); mr_params.pd_handle = pd->pd_handle;drivers/infiniband/hw/mana/qp.c +3
-3@@ -357,8 +357,8 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp, struct ib_pd *ibpd, } qp->sq_umem = umem; - err =mana_ib_gd_create_dma_region (mdev, qp->sq_umem, - &qp->sq_gdma_region); + err =mana_ib_create_zero_offset_dma_region (mdev, qp->sq_umem, + &qp->sq_gdma_region);if (err) { ibdev_dbg(&mdev->ib_dev, "Failed to create dma region for create qp-raw, %d\n",@@ -367,7 +367,7 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp, struct ib_pd *ibpd, }ibdev_dbg (&mdev->ib_dev, -"mana_ib_gd_create_dma_region ret %d gdma_region 0x%llx\n" , +"create_dma_region ret %d gdma_region 0x%llx\n" , err, qp->sq_gdma_region);/* Create a WQ on the same port handle used by the Ethernet */ drivers/infiniband/hw/mana/wq.c +2
-2@@ -46,7 +46,7 @@ struct ib_wq *mana_ib_create_wq(struct ib_pd *pd, wq->wq_buf_size = ucmd.wq_buf_size; wq->rx_object =INVALID_MANA_HANDLE ; - err =mana_ib_gd_create_dma_region (mdev, wq->umem, &wq->gdma_region); + err =mana_ib_create_zero_offset_dma_region (mdev, wq->umem, &wq->gdma_region);if (err) { ibdev_dbg(&mdev->ib_dev, "Failed to create dma region for create wq, %d\n",@@ -55,7 +55,7 @@ struct ib_wq *mana_ib_create_wq(struct ib_pd *pd, }ibdev_dbg (&mdev->ib_dev, -"mana_ib_gd_create_dma_region ret %d gdma_region 0x%llx\n" , +"create_dma_region ret %d gdma_region 0x%llx\n" , err, wq->gdma_region);/* WQ ID is returned at wq_create time, doesn't know the value yet */
Leon Romanovsky
AppliedQuoted 8 lines · Konstantin Taranov
From: Konstantin Taranov <[email protected]>
This patch series fixes an incorrect offset calculation for dma regions and adds new functions to create dma regions:
1) with iova
2) without iova but with zero dma offset[...]
Applied, thanks!
[1/2] RDMA/mana_ib: Fix bug in creation of dma regions
https://git.kernel.org/rdma/rdma/c/e02497fb654689 [2/2] RDMA/mana_ib: Use virtual address in dma regions for MRs https://git.kernel.org/rdma/rdma/c/2d5c00815778ec
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>