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 57c47f3bf8..7fd542af3e 100644 --- a/drivers/net/zxdh/zxdh_ethdev.c +++ b/drivers/net/zxdh/zxdh_ethdev.c @@ -1904,6 +1904,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); @@ -1924,12 +1925,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