modify rss related issues in testing process.
Signed-off-by: Junlong Wang <wang.junlo...@zte.com.cn>
---
drivers/net/zxdh/zxdh_ethdev.c | 1 +
drivers/net/zxdh/zxdh_ethdev_ops.c | 66 +++++++++++++++++++-----------
drivers/net/zxdh/zxdh_ethdev_ops.h | 4 +-
drivers/net/zxdh/zxdh_msg.c | 12 +++---
drivers/net/zxdh/zxdh_tables.c | 8 ++--
5 files changed, 54 insertions(+), 37 deletions(-)
diff --git a/drivers/net/zxdh/zxdh_ethdev.c b/drivers/net/zxdh/zxdh_ethdev.c
index 9512aff99c..a245ab24ce 100644
--- a/drivers/net/zxdh/zxdh_ethdev.c
+++ b/drivers/net/zxdh/zxdh_ethdev.c
@@ -66,6 +66,7 @@ zxdh_dev_infos_get(struct rte_eth_dev *dev,
dev_info->rx_offload_capa |= RTE_ETH_RX_OFFLOAD_TCP_LRO;
dev_info->rx_offload_capa |= RTE_ETH_RX_OFFLOAD_RSS_HASH;
+ dev_info->hash_key_size = ZXDH_RSS_HASH_KEY_LEN;
dev_info->reta_size = RTE_ETH_RSS_RETA_SIZE_256;
dev_info->flow_type_rss_offloads = ZXDH_RSS_HF;
diff --git a/drivers/net/zxdh/zxdh_ethdev_ops.c
b/drivers/net/zxdh/zxdh_ethdev_ops.c
index c16271aeaf..86517d571a 100644
--- a/drivers/net/zxdh/zxdh_ethdev_ops.c
+++ b/drivers/net/zxdh/zxdh_ethdev_ops.c
@@ -289,7 +289,7 @@ zxdh_link_info_get(struct rte_eth_dev *dev, struct
rte_eth_link *link)
zxdh_pci_read_dev_config(hw, offsetof(struct zxdh_net_config,
status),
&status, sizeof(status));
- link->link_status = status;
+ link->link_status = status & hw->admin_status;
if (status == RTE_ETH_LINK_DOWN) {
link->link_speed = RTE_ETH_SPEED_NUM_UNKNOWN;
@@ -1207,7 +1207,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;
@@ -1245,7 +1245,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) {
@@ -1267,6 +1267,9 @@ zxdh_rss_hash_update(struct rte_eth_dev *dev,
return -EINVAL;
}
}
+ hw->rss_enable = !!rss_conf->rss_hf;
+ if (rss_conf->rss_hf == 0)
+ return 0;
if (hw->is_pf) {
ret = zxdh_get_port_attr(hw, hw->vport.vport,
&port_attr);
port_attr.rss_hash_factor = hw_hf_new;
@@ -1294,15 +1297,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) {
@@ -1310,27 +1314,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;
}
@@ -1389,7 +1406,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_ethdev_ops.h
b/drivers/net/zxdh/zxdh_ethdev_ops.h
index 6015b3de59..762562fbef 100644
--- a/drivers/net/zxdh/zxdh_ethdev_ops.h
+++ b/drivers/net/zxdh/zxdh_ethdev_ops.h
@@ -12,8 +12,7 @@
#include "zxdh_ethdev.h"
#define ZXDH_ETH_RSS_L2 RTE_ETH_RSS_L2_PAYLOAD
-#define ZXDH_ETH_RSS_IP \
- (RTE_ETH_RSS_IPV4 | \
+#define ZXDH_ETH_RSS_IP (RTE_ETH_RSS_IPV4 | \
RTE_ETH_RSS_FRAG_IPV4 | \
RTE_ETH_RSS_IPV6 | \
RTE_ETH_RSS_FRAG_IPV6)
@@ -25,6 +24,7 @@
#define ZXDH_HF_F3_ETH ZXDH_ETH_RSS_IP
#define ZXDH_HF_MAC_VLAN_ETH ZXDH_ETH_RSS_L2
#define ZXDH_RSS_HF ((ZXDH_HF_MAC_VLAN_ETH | ZXDH_HF_F3_ETH | ZXDH_HF_F5_ETH))
+#define ZXDH_RSS_HASH_KEY_LEN 40U
#define ZXDH_ETHER_MIN_MTU 68
diff --git a/drivers/net/zxdh/zxdh_msg.c b/drivers/net/zxdh/zxdh_msg.c
index be4f115380..68f2bab0c1 100644
--- a/drivers/net/zxdh/zxdh_msg.c
+++ b/drivers/net/zxdh/zxdh_msg.c
@@ -1270,7 +1270,6 @@ zxdh_vf_port_init(struct zxdh_hw *pf_hw, uint16_t vport,
void *cfg_data,
port_attr.pf_vfid = pf_hw->vfid;
port_attr.hash_search_index = pf_hw->hash_search_index;
port_attr.port_base_qid = vf_init_msg->base_qid;
- uint16_t vfid = zxdh_vport_to_vfid(port);
ret = zxdh_set_port_attr(pf_hw, vport, &port_attr);
if (ret) {
@@ -1714,12 +1713,14 @@ 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;
}
@@ -2160,7 +2161,6 @@ static int
zxdh_vf_vlan_tpid_set(struct zxdh_hw *pf_hw, uint16_t vport, void *cfg_data,
void *res_info, uint16_t *res_len)
{
- union zxdh_virport_num port = {.vport = vport};
struct zxdh_vlan_tpid *vlan_tpid = (struct zxdh_vlan_tpid *)cfg_data;
struct zxdh_port_vlan_table port_vlan_table = {0};
int ret = 0;
diff --git a/drivers/net/zxdh/zxdh_tables.c b/drivers/net/zxdh/zxdh_tables.c
index 57a291e92a..e11b4bf92c 100644
--- a/drivers/net/zxdh/zxdh_tables.c
+++ b/drivers/net/zxdh/zxdh_tables.c
@@ -620,7 +620,7 @@ zxdh_dev_unicast_table_set(struct zxdh_hw *hw, uint16_t
vport, bool enable)
ret = zxdh_np_dtb_table_entry_get(hw->slot_id, dtb_data->queueid,
&entry, 1);
if (ret) {
- PMD_DRV_LOG(ERR, "unicast_table_get_failed:%d", hw->vfid);
+ PMD_DRV_LOG(ERR, "unicast_table_get_failed:%d", vfid);
return -ret;
}
@@ -637,20 +637,20 @@ zxdh_dev_unicast_table_set(struct zxdh_hw *hw, uint16_t
vport, bool enable)
ret = zxdh_np_dtb_table_entry_write(hw->slot_id, dtb_data->queueid, 1,
&entry);
if (ret) {
- PMD_DRV_LOG(ERR, "unicast_table_set_failed:%d", hw->vfid);
+ PMD_DRV_LOG(ERR, "unicast_table_set_failed:%d", vfid);
return -ret;
}
ret = zxdh_get_port_attr(hw, vport, &port_attr);
if (ret) {
- PMD_DRV_LOG(ERR, "port_attr_table_get_failed:%d", hw->vfid);
+ PMD_DRV_LOG(ERR, "port_attr_table_get_failed:%d", vfid);
return -ret;
}
port_attr.promisc_enable = enable;
ret = zxdh_set_port_attr(hw, vport, &port_attr);
if (ret) {
- PMD_DRV_LOG(ERR, "port_attr_table_set_failed:%d", hw->vfid);
+ PMD_DRV_LOG(ERR, "port_attr_table_set_failed:%d", vfid);
return -ret;
}
--
2.27.0
