Skip to contentSkip to conversation

RDMA/irdma: Refactor irdma_reg_user_mr function

PATCH Superseded Zhu Yanjun 3 participants 14 messages Jan 9, 2023 – Jan 11, 2023

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Zhu Yanjun

author
#0 lore raw

cover RDMA/irdma: Refactor irdma_reg_user_mr function

From: Zhu Yanjun <[email protected]>

Split the shared source codes into several new functions for future use. No bug fix and new feature in this commit series.

The new functions are as below:

irdma_reg_user_mr_type_mem
irdma_alloc_iwmr
irdma_free_iwmr
irdma_reg_user_mr_type_qp
irdma_reg_user_mr_type_cq

These functions will be used in the dmabuf feature.

Zhu Yanjun (4):
RDMA/irdma: Split MEM handler into irdma_reg_user_mr_type_mem RDMA/irdma: Split mr alloc and free into new functions RDMA/irdma: Split QP handler into irdma_reg_user_mr_type_qp RDMA/irdma: Split CQ handler into irdma_reg_user_mr_type_cq

 drivers/infiniband/hw/irdma/verbs.c | 260 +++++++++++++++++-----------
 1 file changed, 160 insertions(+), 100 deletions(-)
Signature · 1 line
2.31.1
author
#1 lore raw

PATCH 1/4 RDMA/irdma: Split MEM handler into irdma_reg_user_mr_type_mem

From: Zhu Yanjun <[email protected]>

The source codes related with IRDMA_MEMREG_TYPE_MEM are split into a new function irdma_reg_user_mr_type_mem.

---
 drivers/infiniband/hw/irdma/verbs.c | 85 +++++++++++++++++------------
 1 file changed, 51 insertions(+), 34 deletions(-)
drivers/infiniband/hw/irdma/verbs.c +51 -34
index f6973ea55eda..40109da6489a 100644
@@ -2745,6 +2745,55 @@ static int irdma_hwreg_mr(struct irdma_device *iwdev, struct irdma_mr *iwmr,
 	return ret;
 }
 
+static int irdma_reg_user_mr_type_mem(struct irdma_device *iwdev,
+				      struct irdma_mr *iwmr, int access)
+{
+	int err = 0;
+	bool use_pbles = false;
+	u32 stag = 0;
+	struct irdma_pbl *iwpbl = &iwmr->iwpbl;
+
+	use_pbles = (iwmr->page_cnt != 1);
+
+	err = irdma_setup_pbles(iwdev->rf, iwmr, use_pbles, false);
+	if (err)
+		return err;
+
+	if (use_pbles) {
+		err = irdma_check_mr_contiguous(&iwpbl->pble_alloc,
+						iwmr->page_size);
+		if (err) {
+			irdma_free_pble(iwdev->rf->pble_rsrc, &iwpbl->pble_alloc);
+			iwpbl->pbl_allocated = false;
+			return err;
+		}
+	}
+
+	stag = irdma_create_stag(iwdev);
+	if (!stag) {
+		if (use_pbles) {
+			irdma_free_pble(iwdev->rf->pble_rsrc, &iwpbl->pble_alloc);
+			iwpbl->pbl_allocated = false;
+		}
+		return -ENOMEM;
+	}
+
+	iwmr->stag = stag;
+	iwmr->ibmr.rkey = stag;
+	iwmr->ibmr.lkey = stag;
+	err = irdma_hwreg_mr(iwdev, iwmr, access);
+	if (err) {
+		irdma_free_stag(iwdev, stag);
+		if (use_pbles) {
+			irdma_free_pble(iwdev->rf->pble_rsrc, &iwpbl->pble_alloc);
+			iwpbl->pbl_allocated = false;
+		}
+		return err;
+	}
+
+	return err;
+}
+
 /**
  * irdma_reg_user_mr - Register a user memory region
  * @pd: ptr of pd
@@ -2761,17 +2810,15 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len,
 #define IRDMA_MEM_REG_MIN_REQ_LEN offsetofend(struct irdma_mem_reg_req, sq_pages)
 	struct irdma_device *iwdev = to_iwdev(pd->device);
 	struct irdma_ucontext *ucontext;
-	struct irdma_pble_alloc *palloc;
 	struct irdma_pbl *iwpbl;
 	struct irdma_mr *iwmr;
 	struct ib_umem *region;
 	struct irdma_mem_reg_req req;
-	u32 total, stag = 0;
+	u32 total;
 	u8 shadow_pgcnt = 1;
 	bool use_pbles = false;
 	unsigned long flags;
 	int err = -EINVAL;
-	int ret;
 
 	if (len > iwdev->rf->sc_dev.hw_attrs.max_mr_size)
 		return ERR_PTR(-EINVAL);
@@ -2818,7 +2865,6 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len,
 	}
 	iwmr->len = region->length;
 	iwpbl->user_base = virt;
-	palloc = &iwpbl->pble_alloc;
 	iwmr->type = req.reg_type;
 	iwmr->page_cnt = ib_umem_num_dma_blocks(region, iwmr->page_size);
 
@@ -2864,36 +2910,9 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len,
 		spin_unlock_irqrestore(&ucontext->cq_reg_mem_list_lock, flags);
 		break;
 	case IRDMA_MEMREG_TYPE_MEM:
-		use_pbles = (iwmr->page_cnt != 1);
-
-		err = irdma_setup_pbles(iwdev->rf, iwmr, use_pbles, false);
+		err = irdma_reg_user_mr_type_mem(iwdev, iwmr, access);
 		if (err)
 			goto error;
-
-		if (use_pbles) {
-			ret = irdma_check_mr_contiguous(palloc,
-							iwmr->page_size);
-			if (ret) {
-				irdma_free_pble(iwdev->rf->pble_rsrc, palloc);
-				iwpbl->pbl_allocated = false;
-			}
-		}
-
-		stag = irdma_create_stag(iwdev);
-		if (!stag) {
-			err = -ENOMEM;
-			goto error;
-		}
-
-		iwmr->stag = stag;
-		iwmr->ibmr.rkey = stag;
-		iwmr->ibmr.lkey = stag;
-		err = irdma_hwreg_mr(iwdev, iwmr, access);
-		if (err) {
-			irdma_free_stag(iwdev, stag);
-			goto error;
-		}
-
 		break;
 	default:
 		goto error;
@@ -2904,8 +2923,6 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len,
 	return &iwmr->ibmr;
 
 error:
-	if (palloc->level != PBLE_LEVEL_0 && iwpbl->pbl_allocated)
-		irdma_free_pble(iwdev->rf->pble_rsrc, palloc);
 	ib_umem_release(region);
 	kfree(iwmr);
 
Signature · 1 line
2.27.0
#2 lore raw

RE: [PATCH for-next 1/4] RDMA/irdma: Split MEM handler into irdma_reg_user_mr_type_mem

Quoted 18 lines

Subject: [PATCH for-next 1/4] RDMA/irdma: Split MEM handler into irdma_reg_user_mr_type_mem

From: Zhu Yanjun <[email protected]>

The source codes related with IRDMA_MEMREG_TYPE_MEM are split into a new function irdma_reg_user_mr_type_mem.

---
 drivers/infiniband/hw/irdma/verbs.c | 85 +++++++++++++++++------------
 1 file changed, 51 insertions(+), 34 deletions(-)
drivers/infiniband/hw/irdma/verbs.c +0 -0
index f6973ea55eda..40109da6489a 100644

drivers/infiniband/hw/irdma/verbs.c static int irdma_hwreg_mr(struct irdma_device *iwdev, · line 2753

Quoted 9 lines
drivers/infiniband/hw/irdma/verbs.c +5 -0
@@ -2745,6 +2745,55 @@ static int irdma_hwreg_mr(struct irdma_device *iwdev,
 struct irdma_mr *iwmr,
 	return ret;
 }
 
+static int irdma_reg_user_mr_type_mem(struct irdma_device *iwdev,
+				      struct irdma_mr *iwmr, int access) {
+	int err = 0;
+	bool use_pbles = false;
+	u32 stag = 0;

No need to initialize any of these?

Quoted 6 lines
drivers/infiniband/hw/irdma/verbs.c +6 -0
+	struct irdma_pbl *iwpbl = &iwmr->iwpbl;
+
+	use_pbles = (iwmr->page_cnt != 1);
+
+	err = irdma_setup_pbles(iwdev->rf, iwmr, use_pbles, false);
+	if (err)

drivers/infiniband/hw/irdma/verbs.c static int irdma_hwreg_mr(struct irdma_device *iwdev, struct irdma_mr *iwmr, · line 2768

Quoted 10 lines
drivers/infiniband/hw/irdma/verbs.c +9 -0
+		return err;
+
+	if (use_pbles) {
+		err = irdma_check_mr_contiguous(&iwpbl->pble_alloc,
+						iwmr->page_size);
+		if (err) {
+			irdma_free_pble(iwdev->rf->pble_rsrc, &iwpbl-
 >pble_alloc);
+			iwpbl->pbl_allocated = false;
+			return err;

No this should not cause an error. Just that we don't want to use pbles for this region. reset use_pbles to false here?

Quoted 22 lines
drivers/infiniband/hw/irdma/verbs.c +20 -0
+		}
+	}
+
+	stag = irdma_create_stag(iwdev);
+	if (!stag) {
+		if (use_pbles) {
+			irdma_free_pble(iwdev->rf->pble_rsrc, &iwpbl-
 >pble_alloc);
+			iwpbl->pbl_allocated = false;
+		}
+		return -ENOMEM;
+	}
+
+	iwmr->stag = stag;
+	iwmr->ibmr.rkey = stag;
+	iwmr->ibmr.lkey = stag;
+	err = irdma_hwreg_mr(iwdev, iwmr, access);
+	if (err) {
+		irdma_free_stag(iwdev, stag);
+		if (use_pbles) {
+			irdma_free_pble(iwdev->rf->pble_rsrc, &iwpbl-
Quoted 1 line

pble_alloc);

drivers/infiniband/hw/irdma/verbs.c

Quoted 1 line
drivers/infiniband/hw/irdma/verbs.c +1 -0
+			iwpbl->pbl_allocated = false;

Setting the iwpbl->pbl_allocated to false is not required. We are going to free up the iwmr memory on this error anyway.

Just a suggestion. Maybe just use a goto a label "free_pble" that does the irdma_free_pble and returns err. And re-use it for irdma_create_stag error unwind too.

Quoted 40 lines
drivers/infiniband/hw/irdma/verbs.c +8 -3
+		}
+		return err;
+	}
+
+	return err;
+}
+
 /**
  * irdma_reg_user_mr - Register a user memory region
  * @pd: ptr of pd
@@ -2761,17 +2810,15 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd
 *pd, u64 start, u64 len,  #define IRDMA_MEM_REG_MIN_REQ_LEN
 offsetofend(struct irdma_mem_reg_req, sq_pages)
 	struct irdma_device *iwdev = to_iwdev(pd->device);
 	struct irdma_ucontext *ucontext;
-	struct irdma_pble_alloc *palloc;
 	struct irdma_pbl *iwpbl;
 	struct irdma_mr *iwmr;
 	struct ib_umem *region;
 	struct irdma_mem_reg_req req;
-	u32 total, stag = 0;
+	u32 total;
 	u8 shadow_pgcnt = 1;
 	bool use_pbles = false;
 	unsigned long flags;
 	int err = -EINVAL;
-	int ret;
 
 	if (len > iwdev->rf->sc_dev.hw_attrs.max_mr_size)
drivers/infiniband/hw/irdma/verbs.c +0 -1
 		return ERR_PTR(-EINVAL);
@@ -2818,7 +2865,6 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd,
 u64 start, u64 len,
 	}
 	iwmr->len = region->length;
 	iwpbl->user_base = virt;
-	palloc = &iwpbl->pble_alloc;
 	iwmr->type = req.reg_type;
 	iwmr->page_cnt = ib_umem_num_dma_blocks(region, iwmr->page_size);

drivers/infiniband/hw/irdma/verbs.c static struct ib_mr *irdma_reg_user_mr(struct ib_pd · line 2914

Quoted 8 lines
drivers/infiniband/hw/irdma/verbs.c +1 -3
@@ -2864,36 +2910,9 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd
 *pd, u64 start, u64 len,
 		spin_unlock_irqrestore(&ucontext->cq_reg_mem_list_lock, flags);
 		break;
 	case IRDMA_MEMREG_TYPE_MEM:
-		use_pbles = (iwmr->page_cnt != 1);
-
-		err = irdma_setup_pbles(iwdev->rf, iwmr, use_pbles, false);
+		err = irdma_reg_user_mr_type_mem(iwdev, iwmr, access);

Perhaps you can just pass the iwmr and access as args for this API and compute the iwdev in the function using to_iwdev(iwmr->ibmr.device)

Quoted 42 lines
drivers/infiniband/hw/irdma/verbs.c +0 -25
 		if (err)
 			goto error;
-
-		if (use_pbles) {
-			ret = irdma_check_mr_contiguous(palloc,
-							iwmr->page_size);
-			if (ret) {
-				irdma_free_pble(iwdev->rf->pble_rsrc, palloc);
-				iwpbl->pbl_allocated = false;
-			}
-		}
-
-		stag = irdma_create_stag(iwdev);
-		if (!stag) {
-			err = -ENOMEM;
-			goto error;
-		}
-
-		iwmr->stag = stag;
-		iwmr->ibmr.rkey = stag;
-		iwmr->ibmr.lkey = stag;
-		err = irdma_hwreg_mr(iwdev, iwmr, access);
-		if (err) {
-			irdma_free_stag(iwdev, stag);
-			goto error;
-		}
-
 		break;
 	default:
drivers/infiniband/hw/irdma/verbs.c +0 -3
 		goto error;
@@ -2904,8 +2923,6 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd,
 u64 start, u64 len,
 	return &iwmr->ibmr;
 
 error:
-	if (palloc->level != PBLE_LEVEL_0 && iwpbl->pbl_allocated)
-		irdma_free_pble(iwdev->rf->pble_rsrc, palloc);
 	ib_umem_release(region);
 	kfree(iwmr);
 
--

2.27.0

#3 lore raw

Re: [PATCH for-next 1/4] RDMA/irdma: Split MEM handler into irdma_reg_user_mr_type_mem

Quoted 22 lines · Shiraz
Quoted 22 lines

Subject: [PATCH for-next 1/4] RDMA/irdma: Split MEM handler into irdma_reg_user_mr_type_mem

From: Zhu Yanjun <[email protected]>

The source codes related with IRDMA_MEMREG_TYPE_MEM are split into a new function irdma_reg_user_mr_type_mem.

---
  drivers/infiniband/hw/irdma/verbs.c | 85 +++++++++++++++++------------
  1 file changed, 51 insertions(+), 34 deletions(-)
drivers/infiniband/hw/irdma/verbs.c +0 -0
index f6973ea55eda..40109da6489a 100644
@@ -2745,6 +2745,55 @@ static int irdma_hwreg_mr(struct irdma_device *iwdev,
 struct irdma_mr *iwmr,
  	return ret;
  }
 
Quoted 6 lines

drivers/infiniband/hw/irdma/verbs.c static int irdma_hwreg_mr(struct irdma_device *iwdev, struct irdma_mr *iwmr, · line 2753

Quoted 5 lines
drivers/infiniband/hw/irdma/verbs.c +5 -0
+static int irdma_reg_user_mr_type_mem(struct irdma_device *iwdev,
+				      struct irdma_mr *iwmr, int access) {
+	int err = 0;
+	bool use_pbles = false;
+	u32 stag = 0;

No need to initialize any of these?

Got it.

Quoted 14 lines
Quoted 14 lines
drivers/infiniband/hw/irdma/verbs.c +13 -0
+	struct irdma_pbl *iwpbl = &iwmr->iwpbl;
+
+	use_pbles = (iwmr->page_cnt != 1);
+
+	err = irdma_setup_pbles(iwdev->rf, iwmr, use_pbles, false);
+	if (err)
+		return err;
+
+	if (use_pbles) {
+		err = irdma_check_mr_contiguous(&iwpbl->pble_alloc,
+						iwmr->page_size);
+		if (err) {
+			irdma_free_pble(iwdev->rf->pble_rsrc, &iwpbl-
Quoted 4 lines

drivers/infiniband/hw/irdma/verbs.c static int irdma_hwreg_mr(struct irdma_device *iwdev, struct irdma_mr *iwmr, · line 2768

Quoted 3 lines
drivers/infiniband/hw/irdma/verbs.c +2 -0
 > pble_alloc);
+			iwpbl->pbl_allocated = false;
+			return err;

No this should not cause an error. Just that we don't want to use pbles for this region. reset use_pbles to false here?

Got it.

Quoted 22 lines
Quoted 22 lines
drivers/infiniband/hw/irdma/verbs.c +20 -0
+		}
+	}
+
+	stag = irdma_create_stag(iwdev);
+	if (!stag) {
+		if (use_pbles) {
+			irdma_free_pble(iwdev->rf->pble_rsrc, &iwpbl-
 > pble_alloc);
+			iwpbl->pbl_allocated = false;
+		}
+		return -ENOMEM;
+	}
+
+	iwmr->stag = stag;
+	iwmr->ibmr.rkey = stag;
+	iwmr->ibmr.lkey = stag;
+	err = irdma_hwreg_mr(iwdev, iwmr, access);
+	if (err) {
+		irdma_free_stag(iwdev, stag);
+		if (use_pbles) {
+			irdma_free_pble(iwdev->rf->pble_rsrc, &iwpbl-
Quoted 5 lines

drivers/infiniband/hw/irdma/verbs.c

Quoted 2 lines
Quoted 1 line

pble_alloc);

drivers/infiniband/hw/irdma/verbs.c +1 -0
+			iwpbl->pbl_allocated = false;

Setting the iwpbl->pbl_allocated to false is not required. We are going to free up the iwmr memory on this error anyway.

Just a suggestion. Maybe just use a goto a label "free_pble" that does the irdma_free_pble and returns err. And re-use it for irdma_create_stag error unwind too.

Sure. I followed your advice in the latest commits.

Quoted 40 lines
Quoted 40 lines
drivers/infiniband/hw/irdma/verbs.c +8 -3
+		}
+		return err;
+	}
+
+	return err;
+}
+
  /**
   * irdma_reg_user_mr - Register a user memory region
   * @pd: ptr of pd
@@ -2761,17 +2810,15 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd
 *pd, u64 start, u64 len,  #define IRDMA_MEM_REG_MIN_REQ_LEN
 offsetofend(struct irdma_mem_reg_req, sq_pages)
  	struct irdma_device *iwdev = to_iwdev(pd->device);
  	struct irdma_ucontext *ucontext;
-	struct irdma_pble_alloc *palloc;
  	struct irdma_pbl *iwpbl;
  	struct irdma_mr *iwmr;
  	struct ib_umem *region;
  	struct irdma_mem_reg_req req;
-	u32 total, stag = 0;
+	u32 total;
  	u8 shadow_pgcnt = 1;
  	bool use_pbles = false;
  	unsigned long flags;
  	int err = -EINVAL;
-	int ret;
 
  	if (len > iwdev->rf->sc_dev.hw_attrs.max_mr_size)
  		return ERR_PTR(-EINVAL);
drivers/infiniband/hw/irdma/verbs.c +0 -1
@@ -2818,7 +2865,6 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd,
 u64 start, u64 len,
  	}
  	iwmr->len = region->length;
  	iwpbl->user_base = virt;
-	palloc = &iwpbl->pble_alloc;
  	iwmr->type = req.reg_type;
  	iwmr->page_cnt = ib_umem_num_dma_blocks(region, iwmr->page_size);
Quoted 10 lines

drivers/infiniband/hw/irdma/verbs.c static struct ib_mr *irdma_reg_user_mr(struct ib_pd · line 2914

Quoted 9 lines
drivers/infiniband/hw/irdma/verbs.c +1 -3
@@ -2864,36 +2910,9 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd
 *pd, u64 start, u64 len,
  		spin_unlock_irqrestore(&ucontext->cq_reg_mem_list_lock, flags);
  		break;
  	case IRDMA_MEMREG_TYPE_MEM:
-		use_pbles = (iwmr->page_cnt != 1);
-
-		err = irdma_setup_pbles(iwdev->rf, iwmr, use_pbles, false);
+		err = irdma_reg_user_mr_type_mem(iwdev, iwmr, access);

Perhaps you can just pass the iwmr and access as args for this API and compute the iwdev in the function using to_iwdev(iwmr->ibmr.device)

Got it. I followed your advice in the latest commits.

I will send out the latest commits very soon.

Zhu Yanjun

Quoted 43 lines
Quoted 43 lines
drivers/infiniband/hw/irdma/verbs.c +0 -25
  		if (err)
  			goto error;
-
-		if (use_pbles) {
-			ret = irdma_check_mr_contiguous(palloc,
-							iwmr->page_size);
-			if (ret) {
-				irdma_free_pble(iwdev->rf->pble_rsrc, palloc);
-				iwpbl->pbl_allocated = false;
-			}
-		}
-
-		stag = irdma_create_stag(iwdev);
-		if (!stag) {
-			err = -ENOMEM;
-			goto error;
-		}
-
-		iwmr->stag = stag;
-		iwmr->ibmr.rkey = stag;
-		iwmr->ibmr.lkey = stag;
-		err = irdma_hwreg_mr(iwdev, iwmr, access);
-		if (err) {
-			irdma_free_stag(iwdev, stag);
-			goto error;
-		}
-
  		break;
  	default:

goto error;

drivers/infiniband/hw/irdma/verbs.c +0 -3
@@ -2904,8 +2923,6 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd,
 u64 start, u64 len,
  	return &iwmr->ibmr;
 
  error:
-	if (palloc->level != PBLE_LEVEL_0 && iwpbl->pbl_allocated)
-		irdma_free_pble(iwdev->rf->pble_rsrc, palloc);
  	ib_umem_release(region);
  	kfree(iwmr);
 
--

2.27.0

author
#4 lore raw

PATCH 2/4 RDMA/irdma: Split mr alloc and free into new functions

In reply to Zhu Yanjun

From: Zhu Yanjun <[email protected]>

In the function irdma_reg_user_mr, the mr allocation and free will be used by other functions. As such, the source codes related with mr allocation and free are split into the new functions.

---
 drivers/infiniband/hw/irdma/verbs.c | 78 ++++++++++++++++++-----------
 1 file changed, 50 insertions(+), 28 deletions(-)
drivers/infiniband/hw/irdma/verbs.c +50 -28
index 40109da6489a..5cff8656d79e 100644
@@ -2794,6 +2794,52 @@ static int irdma_reg_user_mr_type_mem(struct irdma_device *iwdev,
 	return err;
 }
 
+static struct irdma_mr *irdma_alloc_iwmr(struct ib_umem *region,
+					 struct ib_pd *pd, u64 virt,
+					 __u16 reg_type,
+					 struct irdma_device *iwdev)
+{
+	struct irdma_mr *iwmr;
+	struct irdma_pbl *iwpbl;
+
+	iwmr = kzalloc(sizeof(*iwmr), GFP_KERNEL);
+	if (!iwmr)
+		return ERR_PTR(-ENOMEM);
+
+	iwpbl = &iwmr->iwpbl;
+	iwpbl->iwmr = iwmr;
+	iwmr->region = region;
+	iwmr->ibmr.pd = pd;
+	iwmr->ibmr.device = pd->device;
+	iwmr->ibmr.iova = virt;
+	iwmr->page_size = PAGE_SIZE;
+	iwmr->type = reg_type;
+
+	if (reg_type == IRDMA_MEMREG_TYPE_MEM) {
+		iwmr->page_size = ib_umem_find_best_pgsz(region,
+							 iwdev->rf->sc_dev.hw_attrs.page_size_cap,
+							 virt);
+		if (unlikely(!iwmr->page_size)) {
+			kfree(iwmr);
+			return ERR_PTR(-EOPNOTSUPP);
+		}
+	}
+
+	iwmr->len = region->length;
+	iwpbl->user_base = virt;
+	iwmr->page_cnt = ib_umem_num_dma_blocks(region, iwmr->page_size);
+
+	return iwmr;
+}
+
+/*
+ * This function frees the resources from irdma_alloc_iwmr
+ */
+static void irdma_free_iwmr(struct irdma_mr *iwmr)
+{
+	kfree(iwmr);
+}
+
 /**
  * irdma_reg_user_mr - Register a user memory region
  * @pd: ptr of pd
@@ -2839,34 +2885,13 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len,
 		return ERR_PTR(-EFAULT);
 	}
 
-	iwmr = kzalloc(sizeof(*iwmr), GFP_KERNEL);
-	if (!iwmr) {
+	iwmr = irdma_alloc_iwmr(region, pd, virt, req.reg_type, iwdev);
+	if (IS_ERR(iwmr)) {
 		ib_umem_release(region);
-		return ERR_PTR(-ENOMEM);
+		return (struct ib_mr *)iwmr;
 	}
 
 	iwpbl = &iwmr->iwpbl;
-	iwpbl->iwmr = iwmr;
-	iwmr->region = region;
-	iwmr->ibmr.pd = pd;
-	iwmr->ibmr.device = pd->device;
-	iwmr->ibmr.iova = virt;
-	iwmr->page_size = PAGE_SIZE;
-
-	if (req.reg_type == IRDMA_MEMREG_TYPE_MEM) {
-		iwmr->page_size = ib_umem_find_best_pgsz(region,
-							 iwdev->rf->sc_dev.hw_attrs.page_size_cap,
-							 virt);
-		if (unlikely(!iwmr->page_size)) {
-			kfree(iwmr);
-			ib_umem_release(region);
-			return ERR_PTR(-EOPNOTSUPP);
-		}
-	}
-	iwmr->len = region->length;
-	iwpbl->user_base = virt;
-	iwmr->type = req.reg_type;
-	iwmr->page_cnt = ib_umem_num_dma_blocks(region, iwmr->page_size);
 
 	switch (req.reg_type) {
 	case IRDMA_MEMREG_TYPE_QP:
@@ -2918,13 +2943,10 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len,
 		goto error;
 	}
 
-	iwmr->type = req.reg_type;
-
 	return &iwmr->ibmr;
-
 error:
 	ib_umem_release(region);
-	kfree(iwmr);
+	irdma_free_iwmr(iwmr);
 
 	return ERR_PTR(err);
 }
Signature · 1 line
2.27.0
#5 lore raw

RE: [PATCH for-next 2/4] RDMA/irdma: Split mr alloc and free into new functions

Quoted 19 lines

Subject: [PATCH for-next 2/4] RDMA/irdma: Split mr alloc and free into new functions

From: Zhu Yanjun <[email protected]>

In the function irdma_reg_user_mr, the mr allocation and free will be used by other functions. As such, the source codes related with mr allocation and free are split into the new functions.

---
 drivers/infiniband/hw/irdma/verbs.c | 78 ++++++++++++++++++-----------
 1 file changed, 50 insertions(+), 28 deletions(-)
drivers/infiniband/hw/irdma/verbs.c +0 -0
index 40109da6489a..5cff8656d79e 100644

drivers/infiniband/hw/irdma/verbs.c static int irdma_reg_user_mr_type_mem(struct · line 2800

Quoted 7 lines
drivers/infiniband/hw/irdma/verbs.c +3 -0
@@ -2794,6 +2794,52 @@ static int irdma_reg_user_mr_type_mem(struct
 irdma_device *iwdev,
 	return err;
 }
 
+static struct irdma_mr *irdma_alloc_iwmr(struct ib_umem *region,
+					 struct ib_pd *pd, u64 virt,
+					 __u16 reg_type,

enum irdma_memreg_type

Quoted 6 lines
drivers/infiniband/hw/irdma/verbs.c +6 -0
+					 struct irdma_device *iwdev)
+{
+	struct irdma_mr *iwmr;
+	struct irdma_pbl *iwpbl;
+
+	iwmr = kzalloc(sizeof(*iwmr), GFP_KERNEL);

drivers/infiniband/hw/irdma/verbs.c static int irdma_reg_user_mr_type_mem(struct irdma_device *iwdev, · line 2815

Quoted 10 lines
drivers/infiniband/hw/irdma/verbs.c +10 -0
+	if (!iwmr)
+		return ERR_PTR(-ENOMEM);
+
+	iwpbl = &iwmr->iwpbl;
+	iwpbl->iwmr = iwmr;
+	iwmr->region = region;
+	iwmr->ibmr.pd = pd;
+	iwmr->ibmr.device = pd->device;
+	iwmr->ibmr.iova = virt;
+	iwmr->page_size = PAGE_SIZE;

Delete this and see comment below,

drivers/infiniband/hw/irdma/verbs.c static int irdma_reg_user_mr_type_mem(struct irdma_device *iwdev,

Quoted 6 lines
drivers/infiniband/hw/irdma/verbs.c +5 -0
+	iwmr->type = reg_type;
+
+	if (reg_type == IRDMA_MEMREG_TYPE_MEM) {
+		iwmr->page_size = ib_umem_find_best_pgsz(region,
+							 iwdev->rf-
 >sc_dev.hw_attrs.page_size_cap,

I think Jason made the comment to always validate the page size with this function before use in rdma_umem_for_each_dma_block.

we can move it out of this if block with something like,

pgsz_bitmask = reg_type == IRDMA_MEMREG_TYPE_MEM ?

			iwdev->rf->sc_dev.hw_attrs.page_size_cap : PAGE_SIZE;

iwmr->page_size = ib_umem_find_best_pgsz(region, pgsz_bitmask, virt);

Quoted 6 lines
drivers/infiniband/hw/irdma/verbs.c +6 -0
+							 virt);
+		if (unlikely(!iwmr->page_size)) {
+			kfree(iwmr);
+			return ERR_PTR(-EOPNOTSUPP);
+		}
+	}

drivers/infiniband/hw/irdma/verbs.c static int irdma_reg_user_mr_type_mem(struct irdma_device *iwdev,

Quoted 10 lines
drivers/infiniband/hw/irdma/verbs.c +10 -0
+
+	iwmr->len = region->length;
+	iwpbl->user_base = virt;
+	iwmr->page_cnt = ib_umem_num_dma_blocks(region, iwmr->page_size);
+
+	return iwmr;
+}
+
+/*
+ * This function frees the resources from irdma_alloc_iwmr  */ static

This doesn't follow kdoc format? And not very useful. I would delete it.

Quoted 65 lines
drivers/infiniband/hw/irdma/verbs.c +7 -24
+void irdma_free_iwmr(struct irdma_mr *iwmr) {
+	kfree(iwmr);
+}
+
 /**
  * irdma_reg_user_mr - Register a user memory region
  * @pd: ptr of pd
@@ -2839,34 +2885,13 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd
 *pd, u64 start, u64 len,
 		return ERR_PTR(-EFAULT);
 	}
 
-	iwmr = kzalloc(sizeof(*iwmr), GFP_KERNEL);
-	if (!iwmr) {
+	iwmr = irdma_alloc_iwmr(region, pd, virt, req.reg_type, iwdev);
+	if (IS_ERR(iwmr)) {
 		ib_umem_release(region);
-		return ERR_PTR(-ENOMEM);
+		return (struct ib_mr *)iwmr;
 	}
 
 	iwpbl = &iwmr->iwpbl;
-	iwpbl->iwmr = iwmr;
-	iwmr->region = region;
-	iwmr->ibmr.pd = pd;
-	iwmr->ibmr.device = pd->device;
-	iwmr->ibmr.iova = virt;
-	iwmr->page_size = PAGE_SIZE;
-
-	if (req.reg_type == IRDMA_MEMREG_TYPE_MEM) {
-		iwmr->page_size = ib_umem_find_best_pgsz(region,
-							 iwdev->rf-
 >sc_dev.hw_attrs.page_size_cap,
-							 virt);
-		if (unlikely(!iwmr->page_size)) {
-			kfree(iwmr);
-			ib_umem_release(region);
-			return ERR_PTR(-EOPNOTSUPP);
-		}
-	}
-	iwmr->len = region->length;
-	iwpbl->user_base = virt;
-	iwmr->type = req.reg_type;
-	iwmr->page_cnt = ib_umem_num_dma_blocks(region, iwmr->page_size);
 
drivers/infiniband/hw/irdma/verbs.c +1 -4
 	switch (req.reg_type) {
 	case IRDMA_MEMREG_TYPE_QP:
@@ -2918,13 +2943,10 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd
 *pd, u64 start, u64 len,
 		goto error;
 	}
 
-	iwmr->type = req.reg_type;
-
 	return &iwmr->ibmr;
-
 error:
 	ib_umem_release(region);
-	kfree(iwmr);
+	irdma_free_iwmr(iwmr);
 
 	return ERR_PTR(err);

}
--
2.27.0

#6 lore raw

Re: [PATCH for-next 2/4] RDMA/irdma: Split mr alloc and free into new functions

Quoted 23 lines · Shiraz
Quoted 23 lines

Subject: [PATCH for-next 2/4] RDMA/irdma: Split mr alloc and free into new functions

From: Zhu Yanjun <[email protected]>

In the function irdma_reg_user_mr, the mr allocation and free will be used by other functions. As such, the source codes related with mr allocation and free are split into the new functions.

---
  drivers/infiniband/hw/irdma/verbs.c | 78 ++++++++++++++++++-----------
  1 file changed, 50 insertions(+), 28 deletions(-)
drivers/infiniband/hw/irdma/verbs.c +0 -0
index 40109da6489a..5cff8656d79e 100644
@@ -2794,6 +2794,52 @@ static int irdma_reg_user_mr_type_mem(struct
 irdma_device *iwdev,
  	return err;
  }
 
Quoted 4 lines

drivers/infiniband/hw/irdma/verbs.c static int irdma_reg_user_mr_type_mem(struct irdma_device *iwdev, · line 2799

Quoted 3 lines
drivers/infiniband/hw/irdma/verbs.c +3 -0
+static struct irdma_mr *irdma_alloc_iwmr(struct ib_umem *region,
+					 struct ib_pd *pd, u64 virt,
+					 __u16 reg_type,

enum irdma_memreg_type

Good catch

Quoted 10 lines
Quoted 10 lines
drivers/infiniband/hw/irdma/verbs.c +9 -0
+					 struct irdma_device *iwdev)
+{
+	struct irdma_mr *iwmr;
+	struct irdma_pbl *iwpbl;
+
+	iwmr = kzalloc(sizeof(*iwmr), GFP_KERNEL);
+	if (!iwmr)
+		return ERR_PTR(-ENOMEM);
+
Quoted 8 lines

drivers/infiniband/hw/irdma/verbs.c static int irdma_reg_user_mr_type_mem(struct irdma_device *iwdev, · line 2815

Quoted 7 lines
drivers/infiniband/hw/irdma/verbs.c +7 -0
+	iwpbl = &iwmr->iwpbl;
+	iwpbl->iwmr = iwmr;
+	iwmr->region = region;
+	iwmr->ibmr.pd = pd;
+	iwmr->ibmr.device = pd->device;
+	iwmr->ibmr.iova = virt;
+	iwmr->page_size = PAGE_SIZE;

Delete this and see comment below,

Will delete.

Quoted 7 lines

drivers/infiniband/hw/irdma/verbs.c static int irdma_reg_user_mr_type_mem(struct irdma_device *iwdev,

Quoted 7 lines
drivers/infiniband/hw/irdma/verbs.c +5 -0
+	iwmr->type = reg_type;
+
+	if (reg_type == IRDMA_MEMREG_TYPE_MEM) {
+		iwmr->page_size = ib_umem_find_best_pgsz(region,
+							 iwdev->rf-
 > sc_dev.hw_attrs.page_size_cap,
Quoted 8 lines

I think Jason made the comment to always validate the page size with this function before use in rdma_umem_for_each_dma_block.

we can move it out of this if block with something like,

pgsz_bitmask = reg_type == IRDMA_MEMREG_TYPE_MEM ?

			iwdev->rf->sc_dev.hw_attrs.page_size_cap : PAGE_SIZE;

iwmr->page_size = ib_umem_find_best_pgsz(region, pgsz_bitmask, virt);

Wonderful. I followed your suggestions in the latest commits.

Quoted 12 lines
Quoted 12 lines
drivers/infiniband/hw/irdma/verbs.c +9 -0
+							 virt);
+		if (unlikely(!iwmr->page_size)) {
+			kfree(iwmr);
+			return ERR_PTR(-EOPNOTSUPP);
+		}
+	}
+
+	iwmr->len = region->length;
+	iwpbl->user_base = virt;
Quoted 8 lines

drivers/infiniband/hw/irdma/verbs.c static int irdma_reg_user_mr_type_mem(struct irdma_device *iwdev,

Quoted 7 lines
drivers/infiniband/hw/irdma/verbs.c +7 -0
+	iwmr->page_cnt = ib_umem_num_dma_blocks(region, iwmr->page_size);
+
+	return iwmr;
+}
+
+/*
+ * This function frees the resources from irdma_alloc_iwmr  */ static

This doesn't follow kdoc format? And not very useful. I would delete it.

Will delete.

Appreciate your helps. I will send out the latest commits very soon.

Zhu Yanjun

Quoted 66 lines
Quoted 66 lines
drivers/infiniband/hw/irdma/verbs.c +7 -24
+void irdma_free_iwmr(struct irdma_mr *iwmr) {
+	kfree(iwmr);
+}
+
  /**
   * irdma_reg_user_mr - Register a user memory region
   * @pd: ptr of pd
@@ -2839,34 +2885,13 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd
 *pd, u64 start, u64 len,
  		return ERR_PTR(-EFAULT);
  	}
 
-	iwmr = kzalloc(sizeof(*iwmr), GFP_KERNEL);
-	if (!iwmr) {
+	iwmr = irdma_alloc_iwmr(region, pd, virt, req.reg_type, iwdev);
+	if (IS_ERR(iwmr)) {
  		ib_umem_release(region);
-		return ERR_PTR(-ENOMEM);
+		return (struct ib_mr *)iwmr;
  	}
 
  	iwpbl = &iwmr->iwpbl;
-	iwpbl->iwmr = iwmr;
-	iwmr->region = region;
-	iwmr->ibmr.pd = pd;
-	iwmr->ibmr.device = pd->device;
-	iwmr->ibmr.iova = virt;
-	iwmr->page_size = PAGE_SIZE;
-
-	if (req.reg_type == IRDMA_MEMREG_TYPE_MEM) {
-		iwmr->page_size = ib_umem_find_best_pgsz(region,
-							 iwdev->rf-
 > sc_dev.hw_attrs.page_size_cap,
-							 virt);
-		if (unlikely(!iwmr->page_size)) {
-			kfree(iwmr);
-			ib_umem_release(region);
-			return ERR_PTR(-EOPNOTSUPP);
-		}
-	}
-	iwmr->len = region->length;
-	iwpbl->user_base = virt;
-	iwmr->type = req.reg_type;
-	iwmr->page_cnt = ib_umem_num_dma_blocks(region, iwmr->page_size);
 
  	switch (req.reg_type) {
  	case IRDMA_MEMREG_TYPE_QP:
drivers/infiniband/hw/irdma/verbs.c +1 -4
@@ -2918,13 +2943,10 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd
 *pd, u64 start, u64 len,
  		goto error;
  	}
 
-	iwmr->type = req.reg_type;
-
  	return &iwmr->ibmr;
-
  error:
  	ib_umem_release(region);
-	kfree(iwmr);
+	irdma_free_iwmr(iwmr);
 
  	return ERR_PTR(err);

}
--
2.27.0

author
#7 lore raw

PATCH 3/4 RDMA/irdma: Split QP handler into irdma_reg_user_mr_type_qp

In reply to Zhu Yanjun

From: Zhu Yanjun <[email protected]>

Split the source codes related with QP handling into a new function.

---
 drivers/infiniband/hw/irdma/verbs.c | 48 ++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 14 deletions(-)
drivers/infiniband/hw/irdma/verbs.c +34 -14
index 287d4313f14d..e90eba73c396 100644
@@ -2831,6 +2831,39 @@ static void irdma_free_iwmr(struct irdma_mr *iwmr)
 	kfree(iwmr);
 }
 
+static int irdma_reg_user_mr_type_qp(struct irdma_mem_reg_req req,
+				     struct irdma_device *iwdev,
+				     struct ib_udata *udata,
+				     struct irdma_mr *iwmr)
+{
+	u32 total;
+	int err = 0;
+	u8 shadow_pgcnt = 1;
+	bool use_pbles = false;
+	unsigned long flags;
+	struct irdma_ucontext *ucontext;
+	struct irdma_pbl *iwpbl = &iwmr->iwpbl;
+
+	total = req.sq_pages + req.rq_pages + shadow_pgcnt;
+	if (total > iwmr->page_cnt)
+		return -EINVAL;
+
+	total = req.sq_pages + req.rq_pages;
+	use_pbles = (total > 2);
+	err = irdma_handle_q_mem(iwdev, &req, iwpbl, use_pbles);
+	if (err)
+		return err;
+
+	ucontext = rdma_udata_to_drv_context(udata, struct irdma_ucontext,
+					     ibucontext);
+	spin_lock_irqsave(&ucontext->qp_reg_mem_list_lock, flags);
+	list_add_tail(&iwpbl->list, &ucontext->qp_reg_mem_list);
+	iwpbl->on_list = true;
+	spin_unlock_irqrestore(&ucontext->qp_reg_mem_list_lock, flags);
+
+	return err;
+}
+
 /**
  * irdma_reg_user_mr - Register a user memory region
  * @pd: ptr of pd
@@ -2886,23 +2919,10 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len,
 
 	switch (req.reg_type) {
 	case IRDMA_MEMREG_TYPE_QP:
-		total = req.sq_pages + req.rq_pages + shadow_pgcnt;
-		if (total > iwmr->page_cnt) {
-			err = -EINVAL;
-			goto error;
-		}
-		total = req.sq_pages + req.rq_pages;
-		use_pbles = (total > 2);
-		err = irdma_handle_q_mem(iwdev, &req, iwpbl, use_pbles);
+		err = irdma_reg_user_mr_type_qp(req, iwdev, udata, iwmr);
 		if (err)
 			goto error;
 
-		ucontext = rdma_udata_to_drv_context(udata, struct irdma_ucontext,
-						     ibucontext);
-		spin_lock_irqsave(&ucontext->qp_reg_mem_list_lock, flags);
-		list_add_tail(&iwpbl->list, &ucontext->qp_reg_mem_list);
-		iwpbl->on_list = true;
-		spin_unlock_irqrestore(&ucontext->qp_reg_mem_list_lock, flags);
 		break;
 	case IRDMA_MEMREG_TYPE_CQ:
 		if (iwdev->rf->sc_dev.hw_attrs.uk_attrs.feature_flags & IRDMA_FEATURE_CQ_RESIZE)
Signature · 1 line
2.31.1
#8 lore raw

RE: [PATCH for-next 3/4] RDMA/irdma: Split QP handler into irdma_reg_user_mr_type_qp

Quoted 17 lines

Subject: [PATCH for-next 3/4] RDMA/irdma: Split QP handler into irdma_reg_user_mr_type_qp

From: Zhu Yanjun <[email protected]>

Split the source codes related with QP handling into a new function.

---
 drivers/infiniband/hw/irdma/verbs.c | 48 ++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 14 deletions(-)
drivers/infiniband/hw/irdma/verbs.c +0 -0
index 287d4313f14d..e90eba73c396 100644

drivers/infiniband/hw/irdma/verbs.c static void irdma_free_iwmr(struct irdma_mr *iwmr) · line 2837

Quoted 7 lines
drivers/infiniband/hw/irdma/verbs.c +4 -0
@@ -2831,6 +2831,39 @@ static void irdma_free_iwmr(struct irdma_mr *iwmr)
 	kfree(iwmr);
 }
 
+static int irdma_reg_user_mr_type_qp(struct irdma_mem_reg_req req,
+				     struct irdma_device *iwdev,
+				     struct ib_udata *udata,
+				     struct irdma_mr *iwmr)

You could omit iwdev and compute it from iwmr.

drivers/infiniband/hw/irdma/verbs.c static void irdma_free_iwmr(struct irdma_mr *iwmr) · line 2840

Quoted 3 lines
drivers/infiniband/hw/irdma/verbs.c +3 -0
+{
+	u32 total;
+	int err = 0;

No need to initialize.

drivers/infiniband/hw/irdma/verbs.c static void irdma_free_iwmr(struct irdma_mr *iwmr) · line 2842

Quoted 3 lines
drivers/infiniband/hw/irdma/verbs.c +2 -0
+	u8 shadow_pgcnt = 1;
 
+	bool use_pbles = false;

No need to initialize use_pbles.

Quoted 57 lines
drivers/infiniband/hw/irdma/verbs.c +24 -0
+	unsigned long flags;
+	struct irdma_ucontext *ucontext;
+	struct irdma_pbl *iwpbl = &iwmr->iwpbl;
+
+	total = req.sq_pages + req.rq_pages + shadow_pgcnt;
+	if (total > iwmr->page_cnt)
+		return -EINVAL;
+
+	total = req.sq_pages + req.rq_pages;
+	use_pbles = (total > 2);
+	err = irdma_handle_q_mem(iwdev, &req, iwpbl, use_pbles);
+	if (err)
+		return err;
+
+	ucontext = rdma_udata_to_drv_context(udata, struct irdma_ucontext,
+					     ibucontext);
+	spin_lock_irqsave(&ucontext->qp_reg_mem_list_lock, flags);
+	list_add_tail(&iwpbl->list, &ucontext->qp_reg_mem_list);
+	iwpbl->on_list = true;
+	spin_unlock_irqrestore(&ucontext->qp_reg_mem_list_lock, flags);
+
+	return err;
+}
+
 /**
  * irdma_reg_user_mr - Register a user memory region

* @pd: ptr of pd

drivers/infiniband/hw/irdma/verbs.c +1 -14
@@ -2886,23 +2919,10 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd
 *pd, u64 start, u64 len,
 
 	switch (req.reg_type) {
 	case IRDMA_MEMREG_TYPE_QP:
-		total = req.sq_pages + req.rq_pages + shadow_pgcnt;
-		if (total > iwmr->page_cnt) {
-			err = -EINVAL;
-			goto error;
-		}
-		total = req.sq_pages + req.rq_pages;
-		use_pbles = (total > 2);
-		err = irdma_handle_q_mem(iwdev, &req, iwpbl, use_pbles);
+		err = irdma_reg_user_mr_type_qp(req, iwdev, udata, iwmr);
 		if (err)
 			goto error;
 
-		ucontext = rdma_udata_to_drv_context(udata, struct
 irdma_ucontext,
-						     ibucontext);
-		spin_lock_irqsave(&ucontext->qp_reg_mem_list_lock, flags);
-		list_add_tail(&iwpbl->list, &ucontext->qp_reg_mem_list);
-		iwpbl->on_list = true;
-		spin_unlock_irqrestore(&ucontext->qp_reg_mem_list_lock, flags);
 		break;
drivers/infiniband/hw/irdma/verbs.c +0 -0
 	case IRDMA_MEMREG_TYPE_CQ:
 		if (iwdev->rf->sc_dev.hw_attrs.uk_attrs.feature_flags &

IRDMA_FEATURE_CQ_RESIZE)
--
2.31.1

#9 lore raw

Re: [PATCH for-next 3/4] RDMA/irdma: Split QP handler into irdma_reg_user_mr_type_qp

Quoted 20 lines · Shiraz
Quoted 20 lines

Subject: [PATCH for-next 3/4] RDMA/irdma: Split QP handler into irdma_reg_user_mr_type_qp

From: Zhu Yanjun <[email protected]>

Split the source codes related with QP handling into a new function.

---
  drivers/infiniband/hw/irdma/verbs.c | 48 ++++++++++++++++++++---------
  1 file changed, 34 insertions(+), 14 deletions(-)
drivers/infiniband/hw/irdma/verbs.c +0 -0
index 287d4313f14d..e90eba73c396 100644
@@ -2831,6 +2831,39 @@ static void irdma_free_iwmr(struct irdma_mr *iwmr)
  	kfree(iwmr);
  }
 
Quoted 5 lines

drivers/infiniband/hw/irdma/verbs.c static void irdma_free_iwmr(struct irdma_mr *iwmr) · line 2837

Quoted 4 lines
drivers/infiniband/hw/irdma/verbs.c +4 -0
+static int irdma_reg_user_mr_type_qp(struct irdma_mem_reg_req req,
+				     struct irdma_device *iwdev,
+				     struct ib_udata *udata,
+				     struct irdma_mr *iwmr)

You could omit iwdev and compute it from iwmr.

Got it.

Quoted 5 lines

drivers/infiniband/hw/irdma/verbs.c static void irdma_free_iwmr(struct irdma_mr *iwmr) · line 2840

Quoted 4 lines
drivers/infiniband/hw/irdma/verbs.c +3 -0
+{
+	u32 total;
+	int err = 0;

No need to initialize.

Got it.

Quoted 5 lines

drivers/infiniband/hw/irdma/verbs.c static void irdma_free_iwmr(struct irdma_mr *iwmr) · line 2842

Quoted 3 lines
drivers/infiniband/hw/irdma/verbs.c +2 -0
+	u8 shadow_pgcnt = 1;
+	bool use_pbles = false;

No need to initialize use_pbles.

Thanks. I will send out the latest commits very soon.

Zhu Yanjun

Quoted 59 lines
Quoted 59 lines
drivers/infiniband/hw/irdma/verbs.c +25 -14
+	unsigned long flags;
+	struct irdma_ucontext *ucontext;
+	struct irdma_pbl *iwpbl = &iwmr->iwpbl;
+
+	total = req.sq_pages + req.rq_pages + shadow_pgcnt;
+	if (total > iwmr->page_cnt)
+		return -EINVAL;
+
+	total = req.sq_pages + req.rq_pages;
+	use_pbles = (total > 2);
+	err = irdma_handle_q_mem(iwdev, &req, iwpbl, use_pbles);
+	if (err)
+		return err;
+
+	ucontext = rdma_udata_to_drv_context(udata, struct irdma_ucontext,
+					     ibucontext);
+	spin_lock_irqsave(&ucontext->qp_reg_mem_list_lock, flags);
+	list_add_tail(&iwpbl->list, &ucontext->qp_reg_mem_list);
+	iwpbl->on_list = true;
+	spin_unlock_irqrestore(&ucontext->qp_reg_mem_list_lock, flags);
+
+	return err;
+}
+
  /**
   * irdma_reg_user_mr - Register a user memory region
   * @pd: ptr of pd
@@ -2886,23 +2919,10 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd
 *pd, u64 start, u64 len,
 
  	switch (req.reg_type) {
  	case IRDMA_MEMREG_TYPE_QP:
-		total = req.sq_pages + req.rq_pages + shadow_pgcnt;
-		if (total > iwmr->page_cnt) {
-			err = -EINVAL;
-			goto error;
-		}
-		total = req.sq_pages + req.rq_pages;
-		use_pbles = (total > 2);
-		err = irdma_handle_q_mem(iwdev, &req, iwpbl, use_pbles);
+		err = irdma_reg_user_mr_type_qp(req, iwdev, udata, iwmr);
  		if (err)
  			goto error;
 
-		ucontext = rdma_udata_to_drv_context(udata, struct
 irdma_ucontext,
-						     ibucontext);
-		spin_lock_irqsave(&ucontext->qp_reg_mem_list_lock, flags);
-		list_add_tail(&iwpbl->list, &ucontext->qp_reg_mem_list);
-		iwpbl->on_list = true;
-		spin_unlock_irqrestore(&ucontext->qp_reg_mem_list_lock, flags);
  		break;

case IRDMA_MEMREG_TYPE_CQ:
if (iwdev->rf->sc_dev.hw_attrs.uk_attrs.feature_flags &
IRDMA_FEATURE_CQ_RESIZE)
--
2.31.1

author
#10 lore raw

PATCH 4/4 RDMA/irdma: Split CQ handler into irdma_reg_user_mr_type_cq

In reply to Zhu Yanjun

From: Zhu Yanjun <[email protected]>

Split the source codes related with CQ handling into a new function.

---
 drivers/infiniband/hw/irdma/verbs.c | 60 +++++++++++++++++------------
 1 file changed, 35 insertions(+), 25 deletions(-)
drivers/infiniband/hw/irdma/verbs.c +35 -25
index e90eba73c396..b4befbafb830 100644
@@ -2864,6 +2864,40 @@ static int irdma_reg_user_mr_type_qp(struct irdma_mem_reg_req req,
 	return err;
 }
 
+static int irdma_reg_user_mr_type_cq(struct irdma_device *iwdev,
+				     struct irdma_mr *iwmr,
+				     struct ib_udata *udata,
+				     struct irdma_mem_reg_req req)
+{
+	int err = 0;
+	u8 shadow_pgcnt = 1;
+	bool use_pbles = false;
+	struct irdma_ucontext *ucontext;
+	unsigned long flags;
+	u32 total;
+	struct irdma_pbl *iwpbl = &iwmr->iwpbl;
+
+	if (iwdev->rf->sc_dev.hw_attrs.uk_attrs.feature_flags & IRDMA_FEATURE_CQ_RESIZE)
+		shadow_pgcnt = 0;
+	total = req.cq_pages + shadow_pgcnt;
+	if (total > iwmr->page_cnt)
+		return -EINVAL;
+
+	use_pbles = (req.cq_pages > 1);
+	err = irdma_handle_q_mem(iwdev, &req, iwpbl, use_pbles);
+	if (err)
+		return err;
+
+	ucontext = rdma_udata_to_drv_context(udata, struct irdma_ucontext,
+					     ibucontext);
+	spin_lock_irqsave(&ucontext->cq_reg_mem_list_lock, flags);
+	list_add_tail(&iwpbl->list, &ucontext->cq_reg_mem_list);
+	iwpbl->on_list = true;
+	spin_unlock_irqrestore(&ucontext->cq_reg_mem_list_lock, flags);
+
+	return err;
+}
+
 /**
  * irdma_reg_user_mr - Register a user memory region
  * @pd: ptr of pd
@@ -2879,15 +2913,9 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len,
 {
 #define IRDMA_MEM_REG_MIN_REQ_LEN offsetofend(struct irdma_mem_reg_req, sq_pages)
 	struct irdma_device *iwdev = to_iwdev(pd->device);
-	struct irdma_ucontext *ucontext;
-	struct irdma_pbl *iwpbl;
 	struct irdma_mr *iwmr;
 	struct ib_umem *region;
 	struct irdma_mem_reg_req req;
-	u32 total;
-	u8 shadow_pgcnt = 1;
-	bool use_pbles = false;
-	unsigned long flags;
 	int err = -EINVAL;
 
 	if (len > iwdev->rf->sc_dev.hw_attrs.max_mr_size)
@@ -2915,8 +2943,6 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len,
 		return (struct ib_mr *)iwmr;
 	}
 
-	iwpbl = &iwmr->iwpbl;
-
 	switch (req.reg_type) {
 	case IRDMA_MEMREG_TYPE_QP:
 		err = irdma_reg_user_mr_type_qp(req, iwdev, udata, iwmr);
@@ -2925,25 +2951,9 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len,
 
 		break;
 	case IRDMA_MEMREG_TYPE_CQ:
-		if (iwdev->rf->sc_dev.hw_attrs.uk_attrs.feature_flags & IRDMA_FEATURE_CQ_RESIZE)
-			shadow_pgcnt = 0;
-		total = req.cq_pages + shadow_pgcnt;
-		if (total > iwmr->page_cnt) {
-			err = -EINVAL;
-			goto error;
-		}
-
-		use_pbles = (req.cq_pages > 1);
-		err = irdma_handle_q_mem(iwdev, &req, iwpbl, use_pbles);
+		err = irdma_reg_user_mr_type_cq(iwdev, iwmr, udata, req);
 		if (err)
 			goto error;
-
-		ucontext = rdma_udata_to_drv_context(udata, struct irdma_ucontext,
-						     ibucontext);
-		spin_lock_irqsave(&ucontext->cq_reg_mem_list_lock, flags);
-		list_add_tail(&iwpbl->list, &ucontext->cq_reg_mem_list);
-		iwpbl->on_list = true;
-		spin_unlock_irqrestore(&ucontext->cq_reg_mem_list_lock, flags);
 		break;
 	case IRDMA_MEMREG_TYPE_MEM:
 		err = irdma_reg_user_mr_type_mem(iwdev, iwmr, access);
Signature · 1 line
2.31.1
#11 lore raw

RE: [PATCH for-next 4/4] RDMA/irdma: Split CQ handler into irdma_reg_user_mr_type_cq

Quoted 17 lines

Subject: [PATCH for-next 4/4] RDMA/irdma: Split CQ handler into irdma_reg_user_mr_type_cq

From: Zhu Yanjun <[email protected]>

Split the source codes related with CQ handling into a new function.

---
 drivers/infiniband/hw/irdma/verbs.c | 60 +++++++++++++++++------------
 1 file changed, 35 insertions(+), 25 deletions(-)
drivers/infiniband/hw/irdma/verbs.c +0 -0
index e90eba73c396..b4befbafb830 100644

drivers/infiniband/hw/irdma/verbs.c static int irdma_reg_user_mr_type_qp(struct · line 2871

Quoted 8 lines
drivers/infiniband/hw/irdma/verbs.c +4 -0
@@ -2864,6 +2864,40 @@ static int irdma_reg_user_mr_type_qp(struct
 irdma_mem_reg_req req,
 	return err;
 }
 
+static int irdma_reg_user_mr_type_cq(struct irdma_device *iwdev,
+				     struct irdma_mr *iwmr,
+				     struct ib_udata *udata,
+				     struct irdma_mem_reg_req req)

I would keep the order of these API args same as the one for irdma_reg_user_mr_type_qp.

drivers/infiniband/hw/irdma/verbs.c static int irdma_reg_user_mr_type_qp(struct irdma_mem_reg_req req, · line 2872

Quoted 2 lines
drivers/infiniband/hw/irdma/verbs.c +2 -0
+{
+	int err = 0;

No need to initialize.

drivers/infiniband/hw/irdma/verbs.c static int irdma_reg_user_mr_type_qp(struct irdma_mem_reg_req req, · line 2874

Quoted 2 lines
drivers/infiniband/hw/irdma/verbs.c +2 -0
+	u8 shadow_pgcnt = 1;
+	bool use_pbles = false;

No need to initialize use_pbles.

Quoted 34 lines
drivers/infiniband/hw/irdma/verbs.c +26 -0
+	struct irdma_ucontext *ucontext;
+	unsigned long flags;
+	u32 total;
+	struct irdma_pbl *iwpbl = &iwmr->iwpbl;
+
+	if (iwdev->rf->sc_dev.hw_attrs.uk_attrs.feature_flags &
 IRDMA_FEATURE_CQ_RESIZE)
+		shadow_pgcnt = 0;
+	total = req.cq_pages + shadow_pgcnt;
+	if (total > iwmr->page_cnt)
+		return -EINVAL;
+
+	use_pbles = (req.cq_pages > 1);
+	err = irdma_handle_q_mem(iwdev, &req, iwpbl, use_pbles);
+	if (err)
+		return err;
+
+	ucontext = rdma_udata_to_drv_context(udata, struct irdma_ucontext,
+					     ibucontext);
+	spin_lock_irqsave(&ucontext->cq_reg_mem_list_lock, flags);
+	list_add_tail(&iwpbl->list, &ucontext->cq_reg_mem_list);
+	iwpbl->on_list = true;
+	spin_unlock_irqrestore(&ucontext->cq_reg_mem_list_lock, flags);
+
+	return err;
+}
+
 /**

* irdma_reg_user_mr - Register a user memory region
* @pd: ptr of pd

drivers/infiniband/hw/irdma/verbs.c +0 -0
@@ -2879,15 +2913,9 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd
 *pd, u64 start, u64 len,  {  #define IRDMA_MEM_REG_MIN_REQ_LEN
 offsetofend(struct irdma_mem_reg_req, sq_pages)
 	struct irdma_device *iwdev = to_iwdev(pd->device);

drivers/infiniband/hw/irdma/verbs.c static struct ib_mr *irdma_reg_user_mr(struct ib_pd · line 2919

Quoted 10 lines
drivers/infiniband/hw/irdma/verbs.c +0 -6
-	struct irdma_ucontext *ucontext;
-	struct irdma_pbl *iwpbl;
 	struct irdma_mr *iwmr;
 	struct ib_umem *region;
 	struct irdma_mem_reg_req req;
-	u32 total;
-	u8 shadow_pgcnt = 1;
-	bool use_pbles = false;
-	unsigned long flags;
 	int err = -EINVAL;

Do we need to initialize err here too? Probably separate from this patch but could clean up.

Quoted 44 lines
drivers/infiniband/hw/irdma/verbs.c +0 -2
 	if (len > iwdev->rf->sc_dev.hw_attrs.max_mr_size)
@@ -2915,8 +2943,6 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd,
 u64 start, u64 len,
 		return (struct ib_mr *)iwmr;
 	}
 
-	iwpbl = &iwmr->iwpbl;
-
 	switch (req.reg_type) {
 	case IRDMA_MEMREG_TYPE_QP:

err = irdma_reg_user_mr_type_qp(req, iwdev, udata, iwmr); @@ -
2925,25 +2951,9 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len,

drivers/infiniband/hw/irdma/verbs.c +0 -1
 		break;
 	case IRDMA_MEMREG_TYPE_CQ:
-		if (iwdev->rf->sc_dev.hw_attrs.uk_attrs.feature_flags &

IRDMA_FEATURE_CQ_RESIZE)

drivers/infiniband/hw/irdma/verbs.c +1 -11
-			shadow_pgcnt = 0;
-		total = req.cq_pages + shadow_pgcnt;
-		if (total > iwmr->page_cnt) {
-			err = -EINVAL;
-			goto error;
-		}
-
-		use_pbles = (req.cq_pages > 1);
-		err = irdma_handle_q_mem(iwdev, &req, iwpbl, use_pbles);
+		err = irdma_reg_user_mr_type_cq(iwdev, iwmr, udata, req);
 		if (err)
 			goto error;
-
-		ucontext = rdma_udata_to_drv_context(udata, struct

irdma_ucontext,

drivers/infiniband/hw/irdma/verbs.c +0 -6
-						     ibucontext);
-		spin_lock_irqsave(&ucontext->cq_reg_mem_list_lock, flags);
-		list_add_tail(&iwpbl->list, &ucontext->cq_reg_mem_list);
-		iwpbl->on_list = true;
-		spin_unlock_irqrestore(&ucontext->cq_reg_mem_list_lock, flags);
 		break;
 	case IRDMA_MEMREG_TYPE_MEM:
 		err = irdma_reg_user_mr_type_mem(iwdev, iwmr, access);
--

2.31.1

#12 lore raw

Re: [PATCH for-next 4/4] RDMA/irdma: Split CQ handler into irdma_reg_user_mr_type_cq

Quoted 21 lines · Shiraz
Quoted 21 lines

Subject: [PATCH for-next 4/4] RDMA/irdma: Split CQ handler into irdma_reg_user_mr_type_cq

From: Zhu Yanjun <[email protected]>

Split the source codes related with CQ handling into a new function.

---
  drivers/infiniband/hw/irdma/verbs.c | 60 +++++++++++++++++------------
  1 file changed, 35 insertions(+), 25 deletions(-)
drivers/infiniband/hw/irdma/verbs.c +0 -0
index e90eba73c396..b4befbafb830 100644
@@ -2864,6 +2864,40 @@ static int irdma_reg_user_mr_type_qp(struct
 irdma_mem_reg_req req,
  	return err;
  }
 
Quoted 5 lines

drivers/infiniband/hw/irdma/verbs.c static int irdma_reg_user_mr_type_qp(struct irdma_mem_reg_req req, · line 2870

Quoted 4 lines
drivers/infiniband/hw/irdma/verbs.c +4 -0
+static int irdma_reg_user_mr_type_cq(struct irdma_device *iwdev,
+				     struct irdma_mr *iwmr,
+				     struct ib_udata *udata,
+				     struct irdma_mem_reg_req req)

I would keep the order of these API args same as the one for irdma_reg_user_mr_type_qp.

Got it.

Quoted 4 lines

drivers/infiniband/hw/irdma/verbs.c static int irdma_reg_user_mr_type_qp(struct irdma_mem_reg_req req, · line 2872

Quoted 3 lines
drivers/infiniband/hw/irdma/verbs.c +2 -0
+{
+	int err = 0;

No need to initialize.

Got it.

Quoted 4 lines

drivers/infiniband/hw/irdma/verbs.c static int irdma_reg_user_mr_type_qp(struct irdma_mem_reg_req req, · line 2874

Quoted 3 lines
drivers/infiniband/hw/irdma/verbs.c +2 -0
+	u8 shadow_pgcnt = 1;
+	bool use_pbles = false;

No need to initialize use_pbles.

Got it.

Quoted 38 lines
Quoted 38 lines
drivers/infiniband/hw/irdma/verbs.c +26 -0
+	struct irdma_ucontext *ucontext;
+	unsigned long flags;
+	u32 total;
+	struct irdma_pbl *iwpbl = &iwmr->iwpbl;
+
+	if (iwdev->rf->sc_dev.hw_attrs.uk_attrs.feature_flags &
 IRDMA_FEATURE_CQ_RESIZE)
+		shadow_pgcnt = 0;
+	total = req.cq_pages + shadow_pgcnt;
+	if (total > iwmr->page_cnt)
+		return -EINVAL;
+
+	use_pbles = (req.cq_pages > 1);
+	err = irdma_handle_q_mem(iwdev, &req, iwpbl, use_pbles);
+	if (err)
+		return err;
+
+	ucontext = rdma_udata_to_drv_context(udata, struct irdma_ucontext,
+					     ibucontext);
+	spin_lock_irqsave(&ucontext->cq_reg_mem_list_lock, flags);
+	list_add_tail(&iwpbl->list, &ucontext->cq_reg_mem_list);
+	iwpbl->on_list = true;
+	spin_unlock_irqrestore(&ucontext->cq_reg_mem_list_lock, flags);
+
+	return err;
+}
+
  /**

* irdma_reg_user_mr - Register a user memory region
* @pd: ptr of pd

drivers/infiniband/hw/irdma/verbs.c +0 -2
@@ -2879,15 +2913,9 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd
 *pd, u64 start, u64 len,  {  #define IRDMA_MEM_REG_MIN_REQ_LEN
 offsetofend(struct irdma_mem_reg_req, sq_pages)
  	struct irdma_device *iwdev = to_iwdev(pd->device);
-	struct irdma_ucontext *ucontext;
-	struct irdma_pbl *iwpbl;
  	struct irdma_mr *iwmr;
Quoted 8 lines

drivers/infiniband/hw/irdma/verbs.c static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len, · line 2919

Quoted 7 lines
drivers/infiniband/hw/irdma/verbs.c +0 -4
  	struct ib_umem *region;
  	struct irdma_mem_reg_req req;
-	u32 total;
-	u8 shadow_pgcnt = 1;
-	bool use_pbles = false;
-	unsigned long flags;
  	int err = -EINVAL;

Do we need to initialize err here too? Probably separate from this patch but could clean up.

Yes. In switch-case-default, in default branch, err is not assigned to any error.

In the latest commit, err is assigned to -EINVAL in default branch and here err is not set.

I will send out the latest commits very soon.

Zhu Yanjun

Quoted 44 lines
Quoted 44 lines
drivers/infiniband/hw/irdma/verbs.c +0 -2
  	if (len > iwdev->rf->sc_dev.hw_attrs.max_mr_size)
@@ -2915,8 +2943,6 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd,
 u64 start, u64 len,
  		return (struct ib_mr *)iwmr;
  	}
 
-	iwpbl = &iwmr->iwpbl;
-
  	switch (req.reg_type) {
  	case IRDMA_MEMREG_TYPE_QP:

err = irdma_reg_user_mr_type_qp(req, iwdev, udata, iwmr); @@ -
2925,25 +2951,9 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len,

break;
case IRDMA_MEMREG_TYPE_CQ:

drivers/infiniband/hw/irdma/verbs.c +0 -1
-		if (iwdev->rf->sc_dev.hw_attrs.uk_attrs.feature_flags &

IRDMA_FEATURE_CQ_RESIZE)

drivers/infiniband/hw/irdma/verbs.c +1 -11
-			shadow_pgcnt = 0;
-		total = req.cq_pages + shadow_pgcnt;
-		if (total > iwmr->page_cnt) {
-			err = -EINVAL;
-			goto error;
-		}
-
-		use_pbles = (req.cq_pages > 1);
-		err = irdma_handle_q_mem(iwdev, &req, iwpbl, use_pbles);
+		err = irdma_reg_user_mr_type_cq(iwdev, iwmr, udata, req);
  		if (err)
  			goto error;
-
-		ucontext = rdma_udata_to_drv_context(udata, struct

irdma_ucontext,

drivers/infiniband/hw/irdma/verbs.c +0 -6
-						     ibucontext);
-		spin_lock_irqsave(&ucontext->cq_reg_mem_list_lock, flags);
-		list_add_tail(&iwpbl->list, &ucontext->cq_reg_mem_list);
-		iwpbl->on_list = true;
-		spin_unlock_irqrestore(&ucontext->cq_reg_mem_list_lock, flags);
  		break;
  	case IRDMA_MEMREG_TYPE_MEM:
  		err = irdma_reg_user_mr_type_mem(iwdev, iwmr, access);
--

2.31.1

#13 lore raw
In reply to Zhu Yanjun
Quoted 7 lines

Subject: [PATCH for-next 0/4] RDMA/irdma: Refactor irdma_reg_user_mr function

From: Zhu Yanjun <[email protected]>

Split the shared source codes into several new functions for future use. No bug fix and new feature in this commit series.

Quoted 7 lines

The new functions are as below:

irdma_reg_user_mr_type_mem
irdma_alloc_iwmr
irdma_free_iwmr
irdma_reg_user_mr_type_qp
irdma_reg_user_mr_type_cq

Thanks! General direction is good. I provided some feedback.

Quoted 2 lines

These functions will be used in the dmabuf feature.

Do you want to add that dma buf patch to this series too? So that we can see it how it re-uses the new APIs you created.

So 1st 4 patches would be clean-up/refactor patches in preparation for patch #5 which is the dma buf API addition.

Quoted 12 lines

Zhu Yanjun (4):
RDMA/irdma: Split MEM handler into irdma_reg_user_mr_type_mem RDMA/irdma: Split mr alloc and free into new functions RDMA/irdma: Split QP handler into irdma_reg_user_mr_type_qp RDMA/irdma: Split CQ handler into irdma_reg_user_mr_type_cq

 drivers/infiniband/hw/irdma/verbs.c | 260 +++++++++++++++++-----------
 1 file changed, 160 insertions(+), 100 deletions(-)

--
2.31.1