From: Wenjia Zhang <wenjia@linux.ibm.com>
To: Kai Shen <KaiShen@linux.alibaba.com>,
kgraul@linux.ibm.com, jaka@linux.ibm.com,
guwen@linux.alibaba.com, kuba@kernel.org
Cc: davem@davemloft.net, tonylu@linux.alibaba.com,
netdev@vger.kernel.org, linux-s390@vger.kernel.org,
linux-rdma@vger.kernel.org
Subject: Re: [PATCH net] net/smc: Fix memory leak when using percpu refs
Date: Thu, 10 Oct 2024 18:09:03 +0200 [thread overview]
Message-ID: <e5a3f5a9-34e1-4575-a1a3-1205afe5ab17@linux.ibm.com> (raw)
In-Reply-To: <20241010115624.7769-1-KaiShen@linux.alibaba.com>
On 10.10.24 13:56, Kai Shen wrote:
> This patch adds missing percpu_ref_exit when releasing percpu refs.
> When releasing percpu refs, percpu_ref_exit should be called.
> Otherwise, memory leak happens.
>
> Fixes: 79a22238b4f2 ("net/smc: Use percpu ref for wr tx reference")
> Signed-off-by: Kai Shen <KaiShen@linux.alibaba.com>
> ---
> net/smc/smc_wr.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/net/smc/smc_wr.c b/net/smc/smc_wr.c
> index 0021065a600a..994c0cd4fddb 100644
> --- a/net/smc/smc_wr.c
> +++ b/net/smc/smc_wr.c
> @@ -648,8 +648,10 @@ void smc_wr_free_link(struct smc_link *lnk)
> smc_wr_tx_wait_no_pending_sends(lnk);
> percpu_ref_kill(&lnk->wr_reg_refs);
> wait_for_completion(&lnk->reg_ref_comp);
> + percpu_ref_exit(&lnk->wr_reg_refs);
> percpu_ref_kill(&lnk->wr_tx_refs);
> wait_for_completion(&lnk->tx_ref_comp);
> + percpu_ref_exit(&lnk->wr_tx_refs);
>
> if (lnk->wr_rx_dma_addr) {
> ib_dma_unmap_single(ibdev, lnk->wr_rx_dma_addr,
> @@ -912,11 +914,13 @@ int smc_wr_create_link(struct smc_link *lnk)
> init_waitqueue_head(&lnk->wr_reg_wait);
> rc = percpu_ref_init(&lnk->wr_reg_refs, smcr_wr_reg_refs_free, 0, GFP_KERNEL);
> if (rc)
> - goto dma_unmap;
> + goto cancel_ref;
> init_completion(&lnk->reg_ref_comp);
> init_waitqueue_head(&lnk->wr_rx_empty_wait);
> return rc;
>
> +cancel_ref:
> + percpu_ref_exit(&lnk->wr_tx_refs);
> dma_unmap:
> if (lnk->wr_rx_v2_dma_addr) {
> ib_dma_unmap_single(ibdev, lnk->wr_rx_v2_dma_addr,
It looks reasonable to me. Thanks for the fix!
Reviewed-by: Wenjia Zhang <wenjia@linux.ibm.com>
Thanks,
Wenjia
next prev parent reply other threads:[~2024-10-10 16:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-10 11:56 [PATCH net] net/smc: Fix memory leak when using percpu refs Kai Shen
2024-10-10 12:17 ` Dust Li
2024-10-10 16:09 ` Wenjia Zhang [this message]
2024-10-15 1:10 ` patchwork-bot+netdevbpf
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=e5a3f5a9-34e1-4575-a1a3-1205afe5ab17@linux.ibm.com \
--to=wenjia@linux.ibm.com \
--cc=KaiShen@linux.alibaba.com \
--cc=davem@davemloft.net \
--cc=guwen@linux.alibaba.com \
--cc=jaka@linux.ibm.com \
--cc=kgraul@linux.ibm.com \
--cc=kuba@kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=tonylu@linux.alibaba.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