|
 |
c7ffa4 |
From bb12b6e32bafdba8836000d8515e5864f65f75be Mon Sep 17 00:00:00 2001
|
|
|
c7ffa4 |
From: Adrien Mazarguil <adrien.mazarguil@6wind.com>
|
|
|
c7ffa4 |
Date: Thu, 1 Feb 2018 14:30:57 +0100
|
|
|
c7ffa4 |
Subject: [PATCH 5/9] net/mlx: add debug checks to glue structure
|
|
|
c7ffa4 |
|
|
|
c7ffa4 |
This code should catch mistakes early if a glue structure member is added
|
|
|
c7ffa4 |
without a corresponding implementation in the library.
|
|
|
c7ffa4 |
|
|
|
c7ffa4 |
Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
|
|
|
c7ffa4 |
(cherry picked from commit 1b176cec4973a410eaeff00f33c6d49b795aa867)
|
|
|
c7ffa4 |
---
|
|
|
c7ffa4 |
drivers/net/mlx4/mlx4.c | 9 +++++++++
|
|
|
c7ffa4 |
drivers/net/mlx5/mlx5.c | 9 +++++++++
|
|
|
c7ffa4 |
2 files changed, 18 insertions(+)
|
|
|
c7ffa4 |
|
|
|
c7ffa4 |
diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
|
|
|
c7ffa4 |
index d12b00c..43d1b0a 100644
|
|
|
c7ffa4 |
--- a/drivers/net/mlx4/mlx4.c
|
|
|
c7ffa4 |
+++ b/drivers/net/mlx4/mlx4.c
|
|
|
c7ffa4 |
@@ -764,6 +764,15 @@ struct mlx4_conf {
|
|
|
c7ffa4 |
return;
|
|
|
c7ffa4 |
assert(mlx4_glue);
|
|
|
c7ffa4 |
#endif
|
|
|
c7ffa4 |
+#ifndef NDEBUG
|
|
|
c7ffa4 |
+ /* Glue structure must not contain any NULL pointers. */
|
|
|
c7ffa4 |
+ {
|
|
|
c7ffa4 |
+ unsigned int i;
|
|
|
c7ffa4 |
+
|
|
|
c7ffa4 |
+ for (i = 0; i != sizeof(*mlx4_glue) / sizeof(void *); ++i)
|
|
|
c7ffa4 |
+ assert(((const void *const *)mlx4_glue)[i]);
|
|
|
c7ffa4 |
+ }
|
|
|
c7ffa4 |
+#endif
|
|
|
c7ffa4 |
mlx4_glue->fork_init();
|
|
|
c7ffa4 |
rte_pci_register(&mlx4_driver);
|
|
|
c7ffa4 |
}
|
|
|
c7ffa4 |
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
|
|
|
c7ffa4 |
index 71ebdce..6a3746d 100644
|
|
|
c7ffa4 |
--- a/drivers/net/mlx5/mlx5.c
|
|
|
c7ffa4 |
+++ b/drivers/net/mlx5/mlx5.c
|
|
|
c7ffa4 |
@@ -1090,6 +1090,15 @@ struct mlx5_args {
|
|
|
c7ffa4 |
return;
|
|
|
c7ffa4 |
assert(mlx5_glue);
|
|
|
c7ffa4 |
#endif
|
|
|
c7ffa4 |
+#ifndef NDEBUG
|
|
|
c7ffa4 |
+ /* Glue structure must not contain any NULL pointers. */
|
|
|
c7ffa4 |
+ {
|
|
|
c7ffa4 |
+ unsigned int i;
|
|
|
c7ffa4 |
+
|
|
|
c7ffa4 |
+ for (i = 0; i != sizeof(*mlx5_glue) / sizeof(void *); ++i)
|
|
|
c7ffa4 |
+ assert(((const void *const *)mlx5_glue)[i]);
|
|
|
c7ffa4 |
+ }
|
|
|
c7ffa4 |
+#endif
|
|
|
c7ffa4 |
mlx5_glue->fork_init();
|
|
|
c7ffa4 |
rte_pci_register(&mlx5_driver);
|
|
|
c7ffa4 |
}
|
|
|
c7ffa4 |
--
|
|
|
c7ffa4 |
1.8.3.1
|
|
|
c7ffa4 |
|