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 63D0FA04B1 for ; Thu, 5 Nov 2020 13:41:53 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5C4C6C7F4; Thu, 5 Nov 2020 13:41:52 +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 7B58DC31F for ; Thu, 5 Nov 2020 13:41:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580109; 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=+eVJrAcdPzDW02iKY5V6A4vzvW+TijVu2R/EZbFoSh4=; b=CMyg2fVR0Gn68V7wC14ugIwfDKTZNZUNge5qUJmjxwlNN/4CD4i9YzQhTlRoVOqRfVHSIi dTQDnvdAIFnmO8/2mWgwhCUvCs8G4EzJIkRIwCZ75vEbI1jQTgrpzQbeKuDZGma7CNde4S xHt6CdepJ+aEt9HRtAWU1JsjwAOSy8o= 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-38-CW-NHke5PwKJy_qgPEFxgQ-1; Thu, 05 Nov 2020 07:41:46 -0500 X-MC-Unique: CW-NHke5PwKJy_qgPEFxgQ-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 75FA1803F41; Thu, 5 Nov 2020 12:41:45 +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 7339B5C5DE; Thu, 5 Nov 2020 12:41:44 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Anatoly Burakov , dpdk stable Date: Thu, 5 Nov 2020 12:39:48 +0000 Message-Id: <20201105124015.306404-41-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 leak on VFIO mapping error' 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/6be24aa7c852d8f31d28f119eefccdea30fa30a1 Thanks. Kevin. --- >From 6be24aa7c852d8f31d28f119eefccdea30fa30a1 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Fri, 11 Sep 2020 19:08:04 +0800 Subject: [PATCH] bus/pci: fix leak on VFIO mapping error [ upstream commit 2a089d2d52f45bca6f179345fa3f3abe1a0e2ea9 ] Currently, only the 'vfio_dev_fd' is closed in failure path, so some resources are not released(such as 'vfio_group_fd'). The rte_vfio_release_device() should be used to avoid this problem. Fixes: 33604c31354a ("vfio: refactor PCI BAR mapping") Signed-off-by: Yunjian Wang Reviewed-by: Anatoly Burakov --- drivers/bus/pci/linux/pci_vfio.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c index 44a7c764ce..0a4dc41cf3 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c @@ -810,5 +810,6 @@ err_vfio_res: rte_free(vfio_res); err_vfio_dev_fd: - close(vfio_dev_fd); + rte_vfio_release_device(rte_pci_get_sysfs_path(), + pci_addr, vfio_dev_fd); return -1; } @@ -878,5 +879,6 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev) return 0; err_vfio_dev_fd: - close(vfio_dev_fd); + rte_vfio_release_device(rte_pci_get_sysfs_path(), + pci_addr, vfio_dev_fd); return -1; } -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:55.040781220 +0000 +++ 0041-bus-pci-fix-leak-on-VFIO-mapping-error.patch 2020-11-05 12:38:54.242896021 +0000 @@ -1 +1 @@ -From 2a089d2d52f45bca6f179345fa3f3abe1a0e2ea9 Mon Sep 17 00:00:00 2001 +From 6be24aa7c852d8f31d28f119eefccdea30fa30a1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2a089d2d52f45bca6f179345fa3f3abe1a0e2ea9 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 940ebc1e35..ef4f72017f 100644 +index 44a7c764ce..0a4dc41cf3 100644 @@ -23 +24 @@ -@@ -839,5 +839,6 @@ err_vfio_res: +@@ -810,5 +810,6 @@ err_vfio_res: @@ -31 +32 @@ -@@ -907,5 +908,6 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev) +@@ -878,5 +879,6 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev)