From: Ferruh Yigit <ferruh.yigit@amd.com>
To: "Loftus, Ciara" <ciara.loftus@intel.com>,
Yunjian Wang <wangyunjian@huawei.com>,
"dev@dpdk.org" <dev@dpdk.org>
Cc: "Zhang, Qi Z" <qi.z.zhang@intel.com>,
"xudingke@huawei.com" <xudingke@huawei.com>,
"stable@dpdk.org" <stable@dpdk.org>
Subject: Re: [PATCH v2] net/af_xdp: fix memzone leak in error path
Date: Wed, 6 Dec 2023 12:29:45 +0000 [thread overview]
Message-ID: <2f642249-e7aa-4d4d-9880-c31719787997@amd.com> (raw)
In-Reply-To: <MW4PR11MB5872BEDBA9DF55EEA2F2BAF98E85A@MW4PR11MB5872.namprd11.prod.outlook.com>
On 12/5/2023 1:16 PM, Loftus, Ciara wrote:
>>
>> In xdp_umem_configure() allocated memzone for the 'umem', we should
>> free it when xsk_umem__create() call fails, otherwise it will lead to
>> memory zone leak. To fix it move 'umem->mz = mz;' assignment after
>> 'mz == NULL' check.
>>
>> Fixes: f1debd77efaf ("net/af_xdp: introduce AF_XDP PMD")
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
>> ---
>> v2: update code suggested by Ferruh Yigit
>> ---
>> drivers/net/af_xdp/rte_eth_af_xdp.c | 2 +-
>> 1 file changed, 1 insertion(+), 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 353c8688ec..9f0f751d4a 100644
>> --- a/drivers/net/af_xdp/rte_eth_af_xdp.c
>> +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
>> @@ -1235,6 +1235,7 @@ xsk_umem_info *xdp_umem_configure(struct
>> pmd_internals *internals,
>> goto err;
>> }
>>
>> + umem->mz = mz;
>
Moved one line up, to group with mz alloc/check block, while merging.
>> ret = xsk_umem__create(&umem->umem, mz->addr,
>> ETH_AF_XDP_NUM_BUFFERS *
>> ETH_AF_XDP_FRAME_SIZE,
>> &rxq->fq, &rxq->cq,
>> @@ -1244,7 +1245,6 @@ xsk_umem_info *xdp_umem_configure(struct
>> pmd_internals *internals,
>> AF_XDP_LOG(ERR, "Failed to create umem\n");
>> goto err;
>> }
>> - umem->mz = mz;
>>
>> return umem;
>>
>> --
>> 2.33.0
>
> Thank you for the patch.
>
> Acked-by: Ciara Loftus <ciara.loftus@intel.com>
>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
Applied to dpdk-next-net/main, thanks.
prev parent reply other threads:[~2023-12-06 12:29 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-01 8:03 [dpdk-dev] [PATCH] " Yunjian Wang
2023-12-04 14:09 ` Ferruh Yigit
2023-12-05 1:23 ` wangyunjian
2023-12-05 9:41 ` Ferruh Yigit
2023-12-05 12:31 ` wangyunjian
2023-12-05 12:23 ` [PATCH v2] " Yunjian Wang
2023-12-05 13:16 ` Loftus, Ciara
2023-12-06 12:29 ` Ferruh Yigit [this message]
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=2f642249-e7aa-4d4d-9880-c31719787997@amd.com \
--to=ferruh.yigit@amd.com \
--cc=ciara.loftus@intel.com \
--cc=dev@dpdk.org \
--cc=qi.z.zhang@intel.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).