From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1D6C3A0093 for ; Thu, 28 May 2020 18:26:01 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 14A0F1DC10; Thu, 28 May 2020 18:26:01 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id E61C41DC1B for ; Thu, 28 May 2020 18:25:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7OKsHOzPbu5fu082oNrjjE0h0tYTi5EZ5BrKhA1xhBE=; b=XiGHHfVO+0ZUmGg/0Z/Cj/G+qo2yQ3MzrIKx/Bb+LBNrliEmzSYascgFl42Da/vdrJzBaA sgtE3TB7CU33/ZCEhlJ2Mujat5pa0C+52TpJfG5fz6pI3OyOM+DfbLevC4V7fDMzQcLt1c Hk2AC0EpDu/gecjsBNAMnkpkOmYsZPc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-232-nJ9o9UR-PB2s-TS7vumFYA-1; Thu, 28 May 2020 12:25:54 -0400 X-MC-Unique: nJ9o9UR-PB2s-TS7vumFYA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A255818FE867; Thu, 28 May 2020 16:25:53 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id BE61560C05; Thu, 28 May 2020 16:25:52 +0000 (UTC) From: Kevin Traynor To: Itsuro Oda Cc: Xiaolong Ye , dpdk stable Date: Thu, 28 May 2020 17:23:00 +0100 Message-Id: <20200528162322.7863-73-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/vhost: fix potential memory leak on close' has been queued to LTS release 18.11.9 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.9 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/03/20. 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/a99aae61bec83b99d3fc8423c5246dd3514fb052 Thanks. Kevin. --- >From a99aae61bec83b99d3fc8423c5246dd3514fb052 Mon Sep 17 00:00:00 2001 From: Itsuro Oda Date: Thu, 5 Mar 2020 11:54:50 +0900 Subject: [PATCH] net/vhost: fix potential memory leak on close [ upstream commit 770fabcd36ec11d64544e86ed7d2dda9f5c64daf ] If a vhost device is closed before eth_dev_configure is done to the device, internal resources allocated to the device would not be freed. This patch fixes it. Fixes: 3d01b759d267 ("net/vhost: delay driver setup") Signed-off-by: Itsuro Oda Reviewed-by: Xiaolong Ye --- drivers/net/vhost/rte_eth_vhost.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index 52b9e0c102..93ca8ebe4b 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -986,14 +986,12 @@ eth_dev_close(struct rte_eth_dev *dev) eth_dev_stop(dev); - rte_vhost_driver_unregister(internal->iface_name); - list = find_internal_resource(internal->iface_name); - if (!list) - return; - - pthread_mutex_lock(&internal_list_lock); - TAILQ_REMOVE(&internal_list, list, next); - pthread_mutex_unlock(&internal_list_lock); - rte_free(list); + if (list) { + rte_vhost_driver_unregister(internal->iface_name); + pthread_mutex_lock(&internal_list_lock); + TAILQ_REMOVE(&internal_list, list, next); + pthread_mutex_unlock(&internal_list_lock); + rte_free(list); + } if (dev->data->rx_queues) -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:02.897922825 +0100 +++ 0073-net-vhost-fix-potential-memory-leak-on-close.patch 2020-05-28 17:12:59.155555179 +0100 @@ -1 +1 @@ -From 770fabcd36ec11d64544e86ed7d2dda9f5c64daf Mon Sep 17 00:00:00 2001 +From a99aae61bec83b99d3fc8423c5246dd3514fb052 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 770fabcd36ec11d64544e86ed7d2dda9f5c64daf ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index f44e6bbebe..808e670f13 100644 +index 52b9e0c102..93ca8ebe4b 100644 @@ -23 +24 @@ -@@ -1070,14 +1070,12 @@ eth_dev_close(struct rte_eth_dev *dev) +@@ -986,14 +986,12 @@ eth_dev_close(struct rte_eth_dev *dev)