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: sta...@dpdk.org
>>
>> Signed-off-by: Yunjian Wang <wangyunj...@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.lof...@intel.com>
>
Acked-by: Ferruh Yigit <ferruh.yi...@amd.com>
Applied to dpdk-next-net/main, thanks.
