[2/4] net/virtio: fix memory leak in mergeable Rx

Message ID 20190618074159.3322-3-tiwei.bie@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Maxime Coquelin
Headers
Series Some fixes for mergeable Rx |

Checks

Context Check Description
ci/Intel-compilation fail Compilation issues
ci/checkpatch success coding style OK

Commit Message

Tiwei Bie June 18, 2019, 7:41 a.m. UTC
  When there is no enough segments for a packet in mergeable
Rx path, we should free the whole mbuf chain instead of just
the last segment.

Fixes: bcac5aa207f8 ("net/virtio: improve batching in mergeable path")
Cc: stable@dpdk.org

Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
---
 drivers/net/virtio/virtio_rxtx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Maxime Coquelin June 19, 2019, 12:37 p.m. UTC | #1
On 6/18/19 9:41 AM, Tiwei Bie wrote:
> When there is no enough segments for a packet in mergeable
> Rx path, we should free the whole mbuf chain instead of just
> the last segment.
> 
> Fixes: bcac5aa207f8 ("net/virtio: improve batching in mergeable path")
> Cc:stable@dpdk.org
> 
> Signed-off-by: Tiwei Bie<tiwei.bie@intel.com>
> ---
>   drivers/net/virtio/virtio_rxtx.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Same comment as patch 1.

Other than that:
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

Thanks,
Maxime
  

Patch

diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index bdb3a2f18..9cf422ffe 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -1737,7 +1737,7 @@  virtio_recv_mergeable_pkts(void *rx_queue,
 		} else {
 			PMD_RX_LOG(ERR,
 					"No enough segments for packet.");
-			virtio_discard_rxbuf(vq, prev);
+			rte_pktmbuf_free(rx_pkts[nb_rx]);
 			rxvq->stats.errors++;
 			break;
 		}