patch 'vfio: fix FreeBSD clear group stub' has been queued to stable release 19.11.11

christian.ehrhardt at canonical.com christian.ehrhardt at canonical.com
Tue Nov 30 17:35:28 CET 2021


Hi,

FYI, your patch has been queued to stable release 19.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 December 10th 2021. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/8bcb2f48523b78d6963a8f3be3e912841b4afd89

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 8bcb2f48523b78d6963a8f3be3e912841b4afd89 Mon Sep 17 00:00:00 2001
From: Anatoly Burakov <anatoly.burakov at intel.com>
Date: Thu, 28 Oct 2021 14:15:17 +0000
Subject: [PATCH] vfio: fix FreeBSD clear group stub

[ upstream commit bf8b792f3b8519fecf3585ffac15da6f7bca2de9 ]

On FreeBSD, `rte_vfio_clear_group()` was returning 0 even though this
function is not valid for FreeBSD, and is called out to return error in
doxygen comments.
Fix the return value to match documentation.

Fixes: c564a2a20093 ("vfio: expose clear group function for internal usages")

Signed-off-by: Anatoly Burakov <anatoly.burakov at intel.com>
---
 lib/librte_eal/freebsd/eal/eal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c
index d97651725b..e148d431c1 100644
--- a/lib/librte_eal/freebsd/eal/eal.c
+++ b/lib/librte_eal/freebsd/eal/eal.c
@@ -1028,7 +1028,7 @@ int rte_vfio_noiommu_is_enabled(void)
 
 int rte_vfio_clear_group(__rte_unused int vfio_group_fd)
 {
-	return 0;
+	return -1;
 }
 
 int
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-30 16:50:13.191862541 +0100
+++ 0124-vfio-fix-FreeBSD-clear-group-stub.patch	2021-11-30 16:50:05.958874763 +0100
@@ -1 +1 @@
-From bf8b792f3b8519fecf3585ffac15da6f7bca2de9 Mon Sep 17 00:00:00 2001
+From 8bcb2f48523b78d6963a8f3be3e912841b4afd89 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bf8b792f3b8519fecf3585ffac15da6f7bca2de9 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -16 +17 @@
- lib/eal/freebsd/eal.c | 2 +-
+ lib/librte_eal/freebsd/eal/eal.c | 2 +-
@@ -19,5 +20,5 @@
-diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c
-index 2c2baaa691..5cea368efe 100644
---- a/lib/eal/freebsd/eal.c
-+++ b/lib/eal/freebsd/eal.c
-@@ -1045,7 +1045,7 @@ int rte_vfio_noiommu_is_enabled(void)
+diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c
+index d97651725b..e148d431c1 100644
+--- a/lib/librte_eal/freebsd/eal/eal.c
++++ b/lib/librte_eal/freebsd/eal/eal.c
+@@ -1028,7 +1028,7 @@ int rte_vfio_noiommu_is_enabled(void)


More information about the stable mailing list