Misc changes for siw

-----Original Message-----
From: Guoqing Jiang <[email protected]>
Sent: Monday, 21 August 2023 10:48
To: Bernard Metzler <[email protected]>; [email protected]; [email protected]
Cc: [email protected]
Subject: [EXTERNAL] [PATCH V2 1/3] RDMA/siw: Balance the reference of cep-

Quoted 1 line

kref in the error path

The siw_connect can go to err in below after cep is allocated successfully:

1. If siw_cm_alloc_work returns failure. In this case socket is not assoicated with cep so siw_cep_put can't be called by siw_socket_disassoc. We need to call siw_cep_put twice since cep->kref is increased once after it was initialized.

2. If siw_cm_queue_work can't find a work, which means siw_cep_get is not called in siw_cm_queue_work, so cep->kref is increased twice by siw_cep_get and when associate socket with cep after it was initialized. So we need to call siw_cep_put three times (one in siw_socket_disassoc).

3. siw_send_mpareqrep returns error, this scenario is similar as 2.

So we need to remove one siw_cep_put in the error path.

Fixes 6c52fdc244b5 ("rdma/siw: connection management")

Signed-off-by Guoqing Jiang <[email protected]>

---
 drivers/infiniband/sw/siw/siw_cm.c | 1 -
 1 file changed, 1 deletion(-)

drivers/infiniband/sw/siw/siw_cm.c +0 -1

index da530c0404da..a2605178f4ed 100644
@@ -1501,7 +1501,6 @@ int siw_connect(struct iw_cm_id *id, struct
 iw_cm_conn_param *params)
 
 		cep->cm_id = NULL;
 		id->rem_ref(id);
-		siw_cep_put(cep);
 
 		qp->cep = NULL;

siw_cep_put(cep);
--
2.35.3

-----Original Message-----
From: Guoqing Jiang <[email protected]>
Sent: Monday, 21 August 2023 10:48
To: Bernard Metzler <[email protected]>; [email protected]; [email protected]
Cc: [email protected]
Subject: [EXTERNAL] [PATCH V2 2/3] RDMA/siw: Correct wrong debug message

We need to print num_sle first then pbl->max_buf per the condition. Also replace mem->pbl with pbl while at it.

Fixes 303ae1cdfdf7 ("rdma/siw: application interface")

Signed-off-by Guoqing Jiang <[email protected]>

---
 drivers/infiniband/sw/siw/siw_verbs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/infiniband/sw/siw/siw_verbs.c +1 -1

index 398ec13db624..4832723dc244 100644
@@ -1494,7 +1494,7 @@ int siw_map_mr_sg(struct ib_mr *base_mr, struct
 scatterlist *sl, int num_sle,
 
 	if (pbl->max_buf < num_sle) {
 		siw_dbg_mem(mem, "too many SGE's: %d > %d\n",
-			    mem->pbl->max_buf, num_sle);
+			    num_sle, pbl->max_buf);
 		return -ENOMEM;
 	}

for_each_sg(sl, slp, num_sle, i) {
--
2.35.3

-----Original Message-----
From: Guoqing Jiang <[email protected]>
Sent: Monday, 21 August 2023 10:48
To: Bernard Metzler <[email protected]>; [email protected]; [email protected]
Cc: [email protected]
Subject: [EXTERNAL] [PATCH V2 3/3] RDMA/siw: Call llist_reverse_order in siw_run_sq

We can call the function to get fifo list.

Signed-off-by Guoqing Jiang <[email protected]>

---
 drivers/infiniband/sw/siw/siw_qp_tx.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

drivers/infiniband/sw/siw/siw_qp_tx.c +1 -12

index 4b292e0504f1..eb3d438828e2 100644
@@ -1229,17 +1229,7 @@ int siw_run_sq(void *data)
 			break;
 
 		active = llist_del_all(&tx_task->active);
-		/*
-		 * llist_del_all returns a list with newest entry first.
-		 * Re-order list for fairness among QP's.
-		 */
-		while (active) {
-			struct llist_node *tmp = active;
-
-			active = llist_next(active);
-			tmp->next = fifo_list;
-			fifo_list = tmp;
-		}
+		fifo_list = llist_reverse_order(active);
 		while (fifo_list) {
 			qp = container_of(fifo_list, struct siw_qp, tx_list);
 			fifo_list = llist_next(fifo_list);
--

2.35.3

Quoted 37 lines

-----Original Message-----
From: Guoqing Jiang <[email protected]>
Sent: Monday, 21 August 2023 10:48
To: Bernard Metzler <[email protected]>; [email protected]; [email protected]
Cc: [email protected]
Subject: [EXTERNAL] [PATCH V2 3/3] RDMA/siw: Call llist_reverse_order in siw_run_sq

We can call the function to get fifo list.

Signed-off-by Guoqing Jiang <[email protected]>

---
  drivers/infiniband/sw/siw/siw_qp_tx.c | 12 +-----------
  1 file changed, 1 insertion(+), 11 deletions(-)

drivers/infiniband/sw/siw/siw_qp_tx.c +1 -11

index 4b292e0504f1..eb3d438828e2 100644
@@ -1229,17 +1229,7 @@ int siw_run_sq(void *data)
  			break;
 
  		active = llist_del_all(&tx_task->active);
-		/*
-		 * llist_del_all returns a list with newest entry first.
-		 * Re-order list for fairness among QP's.
-		 */
-		while (active) {
-			struct llist_node *tmp = active;
-
-			active = llist_next(active);
-			tmp->next = fifo_list;
-			fifo_list = tmp;
-		}
+		fifo_list = llist_reverse_order(active);

Quoted 5 lines

drivers/infiniband/sw/siw/siw_qp_tx.c +0 -1

  		while (fifo_list) {
  			qp = container_of(fifo_list, struct siw_qp, tx_list);
  			fifo_list = llist_next(fifo_list);
--

2.35.3

Oh yes, that function already exists. Many thanks! I'd keep the comment, since it might be not obvious why we reverse the list.

Acked-by Bernard Metzler <[email protected]>