[dpdk-stable] patch 'net/virtio: fix memory leak in in-order Rx' has been queued to LTS release 18.11.3

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/27/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/c2f06b2a7d157455c8ae39883b15bd3fae9eee91

Thanks.

Kevin Traynor

---
From c2f06b2a7d157455c8ae39883b15bd3fae9eee91 Mon Sep 17 00:00:00 2001
From: Tiwei Bie <tiwei.bie@intel.com>
Date: Thu, 20 Jun 2019 10:34:33 +0800
Subject: [PATCH] net/virtio: fix memory leak in in-order Rx

[ upstream commit 18e8c0fa91fff4e24e27bbbf42d1bdede93b879e ]

When there is no enough segments for a packet in in-order
mergeable Rx path, we should free the whole mbuf chain instead
of just recycling the last segment.

Fixes: e5f456a98d3c ("net/virtio: support in-order Rx and Tx")

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

diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index 4a56fb161..a02e1207f 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -1118,5 +1118,5 @@ virtio_recv_mergeable_pkts_inorder(void *rx_queue,
 			PMD_RX_LOG(ERR,
 					"No enough segments for packet.");
-			virtio_discard_rxbuf_inorder(vq, prev);
+			rte_pktmbuf_free(rx_pkts[nb_rx]);
 			rxvq->stats.errors++;
 			break;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-06-24 16:18:58.008434200 +0100
+++ 0057-net-virtio-fix-memory-leak-in-in-order-Rx.patch	2019-06-24 16:18:55.131428863 +0100
@@ -1 +1 @@
-From 18e8c0fa91fff4e24e27bbbf42d1bdede93b879e Mon Sep 17 00:00:00 2001
+From c2f06b2a7d157455c8ae39883b15bd3fae9eee91 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 18e8c0fa91fff4e24e27bbbf42d1bdede93b879e ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index dcce39e8c..e4d5b6f09 100644
+index 4a56fb161..a02e1207f 100644
@@ -23 +24 @@
-@@ -1555,5 +1555,5 @@ virtio_recv_pkts_inorder(void *rx_queue,
+@@ -1118,5 +1118,5 @@ virtio_recv_mergeable_pkts_inorder(void *rx_queue,