RDMA/irdma: Prevent premature deregistration of user ring MRs
Subsystems (2)
cover RDMA/irdma: Prevent premature deregistration of user ring MRs
When a QP/CQ/SRQ is created, a two step process is used where the buffer is allocated in userspace and explicitly registered with the normal reg_mr mechanism prior to creating the actual QP/CQ/SRQ object.
Even though these special MRs are internal to the verbs provider, nothing actually prevents a custom/malicious user application from manually invoking dereg_mr on these regions. If this occurs, the PBL is freed and umem is released while the HW may still be accessing it.
Since the core layer is unaware of the relationship between these MRs and their associated QP/CQ/SRQ objects, refcounting must be performed in the irdma driver to block any deregistration attempts if the region is still associated with an active ring object.
Jacob Moroni (4):
RDMA/irdma: Deduplicate the irdma_del_memlist logic RDMA/irdma: Add a refcount to track user ring MR associations RDMA/irdma: Add irdma_cq fields to track pbl allocations RDMA/irdma: Add refcounting to user ring MRs
drivers/infiniband/hw/irdma/utils.c | 6 ++ drivers/infiniband/hw/irdma/verbs.c | 116 ++++++++++++++++++++-------- drivers/infiniband/hw/irdma/verbs.h | 3 + 3 files changed, 93 insertions(+), 32 deletions(-)
Signature · 1 line
2.55.0.rc0.738.g0c8ab3ebcc-goog
PATCH 1/4 RDMA/irdma: Deduplicate the irdma_del_memlist logic
Simplify/dedup the irdma_del_memlist logic in preparation for the QP/CQ/SRQ ring MR refcounting change that will follow in a subsequent commit.
--- drivers/infiniband/hw/irdma/verbs.c | 31 +++++++++++------------------ 1 file changed, 12 insertions(+), 19 deletions(-)
drivers/infiniband/hw/irdma/verbs.c +12 -19
@@ -3929,35 +3929,28 @@ static void irdma_del_memlist(struct irdma_mr *iwmr, {struct irdma_pbl *iwpbl = &iwmr->iwpbl;unsigned long flags; +spinlock_t *lock;switch (iwmr->type) {case IRDMA_MEMREG_TYPE_CQ : -spin_lock_irqsave (&ucontext->cq_reg_mem_list_lock, flags); -if (iwpbl->on_list) { - iwpbl->on_list = false; -list_del (&iwpbl->list); - } -spin_unlock_irqrestore (&ucontext->cq_reg_mem_list_lock, flags); + lock = &ucontext->cq_reg_mem_list_lock;break ;case IRDMA_MEMREG_TYPE_QP : -spin_lock_irqsave (&ucontext->qp_reg_mem_list_lock, flags); -if (iwpbl->on_list) { - iwpbl->on_list = false; -list_del (&iwpbl->list); - } -spin_unlock_irqrestore (&ucontext->qp_reg_mem_list_lock, flags); + lock = &ucontext->qp_reg_mem_list_lock;break ;case IRDMA_MEMREG_TYPE_SRQ : -spin_lock_irqsave (&ucontext->srq_reg_mem_list_lock, flags); -if (iwpbl->on_list) { - iwpbl->on_list = false; -list_del (&iwpbl->list); - } -spin_unlock_irqrestore (&ucontext->srq_reg_mem_list_lock, flags); + lock = &ucontext->srq_reg_mem_list_lock;break ;default : -break ; +return ; + } + +spin_lock_irqsave (lock, flags); +if (iwpbl->on_list) { + iwpbl->on_list = false; +list_del (&iwpbl->list); } +spin_unlock_irqrestore (lock, flags); }/**
Signature · 1 line
2.55.0.rc0.738.g0c8ab3ebcc-goog
PATCH 2/4 RDMA/irdma: Add a refcount to track user ring MR associations
In reply to Jacob MoroniUser QP/CQ/SRQ rings are registered with the normal reg_mr mechanism prior to creating the actual QP/CQ/SRQ object. In order to prevent userspace from deregistering these special MRs while the child object still exists, a refcount will be used.
This commit adds the refcount and logic to reject a dereg_mr with active references. Subsequent commits will add logic to bump this refcount when the user QP/CQ/SRQ objects are created.
--- drivers/infiniband/hw/irdma/verbs.c | 21 +++++++++++++++++---- drivers/infiniband/hw/irdma/verbs.h | 1 + 2 files changed, 18 insertions(+), 4 deletions(-)
drivers/infiniband/hw/irdma/verbs.c +17 -4
@@ -3363,6 +3363,7 @@ static struct irdma_mr *irdma_alloc_iwmr(struct ib_umem *region,if (!iwmr)return ERR_PTR (-ENOMEM ); +refcount_set (&iwmr->user_ring_refs,1 ); iwpbl = &iwmr->iwpbl; iwpbl->iwmr = iwmr; iwmr->region = region;
@@ -3923,13 +3924,16 @@ static struct ib_mr *irdma_get_dma_mr(struct ib_pd *pd, int acc)* irdma_del_memlist - Deleting pbl list entries for CQ/QP * @iwmr: iwmr for IB's user page addresses * @ucontext: ptr to user context +* +* Return: True if the MR is currently in-use by a QP/CQ/SRQ ring. */ -static void irdma_del_memlist (struct irdma_mr *iwmr, +static bool irdma_del_memlist (struct irdma_mr *iwmr,struct irdma_ucontext *ucontext) {struct irdma_pbl *iwpbl = &iwmr->iwpbl;unsigned long flags;spinlock_t *lock; +bool in_use = false;switch (iwmr->type) {case IRDMA_MEMREG_TYPE_CQ :
@@ -3942,15 +3946,19 @@ static void irdma_del_memlist(struct irdma_mr *iwmr, lock = &ucontext->srq_reg_mem_list_lock;break ;default : -return ; +return false; }spin_lock_irqsave (lock, flags); -if (iwpbl->on_list) { +if (!refcount_dec_if_one (&iwmr->user_ring_refs)) { + in_use = true; + }else if (iwpbl->on_list) { iwpbl->on_list = false;list_del (&iwpbl->list); }spin_unlock_irqrestore (lock, flags); + +return in_use; }/**
@@ -3973,7 +3981,12 @@ static int irdma_dereg_mr(struct ib_mr *ib_mr, struct ib_udata *udata) ucontext =rdma_udata_to_drv_context (udata, struct irdma_ucontext, ibucontext); -irdma_del_memlist (iwmr, ucontext); + +/* Do not allow the MR to be unpinned if it is still +* backing a user ring. +*/ +if (irdma_del_memlist (iwmr, ucontext)) +return -EBUSY ; } goto done; }
drivers/infiniband/hw/irdma/verbs.h +1 -0
@@ -120,6 +120,7 @@ struct irdma_mr {u64 len;u64 pgaddrmem[IRDMA_MAX_SAVED_PHY_PGADDR ];struct irdma_pbl iwpbl; +refcount_t user_ring_refs; };struct irdma_srq {
Signature · 1 line
2.55.0.rc0.738.g0c8ab3ebcc-goog
PATCH 3/4 RDMA/irdma: Add irdma_cq fields to track pbl allocations
In reply to Jacob MoroniThese fields will be used in a subsequent commit which adds refcounting to user CQ MRs.
--- drivers/infiniband/hw/irdma/verbs.c | 25 +++++++++++++++---------- drivers/infiniband/hw/irdma/verbs.h | 2 ++ 2 files changed, 17 insertions(+), 10 deletions(-)
drivers/infiniband/hw/irdma/verbs.c +15 -10
@@ -2129,6 +2129,11 @@ static int irdma_resize_cq(struct ib_cq *ibcq, unsigned int entries, goto error;spin_lock_irqsave (&iwcq->lock, flags); +if (udata) +/* Only update if the resize was successful. Otherwise, HW is +* still pointing to the old PBL. +*/ + iwcq->iwpbl = iwpbl_buf;if (cq_buf) { cq_buf->kmem_buf = iwcq->kmem; cq_buf->hw = dev->hw;
@@ -2499,6 +2504,8 @@ static int irdma_create_cq(struct ib_cq *ibcq,INIT_LIST_HEAD (&iwcq->resize_list);INIT_LIST_HEAD (&iwcq->cmpl_generated); iwcq->cq_num = cq_num; + iwcq->iwpbl =NULL ; + iwcq->iwpbl_shadow =NULL ; info.dev = dev; ukinfo->cq_size =max (entries,4 ); ukinfo->cq_id = cq_num;
@@ -2518,8 +2525,6 @@ static int irdma_create_cq(struct ib_cq *ibcq,struct irdma_ucontext *ucontext;struct irdma_create_cq_req req = {};struct irdma_cq_mr *cqmr; -struct irdma_pbl *iwpbl; -struct irdma_pbl *iwpbl_shadow;struct irdma_cq_mr *cqmr_shadow; iwcq->user_mode = true;
@@ -2533,34 +2538,34 @@ static int irdma_create_cq(struct ib_cq *ibcq, }spin_lock_irqsave (&ucontext->cq_reg_mem_list_lock, flags); - iwpbl =irdma_get_pbl ((unsigned long )req.user_cq_buf, - &ucontext->cq_reg_mem_list); + iwcq->iwpbl =irdma_get_pbl ((unsigned long )req.user_cq_buf, + &ucontext->cq_reg_mem_list);spin_unlock_irqrestore (&ucontext->cq_reg_mem_list_lock, flags); -if (!iwpbl) { +if (!iwcq->iwpbl) { err_code = -EPROTO ; goto cq_free_rsrc; } - cqmr = &iwpbl->cq_mr; + cqmr = &iwcq->iwpbl->cq_mr;if (rf->sc_dev.hw_attrs.uk_attrs.feature_flags &IRDMA_FEATURE_CQ_RESIZE ) {spin_lock_irqsave (&ucontext->cq_reg_mem_list_lock, flags); - iwpbl_shadow =irdma_get_pbl ( + iwcq->iwpbl_shadow =irdma_get_pbl ( (unsigned long )req.user_shadow_area, &ucontext->cq_reg_mem_list);spin_unlock_irqrestore (&ucontext->cq_reg_mem_list_lock, flags); -if (!iwpbl_shadow) { +if (!iwcq->iwpbl_shadow) { err_code = -EPROTO ; goto cq_free_rsrc; } - cqmr_shadow = &iwpbl_shadow->cq_mr; + cqmr_shadow = &iwcq->iwpbl_shadow->cq_mr; info.shadow_area_pa = cqmr_shadow->cq_pbl.addr; }else { info.shadow_area_pa = cqmr->shadow; } -if (iwpbl->pbl_allocated) { +if (iwcq->iwpbl->pbl_allocated) { info.virtual_map = true; info.pbl_chunk_size =1 ; info.first_pm_pbl_idx = cqmr->cq_pbl.idx;
drivers/infiniband/hw/irdma/verbs.h +2 -0
@@ -153,6 +153,8 @@ struct irdma_cq {struct list_head resize_list;struct irdma_cq_poll_info cur_cqe;struct list_head cmpl_generated; +struct irdma_pbl *iwpbl; +struct irdma_pbl *iwpbl_shadow; };struct irdma_cmpl_gen {
Signature · 1 line
2.55.0.rc0.738.g0c8ab3ebcc-goog
PATCH 4/4 RDMA/irdma: Add refcounting to user ring MRs
In reply to Jacob MoroniPrevent userspace from deregistering the MRs that back QP/CQ/SRQ rings by bumping the MR's refcount upon association.
--- drivers/infiniband/hw/irdma/utils.c | 6 ++++ drivers/infiniband/hw/irdma/verbs.c | 45 +++++++++++++++++++++++++++-- 2 files changed, 49 insertions(+), 2 deletions(-)
drivers/infiniband/hw/irdma/utils.c +6 -0
@@ -1168,6 +1168,12 @@ void irdma_free_qp_rsrc(struct irdma_qp *iwqp) iwqp->kqp.dma_mem.va =NULL ;kfree (iwqp->kqp.sq_wrid_mem);kfree (iwqp->kqp.rq_wrid_mem); + +if (iwqp->user_mode && iwqp->iwpbl) { +struct irdma_mr *iwmr = iwqp->iwpbl->iwmr; + +refcount_dec (&iwmr->user_ring_refs); + } }/**
drivers/infiniband/hw/irdma/verbs.c +43 -2
91 lines not on this page · raw message
Signature · 1 line
2.55.0.rc0.738.g0c8ab3ebcc-goog
Leon Romanovsky
AppliedQuoted 10 lines · Jacob Moroni
When a QP/CQ/SRQ is created, a two step process is used where the buffer is allocated in userspace and explicitly registered with the normal
reg_mrmechanism prior to creating the actual QP/CQ/SRQ object.Even though these special MRs are internal to the verbs provider, nothing actually prevents a custom/malicious user application from manually invoking
dereg_mron these regions. If this occurs, the PBL is freed and umem is released while the HW may still be accessing it.[...]
Applied, thanks!
[1/4] RDMA/irdma: Deduplicate the irdma_del_memlist logic
https://git.kernel.org/rdma/rdma/c/097f50384e1877 [2/4] RDMA/irdma: Add a refcount to track user ring MR associations https://git.kernel.org/rdma/rdma/c/a7d0a6b58256a7 [3/4] RDMA/irdma: Add irdma_cq fields to track pbl allocations https://git.kernel.org/rdma/rdma/c/971e99623ed7a0 [4/4] RDMA/irdma: Add refcounting to user ring MRs https://git.kernel.org/rdma/rdma/c/f67d8a08f60c92
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>