From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 996C4A046B for ; Mon, 24 Jun 2019 17:28:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 915571BEE9; Mon, 24 Jun 2019 17:28:15 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 379641BEE9 for ; Mon, 24 Jun 2019 17:28:14 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 81A95356E9; Mon, 24 Jun 2019 15:28:13 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-250.ams2.redhat.com [10.36.116.250]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0616319936; Mon, 24 Jun 2019 15:28:10 +0000 (UTC) From: Kevin Traynor To: Tiwei Bie Cc: Maxime Coquelin , dpdk stable Date: Mon, 24 Jun 2019 16:25:21 +0100 Message-Id: <20190624152525.19349-57-ktraynor@redhat.com> In-Reply-To: <20190624152525.19349-1-ktraynor@redhat.com> References: <20190624152525.19349-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 24 Jun 2019 15:28:13 +0000 (UTC) Subject: [dpdk-stable] patch 'net/virtio: fix memory leak in in-order Rx' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 Signed-off-by: Tiwei Bie --- 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,