From: wangyunjian <wangyunjian@huawei.com>
To: "Loftus, Ciara" <ciara.loftus@intel.com>,
"Tahhan, Maryam" <mtahhan@redhat.com>
Cc: "dev@dpdk.org" <dev@dpdk.org>,
"ferruh.yigit@amd.com" <ferruh.yigit@amd.com>,
"stable@dpdk.org" <stable@dpdk.org>
Subject: RE: [PATCH] net/af_xdp: fix resources leak when xsk configure fails
Date: Thu, 22 Feb 2024 11:52:25 +0000 [thread overview]
Message-ID: <749f6c543e88472282f578b2becd949f@huawei.com> (raw)
In-Reply-To: <MW4PR11MB5872A74ACDAA88ED067B6EBD8E562@MW4PR11MB5872.namprd11.prod.outlook.com>
> -----Original Message-----
> From: Loftus, Ciara [mailto:ciara.loftus@intel.com]
> Sent: Thursday, February 22, 2024 7:06 PM
> To: Tahhan, Maryam <mtahhan@redhat.com>; wangyunjian
> <wangyunjian@huawei.com>
> Cc: dev@dpdk.org; ferruh.yigit@amd.com; stable@dpdk.org
> Subject: RE: [PATCH] net/af_xdp: fix resources leak when xsk configure fails
>
> >
> > On 22/02/2024 03:07, Yunjian Wang wrote:
> > In xdp_umem_configure() allocated some resources for the xsk umem, we
> > should delete them when xsk configure fails, otherwise it will lead to
> > resources leak.
> >
> > Fixes: f1debd77efaf ("net/af_xdp: introduce AF_XDP PMD")
> > Cc: mailto:stable@dpdk.org
> >
> > Signed-off-by: Yunjian Wang mailto:wangyunjian@huawei.com
> > ---
> > drivers/net/af_xdp/rte_eth_af_xdp.c | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c
> > b/drivers/net/af_xdp/rte_eth_af_xdp.c
> > index 2d151e45c7..8b8b2cff9f 100644
> > --- a/drivers/net/af_xdp/rte_eth_af_xdp.c
> > +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
> > @@ -1723,8 +1723,10 @@ xsk_configure(struct pmd_internals *internals,
> > struct pkt_rx_queue *rxq,
> > out_xsk:
> > xsk_socket__delete(rxq->xsk);
> > out_umem:
> > - if (__atomic_fetch_sub(&rxq->umem->refcnt, 1,
> > __ATOMIC_ACQUIRE) - 1 == 0)
> > + if (__atomic_fetch_sub(&rxq->umem->refcnt, 1,
> > __ATOMIC_ACQUIRE) - 1 == 0) {
> > + (void)xsk_umem__delete(rxq->umem->umem);
> > xdp_umem_destroy(rxq->umem);
> > + }
> >
> > return ret;
> > }
> >
> > Does it make sense to: move `xsk_umem__delete()` inside
> > `xdp_umem_destroy()` to be invoked after a NULL check for `umem->umem`
> > and then fixup the places where both functions are called to only
> > invoke `xdp_umem_destroy()`? (Keeping all the umem cleanup code in one
> > place) @Yunjian WDYT?
> >
> > @Ciara WDYT?
>
> Thanks for the patch Yunjian.
>
> @Maryam +1 for the suggestion I think it would be a good optimisation for the
> cleanup code.
OK, I will update it in next version.
>
> Thanks,
> Ciara
>
> >
next prev parent reply other threads:[~2024-02-22 11:52 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-22 3:07 Yunjian Wang
2024-02-22 9:54 ` Maryam Tahhan
2024-02-22 11:05 ` Loftus, Ciara
2024-02-22 11:52 ` wangyunjian [this message]
2024-02-22 13:35 ` [PATCH v2] " Yunjian Wang
2024-02-22 15:54 ` Ferruh Yigit
2024-02-22 15:58 ` Loftus, Ciara
2024-02-23 1:45 ` [PATCH v3] " Yunjian Wang
2024-02-23 11:42 ` Ferruh Yigit
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=749f6c543e88472282f578b2becd949f@huawei.com \
--to=wangyunjian@huawei.com \
--cc=ciara.loftus@intel.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@amd.com \
--cc=mtahhan@redhat.com \
--cc=stable@dpdk.org \
/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;
as well as URLs for NNTP newsgroup(s).