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 B76FFA04DD for ; Wed, 28 Oct 2020 11:51:38 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id ADF714CA7; Wed, 28 Oct 2020 11:51:37 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by dpdk.org (Postfix) with ESMTP id D00894CA7 for ; Wed, 28 Oct 2020 11:51:35 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id 13so4101619wmf.0 for ; Wed, 28 Oct 2020 03:51:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1y/FuzqEwBGUaoiXRCXsipb35NP5BH2lN76YvFTtlIQ=; b=UHlCgV2oS0PWu25l8Weuidazq19nxiaErrbzVBaYponL8vL1l3OktShvhgdazBWkd5 FdGEOGB4Wz9InAZx1Io5f3mJTBWoyBkVrgdTGtZQxSFPpjIeReyDUGdYZD5BDbLXl3Ma JH+VhU3foSqxsQUTJQS/4fDbRUM+v6+Yz4Tce1JNY6qEakl6RBOV1Z3rWpyygso/1rjv yiE1Sn8HPPclOIFzivRCYTl1aR7aZEl6uSEtsgV6qSBWNLhswrqr/VBVAN/Y+kpKaAQ8 gXRta/EafAavsfe+GBLHUOyWAYm2IYud4Z1pIwhQBYxoF5Cc4Zgr+TAl+1qt2eAI8kpN /yWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1y/FuzqEwBGUaoiXRCXsipb35NP5BH2lN76YvFTtlIQ=; b=ajPuG8z9ZJK2F2rfQyQA5MTwVLcpkGvf9trk1jjdXdy88El4/0aFn1vZI9WEfqT8b7 gzxmXokXLrdzd6X29GekIS5clm5uAh3Ugud0bLlYaqzvueucXEZfVuDYlobg/hJprmDa p1AKBfcAJeJaqMbV3Tqo6AzkpVEBYzpI/tKjvXrjRfVB4OIwa/4/bdG1zXxdlBvlfF6A mWQ+apxVIck42l0YFJgN4j3md6NVcXZbm5ninTzGTBMb5WdPvhP6z4HYiz/BFzudOjjE VA0kwmo4D9Q2hPsyqLUGbYHJDBpxEP45uMh8q1GqkaLPyk6V1f0lMGy4qCnwfEkV+bsz pGBA== X-Gm-Message-State: AOAM533/AHNzhOcb0fyKeD0Ad543oe47dzc7+B7moQn3X/sIMfzquunn 97+Kkyq3jWXGCrCiYitdzTk9YlHuZERDELtc X-Google-Smtp-Source: ABdhPJxHg0DoCWQLTKpnxQh5z0xq3xSEmCBSz+GzNBOK+BEaxFdA5UhrDSCpXjQIqhEGU50MEGekuQ== X-Received: by 2002:a1c:dcc3:: with SMTP id t186mr7532239wmg.70.1603882295627; Wed, 28 Oct 2020 03:51:35 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id d3sm5860469wre.91.2020.10.28.03.51.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:51:35 -0700 (PDT) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Anatoly Burakov , dpdk stable Date: Wed, 28 Oct 2020 10:44:21 +0000 Message-Id: <20201028104606.3504127-102-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'bus/pci: fix memory leak when unmapping VFIO resource' has been queued to stable release 19.11.6 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 stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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. Thanks. Luca Boccassi --- >From 03941a263cc287f42f73adac8a10a4b9032a2d5a 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 ba60e7ce99..5dcf15424c 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c @@ -1003,7 +1003,7 @@ 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.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:14.947159617 +0000 +++ 0102-bus-pci-fix-memory-leak-when-unmapping-VFIO-resource.patch 2020-10-28 10:35:11.656832261 +0000 @@ -1,13 +1,14 @@ -From e34a43a6729dd33e430e1815a395893fe1c643d6 Mon Sep 17 00:00:00 2001 +From 03941a263cc287f42f73adac8a10a4b9032a2d5a 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") -Cc: stable@dpdk.org Signed-off-by: Yunjian Wang Acked-by: Anatoly Burakov @@ -16,10 +17,10 @@ 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 d2073994fa..940ebc1e35 100644 +index ba60e7ce99..5dcf15424c 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c -@@ -1015,7 +1015,7 @@ pci_vfio_unmap_resource_primary(struct rte_pci_device *dev) +@@ -1003,7 +1003,7 @@ pci_vfio_unmap_resource_primary(struct rte_pci_device *dev) } TAILQ_REMOVE(vfio_res_list, vfio_res, next);