From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
To: "Niklas Söderlund" <niklas.soderlund@corigine.com>
Cc: stable@dpdk.org, oss-drivers@corigine.com,
Long Wu <long.wu@corigine.com>,
Chaoyong He <chaoyong.he@corigine.com>
Subject: Re: [PATCH 19.11] net/nfp: fix memory leak in Rx
Date: Fri, 18 Nov 2022 08:01:33 +0100 [thread overview]
Message-ID: <CAATJJ0JRqKVSkOK5HFWWaRC08XniOErUzbP_YPEhKEs=MRKCjA@mail.gmail.com> (raw)
In-Reply-To: <20221117142701.3145276-1-niklas.soderlund@corigine.com>
On Thu, Nov 17, 2022 at 3:27 PM Niklas Söderlund
<niklas.soderlund@corigine.com> wrote:
>
> From: Long Wu <long.wu@corigine.com>
>
> [ upstream commit bb340f56fcb7bac9ec04c1c1ca7a2a4f3012c848 ]
Thanks, applied.
>
> nfp_net_recv_pkts() should not return a value that less than 0 and the
> inappropriate return value in receive loop also causes the memory leak.
> Modify code to avoid return a value less than 0. Furthermore, When
> nfp_net_recv_pkts() break out from the receive loop because of packet
> problems, a rte_mbuf will not be freed and it will cause memory leak.
> Free the rte_mbuf before break out.
>
> Fixes: b812daadad0d ("nfp: add Rx and Tx")
>
> Signed-off-by: Long Wu <long.wu@corigine.com>
> Reviewed-by: Chaoyong He <chaoyong.he@corigine.com>
> Signed-off-by: Niklas Söderlund <niklas.soderlund@corigine.com>
> ---
> drivers/net/nfp/nfp_net.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
> index 76222ca5affd..f2fdff56636c 100644
> --- a/drivers/net/nfp/nfp_net.c
> +++ b/drivers/net/nfp/nfp_net.c
> @@ -2035,8 +2035,9 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
> struct rte_mbuf *new_mb;
> uint16_t nb_hold;
> uint64_t dma_addr;
> - int avail;
> + uint16_t avail;
>
> + avail = 0;
> rxq = rx_queue;
> if (unlikely(rxq == NULL)) {
> /*
> @@ -2044,11 +2045,10 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
> * enabled. But the queue needs to be configured
> */
> RTE_LOG_DP(ERR, PMD, "RX Bad queue\n");
> - return -EINVAL;
> + return avail;
> }
>
> hw = rxq->hw;
> - avail = 0;
> nb_hold = 0;
>
> while (avail < nb_pkts) {
> @@ -2114,7 +2114,8 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
> hw->rx_offset,
> rxq->mbuf_size - hw->rx_offset,
> mb->data_len);
> - return -EINVAL;
> + rte_pktmbuf_free(mb);
> + break;
> }
>
> /* Filling the received mbuf with packet info */
> --
> 2.38.1
>
--
Christian Ehrhardt
Senior Staff Engineer, Ubuntu Server
Canonical Ltd
prev parent reply other threads:[~2022-11-18 7:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-17 14:27 Niklas Söderlund
2022-11-18 7:01 ` Christian Ehrhardt [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='CAATJJ0JRqKVSkOK5HFWWaRC08XniOErUzbP_YPEhKEs=MRKCjA@mail.gmail.com' \
--to=christian.ehrhardt@canonical.com \
--cc=chaoyong.he@corigine.com \
--cc=long.wu@corigine.com \
--cc=niklas.soderlund@corigine.com \
--cc=oss-drivers@corigine.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).