[dpdk-stable] patch 'vfio: fix FreeBSD clear group stub' has been queued to stable release 20.11.4

Xueming Li xuemingl at nvidia.com
Wed Nov 10 07:32:10 CET 2021


Hi,

FYI, your patch has been queued to stable release 20.11.4

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/12/21. 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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/bef6f8c951463c9c99449553b2ab95c812643309

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From bef6f8c951463c9c99449553b2ab95c812643309 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
Cc: Xueming Li <xuemingl at nvidia.com>

[ 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.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_eal/freebsd/eal.c b/lib/librte_eal/freebsd/eal.c
index 957273a9bb..053ae65365 100644
--- a/lib/librte_eal/freebsd/eal.c
+++ b/lib/librte_eal/freebsd/eal.c
@@ -1041,7 +1041,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.33.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-10 14:17:12.720041765 +0800
+++ 0246-vfio-fix-FreeBSD-clear-group-stub.patch	2021-11-10 14:17:02.090744291 +0800
@@ -1 +1 @@
-From bf8b792f3b8519fecf3585ffac15da6f7bca2de9 Mon Sep 17 00:00:00 2001
+From bef6f8c951463c9c99449553b2ab95c812643309 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit bf8b792f3b8519fecf3585ffac15da6f7bca2de9 ]
@@ -12 +14,0 @@
-Cc: stable at dpdk.org
@@ -16 +18 @@
- lib/eal/freebsd/eal.c | 2 +-
+ lib/librte_eal/freebsd/eal.c | 2 +-
@@ -19,5 +21,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.c b/lib/librte_eal/freebsd/eal.c
+index 957273a9bb..053ae65365 100644
+--- a/lib/librte_eal/freebsd/eal.c
++++ b/lib/librte_eal/freebsd/eal.c
+@@ -1041,7 +1041,7 @@ int rte_vfio_noiommu_is_enabled(void)


More information about the stable mailing list