3a8995b1ad
Update DPDK version from 19.11 to 20.11 and also support hns3 PMD for Kunpeng 920 and Kunpeng 930. Signed-off-by: speech_white <humin29@huawei.com>
90 lines
3.9 KiB
Diff
90 lines
3.9 KiB
Diff
From 81ac96b3d326444b3ec1dc5e72819056a94b9e2f Mon Sep 17 00:00:00 2001
|
|
From: Chengwen Feng <fengchengwen@huawei.com>
|
|
Date: Sat, 17 Apr 2021 17:54:54 +0800
|
|
Subject: [PATCH 123/189] net/hns3: add compile-time verification on Rx vector
|
|
|
|
Rx vector implementation depends on the mbuf fields
|
|
(such as rearm_data/rx_descriptor_fields1) layout, this patch adds
|
|
compile-time verification for this.
|
|
|
|
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
|
|
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
|
|
---
|
|
drivers/net/hns3/hns3_rxtx_vec.c | 22 ++++++++++++++++++++++
|
|
drivers/net/hns3/hns3_rxtx_vec_neon.h | 8 ++++++++
|
|
drivers/net/hns3/hns3_rxtx_vec_sve.c | 6 ++++++
|
|
3 files changed, 36 insertions(+)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_rxtx_vec.c b/drivers/net/hns3/hns3_rxtx_vec.c
|
|
index fd7b272..d6636df 100644
|
|
--- a/drivers/net/hns3/hns3_rxtx_vec.c
|
|
+++ b/drivers/net/hns3/hns3_rxtx_vec.c
|
|
@@ -147,6 +147,28 @@ hns3_rxq_vec_setup_rearm_data(struct hns3_rx_queue *rxq)
|
|
mb_def.port = rxq->port_id;
|
|
rte_mbuf_refcnt_set(&mb_def, 1);
|
|
|
|
+ /* compile-time verifies the rearm_data first 8bytes */
|
|
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, data_off) <
|
|
+ offsetof(struct rte_mbuf, rearm_data));
|
|
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, refcnt) <
|
|
+ offsetof(struct rte_mbuf, rearm_data));
|
|
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, refcnt) <
|
|
+ offsetof(struct rte_mbuf, rearm_data));
|
|
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, nb_segs) <
|
|
+ offsetof(struct rte_mbuf, rearm_data));
|
|
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, port) <
|
|
+ offsetof(struct rte_mbuf, rearm_data));
|
|
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, data_off) -
|
|
+ offsetof(struct rte_mbuf, rearm_data) > 6);
|
|
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, refcnt) -
|
|
+ offsetof(struct rte_mbuf, rearm_data) > 6);
|
|
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, refcnt) -
|
|
+ offsetof(struct rte_mbuf, rearm_data) > 6);
|
|
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, nb_segs) -
|
|
+ offsetof(struct rte_mbuf, rearm_data) > 6);
|
|
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, port) -
|
|
+ offsetof(struct rte_mbuf, rearm_data) > 6);
|
|
+
|
|
/* prevent compiler reordering: rearm_data covers previous fields */
|
|
rte_compiler_barrier();
|
|
p = (uintptr_t)&mb_def.rearm_data;
|
|
diff --git a/drivers/net/hns3/hns3_rxtx_vec_neon.h b/drivers/net/hns3/hns3_rxtx_vec_neon.h
|
|
index 4699a62..35fef12 100644
|
|
--- a/drivers/net/hns3/hns3_rxtx_vec_neon.h
|
|
+++ b/drivers/net/hns3/hns3_rxtx_vec_neon.h
|
|
@@ -156,6 +156,14 @@ hns3_recv_burst_vec(struct hns3_rx_queue *__restrict rxq,
|
|
0, 0, 0, /* ignore non-length fields */
|
|
};
|
|
|
|
+ /* compile-time verifies the shuffle mask */
|
|
+ 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.rss) !=
|
|
+ offsetof(struct rte_mbuf, rx_descriptor_fields1) + 12);
|
|
+
|
|
for (pos = 0; pos < nb_pkts; pos += HNS3_DEFAULT_DESCS_PER_LOOP,
|
|
rxdp += HNS3_DEFAULT_DESCS_PER_LOOP) {
|
|
uint64x2x2_t descs[HNS3_DEFAULT_DESCS_PER_LOOP];
|
|
diff --git a/drivers/net/hns3/hns3_rxtx_vec_sve.c b/drivers/net/hns3/hns3_rxtx_vec_sve.c
|
|
index bc5577b..e15fd7a 100644
|
|
--- a/drivers/net/hns3/hns3_rxtx_vec_sve.c
|
|
+++ b/drivers/net/hns3/hns3_rxtx_vec_sve.c
|
|
@@ -118,6 +118,12 @@ hns3_recv_burst_vec_sve(struct hns3_rx_queue *__restrict rxq,
|
|
svuint32_t rss_tbl1 = svld1_u32(PG32_256BIT, rss_adjust);
|
|
svuint32_t rss_tbl2 = svld1_u32(PG32_256BIT, &rss_adjust[8]);
|
|
|
|
+ /* compile-time verifies the xlen_adjust mask */
|
|
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, data_len) !=
|
|
+ offsetof(struct rte_mbuf, pkt_len) + 4);
|
|
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, vlan_tci) !=
|
|
+ offsetof(struct rte_mbuf, data_len) + 2);
|
|
+
|
|
for (pos = 0; pos < nb_pkts; pos += HNS3_SVE_DEFAULT_DESCS_PER_LOOP,
|
|
rxdp += HNS3_SVE_DEFAULT_DESCS_PER_LOOP) {
|
|
svuint64_t vld_clz, mbp1st, mbp2st, mbuf_init;
|
|
--
|
|
2.7.4
|
|
|