* [PATCH v1 2/6] net/zxdh: fix issues related to MAC configuration
2025-07-07 5:56 [PATCH v1 1/6] net/zxdh: fix meson.build issues in compilation Junlong Wang
@ 2025-07-07 5:56 ` Junlong Wang
2025-07-07 16:02 ` Stephen Hemminger
2025-07-07 5:56 ` [PATCH v1 3/6] net/zxdh: fix some VLAN related issues Junlong Wang
2025-07-07 5:56 ` [PATCH v1 4/6] net/zxdh: fix RSS " Junlong Wang
2 siblings, 1 reply; 5+ messages in thread
From: Junlong Wang @ 2025-07-07 5:56 UTC (permalink / raw)
To: stephen; +Cc: dev, Junlong Wang, stable
[-- Attachment #1.1.1: Type: text/plain, Size: 14076 bytes --]
Fix error handling when MAC configuration fails.
This is issue was discovered during internal testing.
Fixes: 1c8f68b64cfc ("net/zxdh: optimize MAC operations")
Cc: stable@dpdk.org
Signed-off-by: Junlong Wang <wang.junlong1@zte.com.cn>
---
drivers/net/zxdh/zxdh_ethdev.c | 15 +++++++++++
drivers/net/zxdh/zxdh_ethdev_ops.c | 34 +++++++++++++++++++-----
drivers/net/zxdh/zxdh_msg.c | 10 +++----
drivers/net/zxdh/zxdh_tables.c | 42 ++++++++++++++++--------------
4 files changed, 69 insertions(+), 32 deletions(-)
diff --git a/drivers/net/zxdh/zxdh_ethdev.c b/drivers/net/zxdh/zxdh_ethdev.c
index 80053678cb..8996d86b90 100644
--- a/drivers/net/zxdh/zxdh_ethdev.c
+++ b/drivers/net/zxdh/zxdh_ethdev.c
@@ -1265,6 +1265,7 @@ static int
zxdh_mac_config(struct rte_eth_dev *eth_dev)
{
struct zxdh_hw *hw = eth_dev->data->dev_private;
+ struct zxdh_msg_info msg_info = {0};
int ret = 0;
if (hw->is_pf) {
@@ -1274,7 +1275,21 @@ zxdh_mac_config(struct rte_eth_dev *eth_dev)
PMD_DRV_LOG(ERR, "Failed to add mac: port 0x%x", hw->vport.vport);
return ret;
}
+ hw->uc_num++;
+ } else {
+ struct zxdh_mac_filter *mac_filter = &msg_info.data.mac_filter_msg;
+ mac_filter->filter_flag = 0xff;
+ memcpy(&mac_filter->mac, ð_dev->data->mac_addrs[0],
+ sizeof(eth_dev->data->mac_addrs[0]));
+ zxdh_msg_head_build(hw, ZXDH_MAC_ADD, &msg_info);
+ ret = zxdh_vf_send_msg_to_pf(eth_dev, &msg_info, sizeof(msg_info), NULL, 0);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "Failed to send msg: msg type %d", ZXDH_MAC_ADD);
+ return ret;
+ }
+ hw->uc_num++;
}
+
return ret;
}
diff --git a/drivers/net/zxdh/zxdh_ethdev_ops.c b/drivers/net/zxdh/zxdh_ethdev_ops.c
index 268f78900c..8c71721472 100644
--- a/drivers/net/zxdh/zxdh_ethdev_ops.c
+++ b/drivers/net/zxdh/zxdh_ethdev_ops.c
@@ -413,7 +413,10 @@ zxdh_dev_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *addr)
struct zxdh_hw *hw = (struct zxdh_hw *)dev->data->dev_private;
struct rte_ether_addr *old_addr = &dev->data->mac_addrs[0];
struct zxdh_msg_info msg_info = {0};
- uint16_t ret = 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 *mac_reply_msg_addr = ZXDH_ADDR_OF(msg_reply_body, reply_body_addr, mac_reply_msg);
+ int ret = 0;
if (!rte_is_valid_assigned_ether_addr(addr)) {
PMD_DRV_LOG(ERR, "mac address is invalid!");
@@ -425,7 +428,7 @@ zxdh_dev_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *addr)
if (hw->is_pf) {
ret = zxdh_add_mac_table(hw, hw->vport.vport, addr, hw->hash_search_index, 0, 0);
if (ret) {
- if (ret == ZXDH_EEXIST_MAC_FLAG) {
+ if (ret == -EADDRINUSE) {
PMD_DRV_LOG(ERR, "pf mac add failed! mac is in used, code:%d", ret);
return -EADDRINUSE;
}
@@ -446,9 +449,11 @@ zxdh_dev_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *addr)
mac_filter->filter_flag = ZXDH_MAC_UNFILTER;
mac_filter->mac = *addr;
zxdh_msg_head_build(hw, ZXDH_MAC_ADD, &msg_info);
- ret = zxdh_vf_send_msg_to_pf(dev, &msg_info, sizeof(msg_info), NULL, 0);
+ ret = zxdh_vf_send_msg_to_pf(dev, &msg_info, sizeof(msg_info),
+ zxdh_msg_reply_info, ZXDH_ST_SZ_BYTES(msg_reply_info));
if (ret) {
- if (ret == ZXDH_EEXIST_MAC_FLAG) {
+ uint8_t flag = ZXDH_GET(mac_reply_msg, mac_reply_msg_addr, mac_flag);
+ if (flag == ZXDH_EEXIST_MAC_FLAG) {
PMD_DRV_LOG(ERR, "pf mac add failed! mac is in used, code:%d", ret);
return -EADDRINUSE;
}
@@ -482,7 +487,11 @@ zxdh_dev_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr,
{
struct zxdh_hw *hw = dev->data->dev_private;
struct zxdh_msg_info msg_info = {0};
- uint16_t i, ret;
+ 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 *mac_reply_msg_addr = ZXDH_ADDR_OF(msg_reply_body, reply_body_addr, mac_reply_msg);
+ uint16_t i;
+ int ret;
if (index >= ZXDH_MAX_MAC_ADDRS) {
PMD_DRV_LOG(ERR, "Add mac index (%u) is out of range", index);
@@ -503,6 +512,10 @@ zxdh_dev_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr,
ret = zxdh_add_mac_table(hw, hw->vport.vport,
mac_addr, hw->hash_search_index, 0, 0);
if (ret) {
+ if (ret == -EADDRINUSE) {
+ PMD_DRV_LOG(ERR, "pf mac add failed mac is in used");
+ return -EADDRINUSE;
+ }
PMD_DRV_LOG(ERR, "mac_addr_add failed, code:%d", ret);
return ret;
}
@@ -536,9 +549,16 @@ zxdh_dev_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr,
zxdh_msg_head_build(hw, ZXDH_MAC_ADD, &msg_info);
if (rte_is_unicast_ether_addr(mac_addr)) {
if (hw->uc_num < ZXDH_MAX_UC_MAC_ADDRS) {
- ret = zxdh_vf_send_msg_to_pf(dev, &msg_info,
- sizeof(msg_info), NULL, 0);
+ ret = zxdh_vf_send_msg_to_pf(dev, &msg_info, sizeof(msg_info),
+ zxdh_msg_reply_info,
+ ZXDH_ST_SZ_BYTES(msg_reply_info));
if (ret) {
+ uint8_t flag = ZXDH_GET(mac_reply_msg,
+ mac_reply_msg_addr, mac_flag);
+ if (flag == ZXDH_EEXIST_MAC_FLAG) {
+ PMD_DRV_LOG(ERR, "pf mac add failed mac is in used");
+ return -EADDRINUSE;
+ }
PMD_DRV_LOG(ERR, "Failed to send msg: port 0x%x msg type %d",
hw->vport.vport, ZXDH_MAC_ADD);
return ret;
diff --git a/drivers/net/zxdh/zxdh_msg.c b/drivers/net/zxdh/zxdh_msg.c
index 02ecd93b12..452c7ab2e3 100644
--- a/drivers/net/zxdh/zxdh_msg.c
+++ b/drivers/net/zxdh/zxdh_msg.c
@@ -1349,11 +1349,11 @@ zxdh_add_vf_mac_table(struct zxdh_hw *hw, uint16_t vport, void *cfg_data,
union zxdh_virport_num port = {0};
struct zxdh_mac_filter *mac_filter = (struct zxdh_mac_filter *)cfg_data;
struct rte_ether_addr *addr = &mac_filter->mac;
- int i = 0, ret = 0;
- uint16_t vf_id = port.vfid;
- port.vport = vport;
void *reply_data_addr = ZXDH_ADDR_OF(msg_reply_body, reply_body, reply_data);
void *mac_reply_msg_addr = ZXDH_ADDR_OF(msg_reply_body, reply_body, mac_reply_msg);
+ port.vport = vport;
+ uint16_t vf_id = port.vfid;
+ int i = 0, ret = 0;
for (i = 0; i < ZXDH_MAX_MAC_ADDRS; i++)
if (rte_is_same_ether_addr(&hw->vfinfo[vf_id].vf_mac[i], addr))
@@ -1396,12 +1396,12 @@ static int
zxdh_del_vf_mac_table(struct zxdh_hw *hw, uint16_t vport, void *cfg_data,
void *res_info, uint16_t *res_len)
{
- int ret, i = 0;
struct zxdh_mac_filter *mac_filter = (struct zxdh_mac_filter *)cfg_data;
union zxdh_virport_num port = (union zxdh_virport_num)vport;
char str[ZXDH_MSG_REPLY_BODY_MAX_LEN] = "del mac";
- uint16_t vf_id = port.vfid;
void *reply_data_addr = ZXDH_ADDR_OF(msg_reply_body, res_info, reply_data);
+ uint16_t vf_id = port.vfid;
+ int ret, i = 0;
PMD_DRV_LOG(DEBUG, "[PF GET MSG FROM VF]--vf mac to del.");
ret = zxdh_del_mac_table(hw, vport, &mac_filter->mac, hw->hash_search_index, 0, 0);
diff --git a/drivers/net/zxdh/zxdh_tables.c b/drivers/net/zxdh/zxdh_tables.c
index 29741e53ed..14974c021b 100644
--- a/drivers/net/zxdh/zxdh_tables.c
+++ b/drivers/net/zxdh/zxdh_tables.c
@@ -8,8 +8,8 @@
#include "zxdh_tables.h"
#include "zxdh_logs.h"
-#define ZXDH_UNIMAC_HASH_INDEX(index) (ZXDH_SDT_L2_ENTRY_TABLE0 + (index))
-#define ZXDH_MULTIMAC_HASH_INDEX(index) (ZXDH_SDT_MC_TABLE0 + (index))
+#define ZXDH_UNICAST_MAC_HASH_INDEX(index) (ZXDH_SDT_L2_ENTRY_TABLE0 + (index))
+#define ZXDH_MULTICAST_MAC_HASH_INDEX(index) (ZXDH_SDT_MC_TABLE0 + (index))
#define ZXDH_MC_GROUP_NUM 4
#define ZXDH_BASE_VFID 1152
#define ZXDH_TABLE_HIT_FLAG 128
@@ -244,8 +244,8 @@ zxdh_add_mac_table(struct zxdh_hw *hw, uint16_t vport, struct rte_ether_addr *ad
struct zxdh_mac_multicast_table multicast_table = {0};
union zxdh_virport_num vport_num = (union zxdh_virport_num)vport;
uint16_t vfid = zxdh_vport_to_vfid(vport_num);
- uint32_t ret;
uint16_t group_id = 0;
+ int32_t ret;
if (rte_is_unicast_ether_addr(addr)) {
rte_memcpy(unicast_table.key.dmac_addr, addr, sizeof(struct rte_ether_addr));
@@ -257,7 +257,7 @@ zxdh_add_mac_table(struct zxdh_hw *hw, uint16_t vport, struct rte_ether_addr *ad
.p_rst = (uint8_t *)&unicast_table.entry
};
ZXDH_DTB_USER_ENTRY_T entry_get = {
- .sdt_no = ZXDH_UNIMAC_HASH_INDEX(hash_search_idx),
+ .sdt_no = ZXDH_UNICAST_MAC_HASH_INDEX(hash_search_idx),
.p_entry_data = (void *)&dtb_hash_entry
};
@@ -294,19 +294,20 @@ zxdh_add_mac_table(struct zxdh_hw *hw, uint16_t vport, struct rte_ether_addr *ad
};
ZXDH_DTB_USER_ENTRY_T entry_get = {
- .sdt_no = ZXDH_MULTIMAC_HASH_INDEX(hash_search_idx),
+ .sdt_no = ZXDH_MULTICAST_MAC_HASH_INDEX(hash_search_idx),
.p_entry_data = (void *)&dtb_hash_entry
};
ret = zxdh_np_dtb_table_entry_get(hw->slot_id, hw->dev_sd->dtb_sd.queueid,
&entry_get, 1);
uint8_t index = (vport_num.vfid % 64) / 32;
+ uint8_t value = (vport_num.vfid % 64) % 32;
if (ret == 0) {
if (vport_num.vf_flag) {
if (group_id == vport_num.vfid / 64)
multicast_table.entry.mc_bitmap[index] |=
rte_cpu_to_be_32(UINT32_C(1) <<
- (31 - index));
+ (31 - value));
} else {
if (group_id == vport_num.vfid / 64)
multicast_table.entry.mc_pf_enable =
@@ -317,7 +318,7 @@ zxdh_add_mac_table(struct zxdh_hw *hw, uint16_t vport, struct rte_ether_addr *ad
if (group_id == vport_num.vfid / 64)
multicast_table.entry.mc_bitmap[index] |=
rte_cpu_to_be_32(UINT32_C(1) <<
- (31 - index));
+ (31 - value));
else
multicast_table.entry.mc_bitmap[index] =
false;
@@ -347,10 +348,9 @@ zxdh_del_mac_table(struct zxdh_hw *hw, uint16_t vport, struct rte_ether_addr *ad
struct zxdh_mac_unicast_table unicast_table = {0};
struct zxdh_mac_multicast_table multicast_table = {0};
union zxdh_virport_num vport_num = (union zxdh_virport_num)vport;
- union zxdh_virport_num port = (union zxdh_virport_num)vport;
- uint16_t vfid = zxdh_vport_to_vfid(port);
- uint32_t ret, del_flag = 0;
- uint16_t group_id = 0;
+ uint16_t vfid = zxdh_vport_to_vfid(vport_num);
+ uint16_t del_flag, group_id = 0;
+ int32_t ret = 0;
if (rte_is_unicast_ether_addr(addr)) {
rte_memcpy(unicast_table.key.dmac_addr, addr, sizeof(struct rte_ether_addr));
@@ -365,7 +365,7 @@ zxdh_del_mac_table(struct zxdh_hw *hw, uint16_t vport, struct rte_ether_addr *ad
};
ZXDH_DTB_USER_ENTRY_T entry_get = {
- .sdt_no = ZXDH_UNIMAC_HASH_INDEX(hash_search_idx),
+ .sdt_no = ZXDH_UNICAST_MAC_HASH_INDEX(hash_search_idx),
.p_entry_data = (void *)&dtb_hash_entry
};
ret = zxdh_np_dtb_table_entry_get(hw->slot_id, hw->dev_sd->dtb_sd.queueid,
@@ -393,16 +393,17 @@ zxdh_del_mac_table(struct zxdh_hw *hw, uint16_t vport, struct rte_ether_addr *ad
};
ZXDH_DTB_USER_ENTRY_T entry_get = {
- .sdt_no = ZXDH_MULTIMAC_HASH_INDEX(hash_search_idx),
+ .sdt_no = ZXDH_MULTICAST_MAC_HASH_INDEX(hash_search_idx),
.p_entry_data = (void *)&dtb_hash_entry
};
ret = zxdh_np_dtb_table_entry_get(hw->slot_id, hw->dev_sd->dtb_sd.queueid,
&entry_get, 1);
uint8_t index = (vport_num.vfid % 64) / 32;
+ uint8_t value = (vport_num.vfid % 64) % 32;
if (vport_num.vf_flag)
multicast_table.entry.mc_bitmap[index] &=
- ~(rte_cpu_to_be_32(UINT32_C(1) << (31 - index)));
+ ~(rte_cpu_to_be_32(UINT32_C(1) << (31 - value)));
else
multicast_table.entry.mc_pf_enable = 0;
@@ -422,7 +423,7 @@ zxdh_del_mac_table(struct zxdh_hw *hw, uint16_t vport, struct rte_ether_addr *ad
.p_rst = (uint8_t *)&multicast_table.entry
};
ZXDH_DTB_USER_ENTRY_T entry_get = {
- .sdt_no = ZXDH_MULTIMAC_HASH_INDEX(hash_search_idx),
+ .sdt_no = ZXDH_MULTICAST_MAC_HASH_INDEX(hash_search_idx),
.p_entry_data = (void *)&dtb_hash_entry
};
@@ -447,7 +448,7 @@ zxdh_del_mac_table(struct zxdh_hw *hw, uint16_t vport, struct rte_ether_addr *ad
.p_rst = (uint8_t *)&multicast_table.entry
};
ZXDH_DTB_USER_ENTRY_T entry_get = {
- .sdt_no = ZXDH_MULTIMAC_HASH_INDEX(hash_search_idx),
+ .sdt_no = ZXDH_MULTICAST_MAC_HASH_INDEX(hash_search_idx),
.p_entry_data = (void *)&dtb_hash_entry
};
@@ -604,6 +605,7 @@ zxdh_dev_unicast_table_set(struct zxdh_hw *hw, uint16_t vport, bool enable)
struct zxdh_unitcast_table uc_table = {0};
struct zxdh_port_attr_table port_attr = {0};
union zxdh_virport_num vport_num = (union zxdh_virport_num)vport;
+ uint16_t vfid = zxdh_vport_to_vfid(vport_num);
int16_t ret = 0;
ZXDH_DTB_ERAM_ENTRY_INFO_T uc_table_entry = {
@@ -617,7 +619,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;
}
@@ -634,20 +636,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
[-- Attachment #1.1.2: Type: text/html , Size: 36683 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v1 3/6] net/zxdh: fix some VLAN related issues
2025-07-07 5:56 [PATCH v1 1/6] net/zxdh: fix meson.build issues in compilation Junlong Wang
2025-07-07 5:56 ` [PATCH v1 2/6] net/zxdh: fix issues related to MAC configuration Junlong Wang
@ 2025-07-07 5:56 ` Junlong Wang
2025-07-07 5:56 ` [PATCH v1 4/6] net/zxdh: fix RSS " Junlong Wang
2 siblings, 0 replies; 5+ messages in thread
From: Junlong Wang @ 2025-07-07 5:56 UTC (permalink / raw)
To: stephen; +Cc: dev, Junlong Wang, stable
[-- Attachment #1.1.1: Type: text/plain, Size: 7923 bytes --]
modify some vlan related issues,
which were discovered during the testing process.
Fixes: b4f996b7fcf6 ("net/zxdh: optimize VLAN filter and offload")
Cc: stable@dpdk.org
Signed-off-by: Junlong Wang <wang.junlong1@zte.com.cn>
---
drivers/net/zxdh/zxdh_ethdev.c | 9 ++++++++-
drivers/net/zxdh/zxdh_ethdev_ops.c | 2 +-
drivers/net/zxdh/zxdh_msg.c | 28 ++++++++++++++++++++++++++--
drivers/net/zxdh/zxdh_tables.c | 28 ++++++++++++++++++++++------
drivers/net/zxdh/zxdh_tables.h | 7 ++++++-
5 files changed, 63 insertions(+), 11 deletions(-)
diff --git a/drivers/net/zxdh/zxdh_ethdev.c b/drivers/net/zxdh/zxdh_ethdev.c
index 8996d86b90..4eb6612c0a 100644
--- a/drivers/net/zxdh/zxdh_ethdev.c
+++ b/drivers/net/zxdh/zxdh_ethdev.c
@@ -1906,6 +1906,7 @@ zxdh_np_init(struct rte_eth_dev *eth_dev)
static int
zxdh_tables_init(struct rte_eth_dev *dev)
{
+ struct zxdh_hw *hw = dev->data->dev_private;
int ret = 0;
ret = zxdh_port_attr_init(dev);
@@ -1926,12 +1927,18 @@ zxdh_tables_init(struct rte_eth_dev *dev)
return ret;
}
- ret = zxdh_vlan_filter_table_init(dev);
+ ret = zxdh_vlan_filter_table_init(hw, hw->vport.vport);
if (ret) {
PMD_DRV_LOG(ERR, "vlan filter table init failed");
return ret;
}
+ ret = zxdh_port_vlan_table_init(hw, hw->vport.vport);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "port vlan table init failed");
+ return ret;
+ }
+
return ret;
}
diff --git a/drivers/net/zxdh/zxdh_ethdev_ops.c b/drivers/net/zxdh/zxdh_ethdev_ops.c
index 8c71721472..93b7045565 100644
--- a/drivers/net/zxdh/zxdh_ethdev_ops.c
+++ b/drivers/net/zxdh/zxdh_ethdev_ops.c
@@ -895,7 +895,7 @@ zxdh_dev_vlan_offload_set(struct rte_eth_dev *dev, int mask)
return -EAGAIN;
}
} else {
- msg.data.vlan_filter_set_msg.enable = true;
+ msg.data.vlan_filter_set_msg.enable = false;
zxdh_msg_head_build(hw, ZXDH_VLAN_FILTER_SET, &msg);
ret = zxdh_vf_send_msg_to_pf(hw->eth_dev, &msg,
sizeof(struct zxdh_msg_info), NULL, 0);
diff --git a/drivers/net/zxdh/zxdh_msg.c b/drivers/net/zxdh/zxdh_msg.c
index 452c7ab2e3..e607ea1dab 100644
--- a/drivers/net/zxdh/zxdh_msg.c
+++ b/drivers/net/zxdh/zxdh_msg.c
@@ -1233,6 +1233,24 @@ zxdh_vf_promisc_uninit(struct zxdh_hw *hw, union zxdh_virport_num vport)
return ret;
}
+static int
+zxdh_vf_vlan_table_init(struct zxdh_hw *hw, uint16_t vport)
+{
+ int ret = 0;
+ ret = zxdh_vlan_filter_table_init(hw, vport);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "vf vlan filter table init failed, code:%d", ret);
+ return -1;
+ }
+
+ ret = zxdh_port_vlan_table_init(hw, vport);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "vf port vlan table init failed, code:%d", ret);
+ return -1;
+ }
+ return ret;
+}
+
static int
zxdh_vf_port_init(struct zxdh_hw *pf_hw, uint16_t vport, void *cfg_data,
void *res_info, uint16_t *res_len)
@@ -1252,9 +1270,8 @@ 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, vfid, &port_attr);
+ ret = zxdh_set_port_attr(pf_hw, vport, &port_attr);
if (ret) {
PMD_DRV_LOG(ERR, "set vport attr failed, code:%d", ret);
goto proc_end;
@@ -1265,6 +1282,13 @@ zxdh_vf_port_init(struct zxdh_hw *pf_hw, uint16_t vport, void *cfg_data,
PMD_DRV_LOG(ERR, "vf_promisc_table_init failed, code:%d", ret);
goto proc_end;
}
+
+ ret = zxdh_vf_vlan_table_init(pf_hw, vport);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "vf vlan table init failed, code:%d", ret);
+ goto proc_end;
+ }
+
ZXDH_SET(msg_reply_body, res_info, flag, ZXDH_REPS_SUCC);
*res_len = sizeof(uint8_t);
diff --git a/drivers/net/zxdh/zxdh_tables.c b/drivers/net/zxdh/zxdh_tables.c
index 14974c021b..2d2dd26499 100644
--- a/drivers/net/zxdh/zxdh_tables.c
+++ b/drivers/net/zxdh/zxdh_tables.c
@@ -699,10 +699,11 @@ zxdh_dev_multicast_table_set(struct zxdh_hw *hw, uint16_t vport, bool enable)
}
int
-zxdh_vlan_filter_table_init(struct rte_eth_dev *dev)
+zxdh_vlan_filter_table_init(struct zxdh_hw *hw, uint16_t vport)
{
- struct zxdh_hw *hw = dev->data->dev_private;
struct zxdh_dtb_shared_data *dtb_data = &hw->dev_sd->dtb_sd;
+ union zxdh_virport_num vport_num = (union zxdh_virport_num)vport;
+ uint16_t vfid = zxdh_vport_to_vfid(vport_num);
struct zxdh_vlan_filter_table vlan_table = {0};
int16_t ret = 0;
@@ -717,7 +718,7 @@ zxdh_vlan_filter_table_init(struct rte_eth_dev *dev)
} else {
vlan_table.vlans[0] = 0;
}
- uint32_t index = (vlan_group << 11) | hw->vport.vfid;
+ uint32_t index = (vlan_group << 11) | vfid;
ZXDH_DTB_ERAM_ENTRY_INFO_T entry_data = {
.index = index,
.p_data = (uint32_t *)&vlan_table
@@ -749,7 +750,7 @@ zxdh_vlan_filter_table_set(struct zxdh_hw *hw, uint16_t vport, uint16_t vlan_id,
memset(&vlan_table, 0, sizeof(struct zxdh_vlan_filter_table));
int table_num = vlan_id / ZXDH_VLAN_FILTER_VLANID_STEP;
uint32_t index = (table_num << 11) | vfid;
- uint16_t group = (vlan_id - table_num * ZXDH_VLAN_FILTER_VLANID_STEP) / 8 + 1;
+ uint16_t group = (vlan_id % ZXDH_VLAN_FILTER_VLANID_STEP) / 8 + 1;
uint8_t val = sizeof(struct zxdh_vlan_filter_table) / sizeof(uint32_t);
uint8_t vlan_tbl_index = group / val;
@@ -950,7 +951,7 @@ zxdh_vlan_relate_vport(struct rte_eth_dev *dev, uint16_t vport,
return 0;
}
-static int
+int
zxdh_set_port_vlan_attr(struct zxdh_hw *hw, uint16_t vport,
struct zxdh_port_vlan_table *port_vlan)
{
@@ -973,7 +974,7 @@ zxdh_set_port_vlan_attr(struct zxdh_hw *hw, uint16_t vport,
return ret;
}
-static int
+int
zxdh_get_port_vlan_attr(struct zxdh_hw *hw, uint16_t vport,
struct zxdh_port_vlan_table *port_vlan)
{
@@ -1045,3 +1046,18 @@ int zxdh_set_vlan_offload(struct zxdh_hw *hw, uint16_t vport, uint8_t type, uint
{
return set_vlan_config(hw, vport, type, enable);
}
+
+int zxdh_port_vlan_table_init(struct zxdh_hw *hw, uint16_t vport)
+{
+ struct zxdh_port_vlan_table port_vlan = {0};
+ int ret = 0;
+
+ if (!hw->is_pf)
+ return 0;
+
+ ret = zxdh_set_port_vlan_attr(hw, vport, &port_vlan);
+ if (ret)
+ PMD_DRV_LOG(ERR, "port vlan table init failed");
+
+ return ret;
+}
diff --git a/drivers/net/zxdh/zxdh_tables.h b/drivers/net/zxdh/zxdh_tables.h
index cb34e38be8..3280ff1f89 100644
--- a/drivers/net/zxdh/zxdh_tables.h
+++ b/drivers/net/zxdh/zxdh_tables.h
@@ -362,7 +362,7 @@ int zxdh_promisc_table_init(struct rte_eth_dev *dev);
int zxdh_promisc_table_uninit(struct rte_eth_dev *dev);
int zxdh_dev_unicast_table_set(struct zxdh_hw *hw, uint16_t vport, bool enable);
int zxdh_dev_multicast_table_set(struct zxdh_hw *hw, uint16_t vport, bool enable);
-int zxdh_vlan_filter_table_init(struct rte_eth_dev *dev);
+int zxdh_vlan_filter_table_init(struct zxdh_hw *hw, uint16_t vport);
int zxdh_vlan_filter_table_set(struct zxdh_hw *hw, uint16_t vport,
uint16_t vlan_id, uint8_t enable);
int zxdh_rss_table_set(struct zxdh_hw *hw, uint16_t vport, struct zxdh_rss_reta *rss_reta);
@@ -372,5 +372,10 @@ int zxdh_set_panel_attr(struct rte_eth_dev *dev, struct zxdh_panel_table *panel_
int zxdh_dev_broadcast_set(struct zxdh_hw *hw, uint16_t vport, bool enable);
int zxdh_set_vlan_filter(struct zxdh_hw *hw, uint16_t vport, uint8_t enable);
int zxdh_set_vlan_offload(struct zxdh_hw *hw, uint16_t vport, uint8_t type, uint8_t enable);
+int zxdh_set_port_vlan_attr(struct zxdh_hw *hw, uint16_t vport,
+ struct zxdh_port_vlan_table *port_vlan);
+int zxdh_get_port_vlan_attr(struct zxdh_hw *hw, uint16_t vport,
+ struct zxdh_port_vlan_table *port_vlan);
+int zxdh_port_vlan_table_init(struct zxdh_hw *hw, uint16_t vport);
#endif /* ZXDH_TABLES_H */
--
2.27.0
[-- Attachment #1.1.2: Type: text/html , Size: 16028 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v1 4/6] net/zxdh: fix RSS related issues
2025-07-07 5:56 [PATCH v1 1/6] net/zxdh: fix meson.build issues in compilation Junlong Wang
2025-07-07 5:56 ` [PATCH v1 2/6] net/zxdh: fix issues related to MAC configuration Junlong Wang
2025-07-07 5:56 ` [PATCH v1 3/6] net/zxdh: fix some VLAN related issues Junlong Wang
@ 2025-07-07 5:56 ` Junlong Wang
2 siblings, 0 replies; 5+ messages in thread
From: Junlong Wang @ 2025-07-07 5:56 UTC (permalink / raw)
To: stephen; +Cc: dev, Junlong Wang, stable
[-- Attachment #1.1.1: Type: text/plain, Size: 5945 bytes --]
modify rss related issues in testing process.
Modify the comments of the maintainers.
Fixes: 01acc23bab13 ("net/zxdh: optimize RSS operations")
Cc: stable@dpdk.org
Signed-off-by: Junlong Wang <wang.junlong1@zte.com.cn>
---
drivers/net/zxdh/zxdh_ethdev.h | 1 +
drivers/net/zxdh/zxdh_ethdev_ops.c | 64 +++++++++++++++++++-----------
drivers/net/zxdh/zxdh_msg.c | 10 +++--
3 files changed, 47 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..b378a99a7e 100644
--- a/drivers/net/zxdh/zxdh_msg.c
+++ b/drivers/net/zxdh/zxdh_msg.c
@@ -1713,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;
}
--
2.27.0
[-- Attachment #1.1.2: Type: text/html , Size: 13857 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread