[PATCH v2 4/6] net/zxdh: fix RSS related issues

[Junlong Wang]

modify rss related issues in testing process.

Fixes: 01acc23bab13 ("net/zxdh: optimize RSS operations")
Cc: stable at dpdk.org

Signed-off-by: Junlong Wang <wang.junlong1 at zte.com.cn>
---
 drivers/net/zxdh/zxdh_ethdev.h     |  1 +
 drivers/net/zxdh/zxdh_ethdev_ops.c | 64 +++++++++++++++++++-----------
 drivers/net/zxdh/zxdh_msg.c        | 11 +++--
 3 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/drivers/net/zxdh/zxdh_ethdev.h b/drivers/net/zxdh/zxdh_ethdev.h
index 169af209a2..1013446876 100644
--- a/drivers/net/zxdh/zxdh_ethdev.h
+++ b/drivers/net/zxdh/zxdh_ethdev.h
@@ -54,6 +54,7 @@
 #define ZXDH_SLOT_MAX             256
 #define ZXDH_MAX_VF               256
 #define ZXDH_HASHIDX_MAX          6
+#define ZXDH_RSS_HASH_KEY_LEN     40U
 
 union zxdh_virport_num {
 	uint16_t vport;
diff --git a/drivers/net/zxdh/zxdh_ethdev_ops.c b/drivers/net/zxdh/zxdh_ethdev_ops.c
index 93b7045565..d0b0c17279 100644
--- a/drivers/net/zxdh/zxdh_ethdev_ops.c
+++ b/drivers/net/zxdh/zxdh_ethdev_ops.c
@@ -1170,7 +1170,7 @@ zxdh_rss_hf_to_hw(uint64_t hf)
 }
 
 static uint64_t
-zxdh_rss_hf_to_eth(uint32_t hw_hf)
+zxdh_rss_hf_to_eth(uint64_t hw_hf)
 {
 	uint64_t hf = 0;
 
@@ -1208,7 +1208,7 @@ zxdh_rss_hash_update(struct rte_eth_dev *dev,
 	hw_hf_new = zxdh_rss_hf_to_hw(rss_conf->rss_hf);
 	hw_hf_old = zxdh_rss_hf_to_hw(old_rss_conf->rss_hf);
 
-	if ((hw_hf_new != hw_hf_old || !!rss_conf->rss_hf))
+	if (hw_hf_new != hw_hf_old || hw->rss_enable != !!rss_conf->rss_hf)
 		need_update_hf = 1;
 
 	if (need_update_hf) {
@@ -1231,6 +1231,9 @@ zxdh_rss_hash_update(struct rte_eth_dev *dev,
 			}
 		}
 		if (hw->is_pf) {
+			hw->rss_enable = !!rss_conf->rss_hf;
+			if (rss_conf->rss_hf == 0)
+				return 0;
 			ret = zxdh_get_port_attr(hw, hw->vport.vport, &port_attr);
 			port_attr.rss_hash_factor = hw_hf_new;
 			ret = zxdh_set_port_attr(hw, hw->vport.vport, &port_attr);
@@ -1257,15 +1260,16 @@ zxdh_rss_hash_update(struct rte_eth_dev *dev,
 int
 zxdh_rss_hash_conf_get(struct rte_eth_dev *dev, struct rte_eth_rss_conf *rss_conf)
 {
-	struct zxdh_hw *hw = (struct zxdh_hw *)dev->data->dev_private;
+	struct zxdh_hw *hw = dev->data->dev_private;
 	struct rte_eth_rss_conf *old_rss_conf = &dev->data->dev_conf.rx_adv_conf.rss_conf;
 	struct zxdh_msg_info msg = {0};
 	uint8_t zxdh_msg_reply_info[ZXDH_ST_SZ_BYTES(msg_reply_info)] = {0};
 	void *reply_body_addr = ZXDH_ADDR_OF(msg_reply_info, zxdh_msg_reply_info, reply_body);
 	void *rss_hf_msg_addr = ZXDH_ADDR_OF(msg_reply_body, reply_body_addr, rss_hf_msg);
 	struct zxdh_port_attr_table port_attr = {0};
-	uint32_t rss_hf;
-	uint32_t hw_hf;
+	uint64_t rss_hf = 0;
+	uint64_t hw_hf = 0;
+	uint8_t need_update_hf = 0;
 	int ret;
 
 	if (rss_conf == NULL) {
@@ -1273,27 +1277,40 @@ zxdh_rss_hash_conf_get(struct rte_eth_dev *dev, struct rte_eth_rss_conf *rss_con
 		return -ENOMEM;
 	}
 
-	hw_hf = zxdh_rss_hf_to_hw(old_rss_conf->rss_hf);
-	rss_conf->rss_hf = zxdh_rss_hf_to_eth(hw_hf);
+	if (hw->rss_enable == 0) {
+		rss_conf->rss_hf = 0;
+		return 0;
+	}
 
-	zxdh_msg_head_build(hw, ZXDH_RSS_HF_GET, &msg);
-	if (hw->is_pf) {
-		ret = zxdh_get_port_attr(hw, hw->vport.vport, &port_attr);
-		if (ret) {
-			PMD_DRV_LOG(ERR, "rss hash factor set failed");
-			return -EINVAL;
-		}
-		ZXDH_SET(rss_hf, rss_hf_msg_addr, rss_hf, port_attr.rss_hash_factor);
-	} else {
-		ret = zxdh_vf_send_msg_to_pf(dev, &msg, sizeof(struct zxdh_msg_info),
-				zxdh_msg_reply_info, ZXDH_ST_SZ_BYTES(msg_reply_info));
-		if (ret) {
-			PMD_DRV_LOG(ERR, "rss hash factor set failed");
-			return -EINVAL;
+	if (old_rss_conf->rss_hf == 0)
+		need_update_hf = 1;
+
+	if (!need_update_hf) {
+		hw_hf = zxdh_rss_hf_to_hw(old_rss_conf->rss_hf);
+		rss_conf->rss_hf = zxdh_rss_hf_to_eth(hw_hf);
+	}
+
+	if (need_update_hf) {
+		zxdh_msg_head_build(hw, ZXDH_RSS_HF_GET, &msg);
+		if (hw->is_pf) {
+			ret = zxdh_get_port_attr(hw, hw->vport.vport, &port_attr);
+			if (ret) {
+				PMD_DRV_LOG(ERR, "rss hash factor set failed");
+				return -EINVAL;
+			}
+			ZXDH_SET(rss_hf, rss_hf_msg_addr, rss_hf, port_attr.rss_hash_factor);
+		} else {
+			ret = zxdh_vf_send_msg_to_pf(dev, &msg, sizeof(struct zxdh_msg_info),
+					zxdh_msg_reply_info, ZXDH_ST_SZ_BYTES(msg_reply_info));
+			if (ret) {
+				PMD_DRV_LOG(ERR, "rss hash factor set failed");
+				return -EINVAL;
+			}
 		}
+		rss_hf = ZXDH_GET(rss_hf, rss_hf_msg_addr, rss_hf);
+		rss_conf->rss_hf = zxdh_rss_hf_to_eth(rss_hf);
+		old_rss_conf->rss_hf = zxdh_rss_hf_to_eth(hw_hf);
 	}
-	rss_hf = ZXDH_GET(rss_hf, rss_hf_msg_addr, rss_hf);
-	rss_conf->rss_hf = zxdh_rss_hf_to_eth(rss_hf);
 
 	return 0;
 }
@@ -1352,7 +1369,6 @@ zxdh_rss_configure(struct rte_eth_dev *dev)
 
 	if (curr_rss_enable && hw->rss_init == 0) {
 		/* config hash factor */
-		dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf = ZXDH_HF_F5_ETH;
 		hw_hf = zxdh_rss_hf_to_hw(dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf);
 		memset(&msg, 0, sizeof(msg));
 		if (hw->is_pf) {
diff --git a/drivers/net/zxdh/zxdh_msg.c b/drivers/net/zxdh/zxdh_msg.c
index e607ea1dab..2a3d358a20 100644
--- a/drivers/net/zxdh/zxdh_msg.c
+++ b/drivers/net/zxdh/zxdh_msg.c
@@ -1713,12 +1713,15 @@ zxdh_vf_rss_table_get(struct zxdh_hw *hw, uint16_t vport, void *cfg_data __rte_u
 	if (ret)
 		sprintf(str, "set rss reta tbl failed, code:%d", ret);
 
-	*res_len = strlen(str) + sizeof(uint8_t);
-	if (ret == 0)
+	if (ret == 0) {
+		*res_len = ZXDH_ST_SZ_BYTES(rss_reta) + sizeof(uint8_t);
 		ZXDH_SET(msg_reply_body, reply, flag, ZXDH_REPS_SUCC);
-	else
+	} else {
+		*res_len = strlen(str) + sizeof(uint8_t);
 		ZXDH_SET(msg_reply_body, reply, flag, ZXDH_REPS_FAIL);
-	memcpy(reply_data_addr, str, strlen(str) + 1);
+		memcpy(reply_data_addr, str, strlen(str) + 1);
+	}
+
 	return ret;
 }
 
-- 
2.27.0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mails.dpdk.org/archives/dev/attachments/20250710/e4b08532/attachment.htm>