[dpdk-stable] patch 'vfio: add stdbool include' has been queued to stable release 20.11.3

luca.boccassi at gmail.com luca.boccassi at gmail.com
Mon Jul 12 15:04:23 CEST 2021


Hi,

FYI, your patch has been queued to stable release 20.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/14/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/e2f67db0c32ec74ae94e80347ed519b75aa70c64

Thanks.

Luca Boccassi

---
>From e2f67db0c32ec74ae94e80347ed519b75aa70c64 Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt at canonical.com>
Date: Tue, 1 Jun 2021 10:28:25 +0200
Subject: [PATCH] vfio: add stdbool include

[ upstream commit 31c5af644b1a209cb720dc62f70a51d84a4f979b ]

This became visible by backporting the following for the 19.11 stable tree:
 c13ca4e8 "vfio: fix DMA mapping granularity for IOVA as VA"

The usage of type bool in the vfio code would require "#include
<stdbool.h>", but rte_vfio.h has no direct paths to stdbool.h.
It happens that in eal_vfio_mp_sync.c it comes after "#include
<rte_log.h>".

And rte_log.h since 20.05 includes stdbool since this change:
 241e67bfe "log: add API to check if a logtype can log in a given level"
and thereby mitigates the issue.

It should be safe to include stdbool.h from rte_vfio.h itself
to be present exactly when needed for the struct it defines using that
type.

Fixes: c13ca4e81cac ("vfio: fix DMA mapping granularity for IOVA as VA")

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
Acked-by: Anatoly Burakov <anatoly.burakov at intel.com>
---
 lib/librte_eal/include/rte_vfio.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/librte_eal/include/rte_vfio.h b/lib/librte_eal/include/rte_vfio.h
index e7a87454be..2d90b36480 100644
--- a/lib/librte_eal/include/rte_vfio.h
+++ b/lib/librte_eal/include/rte_vfio.h
@@ -14,6 +14,7 @@
 extern "C" {
 #endif
 
+#include <stdbool.h>
 #include <stdint.h>
 
 /*
-- 
2.30.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-07-12 13:41:38.227612080 +0100
+++ 0028-vfio-add-stdbool-include.patch	2021-07-12 13:41:36.286118361 +0100
@@ -1 +1 @@
-From 31c5af644b1a209cb720dc62f70a51d84a4f979b Mon Sep 17 00:00:00 2001
+From e2f67db0c32ec74ae94e80347ed519b75aa70c64 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 31c5af644b1a209cb720dc62f70a51d84a4f979b ]
+
@@ -23 +24,0 @@
-Cc: stable at dpdk.org
@@ -28 +29 @@
- lib/eal/include/rte_vfio.h | 1 +
+ lib/librte_eal/include/rte_vfio.h | 1 +
@@ -31 +32 @@
-diff --git a/lib/eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h
+diff --git a/lib/librte_eal/include/rte_vfio.h b/lib/librte_eal/include/rte_vfio.h
@@ -33,2 +34,2 @@
---- a/lib/eal/include/rte_vfio.h
-+++ b/lib/eal/include/rte_vfio.h
+--- a/lib/librte_eal/include/rte_vfio.h
++++ b/lib/librte_eal/include/rte_vfio.h


More information about the stable mailing list