From: Zhu Yanjun <yanjun.zhu@linux.dev>
To: Bob Pearson <rpearsonhpe@gmail.com>,
jgg@nvidia.com, zyjzyj2000@gmail.com, linux-rdma@vger.kernel.org
Cc: rpearson@hpe.com
Subject: Re: [PATCH for-next] RDMA/rxe: Remove rxe_alloc()
Date: Wed, 15 Feb 2023 07:55:40 +0800 [thread overview]
Message-ID: <ee983dce-0f26-3e1a-e792-a57bba6ca7e4@linux.dev> (raw)
In-Reply-To: <20230213225551.12437-1-rpearsonhpe@gmail.com>
在 2023/2/14 6:55, Bob Pearson 写道:
> Currently all the object types in the rxe driver are allocated in
> rdma-core except for MRs. By moving tha kzalloc() call outside of
> the pool code the rxe_alloc() subroutine can be eliminated and code
> checking for MR as a special case can be removed.
>
> This patch moves the kzalloc() and kfree_rcu() calls into the mr
> registration and destruction verbs. It removes that code from
> rxe_pool.c including the rxe_alloc() subroutine which is no longer
> used.
No bug fixes and no function changes.
In this commit, refactoring the some code snippet.
Not sure if this will introduce risks.
But to now, it seems fine to me.
Reviewed-by: Zhu Yanjun <yanjun.zhu@linux.dev>
Zhu Yanjun
>
> Signed-off-by: Bob Pearson <rpearsonhpe@gmail.com>
> ---
> drivers/infiniband/sw/rxe/rxe_mr.c | 2 +-
> drivers/infiniband/sw/rxe/rxe_pool.c | 46 --------------------
> drivers/infiniband/sw/rxe/rxe_pool.h | 3 --
> drivers/infiniband/sw/rxe/rxe_verbs.c | 61 +++++++++++++++++++--------
> 4 files changed, 45 insertions(+), 67 deletions(-)
>
> diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c
> index c80458634962..c79a4161a6ae 100644
> --- a/drivers/infiniband/sw/rxe/rxe_mr.c
> +++ b/drivers/infiniband/sw/rxe/rxe_mr.c
> @@ -724,7 +724,7 @@ int rxe_dereg_mr(struct ib_mr *ibmr, struct ib_udata *udata)
> return -EINVAL;
>
> rxe_cleanup(mr);
> -
> + kfree_rcu(mr);
> return 0;
> }
>
> diff --git a/drivers/infiniband/sw/rxe/rxe_pool.c b/drivers/infiniband/sw/rxe/rxe_pool.c
> index f50620f5a0a1..3f6bd672cc2d 100644
> --- a/drivers/infiniband/sw/rxe/rxe_pool.c
> +++ b/drivers/infiniband/sw/rxe/rxe_pool.c
> @@ -116,55 +116,12 @@ void rxe_pool_cleanup(struct rxe_pool *pool)
> WARN_ON(!xa_empty(&pool->xa));
> }
>
> -void *rxe_alloc(struct rxe_pool *pool)
> -{
> - struct rxe_pool_elem *elem;
> - void *obj;
> - int err;
> -
> - if (WARN_ON(!(pool->type == RXE_TYPE_MR)))
> - return NULL;
> -
> - if (atomic_inc_return(&pool->num_elem) > pool->max_elem)
> - goto err_cnt;
> -
> - obj = kzalloc(pool->elem_size, GFP_KERNEL);
> - if (!obj)
> - goto err_cnt;
> -
> - elem = (struct rxe_pool_elem *)((u8 *)obj + pool->elem_offset);
> -
> - elem->pool = pool;
> - elem->obj = obj;
> - kref_init(&elem->ref_cnt);
> - init_completion(&elem->complete);
> -
> - /* allocate index in array but leave pointer as NULL so it
> - * can't be looked up until rxe_finalize() is called
> - */
> - err = xa_alloc_cyclic(&pool->xa, &elem->index, NULL, pool->limit,
> - &pool->next, GFP_KERNEL);
> - if (err < 0)
> - goto err_free;
> -
> - return obj;
> -
> -err_free:
> - kfree(obj);
> -err_cnt:
> - atomic_dec(&pool->num_elem);
> - return NULL;
> -}
> -
> int __rxe_add_to_pool(struct rxe_pool *pool, struct rxe_pool_elem *elem,
> bool sleepable)
> {
> int err;
> gfp_t gfp_flags;
>
> - if (WARN_ON(pool->type == RXE_TYPE_MR))
> - return -EINVAL;
> -
> if (atomic_inc_return(&pool->num_elem) > pool->max_elem)
> goto err_cnt;
>
> @@ -275,9 +232,6 @@ int __rxe_cleanup(struct rxe_pool_elem *elem, bool sleepable)
> if (pool->cleanup)
> pool->cleanup(elem);
>
> - if (pool->type == RXE_TYPE_MR)
> - kfree_rcu(elem->obj);
> -
> atomic_dec(&pool->num_elem);
>
> return err;
> diff --git a/drivers/infiniband/sw/rxe/rxe_pool.h b/drivers/infiniband/sw/rxe/rxe_pool.h
> index 9d83cb32092f..b42e26427a70 100644
> --- a/drivers/infiniband/sw/rxe/rxe_pool.h
> +++ b/drivers/infiniband/sw/rxe/rxe_pool.h
> @@ -54,9 +54,6 @@ void rxe_pool_init(struct rxe_dev *rxe, struct rxe_pool *pool,
> /* free resources from object pool */
> void rxe_pool_cleanup(struct rxe_pool *pool);
>
> -/* allocate an object from pool */
> -void *rxe_alloc(struct rxe_pool *pool);
> -
> /* connect already allocated object to pool */
> int __rxe_add_to_pool(struct rxe_pool *pool, struct rxe_pool_elem *elem,
> bool sleepable);
> diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c
> index 7a902e0a0607..268be6983c1e 100644
> --- a/drivers/infiniband/sw/rxe/rxe_verbs.c
> +++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
> @@ -869,10 +869,17 @@ static struct ib_mr *rxe_get_dma_mr(struct ib_pd *ibpd, int access)
> struct rxe_dev *rxe = to_rdev(ibpd->device);
> struct rxe_pd *pd = to_rpd(ibpd);
> struct rxe_mr *mr;
> + int err;
>
> - mr = rxe_alloc(&rxe->mr_pool);
> - if (!mr)
> - return ERR_PTR(-ENOMEM);
> + mr = kzalloc(sizeof(*mr), GFP_KERNEL);
> + if (!mr) {
> + err = -ENOMEM;
> + goto err_out;
> + }
> +
> + err = rxe_add_to_pool(&rxe->mr_pool, mr);
> + if (err)
> + goto err_free;
>
> rxe_get(pd);
> mr->ibmr.pd = ibpd;
> @@ -880,8 +887,12 @@ static struct ib_mr *rxe_get_dma_mr(struct ib_pd *ibpd, int access)
>
> rxe_mr_init_dma(access, mr);
> rxe_finalize(mr);
> -
> return &mr->ibmr;
> +
> +err_free:
> + kfree(mr);
> +err_out:
> + return ERR_PTR(err);
> }
>
> static struct ib_mr *rxe_reg_user_mr(struct ib_pd *ibpd,
> @@ -895,9 +906,15 @@ static struct ib_mr *rxe_reg_user_mr(struct ib_pd *ibpd,
> struct rxe_pd *pd = to_rpd(ibpd);
> struct rxe_mr *mr;
>
> - mr = rxe_alloc(&rxe->mr_pool);
> - if (!mr)
> - return ERR_PTR(-ENOMEM);
> + mr = kzalloc(sizeof(*mr), GFP_KERNEL);
> + if (!mr) {
> + err = -ENOMEM;
> + goto err_out;
> + }
> +
> + err = rxe_add_to_pool(&rxe->mr_pool, mr);
> + if (err)
> + goto err_free;
>
> rxe_get(pd);
> mr->ibmr.pd = ibpd;
> @@ -905,14 +922,16 @@ static struct ib_mr *rxe_reg_user_mr(struct ib_pd *ibpd,
>
> err = rxe_mr_init_user(rxe, start, length, iova, access, mr);
> if (err)
> - goto err1;
> + goto err_cleanup;
>
> rxe_finalize(mr);
> -
> return &mr->ibmr;
>
> -err1:
> +err_cleanup:
> rxe_cleanup(mr);
> +err_free:
> + kfree(mr);
> +err_out:
> return ERR_PTR(err);
> }
>
> @@ -927,24 +946,32 @@ static struct ib_mr *rxe_alloc_mr(struct ib_pd *ibpd, enum ib_mr_type mr_type,
> if (mr_type != IB_MR_TYPE_MEM_REG)
> return ERR_PTR(-EINVAL);
>
> - mr = rxe_alloc(&rxe->mr_pool);
> - if (!mr)
> - return ERR_PTR(-ENOMEM);
> + mr = kzalloc(sizeof(*mr), GFP_KERNEL);
> + if (!mr) {
> + err = -ENOMEM;
> + goto err_out;
> + }
> +
> + err = rxe_add_to_pool(&rxe->mr_pool, mr);
> + if (err)
> + goto err_free;
>
> rxe_get(pd);
> mr->ibmr.pd = ibpd;
> mr->ibmr.device = ibpd->device;
>
> err = rxe_mr_init_fast(max_num_sg, mr);
> - if (err)
> - goto err1;
> + if (err)
> + goto err_cleanup;
>
> rxe_finalize(mr);
> -
> return &mr->ibmr;
>
> -err1:
> +err_cleanup:
> rxe_cleanup(mr);
> +err_free:
> + kfree(mr);
> +err_out:
> return ERR_PTR(err);
> }
>
>
> base-commit: 9cd9842c46996ef62173c36619c746f57416bcb0
next prev parent reply other threads:[~2023-02-14 23:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-13 22:55 [PATCH for-next] RDMA/rxe: Remove rxe_alloc() Bob Pearson
2023-02-14 4:15 ` Devesh Sharma
2023-02-14 17:33 ` Pearson, Robert B
2023-02-14 23:55 ` Zhu Yanjun [this message]
2023-02-16 15:59 ` Jason Gunthorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ee983dce-0f26-3e1a-e792-a57bba6ca7e4@linux.dev \
--to=yanjun.zhu@linux.dev \
--cc=jgg@nvidia.com \
--cc=linux-rdma@vger.kernel.org \
--cc=rpearson@hpe.com \
--cc=rpearsonhpe@gmail.com \
--cc=zyjzyj2000@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox