From: Leon Romanovsky <leon@kernel.org>
To: Zhipeng Lu <alexious@zju.edu.cn>
Cc: Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>,
Jason Gunthorpe <jgg@ziepe.ca>, Jubin John <jubin.john@intel.com>,
Mitko Haralanov <mitko.haralanov@intel.com>,
Ravi Krishnaswamy <ravi.krishnaswamy@intel.com>,
Harish Chegondi <harish.chegondi@intel.com>,
Brendan Cunningham <brendan.cunningham@intel.com>,
linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] IB/hfi1: fix a memleak in init_credit_return
Date: Sun, 14 Jan 2024 11:04:34 +0200 [thread overview]
Message-ID: <20240114090434.GD6404@unreal> (raw)
In-Reply-To: <20240112085523.3731720-1-alexious@zju.edu.cn>
On Fri, Jan 12, 2024 at 04:55:23PM +0800, Zhipeng Lu wrote:
> When dma_alloc_coherent fails to allocate dd->cr_base[i].va,
> init_credit_return should deallocate dd->cr_base and
> dd->cr_base[i] that allocated before. Or those resources
> would be never freed and a memleak is triggered.
>
> Fixes: 7724105686e7 ("IB/hfi1: add driver files")
> Signed-off-by: Zhipeng Lu <alexious@zju.edu.cn>
> ---
> drivers/infiniband/hw/hfi1/pio.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/infiniband/hw/hfi1/pio.c b/drivers/infiniband/hw/hfi1/pio.c
> index 68c621ff59d0..5a91cbda4aee 100644
> --- a/drivers/infiniband/hw/hfi1/pio.c
> +++ b/drivers/infiniband/hw/hfi1/pio.c
> @@ -2086,7 +2086,7 @@ int init_credit_return(struct hfi1_devdata *dd)
> "Unable to allocate credit return DMA range for NUMA %d\n",
> i);
> ret = -ENOMEM;
> - goto done;
> + goto free_cr_base;
> }
> }
> set_dev_node(&dd->pcidev->dev, dd->node);
> @@ -2094,6 +2094,10 @@ int init_credit_return(struct hfi1_devdata *dd)
> ret = 0;
> done:
> return ret;
> +
> +free_cr_base:
> + free_credit_return(dd);
Dennis,
The idea of this patch is right, but it made me wonder, if
free_credit_return() is correct.
init_credit_return() iterates with help of for_each_node_with_cpus():
2062 int init_credit_return(struct hfi1_devdata *dd)
2063 {
...
2075 for_each_node_with_cpus(i) {
2076 int bytes = TXE_NUM_CONTEXTS * sizeof(struct credit_return);
2077
But free_credit_return uses something else:
2099 void free_credit_return(struct hfi1_devdata *dd)
2100 {
...
2105 for (i = 0; i < node_affinity.num_possible_nodes; i++) {
2106 if (dd->cr_base[i].va) {
Thanks
> + goto done;
> }
>
> void free_credit_return(struct hfi1_devdata *dd)
> --
> 2.34.1
>
next prev parent reply other threads:[~2024-01-14 9:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-12 8:55 [PATCH] IB/hfi1: fix a memleak in init_credit_return Zhipeng Lu
2024-01-14 9:04 ` Leon Romanovsky [this message]
2024-01-18 23:14 ` Dennis Dalessandro
2024-01-21 13:09 ` Leon Romanovsky
2024-01-25 9:56 ` Leon Romanovsky
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=20240114090434.GD6404@unreal \
--to=leon@kernel.org \
--cc=alexious@zju.edu.cn \
--cc=brendan.cunningham@intel.com \
--cc=dennis.dalessandro@cornelisnetworks.com \
--cc=harish.chegondi@intel.com \
--cc=jgg@ziepe.ca \
--cc=jubin.john@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=mitko.haralanov@intel.com \
--cc=ravi.krishnaswamy@intel.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