From: "Michał Krawczyk" <mk@semihalf.com>
To: David Harton <dharton@cisco.com>
Cc: Marcin Wojtas <mw@semihalf.com>,
"Tzalik, Guy" <gtzalik@amazon.com>,
"Schmeilin, Evgeny" <evgenys@amazon.com>,
"Chauskin, Igor" <igorch@amazon.com>, dev <dev@dpdk.org>
Subject: Re: [dpdk-dev] [PATCH] net/ena: fix releasing Tx ring mbufs
Date: Tue, 6 Apr 2021 07:25:08 +0200 [thread overview]
Message-ID: <CAJMMOfPKEQKJCUB6ZTpXciw2coUM9U+YEoMW-2DNz=U_sNuS_g@mail.gmail.com> (raw)
In-Reply-To: <20210406002719.2556501-1-dharton@cisco.com>
wt., 6 kwi 2021 o 02:27 David Harton <dharton@cisco.com> napisał(a):
>
> When ena_tx_queue_release_bufs() frees the mbufs it does not clear
> the mbuf pointers. So, when the device starts and stops multiple
> times it can cause the application to receive duplicate mbufs for
> two different packets. Fix the issue by clearing the mbuf pointer.
>
> Also, while tracking down the "double free" issue the ena calls to
> allocate and free mbufs in bulk were migrated to the mbuf based APIs
> so the common mbuf alloc/free routines are exercised.
>
> Fixes: 79405ee17585 ("net/ena: fix out of order completion")
> Fixes: 1173fca25af9 ("ena: add polling-mode driver")
>
> Signed-off-by: David Harton <dharton@cisco.com>
Acked-by: Michal Krawczyk <mk@semihalf.com>
> ---
> drivers/net/ena/ena_ethdev.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
> index 9aa51c9dc..f60e843b7 100644
> --- a/drivers/net/ena/ena_ethdev.c
> +++ b/drivers/net/ena/ena_ethdev.c
> @@ -767,8 +767,10 @@ static void ena_tx_queue_release_bufs(struct ena_ring *ring)
> for (i = 0; i < ring->ring_size; ++i) {
> struct ena_tx_buffer *tx_buf = &ring->tx_buffer_info[i];
>
> - if (tx_buf->mbuf)
> + if (tx_buf->mbuf) {
> rte_pktmbuf_free(tx_buf->mbuf);
> + tx_buf->mbuf = NULL;
> + }
> }
> }
>
> @@ -1457,7 +1459,7 @@ static int ena_populate_rx_queue(struct ena_ring *rxq, unsigned int count)
> "bad ring state\n");
>
> /* get resources for incoming packets */
> - rc = rte_mempool_get_bulk(rxq->mb_pool, (void **)mbufs, count);
> + rc = rte_pktmbuf_alloc_bulk(rxq->mb_pool, mbufs, count);
> if (unlikely(rc < 0)) {
> rte_atomic64_inc(&rxq->adapter->drv_stats->rx_nombuf);
> ++rxq->rx_stats.mbuf_alloc_fail;
> @@ -1486,8 +1488,7 @@ static int ena_populate_rx_queue(struct ena_ring *rxq, unsigned int count)
> if (unlikely(i < count)) {
> PMD_DRV_LOG(WARNING, "refilled rx qid %d with only %d "
> "buffers (from %d)\n", rxq->id, i, count);
> - rte_mempool_put_bulk(rxq->mb_pool, (void **)(&mbufs[i]),
> - count - i);
> + rte_pktmbuf_free_bulk(&mbufs[i], count - i);
> ++rxq->rx_stats.refill_partial;
> }
>
> --
> 2.26.2.Cisco
>
next prev parent reply other threads:[~2021-04-06 5:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-06 0:27 David Harton
2021-04-06 5:25 ` Michał Krawczyk [this message]
2021-04-07 8:15 ` Ferruh Yigit
-- strict thread matches above, loose matches on Subject: below --
2021-04-05 18:57 David Harton
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='CAJMMOfPKEQKJCUB6ZTpXciw2coUM9U+YEoMW-2DNz=U_sNuS_g@mail.gmail.com' \
--to=mk@semihalf.com \
--cc=dev@dpdk.org \
--cc=dharton@cisco.com \
--cc=evgenys@amazon.com \
--cc=gtzalik@amazon.com \
--cc=igorch@amazon.com \
--cc=mw@semihalf.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).