Several source files include verbs header files as in (1). These source files will not compile under non-Linux operating systems. This commit removes this inclusion in two cases:
Case 1: There is no usage of ibv_* or mlx5dv_* symbols in the source file so the inclusion in (1) can be safely removed. Case 2: verbs symbols are used. Please note the inclusion in (1) already appears in file linux/mlx5_glue.h (which represents the interface to the rdma-core library). Therefore, replace (1) in the source file with (2). Under non-Linux operating systems - file mlx5_glue.h will not include (1). (1) #include <infiniband/verbs.h> #include <infiniband/mlx5dv.h> (2) #include <mlx5_glue.h> Signed-off-by: Ophir Munk <ophi...@mellanox.com> Acked-by: Matan Azrad <ma...@mellanox.com> --- drivers/common/mlx5/linux/mlx5_common_os.h | 7 +------ drivers/common/mlx5/linux/mlx5_common_verbs.c | 15 --------------- drivers/common/mlx5/mlx5_common_mp.h | 11 +---------- drivers/common/mlx5/mlx5_common_mr.h | 11 +---------- drivers/common/mlx5/mlx5_prm.h | 11 +---------- drivers/net/mlx5/linux/mlx5_os.c | 10 ---------- drivers/net/mlx5/linux/mlx5_verbs.c | 14 -------------- drivers/net/mlx5/mlx5.c | 10 ---------- drivers/net/mlx5/mlx5.h | 10 ---------- drivers/net/mlx5/mlx5_flow.c | 11 +---------- drivers/net/mlx5/mlx5_flow.h | 11 +---------- drivers/net/mlx5/mlx5_flow_dv.c | 11 +---------- drivers/net/mlx5/mlx5_flow_verbs.c | 10 ---------- drivers/net/mlx5/mlx5_mac.c | 10 ---------- drivers/net/mlx5/mlx5_mr.c | 9 --------- drivers/net/mlx5/mlx5_mr.h | 11 ----------- drivers/net/mlx5/mlx5_rss.c | 10 ---------- drivers/net/mlx5/mlx5_rxmode.c | 11 +---------- drivers/net/mlx5/mlx5_rxq.c | 11 ----------- drivers/net/mlx5/mlx5_rxtx.c | 12 +----------- drivers/net/mlx5/mlx5_rxtx.h | 11 ----------- drivers/net/mlx5/mlx5_rxtx_vec.c | 12 +----------- drivers/net/mlx5/mlx5_txq.c | 11 ----------- drivers/net/mlx5/mlx5_vlan.c | 17 ----------------- 24 files changed, 10 insertions(+), 257 deletions(-) diff --git a/drivers/common/mlx5/linux/mlx5_common_os.h b/drivers/common/mlx5/linux/mlx5_common_os.h index 9a6872c..55c0902 100644 --- a/drivers/common/mlx5/linux/mlx5_common_os.h +++ b/drivers/common/mlx5/linux/mlx5_common_os.h @@ -15,12 +15,7 @@ #include <rte_devargs.h> #include "mlx5_autoconf.h" -#ifdef HAVE_INFINIBAND_VERBS_H -#include <infiniband/verbs.h> -#endif -#ifdef HAVE_INFINIBAND_MLX5DV_H -#include <infiniband/mlx5dv.h> -#endif +#include "mlx5_glue.h" /** * Get device name. Given an ibv_device pointer - return a diff --git a/drivers/common/mlx5/linux/mlx5_common_verbs.c b/drivers/common/mlx5/linux/mlx5_common_verbs.c index a2fc7a3..339535d 100644 --- a/drivers/common/mlx5/linux/mlx5_common_verbs.c +++ b/drivers/common/mlx5/linux/mlx5_common_verbs.c @@ -10,22 +10,7 @@ #include <sys/mman.h> #include <inttypes.h> -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ #include "mlx5_autoconf.h" -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#ifdef HAVE_INFINIBAND_VERBS_H -#include <infiniband/verbs.h> -#endif -#ifdef HAVE_INFINIBAND_MLX5DV_H -#include <infiniband/mlx5dv.h> -#endif -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif - #include <mlx5_glue.h> #include <mlx5_common.h> #include <mlx5_common_mr.h> diff --git a/drivers/common/mlx5/mlx5_common_mp.h b/drivers/common/mlx5/mlx5_common_mp.h index 05466fd..64260c0 100644 --- a/drivers/common/mlx5/mlx5_common_mp.h +++ b/drivers/common/mlx5/mlx5_common_mp.h @@ -6,16 +6,7 @@ #ifndef RTE_PMD_MLX5_COMMON_MP_H_ #define RTE_PMD_MLX5_COMMON_MP_H_ -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#include <infiniband/verbs.h> -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif - +#include <mlx5_glue.h> #include <rte_eal.h> #include <rte_string_fns.h> diff --git a/drivers/common/mlx5/mlx5_common_mr.h b/drivers/common/mlx5/mlx5_common_mr.h index b23ee66..a2c426d 100644 --- a/drivers/common/mlx5/mlx5_common_mr.h +++ b/drivers/common/mlx5/mlx5_common_mr.h @@ -10,21 +10,12 @@ #include <stdint.h> #include <sys/queue.h> -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#include <infiniband/verbs.h> -#include <infiniband/mlx5dv.h> -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif #include <rte_rwlock.h> #include <rte_bitmap.h> #include <rte_memory.h> +#include "mlx5_glue.h" #include "mlx5_common_mp.h" /* Size of per-queue MR cache array for linear search. */ diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h index 1b7b4c7..9ae2386 100644 --- a/drivers/common/mlx5/mlx5_prm.h +++ b/drivers/common/mlx5/mlx5_prm.h @@ -6,21 +6,12 @@ #ifndef RTE_PMD_MLX5_PRM_H_ #define RTE_PMD_MLX5_PRM_H_ -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#include <infiniband/mlx5dv.h> -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif - #include <unistd.h> #include <rte_vect.h> #include <rte_byteorder.h> +#include <mlx5_glue.h> #include "mlx5_autoconf.h" /* RSS hash key size. */ diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 2385d69..37903ed 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -15,16 +15,6 @@ #include <linux/ethtool.h> #include <fcntl.h> -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#include <infiniband/verbs.h> -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif - #include <rte_malloc.h> #include <rte_ethdev_driver.h> #include <rte_ethdev_pci.h> diff --git a/drivers/net/mlx5/linux/mlx5_verbs.c b/drivers/net/mlx5/linux/mlx5_verbs.c index 5ac6982..d41b0fe 100644 --- a/drivers/net/mlx5/linux/mlx5_verbs.c +++ b/drivers/net/mlx5/linux/mlx5_verbs.c @@ -9,21 +9,7 @@ #include <unistd.h> #include <inttypes.h> -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ #include "mlx5_autoconf.h" -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#ifdef HAVE_INFINIBAND_VERBS_H -#include <infiniband/verbs.h> -#endif -#ifdef HAVE_INFINIBAND_MLX5DV_H -#include <infiniband/mlx5dv.h> -#endif -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif #include <rte_mbuf.h> #include <rte_malloc.h> diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 10a0306..5dff36a 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -13,16 +13,6 @@ #include <sys/mman.h> #include <linux/rtnetlink.h> -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#include <infiniband/verbs.h> -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif - #include <rte_malloc.h> #include <rte_ethdev_driver.h> #include <rte_ethdev_pci.h> diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index fa223a1..d6372eb 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -14,16 +14,6 @@ #include <netinet/in.h> #include <sys/queue.h> -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#include <infiniband/verbs.h> -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif - #include <rte_pci.h> #include <rte_ether.h> #include <rte_ethdev_driver.h> diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 5fdf6df..4b90269 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -10,16 +10,6 @@ #include <string.h> #include <stdbool.h> -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#include <infiniband/verbs.h> -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif - #include <rte_common.h> #include <rte_ether.h> #include <rte_ethdev_driver.h> @@ -29,6 +19,7 @@ #include <rte_malloc.h> #include <rte_ip.h> +#include <mlx5_glue.h> #include <mlx5_devx_cmds.h> #include <mlx5_prm.h> diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 616c14a..bc0066a 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -11,20 +11,11 @@ #include <stdint.h> #include <string.h> -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#include <infiniband/verbs.h> -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif - #include <rte_atomic.h> #include <rte_alarm.h> #include <rte_mtr.h> +#include <mlx5_glue.h> #include <mlx5_prm.h> #include "mlx5.h" diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 7ce30e0..8ec8755 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -8,16 +8,6 @@ #include <string.h> #include <unistd.h> -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#include <infiniband/verbs.h> -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif - #include <rte_common.h> #include <rte_ether.h> #include <rte_ethdev_driver.h> @@ -31,6 +21,7 @@ #include <rte_gtp.h> #include <rte_eal_paging.h> +#include <mlx5_glue.h> #include <mlx5_devx_cmds.h> #include <mlx5_prm.h> diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c index 9b8ae5b..544b26d 100644 --- a/drivers/net/mlx5/mlx5_flow_verbs.c +++ b/drivers/net/mlx5/mlx5_flow_verbs.c @@ -8,16 +8,6 @@ #include <stdint.h> #include <string.h> -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#include <infiniband/verbs.h> -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif - #include <rte_common.h> #include <rte_ether.h> #include <rte_ethdev_driver.h> diff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c index 2a88086..2d808d6 100644 --- a/drivers/net/mlx5/mlx5_mac.c +++ b/drivers/net/mlx5/mlx5_mac.c @@ -12,16 +12,6 @@ #include <sys/ioctl.h> #include <arpa/inet.h> -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#include <infiniband/verbs.h> -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif - #include <rte_ether.h> #include <rte_ethdev_driver.h> #include <rte_common.h> diff --git a/drivers/net/mlx5/mlx5_mr.c b/drivers/net/mlx5/mlx5_mr.c index 3b781b6..dbcf0aa 100644 --- a/drivers/net/mlx5/mlx5_mr.c +++ b/drivers/net/mlx5/mlx5_mr.c @@ -3,21 +3,12 @@ * Copyright 2016 Mellanox Technologies, Ltd */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#include <infiniband/verbs.h> -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif - #include <rte_eal_memconfig.h> #include <rte_mempool.h> #include <rte_malloc.h> #include <rte_rwlock.h> #include <rte_bus_pci.h> -#include <mlx5_glue.h> #include <mlx5_common_mp.h> #include <mlx5_common_mr.h> diff --git a/drivers/net/mlx5/mlx5_mr.h b/drivers/net/mlx5/mlx5_mr.h index 0c5877b..4a7fab6 100644 --- a/drivers/net/mlx5/mlx5_mr.h +++ b/drivers/net/mlx5/mlx5_mr.h @@ -10,17 +10,6 @@ #include <stdint.h> #include <sys/queue.h> -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#include <infiniband/verbs.h> -#include <infiniband/mlx5dv.h> -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif - #include <rte_ethdev.h> #include <rte_rwlock.h> #include <rte_bitmap.h> diff --git a/drivers/net/mlx5/mlx5_rss.c b/drivers/net/mlx5/mlx5_rss.c index 653b069..f11851f 100644 --- a/drivers/net/mlx5/mlx5_rss.c +++ b/drivers/net/mlx5/mlx5_rss.c @@ -8,16 +8,6 @@ #include <errno.h> #include <string.h> -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#include <infiniband/verbs.h> -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif - #include <rte_malloc.h> #include <rte_ethdev_driver.h> diff --git a/drivers/net/mlx5/mlx5_rxmode.c b/drivers/net/mlx5/mlx5_rxmode.c index 80b1256..7613ff7 100644 --- a/drivers/net/mlx5/mlx5_rxmode.c +++ b/drivers/net/mlx5/mlx5_rxmode.c @@ -7,18 +7,9 @@ #include <errno.h> #include <string.h> -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#include <infiniband/verbs.h> -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif - #include <rte_ethdev_driver.h> +#include <mlx5_glue.h> #include "mlx5.h" #include "mlx5_rxtx.h" #include "mlx5_utils.h" diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index 637b131..2308ae8 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -10,17 +10,6 @@ #include <fcntl.h> #include <sys/queue.h> -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#include <infiniband/verbs.h> -#include <infiniband/mlx5dv.h> -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif - #include <rte_mbuf.h> #include <rte_malloc.h> #include <rte_ethdev_driver.h> diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index 894f441..86b0e8b 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -7,17 +7,6 @@ #include <string.h> #include <stdlib.h> -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#include <infiniband/verbs.h> -#include <infiniband/mlx5dv.h> -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif - #include <rte_mbuf.h> #include <rte_mempool.h> #include <rte_prefetch.h> @@ -27,6 +16,7 @@ #include <rte_cycles.h> #include <rte_flow.h> +#include <mlx5_glue.h> #include <mlx5_devx_cmds.h> #include <mlx5_prm.h> #include <mlx5_common.h> diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h index 26621ff..43a4406 100644 --- a/drivers/net/mlx5/mlx5_rxtx.h +++ b/drivers/net/mlx5/mlx5_rxtx.h @@ -10,17 +10,6 @@ #include <stdint.h> #include <sys/queue.h> -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#include <infiniband/verbs.h> -#include <infiniband/mlx5dv.h> -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif - #include <rte_mbuf.h> #include <rte_mempool.h> #include <rte_common.h> diff --git a/drivers/net/mlx5/mlx5_rxtx_vec.c b/drivers/net/mlx5/mlx5_rxtx_vec.c index 7fae201..711dcd3 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec.c +++ b/drivers/net/mlx5/mlx5_rxtx_vec.c @@ -7,21 +7,11 @@ #include <string.h> #include <stdlib.h> -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#include <infiniband/verbs.h> -#include <infiniband/mlx5dv.h> -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif - #include <rte_mbuf.h> #include <rte_mempool.h> #include <rte_prefetch.h> +#include <mlx5_glue.h> #include <mlx5_prm.h> #include "mlx5_defs.h" diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c index a9bf42d..e9f5a8c 100644 --- a/drivers/net/mlx5/mlx5_txq.c +++ b/drivers/net/mlx5/mlx5_txq.c @@ -10,17 +10,6 @@ #include <unistd.h> #include <inttypes.h> -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#include <infiniband/verbs.h> -#include <infiniband/mlx5dv.h> -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif - #include <rte_mbuf.h> #include <rte_malloc.h> #include <rte_ethdev_driver.h> diff --git a/drivers/net/mlx5/mlx5_vlan.c b/drivers/net/mlx5/mlx5_vlan.c index f65e416..6e1d71f 100644 --- a/drivers/net/mlx5/mlx5_vlan.c +++ b/drivers/net/mlx5/mlx5_vlan.c @@ -8,23 +8,6 @@ #include <stdint.h> #include <unistd.h> - -/* - * Not needed by this file; included to work around the lack of off_t - * definition for mlx5dv.h with unpatched rdma-core versions. - */ -#include <sys/types.h> - -/* Verbs headers do not support -pedantic. */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#include <infiniband/mlx5dv.h> -#include <infiniband/verbs.h> -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif - #include <rte_ethdev_driver.h> #include <rte_common.h> #include <rte_malloc.h> -- 2.8.4
