From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 16FB41B51D for ; Fri, 23 Nov 2018 11:28:50 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6F735C015C17; Fri, 23 Nov 2018 10:28:49 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 97E5A6128A; Fri, 23 Nov 2018 10:28:47 +0000 (UTC) From: Kevin Traynor To: Dariusz Stojaczyk Cc: Xiao Wang , Anatoly Burakov , dpdk stable Date: Fri, 23 Nov 2018 10:26:12 +0000 Message-Id: <20181123102713.17309-8-ktraynor@redhat.com> In-Reply-To: <20181123102713.17309-1-ktraynor@redhat.com> References: <20181123102713.17309-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 23 Nov 2018 10:28:49 +0000 (UTC) Subject: [dpdk-stable] patch 'vfio: check if group fd is already open' has been queued to stable release 18.08.1 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: , X-List-Received-Date: Fri, 23 Nov 2018 10:28:50 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 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/29/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From 9e8a431408f3538e4853dbaef7db72771e639065 Mon Sep 17 00:00:00 2001 From: Dariusz Stojaczyk Date: Mon, 17 Sep 2018 15:46:42 +0200 Subject: [PATCH] vfio: check if group fd is already open [ upstream commit db9d32b8b73e3fc9e16f8a38e5b7f66a5df0e36a ] Always attempt to find already opened fd for an iommu group as subsequent attempts to open it will fail. There's no public API to check if a group was already bound and has a container, so rte_vfio_container_group_bind() shouldn't fail in such case. Fixes: ea2dc1066870 ("vfio: add multi container support") Signed-off-by: Dariusz Stojaczyk Acked-by: Xiao Wang Acked-by: Anatoly Burakov --- lib/librte_eal/linuxapp/eal/eal_vfio.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.c b/lib/librte_eal/linuxapp/eal/eal_vfio.c index 68e862946..957844ad8 100644 --- a/lib/librte_eal/linuxapp/eal/eal_vfio.c +++ b/lib/librte_eal/linuxapp/eal/eal_vfio.c @@ -1688,4 +1688,9 @@ rte_vfio_container_group_bind(int container_fd, int iommu_group_num) } + /* check if we already have the group descriptor open */ + for (i = 0; i < VFIO_MAX_GROUPS; i++) + if (vfio_cfg->vfio_groups[i].group_num == iommu_group_num) + return vfio_cfg->vfio_groups[i].fd; + /* Check room for new group */ if (vfio_cfg->vfio_active_groups == VFIO_MAX_GROUPS) { -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-23 10:22:54.453462731 +0000 +++ 0008-vfio-check-if-group-fd-is-already-open.patch 2018-11-23 10:22:54.000000000 +0000 @@ -1,8 +1,10 @@ -From db9d32b8b73e3fc9e16f8a38e5b7f66a5df0e36a Mon Sep 17 00:00:00 2001 +From 9e8a431408f3538e4853dbaef7db72771e639065 Mon Sep 17 00:00:00 2001 From: Dariusz Stojaczyk Date: Mon, 17 Sep 2018 15:46:42 +0200 Subject: [PATCH] vfio: check if group fd is already open +[ upstream commit db9d32b8b73e3fc9e16f8a38e5b7f66a5df0e36a ] + Always attempt to find already opened fd for an iommu group as subsequent attempts to open it will fail. @@ -11,7 +13,6 @@ shouldn't fail in such case. Fixes: ea2dc1066870 ("vfio: add multi container support") -Cc: stable@dpdk.org Signed-off-by: Dariusz Stojaczyk Acked-by: Xiao Wang @@ -21,10 +22,10 @@ 1 file changed, 5 insertions(+) diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.c b/lib/librte_eal/linuxapp/eal/eal_vfio.c -index ebecde12c..04c8f2e9c 100644 +index 68e862946..957844ad8 100644 --- a/lib/librte_eal/linuxapp/eal/eal_vfio.c +++ b/lib/librte_eal/linuxapp/eal/eal_vfio.c -@@ -1703,4 +1703,9 @@ rte_vfio_container_group_bind(int container_fd, int iommu_group_num) +@@ -1688,4 +1688,9 @@ rte_vfio_container_group_bind(int container_fd, int iommu_group_num) } + /* check if we already have the group descriptor open */