DPDK patches and discussions
 help / color / mirror / Atom feed
From: "Loftus, Ciara" <ciara.loftus@intel.com>
To: Yunjian Wang <wangyunjian@huawei.com>, "dev@dpdk.org" <dev@dpdk.org>
Cc: "ferruh.yigit@amd.com" <ferruh.yigit@amd.com>,
	"xudingke@huawei.com" <xudingke@huawei.com>,
	"stable@dpdk.org" <stable@dpdk.org>
Subject: RE: [PATCH v2] net/af_xdp: fix resources leak when xsk configure fails
Date: Thu, 22 Feb 2024 15:58:12 +0000	[thread overview]
Message-ID: <MW4PR11MB587208A808B427A573F61A798E562@MW4PR11MB5872.namprd11.prod.outlook.com> (raw)
In-Reply-To: <1708608939-14440-1-git-send-email-wangyunjian@huawei.com>

> Subject: [PATCH v2] net/af_xdp: fix resources leak when xsk configure fails
> 
> 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: stable@dpdk.org
> 
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>

Thanks!

Reviewed-by <ciara.loftus@intel.com>

> ---
> v2: update code style as suggested by Maryam Tahhan
> ---
>  drivers/net/af_xdp/rte_eth_af_xdp.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c
> b/drivers/net/af_xdp/rte_eth_af_xdp.c
> index 2d151e45c7..b52513bd7e 100644
> --- a/drivers/net/af_xdp/rte_eth_af_xdp.c
> +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
> @@ -960,6 +960,11 @@ remove_xdp_program(struct pmd_internals
> *internals)
>  static void
>  xdp_umem_destroy(struct xsk_umem_info *umem)
>  {
> +	if (umem->umem) {
> +		(void)xsk_umem__delete(umem->umem);
> +		umem->umem = NULL;
> +	}
> +
>  #if defined(XDP_UMEM_UNALIGNED_CHUNK_FLAG)
>  	umem->mb_pool = NULL;
>  #else
> @@ -992,11 +997,8 @@ eth_dev_close(struct rte_eth_dev *dev)
>  			break;
>  		xsk_socket__delete(rxq->xsk);
> 
> -		if (__atomic_fetch_sub(&rxq->umem->refcnt, 1,
> __ATOMIC_ACQUIRE) - 1
> -				== 0) {
> -			(void)xsk_umem__delete(rxq->umem->umem);
> +		if (__atomic_fetch_sub(&rxq->umem->refcnt, 1,
> __ATOMIC_ACQUIRE) - 1 == 0)
>  			xdp_umem_destroy(rxq->umem);
> -		}
> 
>  		/* free pkt_tx_queue */
>  		rte_free(rxq->pair);
> --
> 2.41.0


  parent reply	other threads:[~2024-02-22 15:58 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-22  3:07 [PATCH] " Yunjian Wang
2024-02-22  9:54 ` Maryam Tahhan
2024-02-22 11:05   ` Loftus, Ciara
2024-02-22 11:52     ` wangyunjian
2024-02-22 13:35 ` [PATCH v2] " Yunjian Wang
2024-02-22 15:54   ` Ferruh Yigit
2024-02-22 15:58   ` Loftus, Ciara [this message]
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=MW4PR11MB587208A808B427A573F61A798E562@MW4PR11MB5872.namprd11.prod.outlook.com \
    --to=ciara.loftus@intel.com \
    --cc=dev@dpdk.org \
    --cc=ferruh.yigit@amd.com \
    --cc=stable@dpdk.org \
    --cc=wangyunjian@huawei.com \
    --cc=xudingke@huawei.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;
as well as URLs for NNTP newsgroup(s).