RDMA/irdma: Remove redundant legacy_mode checks
Subsystems (2)
PATCH 1/2 RDMA/irdma: Remove redundant legacy_mode checks
The driver has the following invariants:
1. legacy_mode is only allowed on GEN_1 hardware (enforced in irdma_alloc_ucontext).
2. GEN_1 hardware does not set IRDMA_FEATURE_CQ_RESIZE or IRDMA_FEATURE_RTS_AE. These feature flags are only set for GEN_2 and GEN_3 hardware.
Therefore, legacy_mode is always false if IRDMA_FEATURE_CQ_RESIZE or IRDMA_FEATURE_RTS_AE is set, so remove the redundant checks.
--- drivers/infiniband/hw/irdma/uk.c | 9 +++------ drivers/infiniband/hw/irdma/user.h | 1 - drivers/infiniband/hw/irdma/verbs.c | 7 +------ 3 files changed, 4 insertions(+), 13 deletions(-)
drivers/infiniband/hw/irdma/uk.c +3 -6
@@ -1568,15 +1568,12 @@ static const struct irdma_wqe_uk_ops iw_wqe_uk_ops_gen_1 = {* irdma_setup_connection_wqes - setup WQEs necessary to complete * connection. * @qp: hw qp (user and kernel) -* @info: qp initialization info */ -static void irdma_setup_connection_wqes (struct irdma_qp_uk *qp, -struct irdma_qp_uk_init_info *info) +static void irdma_setup_connection_wqes (struct irdma_qp_uk *qp) {u16 move_cnt =1 ; -if (!info->legacy_mode && - (qp->uk_attrs->feature_flags &IRDMA_FEATURE_RTS_AE )) +if (qp->uk_attrs->feature_flags &IRDMA_FEATURE_RTS_AE ) move_cnt =3 ; qp->conn_wqes = move_cnt;
@@ -1727,7 +1724,7 @@ int irdma_uk_qp_init(struct irdma_qp_uk *qp, struct irdma_qp_uk_init_info *info) sq_ring_size = qp->sq_size << info->sq_shift;IRDMA_RING_INIT (qp->sq_ring, sq_ring_size);if (info->first_sq_wq) { -irdma_setup_connection_wqes (qp, info); +irdma_setup_connection_wqes (qp); qp->swqe_polarity =1 ; qp->first_sq_wq = true; }else {
drivers/infiniband/hw/irdma/user.h +0 -1
@@ -563,7 +563,6 @@ struct irdma_qp_uk_init_info {u8 sq_shift;u8 rq_shift;int abi_ver; -bool legacy_mode;struct irdma_srq_uk *srq_uk; };
drivers/infiniband/hw/irdma/verbs.c +1 -6
@@ -634,7 +634,6 @@ static int irdma_setup_umode_qp(struct ib_udata *udata, iwqp->ctx_info.qp_compl_ctx = req.user_compl_ctx; iwqp->user_mode =1 ;if (req.user_wqe_bufs) { - info->qp_uk_init_info.legacy_mode = ucontext->legacy_mode;spin_lock_irqsave (&ucontext->qp_reg_mem_list_lock, flags); iwqp->iwpbl =irdma_get_pbl ((unsigned long )req.user_wqe_bufs, &ucontext->qp_reg_mem_list);
@@ -2074,10 +2073,6 @@ static int irdma_resize_cq(struct ib_cq *ibcq, unsigned int entries, rdma_udata_to_drv_context(udata, struct irdma_ucontext, ibucontext); -/* CQ resize not supported with legacy GEN_1 libi40iw */ -if (ucontext->legacy_mode) -return -EOPNOTSUPP ; -if (ib_copy_from_udata (&req, udata,min (sizeof (req), udata->inlen)))return -EINVAL ;
@@ -2559,7 +2554,7 @@ static int irdma_create_cq(struct ib_cq *ibcq, cqmr = &iwpbl->cq_mr;if (rf->sc_dev.hw_attrs.uk_attrs.feature_flags & -IRDMA_FEATURE_CQ_RESIZE && !ucontext->legacy_mode) { +IRDMA_FEATURE_CQ_RESIZE ) {spin_lock_irqsave (&ucontext->cq_reg_mem_list_lock, flags); iwpbl_shadow = irdma_get_pbl( (unsigned long)req.user_shadow_area,
Signature · 1 line
2.54.0.1032.g2f8565e1d1-goog
PATCH 2/2 RDMA/irdma: Fix OOB read during CQ MR registration
Sashiko pointed out an unrelated bug during a previous patch:
https://sashiko.dev/#/patchset/20260512183852.614045-1-jmoroni%40google.com
This change fixes the bug by eliminating the cqmr->split field which was not being set properly and instead just checks the CQ resize feature flag directly.
The cqmr->split field essentially tracks whether IRDMA_FEATURE_CQ_RESIZE is set, but it was not being set until CQ creation time, which is _after_ CQ memory registration (the only other place where it is referenced).
As a result, it would always be false during MR registration and would therefore cause irdma_handle_q_mem to populate cqmr->shadow even for GEN_2 HW and beyond:
cqmr->shadow = (dma_addr_t)arr[req->cq_pages];
The issue is that for GEN_2 and beyond, req->cq_pages may be exactly equal to iwmr->page_cnt and therefore equal to the size of arr, which would cause an OOB read by one.
--- drivers/infiniband/hw/irdma/verbs.c | 4 ++-- drivers/infiniband/hw/irdma/verbs.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/infiniband/hw/irdma/verbs.c +2 -2
@@ -2567,7 +2567,6 @@ static int irdma_create_cq(struct ib_cq *ibcq, } cqmr_shadow = &iwpbl_shadow->cq_mr; info.shadow_area_pa = cqmr_shadow->cq_pbl.addr; - cqmr->split = true; }else { info.shadow_area_pa = cqmr->shadow; }
@@ -2975,7 +2974,8 @@ static int irdma_handle_q_mem(struct irdma_device *iwdev,case IRDMA_MEMREG_TYPE_CQ : hmc_p = &cqmr->cq_pbl; -if (!cqmr->split) +if (!(iwdev->rf->sc_dev.hw_attrs.uk_attrs.feature_flags & +IRDMA_FEATURE_CQ_RESIZE )) cqmr->shadow = (dma_addr_t )arr[req->cq_pages];if (lvl)
drivers/infiniband/hw/irdma/verbs.h +0 -1
@@ -65,7 +65,6 @@ struct irdma_hmc_pble {struct irdma_cq_mr {struct irdma_hmc_pble cq_pbl;dma_addr_t shadow; -bool split; };struct irdma_srq_mr {
Signature · 1 line
2.54.0.1032.g2f8565e1d1-goog
Quoted 12 lines · Jacob Moroni
The driver has the following invariants:
1.
legacy_modeis only allowed onGEN_1hardware (enforced inirdma_alloc_ucontext).2.
GEN_1hardware does not setIRDMA_FEATURE_CQ_RESIZEorIRDMA_FEATURE_RTS_AE. These feature flags are only set forGEN_2andGEN_3hardware.Therefore,
legacy_modeis always false ifIRDMA_FEATURE_CQ_RESIZEorIRDMA_FEATURE_RTS_AEis set, so remove the redundant checks.
Quoted 6 lines
Signed-off-by Jacob Moroni <[email protected]>--- drivers/infiniband/hw/irdma/uk.c | 9 +++------ drivers/infiniband/hw/irdma/user.h | 1 - drivers/infiniband/hw/irdma/verbs.c | 7 +------ 3 files changed, 4 insertions(+), 13 deletions(-)
Applied to for-next
There are more sashiko existing issues:
https://sashiko.dev/#/patchset/20260602214423.1315105-1-jmoroni%40google.com
Some of them look like they need to be fixed
Jason
Thanks!
Quoted 1 line
There are more sashiko existing issues:
Yep, Sashiko is keeping me busy. I will take a look at them as well as the findings on the rereg_mr patch.
Thanks,
- Jake