net/mlx5: use static assert for compile-time sanity checks

Replace compile-time sanity check with static_assert() as c11 standard
has been set. Add mlx5_rxtx_vec.h and move the sanity checks to the file

Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>

diff --git a/drivers/net/mlx5/mlx5_rxtx_vec.c b/drivers/net/mlx5/mlx5_rxtx_vec.c
index e8f0626..deab2ad 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxtx_vec.c
+++ b/drivers/net/mlx5/mlx5_rxtx_vec.c
@@ -55,6 +55,7 @@
 #include "mlx5.h"
 #include "mlx5_utils.h"
 #include "mlx5_rxtx.h"
+#include "mlx5_rxtx_vec.h"
 #include "mlx5_autoconf.h"
 #include "mlx5_defs.h"
 #include "mlx5_prm.h"
@@ -632,13 +633,6 @@ rxq_cq_decompress_v(struct mlx5_rxq_data *rxq,
                             10, 11,  2,  3);
 #endif
 
-       /* Compile time sanity check for this function. */
-       RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, pkt_len) !=
-                        offsetof(struct rte_mbuf, rx_descriptor_fields1) + 4);
-       RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, data_len) !=
-                        offsetof(struct rte_mbuf, rx_descriptor_fields1) + 8);
-       RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, hash) !=
-                        offsetof(struct rte_mbuf, rx_descriptor_fields1) + 12);
        /*
         * Not to overflow elts array. Decompress next time after mbuf
         * replenishment.
@@ -856,15 +850,11 @@ rxq_cq_to_ptype_oflags_v(struct mlx5_rxq_data *rxq, __m128i cqes[4],
        /* Merge to ol_flags. */
        ol_flags = _mm_or_si128(ol_flags, cv_flags);
        /* Merge mbuf_init and ol_flags. */
-       RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, ol_flags) !=
-                        offsetof(struct rte_mbuf, rearm_data) + 8);
        rearm0 = _mm_blend_epi16(mbuf_init, _mm_slli_si128(ol_flags, 8), 0x30);
        rearm1 = _mm_blend_epi16(mbuf_init, _mm_slli_si128(ol_flags, 4), 0x30);
        rearm2 = _mm_blend_epi16(mbuf_init, ol_flags, 0x30);
        rearm3 = _mm_blend_epi16(mbuf_init, _mm_srli_si128(ol_flags, 4), 0x30);
        /* Write 8B rearm_data and 8B ol_flags. */
-       RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, rearm_data) !=
-                        RTE_ALIGN(offsetof(struct rte_mbuf, rearm_data), 16));
        _mm_store_si128((__m128i *)&pkts[0]->rearm_data, rearm0);
        _mm_store_si128((__m128i *)&pkts[1]->rearm_data, rearm1);
        _mm_store_si128((__m128i *)&pkts[2]->rearm_data, rearm2);
@@ -987,26 +977,6 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n)
                              rxq->crc_present * ETHER_CRC_LEN);
        const __m128i flow_mark_adj = _mm_set_epi32(rxq->mark * (-1), 0, 0, 0);
 
-       /* Compile time sanity check for this function. */
-       RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, pkt_len) !=
-                        offsetof(struct rte_mbuf, rx_descriptor_fields1) + 4);
-       RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, data_len) !=
-                        offsetof(struct rte_mbuf, rx_descriptor_fields1) + 8);
-       RTE_BUILD_BUG_ON(offsetof(struct mlx5_cqe, pkt_info) != 0);
-       RTE_BUILD_BUG_ON(offsetof(struct mlx5_cqe, rx_hash_res) !=
-                        offsetof(struct mlx5_cqe, pkt_info) + 12);
-       RTE_BUILD_BUG_ON(offsetof(struct mlx5_cqe, rsvd1) +
-                         sizeof(((struct mlx5_cqe *)0)->rsvd1) !=
-                        offsetof(struct mlx5_cqe, hdr_type_etc));
-       RTE_BUILD_BUG_ON(offsetof(struct mlx5_cqe, vlan_info) !=
-                        offsetof(struct mlx5_cqe, hdr_type_etc) + 2);
-       RTE_BUILD_BUG_ON(offsetof(struct mlx5_cqe, rsvd2) +
-                         sizeof(((struct mlx5_cqe *)0)->rsvd2) !=
-                        offsetof(struct mlx5_cqe, byte_cnt));
-       RTE_BUILD_BUG_ON(offsetof(struct mlx5_cqe, sop_drop_qpn) !=
-                        RTE_ALIGN(offsetof(struct mlx5_cqe, sop_drop_qpn), 8));
-       RTE_BUILD_BUG_ON(offsetof(struct mlx5_cqe, op_own) !=
-                        offsetof(struct mlx5_cqe, sop_drop_qpn) + 7);
        assert(rxq->sges_n == 0);
        assert(rxq->cqe_n == rxq->elts_n);
        cq = &(*rxq->cqes)[cq_idx];

diff --git a/drivers/net/mlx5/mlx5_rxtx_vec.h b/drivers/net/mlx5/mlx5_rxtx_vec.h
new file mode 100644 (file)
index 0000000..c41a9b9
--- /dev/null
+++ b/drivers/net/mlx5/mlx5_rxtx_vec.h
@@ -0,0 +1,87 @@
+/*-
+ *   BSD LICENSE
+ *
+ *   Copyright 2017 6WIND S.A.
+ *   Copyright 2017 Mellanox.
+ *
+ *   Redistribution and use in source and binary forms, with or without
+ *   modification, are permitted provided that the following conditions
+ *   are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *     * Neither the name of 6WIND S.A. nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef RTE_PMD_MLX5_RXTX_VEC_H_
+#define RTE_PMD_MLX5_RXTX_VEC_H_
+
+#include <rte_common.h>
+#include <rte_mbuf.h>
+
+#include "mlx5_autoconf.h"
+#include "mlx5_prm.h"
+
+/*
+ * Compile time sanity check for vectorized functions.
+ */
+
+#define S_ASSERT_RTE_MBUF(s) \
+       static_assert(s, "A field of struct rte_mbuf is changed")
+#define S_ASSERT_MLX5_CQE(s) \
+       static_assert(s, "A field of struct mlx5_cqe is changed")
+
+/* rxq_cq_decompress_v() */
+S_ASSERT_RTE_MBUF(offsetof(struct rte_mbuf, pkt_len) ==
+                 offsetof(struct rte_mbuf, rx_descriptor_fields1) + 4);
+S_ASSERT_RTE_MBUF(offsetof(struct rte_mbuf, data_len) ==
+                 offsetof(struct rte_mbuf, rx_descriptor_fields1) + 8);
+S_ASSERT_RTE_MBUF(offsetof(struct rte_mbuf, hash) ==
+                 offsetof(struct rte_mbuf, rx_descriptor_fields1) + 12);
+
+/* rxq_cq_to_ptype_oflags_v() */
+S_ASSERT_RTE_MBUF(offsetof(struct rte_mbuf, ol_flags) ==
+                 offsetof(struct rte_mbuf, rearm_data) + 8);
+S_ASSERT_RTE_MBUF(offsetof(struct rte_mbuf, rearm_data) ==
+                 RTE_ALIGN(offsetof(struct rte_mbuf, rearm_data), 16));
+
+/* rxq_burst_v() */
+S_ASSERT_RTE_MBUF(offsetof(struct rte_mbuf, pkt_len) ==
+                 offsetof(struct rte_mbuf, rx_descriptor_fields1) + 4);
+S_ASSERT_RTE_MBUF(offsetof(struct rte_mbuf, data_len) ==
+                 offsetof(struct rte_mbuf, rx_descriptor_fields1) + 8);
+S_ASSERT_MLX5_CQE(offsetof(struct mlx5_cqe, pkt_info) == 0);
+S_ASSERT_MLX5_CQE(offsetof(struct mlx5_cqe, rx_hash_res) ==
+                 offsetof(struct mlx5_cqe, pkt_info) + 12);
+S_ASSERT_MLX5_CQE(offsetof(struct mlx5_cqe, rsvd1) +
+                 sizeof(((struct mlx5_cqe *)0)->rsvd1) ==
+                 offsetof(struct mlx5_cqe, hdr_type_etc));
+S_ASSERT_MLX5_CQE(offsetof(struct mlx5_cqe, vlan_info) ==
+                 offsetof(struct mlx5_cqe, hdr_type_etc) + 2);
+S_ASSERT_MLX5_CQE(offsetof(struct mlx5_cqe, rsvd2) +
+                 sizeof(((struct mlx5_cqe *)0)->rsvd2) ==
+                 offsetof(struct mlx5_cqe, byte_cnt));
+S_ASSERT_MLX5_CQE(offsetof(struct mlx5_cqe, sop_drop_qpn) ==
+                 RTE_ALIGN(offsetof(struct mlx5_cqe, sop_drop_qpn), 8));
+S_ASSERT_MLX5_CQE(offsetof(struct mlx5_cqe, op_own) ==
+                 offsetof(struct mlx5_cqe, sop_drop_qpn) + 7);
+
+#endif /* RTE_PMD_MLX5_RXTX_VEC_H_ */