RDMA/bnxt_re: Bug fixes for 6.12 kernel
Subsystems (2)
Selvin Xavier
maintainerv2 cover RDMA/bnxt_re: Bug fixes for 6.12 kernel
Few generic fixes in bnxt_re driver for 6.12 kernel. Please review and apply.
Thanks,
Selvin Xavier
v1 - v2:
- Add a patch that removes irq variant of spinlock and use spin_lock_bh as the control path processing happens from tasklet context
- Address the comments from Zhu Yanjun by initializing the newly added spin lock.
- One more fix included in the series
Kalesh AP (2):
RDMA/bnxt_re: Fix a possible memory leak
RDMA/bnxt_re: Add a check for memory allocation
Saravanan Vajravel (1):
RDMA/bnxt_re: Fix incorrect AVID type in WQE structure
Selvin Xavier (3):
RDMA/bnxt_re: Fix the usage of control path spin locks RDMA/bnxt_re: synchronize the qp-handle table array RDMA/bnxt_re: Fix the max WQEs used in Static WQE mode
drivers/infiniband/hw/bnxt_re/ib_verbs.c | 6 ++++- drivers/infiniband/hw/bnxt_re/main.c | 5 +++- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 4 ++++ drivers/infiniband/hw/bnxt_re/qplib_fp.h | 2 +- drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 38 +++++++++++++++--------------- drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 2 ++ drivers/infiniband/hw/bnxt_re/qplib_res.c | 2 ++ 7 files changed, 37 insertions(+), 22 deletions(-)
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH v2 1/6 RDMA/bnxt_re: Fix a possible memory leak
From: Kalesh AP <[email protected]>
In bnxt_re_setup_chip_ctx() when bnxt_qplib_map_db_bar() fails driver is not freeing the memory allocated for "rdev->chip_ctx".
--- drivers/infiniband/hw/bnxt_re/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/infiniband/hw/bnxt_re/main.c +4 -1
@@ -186,8 +186,11 @@ static int bnxt_re_setup_chip_ctx(struct bnxt_re_dev *rdev)bnxt_re_set_db_offset (rdev); rc =bnxt_qplib_map_db_bar (&rdev->qplib_res); -if (rc) +if (rc) { +kfree (rdev->chip_ctx); + rdev->chip_ctx =NULL ;return rc; + }if (bnxt_qplib_determine_atomics (en_dev->pdev)) ibdev_info(&rdev->ibdev,
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH v2 2/6 RDMA/bnxt_re: Fix incorrect AVID type in WQE structure
In reply to Selvin XavierFrom: Saravanan Vajravel <[email protected]>
Driver uses internal data structure to construct WQE frame. It used avid type as u16 which can accommodate up to 64K AVs. When outstanding AVID crosses 64K, driver truncates AVID and hence it uses incorrect AVID to WR. This leads to WR failure due to invalid AV ID and QP is moved to error state with reason set to 19 (INVALID AVID). When RDMA CM path is used, this issue hits QP1 and it is moved to error state
--- drivers/infiniband/hw/bnxt_re/qplib_fp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/bnxt_re/qplib_fp.h +1 -1
@@ -170,7 +170,7 @@ struct bnxt_qplib_swqe { };u32 q_key;u32 dst_qp; -u16 avid; +u32 avid; } send;/* Send Raw Ethernet and QP1 */
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH v2 3/6 RDMA/bnxt_re: Add a check for memory allocation
In reply to Selvin XavierFrom: Kalesh AP <[email protected]>
__alloc_pbl() can return error when memory allocation fails. Driver is not checking the status on one of the instances.
--- drivers/infiniband/hw/bnxt_re/qplib_res.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/infiniband/hw/bnxt_re/qplib_res.c +2 -0
@@ -244,6 +244,8 @@ int bnxt_qplib_alloc_init_hwq(struct bnxt_qplib_hwq *hwq, sginfo.pgsize = npde * pg_size; sginfo.npages =1 ; rc =__alloc_pbl (res, &hwq->pbl[PBL_LVL_0 ], &sginfo); +if (rc) + goto fail;/* Alloc PBL pages */ sginfo.npages = npbl;
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH v2 4/6 RDMA/bnxt_re: Fix the usage of control path spin locks
In reply to Selvin XavierControl path completion processing always runs in tasklet context. To synchronize with the posting thread, there is no need to use the irq variant of spin lock. Use spin_lock_bh instead.
--- drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-)
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +10 -15
@@ -290,7 +290,6 @@ static int __send_message(struct bnxt_qplib_rcfw *rcfw,struct bnxt_qplib_hwq *hwq;u32 sw_prod, cmdq_prod;struct pci_dev *pdev; -unsigned long flags;u16 cookie;u8 *preq;
@@ -301,7 +300,7 @@ static int __send_message(struct bnxt_qplib_rcfw *rcfw,/* Cmdq are in 16-byte units, each request can consume 1 or more * cmdqe */ -spin_lock_irqsave (&hwq->lock, flags); +spin_lock_bh (&hwq->lock); required_slots =bnxt_qplib_get_cmd_slots (msg->req); free_slots =HWQ_FREE_SLOTS (hwq); cookie = cmdq->seq_num &RCFW_MAX_COOKIE_VALUE ;
@@ -311,7 +310,7 @@ static int __send_message(struct bnxt_qplib_rcfw *rcfw,dev_info_ratelimited (&pdev->dev,"CMDQ is full req/free %d/%d!" , required_slots, free_slots); -spin_unlock_irqrestore (&hwq->lock, flags); +spin_unlock_bh (&hwq->lock);return -EAGAIN ; }if (msg->block)
@@ -367,7 +366,7 @@ static int __send_message(struct bnxt_qplib_rcfw *rcfw,wmb ();writel (cmdq_prod, cmdq->cmdq_mbox.prod);writel (RCFW_CMDQ_TRIG_VAL , cmdq->cmdq_mbox.db); -spin_unlock_irqrestore (&hwq->lock, flags); +spin_unlock_bh (&hwq->lock);/* Return the CREQ response pointer */ return 0 ; }
@@ -486,7 +485,6 @@ static int __bnxt_qplib_rcfw_send_message(struct bnxt_qplib_rcfw *rcfw, {struct creq_qp_event *evnt = (struct creq_qp_event *)msg->resp;struct bnxt_qplib_crsqe *crsqe; -unsigned long flags;u16 cookie;int rc;u8 opcode;
@@ -512,12 +510,12 @@ static int __bnxt_qplib_rcfw_send_message(struct bnxt_qplib_rcfw *rcfw, rc =__poll_for_resp (rcfw, cookie);if (rc) { -spin_lock_irqsave (&rcfw->cmdq.hwq.lock, flags); +spin_lock_bh (&rcfw->cmdq.hwq.lock); crsqe = &rcfw->crsqe_tbl[cookie]; crsqe->is_waiter_alive = false;if (rc == -ENODEV )set_bit (FIRMWARE_STALL_DETECTED , &rcfw->cmdq.flags); -spin_unlock_irqrestore (&rcfw->cmdq.hwq.lock, flags); +spin_unlock_bh (&rcfw->cmdq.hwq.lock);return -ETIMEDOUT ; }
@@ -628,7 +626,6 @@ static int bnxt_qplib_process_qp_event(struct bnxt_qplib_rcfw *rcfw,u16 cookie, blocked =0 ;bool is_waiter_alive;struct pci_dev *pdev; -unsigned long flags;u32 wait_cmds =0 ;int rc =0 ;
@@ -659,8 +656,7 @@ static int bnxt_qplib_process_qp_event(struct bnxt_qplib_rcfw *rcfw,* */ -spin_lock_irqsave_nested (&hwq->lock, flags, -SINGLE_DEPTH_NESTING ); +spin_lock_nested (&hwq->lock,SINGLE_DEPTH_NESTING ); cookie =le16_to_cpu (qp_event->cookie); blocked = cookie &RCFW_CMD_IS_BLOCKING ; cookie &=RCFW_MAX_COOKIE_VALUE ;
@@ -672,7 +668,7 @@ static int bnxt_qplib_process_qp_event(struct bnxt_qplib_rcfw *rcfw,dev_info (&pdev->dev,"rcfw timedout: cookie = %#x, free_slots = %d" , cookie, crsqe->free_slots); -spin_unlock_irqrestore (&hwq->lock, flags); +spin_unlock (&hwq->lock);return rc; }
@@ -720,7 +716,7 @@ static int bnxt_qplib_process_qp_event(struct bnxt_qplib_rcfw *rcfw,__destroy_timedout_ah (rcfw, (struct creq_create_ah_resp *) qp_event); -spin_unlock_irqrestore (&hwq->lock, flags); +spin_unlock (&hwq->lock); } *num_wait += wait_cmds;return rc;
@@ -734,12 +730,11 @@ static void bnxt_qplib_service_creq(struct tasklet_struct *t)u32 type, budget =CREQ_ENTRY_POLL_BUDGET ;struct bnxt_qplib_hwq *hwq = &creq->hwq;struct creq_base *creqe; -unsigned long flags;u32 num_wakeup =0 ;u32 hw_polled =0 ;/* Service the CREQ until budget is over */ -spin_lock_irqsave (&hwq->lock, flags); +spin_lock_bh (&hwq->lock);while (budget >0 ) { creqe =bnxt_qplib_get_qe (hwq, hwq->cons,NULL );if (!CREQ_CMP_VALID (creqe, creq->creq_db.dbinfo.flags))
@@ -782,7 +777,7 @@ static void bnxt_qplib_service_creq(struct tasklet_struct *t)if (hw_polled)bnxt_qplib_ring_nq_db (&creq->creq_db.dbinfo, rcfw->res->cctx, true); -spin_unlock_irqrestore (&hwq->lock, flags); +spin_unlock_bh (&hwq->lock);if (num_wakeup)wake_up_nr (&rcfw->cmdq.waitq, num_wakeup); }
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH v2 5/6 RDMA/bnxt_re: synchronize the qp-handle table array
In reply to Selvin XavierThere is a race between the CREQ tasklet and destroy qp when accessing the qp-handle table. There is a chance of reading a valid qp-handle in the CREQ tasklet handler while the QP is already moving ahead with the destruction.
Fixing this race by implementing a table-lock to
synchronize the access.
--- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 4 ++++ drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 13 +++++++++---- drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 2 ++ 3 files changed, 15 insertions(+), 4 deletions(-)
drivers/infiniband/hw/bnxt_re/qplib_fp.c +4 -0
@@ -1527,9 +1527,11 @@ int bnxt_qplib_destroy_qp(struct bnxt_qplib_res *res,u32 tbl_indx;int rc; +spin_lock_bh (&rcfw->tbl_lock); tbl_indx =map_qp_id_to_tbl_indx (qp->id, rcfw); rcfw->qp_tbl[tbl_indx].qp_id =BNXT_QPLIB_QP_ID_INVALID ; rcfw->qp_tbl[tbl_indx].qp_handle =NULL ; +spin_unlock_bh (&rcfw->tbl_lock); bnxt_qplib_rcfw_cmd_prep((struct cmdq_base *)&req, CMDQ_BASE_OPCODE_DESTROY_QP,
@@ -1540,8 +1542,10 @@ int bnxt_qplib_destroy_qp(struct bnxt_qplib_res *res, sizeof(resp), 0); rc =bnxt_qplib_rcfw_send_message (rcfw, &msg);if (rc) { +spin_lock_bh (&rcfw->tbl_lock); rcfw->qp_tbl[tbl_indx].qp_id = qp->id; rcfw->qp_tbl[tbl_indx].qp_handle = qp; +spin_unlock_bh (&rcfw->tbl_lock);return rc; }
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +9 -4
@@ -634,17 +634,21 @@ static int bnxt_qplib_process_qp_event(struct bnxt_qplib_rcfw *rcfw,case CREQ_QP_EVENT_EVENT_QP_ERROR_NOTIFICATION : err_event = (struct creq_qp_error_notification *)qp_event; qp_id =le32_to_cpu (err_event->xid); +spin_lock_nested (&rcfw->tbl_lock,SINGLE_DEPTH_NESTING ); tbl_indx =map_qp_id_to_tbl_indx (qp_id, rcfw); qp = rcfw->qp_tbl[tbl_indx].qp_handle; +if (!qp) { +spin_unlock (&rcfw->tbl_lock); +break ; + } +bnxt_qplib_mark_qp_error (qp); + rc = rcfw->creq.aeq_handler (rcfw, qp_event, qp); +spin_unlock (&rcfw->tbl_lock);dev_dbg (&pdev->dev,"Received QP error notification\n" );dev_dbg (&pdev->dev,"qpid 0x%x, req_err=0x%x, resp_err=0x%x\n" , qp_id, err_event->req_err_state_reason, err_event->res_err_state_reason); -if (!qp) -break ; -bnxt_qplib_mark_qp_error (qp); - rc = rcfw->creq.aeq_handler (rcfw, qp_event, qp);break ;default :/*
@@ -973,6 +977,7 @@ int bnxt_qplib_alloc_rcfw_channel(struct bnxt_qplib_res *res, GFP_KERNEL);if (!rcfw->qp_tbl) goto fail; +spin_lock_init (&rcfw->tbl_lock); rcfw->max_timeout = res->cctx->hwrm_cmd_max_timeout;
drivers/infiniband/hw/bnxt_re/qplib_rcfw.h +2 -0
@@ -224,6 +224,8 @@ struct bnxt_qplib_rcfw {struct bnxt_qplib_crsqe *crsqe_tbl;int qp_tbl_size;struct bnxt_qplib_qp_node *qp_tbl; +/* To synchronize the qp-handle hash table */ +spinlock_t tbl_lock;u64 oos_prev;u32 init_oos_stats;u32 cmdq_depth;
Signature · 1 line
2.5.5
Re: [PATCH v2 for-rc 5/6] RDMA/bnxt_re: synchronize the qp-handle table array
Quoted 77 lines · Selvin Xavier
There is a race between the CREQ tasklet and destroy qp when accessing the qp-handle table. There is a chance of reading a valid qp-handle in the CREQ tasklet handler while the QP is already moving ahead with the destruction.
Fixing this race by implementing a table-lock to
synchronize the access.Fixes f218d67ef004 ("RDMA/bnxt_re: Allow posting when QPs are in error")Fixes 84cf229f4001 ("RDMA/bnxt_re: Fix the qp table indexing")Signed-off-by Kalesh AP <[email protected]>Signed-off-by Selvin Xavier <[email protected]>--- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 4 ++++ drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 13 +++++++++---- drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 2 ++ 3 files changed, 15 insertions(+), 4 deletions(-)drivers/infiniband/hw/bnxt_re/qplib_fp.c +4
-0@@ -1527,9 +1527,11 @@ int bnxt_qplib_destroy_qp(struct bnxt_qplib_res *res,u32 tbl_indx;int rc; +spin_lock_bh (&rcfw->tbl_lock); tbl_indx =map_qp_id_to_tbl_indx (qp->id, rcfw); rcfw->qp_tbl[tbl_indx].qp_id =BNXT_QPLIB_QP_ID_INVALID ; rcfw->qp_tbl[tbl_indx].qp_handle =NULL ; +spin_unlock_bh (&rcfw->tbl_lock); bnxt_qplib_rcfw_cmd_prep((struct cmdq_base *)&req, CMDQ_BASE_OPCODE_DESTROY_QP,@@ -1540,8 +1542,10 @@ int bnxt_qplib_destroy_qp(struct bnxt_qplib_res *res, sizeof(resp), 0); rc =bnxt_qplib_rcfw_send_message (rcfw, &msg);if (rc) { +spin_lock_bh (&rcfw->tbl_lock); rcfw->qp_tbl[tbl_indx].qp_id = qp->id; rcfw->qp_tbl[tbl_indx].qp_handle = qp; +spin_unlock_bh (&rcfw->tbl_lock);return rc; }drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +8
-4@@ -634,17 +634,21 @@ static int bnxt_qplib_process_qp_event(struct bnxt_qplib_rcfw *rcfw,case CREQ_QP_EVENT_EVENT_QP_ERROR_NOTIFICATION : err_event = (struct creq_qp_error_notification *)qp_event; qp_id =le32_to_cpu (err_event->xid); +spin_lock_nested (&rcfw->tbl_lock,SINGLE_DEPTH_NESTING ); tbl_indx =map_qp_id_to_tbl_indx (qp_id, rcfw); qp = rcfw->qp_tbl[tbl_indx].qp_handle; +if (!qp) { +spin_unlock (&rcfw->tbl_lock); +break ; + } +bnxt_qplib_mark_qp_error (qp); + rc = rcfw->creq.aeq_handler (rcfw, qp_event, qp); +spin_unlock (&rcfw->tbl_lock);dev_dbg (&pdev->dev,"Received QP error notification\n" );dev_dbg (&pdev->dev,"qpid 0x%x, req_err=0x%x, resp_err=0x%x\n" , qp_id, err_event->req_err_state_reason, err_event->res_err_state_reason); -if (!qp) -break ; -bnxt_qplib_mark_qp_error (qp); - rc = rcfw->creq.aeq_handler (rcfw, qp_event, qp);break ;default :/*
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c int bnxt_qplib_alloc_rcfw_channel(struct bnxt_qplib_res *res, · line 980
Quoted 4 lines
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +1
-0@@ -973,6 +977,7 @@ int bnxt_qplib_alloc_rcfw_channel(struct bnxt_qplib_res *res, GFP_KERNEL);if (!rcfw->qp_tbl) goto fail; +spin_lock_init (&rcfw->tbl_lock);
Thanks. I am fine with this spin_lock_bh and spin_lock_init.
Zhu Yanjun
Quoted 16 lines
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +0
-0rcfw->max_timeout = res->cctx->hwrm_cmd_max_timeout;drivers/infiniband/hw/bnxt_re/qplib_rcfw.h +2
-0@@ -224,6 +224,8 @@ struct bnxt_qplib_rcfw {struct bnxt_qplib_crsqe *crsqe_tbl;int qp_tbl_size;struct bnxt_qplib_qp_node *qp_tbl; +/* To synchronize the qp-handle hash table */ +spinlock_t tbl_lock;u64 oos_prev;u32 init_oos_stats;u32 cmdq_depth;
Jason Gunthorpe
maintainerRe: [PATCH v2 for-rc 5/6] RDMA/bnxt_re: synchronize the qp-handle table array
In reply to Selvin Xavierdrivers/infiniband/hw/bnxt_re/qplib_rcfw.c static int bnxt_qplib_process_qp_event(struct bnxt_qplib_rcfw *rcfw, · line 637
Quoted 9 lines · Selvin Xavier
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +1
-0@@ -634,17 +634,21 @@ static int bnxt_qplib_process_qp_event(struct bnxt_qplib_rcfw *rcfw,case CREQ_QP_EVENT_EVENT_QP_ERROR_NOTIFICATION : err_event = (struct creq_qp_error_notification *)qp_event; qp_id =le32_to_cpu (err_event->xid); +spin_lock_nested (&rcfw->tbl_lock,SINGLE_DEPTH_NESTING );
Why would you need this lockdep annotation? tbl_lock doesn't look nested into itself to me.
Regardless it is a big red flag to see lockdep exception stuff like this without a clear explanation what it is for..
Jason
Selvin Xavier
maintainerRe: [PATCH v2 for-rc 5/6] RDMA/bnxt_re: synchronize the qp-handle table array
Quoted 15 lines · Jason Gunthorpe
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c static int bnxt_qplib_process_qp_event(struct bnxt_qplib_rcfw *rcfw, · line 637
Quoted 9 lines · Selvin Xavier
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +1
-0@@ -634,17 +634,21 @@ static int bnxt_qplib_process_qp_event(struct bnxt_qplib_rcfw *rcfw,case CREQ_QP_EVENT_EVENT_QP_ERROR_NOTIFICATION : err_event = (struct creq_qp_error_notification *)qp_event; qp_id =le32_to_cpu (err_event->xid); +spin_lock_nested (&rcfw->tbl_lock,SINGLE_DEPTH_NESTING );Why would you need this lockdep annotation?
tbl_lockdoesn't look nested into itself to me.
bnxt_qplib_process_qp_event is always called with a spinlock (hwq->lock ) in the caller. i.e. bnxt_qplib_service_creq. I have used the nested variant because of this.
Quoted 3 lines
Regardless it is a big red flag to see lockdep exception stuff like this without a clear explanation what it is for..
Will add an explanation for this.
Quoted 2 lines
Jason
Jason Gunthorpe
maintainerRe: [PATCH v2 for-rc 5/6] RDMA/bnxt_re: synchronize the qp-handle table array
Quoted 16 lines · Selvin Xavier
Quoted 15 lines · Jason Gunthorpe
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c static int bnxt_qplib_process_qp_event(struct bnxt_qplib_rcfw *rcfw, · line 637
Quoted 9 lines · Selvin Xavier
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +1
-0@@ -634,17 +634,21 @@ static int bnxt_qplib_process_qp_event(struct bnxt_qplib_rcfw *rcfw,case CREQ_QP_EVENT_EVENT_QP_ERROR_NOTIFICATION : err_event = (struct creq_qp_error_notification *)qp_event; qp_id =le32_to_cpu (err_event->xid); +spin_lock_nested (&rcfw->tbl_lock,SINGLE_DEPTH_NESTING );Why would you need this lockdep annotation?
tbl_lockdoesn't look nested into itself to me.
Quoted 3 lines
bnxt_qplib_process_qp_eventis always called with a spinlock (hwq->lock) in the caller. i.e.bnxt_qplib_service_creq. I have used the nested variant because of this.
That is not what nested is for. Nested different locks are fine, you only need nested if you are nesting the same lock
Jason
Selvin Xavier
maintainerRe: [PATCH v2 for-rc 5/6] RDMA/bnxt_re: synchronize the qp-handle table array
Quoted 18 lines · Jason Gunthorpe
Quoted 16 lines · Selvin Xavier
Quoted 15 lines · Jason Gunthorpe
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c static int bnxt_qplib_process_qp_event(struct bnxt_qplib_rcfw *rcfw, · line 637
Quoted 9 lines · Selvin Xavier
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +1
-0@@ -634,17 +634,21 @@ static int bnxt_qplib_process_qp_event(struct bnxt_qplib_rcfw *rcfw,case CREQ_QP_EVENT_EVENT_QP_ERROR_NOTIFICATION : err_event = (struct creq_qp_error_notification *)qp_event; qp_id =le32_to_cpu (err_event->xid); +spin_lock_nested (&rcfw->tbl_lock,SINGLE_DEPTH_NESTING );Why would you need this lockdep annotation?
tbl_lockdoesn't look nested into itself to me.
Quoted 6 lines
Quoted 3 lines
bnxt_qplib_process_qp_eventis always called with a spinlock (hwq->lock) in the caller. i.e.bnxt_qplib_service_creq. I have used the nested variant because of this.That is not what nested is for. Nested different locks are fine, you only need nested if you are nesting the same lock
Ok. I will modify the patch and post it this week.
Quoted 2 lines
Jason
Selvin Xavier
maintainerPATCH v2 6/6 RDMA/bnxt_re: Fix the max WQEs used in Static WQE mode
In reply to Selvin Xaviermax_sw_wqe used for static wqe mode should be same as the max_wqe. Calculate the max_sw_wqe only for the variable WQE mode.
--- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/infiniband/hw/bnxt_re/ib_verbs.c +5 -1
@@ -1307,7 +1307,11 @@ static int bnxt_re_init_sq_attr(struct bnxt_re_qp *qp, 0 : BNXT_QPLIB_RESERVED_QP_WRS; entries =bnxt_re_init_depth (entries + diff +1 , uctx); sq->max_wqe =min_t (u32, entries, dev_attr->max_qp_wqes + diff +1 ); - sq->max_sw_wqe =bnxt_qplib_get_depth (sq, qplqp->wqe_mode, true); +if (qplqp->wqe_mode ==BNXT_QPLIB_WQE_MODE_VARIABLE ) + sq->max_sw_wqe =bnxt_qplib_get_depth (sq, qplqp->wqe_mode, true); +else + sq->max_sw_wqe = sq->max_wqe; + } sq->q_full_delta = diff +1 ;/*
Signature · 1 line
2.5.5
Quoted 2 lines · Selvin Xavier
Few generic fixes in
bnxt_redriver for 6.12 kernel. Please review and apply.
These will have to wait till the next rc1 due to the LPC conference..
Jason
Quoted 18 lines · Selvin Xavier
Few generic fixes in
bnxt_redriver for 6.12 kernel. Please review and apply.Thanks,
Selvin Xavierv1 - v2:
- Add a patch that removes irq variant of spinlock and usespin_lock_bhas the control path processing happens from tasklet context
- Address the comments from Zhu Yanjun by initializing the newly added spin lock.
- One more fix included in the seriesKalesh AP (2):
RDMA/bnxt_re: Fix a possible memory leak
RDMA/bnxt_re: Add a check for memory allocation
Quoted 5 lines
Saravanan Vajravel (1):
RDMA/bnxt_re: Fix incorrect AVID type in WQE structureSelvin Xavier (3):
RDMA/bnxt_re: Fix the max WQEs used in Static WQE mode
Applied to for-rc
Quoted 2 lines
RDMA/bnxt_re: Fix the usage of control path spin locks RDMA/bnxt_re: synchronize the qp-handle table array
I deferred these two with remarks
Thanks,
Jason