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 7D2F7A04B1 for ; Thu, 5 Nov 2020 13:41:54 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 72E98C7FE; Thu, 5 Nov 2020 13:41:53 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 8038CC7FE for ; Thu, 5 Nov 2020 13:41:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580110; 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=CGe4WwGW6BBS+0rKnIAYNocEEII19YCwtTZa1gbEfSI=; b=Dzd+amYCmgPgbbdOs0c1UI8+oAkMQG6iTMmR/q2N5i+G0zr5nA/+9OUTQIV2wiQDNN8ReQ dgzrtYW2jejDNbTrwgCnVbn8MC6cHqiRk31ci7oFfBytM11LGWTA8PRbPcAU4aeYrKfgym 2fVNWgjKy0c7RlwnSC0KHp6aAUmpzlo= 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-586-d5qiM0t_NIGNms3k7A_sTg-1; Thu, 05 Nov 2020 07:41:45 -0500 X-MC-Unique: d5qiM0t_NIGNms3k7A_sTg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 14C95805EFD; Thu, 5 Nov 2020 12:41:44 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 135C45C3E1; Thu, 5 Nov 2020 12:41:42 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Anatoly Burakov , dpdk stable Date: Thu, 5 Nov 2020 12:39:47 +0000 Message-Id: <20201105124015.306404-40-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'bus/pci: fix memory leak when unmapping VFIO resource' has been queued to LTS release 18.11.11 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.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/10/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/b27a0f085a793a178d054d01740d1fbe2720ce86 Thanks. Kevin. --- >From b27a0f085a793a178d054d01740d1fbe2720ce86 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Fri, 11 Sep 2020 18:57:42 +0800 Subject: [PATCH] bus/pci: fix memory leak when unmapping VFIO resource [ upstream commit e34a43a6729dd33e430e1815a395893fe1c643d6 ] The 'vfio_res' is not freed when unmapping resource by primary process. This leads to memory leak. Fixes: ab53203e194b ("vfio: enable unmapping resource for secondary") Signed-off-by: Yunjian Wang Acked-by: Anatoly Burakov --- drivers/bus/pci/linux/pci_vfio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c index cf61032a5d..44a7c764ce 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c @@ -987,5 +987,5 @@ pci_vfio_unmap_resource_primary(struct rte_pci_device *dev) TAILQ_REMOVE(vfio_res_list, vfio_res, next); - + rte_free(vfio_res); return 0; } -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:55.022956248 +0000 +++ 0040-bus-pci-fix-memory-leak-when-unmapping-VFIO-resource.patch 2020-11-05 12:38:54.241896020 +0000 @@ -1 +1 @@ -From e34a43a6729dd33e430e1815a395893fe1c643d6 Mon Sep 17 00:00:00 2001 +From b27a0f085a793a178d054d01740d1fbe2720ce86 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e34a43a6729dd33e430e1815a395893fe1c643d6 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index d2073994fa..940ebc1e35 100644 +index cf61032a5d..44a7c764ce 100644 @@ -22 +23 @@ -@@ -1016,5 +1016,5 @@ pci_vfio_unmap_resource_primary(struct rte_pci_device *dev) +@@ -987,5 +987,5 @@ pci_vfio_unmap_resource_primary(struct rte_pci_device *dev)