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 189D8A046B for ; Mon, 24 Jun 2019 17:27:56 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 10CA61BEAB; Mon, 24 Jun 2019 17:27:56 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 2C7A91BEB7 for ; Mon, 24 Jun 2019 17:27:54 +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 B369985550; Mon, 24 Jun 2019 15:27:48 +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 9811D19C6A; Mon, 24 Jun 2019 15:27:43 +0000 (UTC) From: Kevin Traynor To: Tiwei Bie Cc: Maxime Coquelin , dpdk stable Date: Mon, 24 Jun 2019 16:25:15 +0100 Message-Id: <20190624152525.19349-51-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.28]); Mon, 24 Jun 2019 15:27:53 +0000 (UTC) Subject: [dpdk-stable] patch 'net/virtio: fix queue memory leak on error' 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/5f34f2eebc67d394837366f6f6272668deb5a84d Thanks. Kevin Traynor --- >From 5f34f2eebc67d394837366f6f6272668deb5a84d Mon Sep 17 00:00:00 2001 From: Tiwei Bie Date: Wed, 5 Jun 2019 17:43:38 +0800 Subject: [PATCH] net/virtio: fix queue memory leak on error [ upstream commit 2b38151f745a30ebe653a202563bf8539740633f ] We should free queues when we failed to initialize the virtio device. Fixes: 26b683b4f7d0 ("net/virtio: setup Rx queue interrupts") Signed-off-by: Tiwei Bie Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_ethdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index f938b7cef..e1c97a481 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1594,4 +1594,5 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features) if (virtio_configure_intr(eth_dev) < 0) { PMD_INIT_LOG(ERR, "failed to configure interrupt"); + virtio_free_queues(hw); return -1; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-24 16:18:57.710214666 +0100 +++ 0051-net-virtio-fix-queue-memory-leak-on-error.patch 2019-06-24 16:18:55.121429099 +0100 @@ -1 +1 @@ -From 2b38151f745a30ebe653a202563bf8539740633f Mon Sep 17 00:00:00 2001 +From 5f34f2eebc67d394837366f6f6272668deb5a84d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2b38151f745a30ebe653a202563bf8539740633f ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index c4570bbf8..df3a218a8 100644 +index f938b7cef..e1c97a481 100644 @@ -21 +22 @@ -@@ -1753,4 +1753,5 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features) +@@ -1594,4 +1594,5 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)