qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RDMA/core: Fix ib_qp_usecnt_dec() called when error 

Bugzilla: http://bugzilla.redhat.com/2056772

commit 7c4a539ec38f4ce400a0f3fcb5ff6c940fcd67bb
Author: Yajun Deng <yajun.deng@linux.dev>
Date:   Thu Mar 3 10:42:32 2022 +0800

    RDMA/core: Fix ib_qp_usecnt_dec() called when error

    ib_destroy_qp() would called by ib_create_qp_user() if error, the former
    contains ib_qp_usecnt_dec(), but ib_qp_usecnt_inc() was not called before.

    So move ib_qp_usecnt_inc() into create_qp().

    Fixes: d2b10794fc13 ("RDMA/core: Create clean QP creations interface for uverbs")
    Link: https://lore.kernel.org/r/20220303024232.2847388-1-yajun.deng@linux.dev
    Signed-off-by: Yajun Deng <yajun.deng@linux.dev>
    Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
    Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

Signed-off-by: Kamal Heib <kheib@redhat.com>
This commit is contained in:
Kamal Heib 2022-04-05 23:20:46 +03:00
parent 8c11a726c7
commit a7d904369d
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/infiniband/core/uverbs_cmd.c
View File

@ -1437,7 +1437,6 @@ static int create_qp(struct uverbs_attr_bundle *attrs,
ret = PTR_ERR(qp);
goto err_put;
}
ib_qp_usecnt_inc(qp);
obj->uevent.uobject.object = qp;
obj->uevent.event_file = READ_ONCE(attrs->ufile->default_async_file);

1
drivers/infiniband/core/uverbs_std_types_qp.c
View File

@ -254,7 +254,6 @@ static int UVERBS_HANDLER(UVERBS_METHOD_QP_CREATE)(
ret = PTR_ERR(qp);
goto err_put;
}
ib_qp_usecnt_inc(qp);
if (attr.qp_type == IB_QPT_XRC_TGT) {
obj->uxrcd = container_of(xrcd_uobj, struct ib_uxrcd_object,

3
drivers/infiniband/core/verbs.c
View File

@ -1244,6 +1244,7 @@ static struct ib_qp *create_qp(struct ib_device *dev, struct ib_pd *pd,
if (ret)
goto err_security;
ib_qp_usecnt_inc(qp);
rdma_restrack_add(&qp->res);
return qp;
@ -1344,8 +1345,6 @@ struct ib_qp *ib_create_qp_kernel(struct ib_pd *pd,
if (IS_ERR(qp))
return qp;
ib_qp_usecnt_inc(qp);
if (qp_init_attr->cap.max_rdma_ctxs) {
ret = rdma_rw_init_mrs(qp, qp_init_attr);
if (ret)