From: Jie Liu <[email protected]> Update the output format for representor primary VSI ID and backup VSI ID in switchdev dump function. The fields repr_vf_primary_vsi_id and repr_vf_backup_vsi_id should be displayed correctly for better debug visibility.
Signed-off-by: Jie Liu <[email protected]> --- drivers/net/sxe2/sxe2_dump.c | 8 ++++---- drivers/net/sxe2/sxe2_ethdev.h | 4 ++-- drivers/net/sxe2/sxe2_flow.c | 4 ++-- drivers/net/sxe2/sxe2_switchdev.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/net/sxe2/sxe2_dump.c b/drivers/net/sxe2/sxe2_dump.c index d43473e083..590219f502 100644 --- a/drivers/net/sxe2/sxe2_dump.c +++ b/drivers/net/sxe2/sxe2_dump.c @@ -211,16 +211,16 @@ sxe2_dump_switchdev_info(FILE *file, struct rte_eth_dev *dev) "\t -- repr_pf_id: %u\n" "\t -- repr_vf_id: %u\n" "\t -- repr_vf_vsi_id: %u\n" - "\t -- repr_vf_k_vsi_id: %s\n" - "\t -- repr_vf_u_vsi_id: %s\n", + "\t -- repr_vf_primary_vsi_id: %s\n" + "\t -- repr_vf_backup_vsi_id: %s\n", adapter->repr_priv_data->repr_id, adapter->repr_priv_data->repr_q_id, adapter->repr_priv_data->repr_pf_id, adapter->repr_priv_data->repr_vf_id, adapter->repr_priv_data->repr_vf_vsi_id, - sxe2_vsi_id_str(adapter->repr_priv_data->repr_vf_k_vsi_id, + sxe2_vsi_id_str(adapter->repr_priv_data->repr_vf_primary_vsi_id, k_vsi_buf, sizeof(k_vsi_buf)), - sxe2_vsi_id_str(adapter->repr_priv_data->repr_vf_u_vsi_id, + sxe2_vsi_id_str(adapter->repr_priv_data->repr_vf_backup_vsi_id, u_vsi_buf, sizeof(u_vsi_buf))); goto l_end; } diff --git a/drivers/net/sxe2/sxe2_ethdev.h b/drivers/net/sxe2/sxe2_ethdev.h index c54e8a435e..158198d74b 100644 --- a/drivers/net/sxe2/sxe2_ethdev.h +++ b/drivers/net/sxe2/sxe2_ethdev.h @@ -263,8 +263,8 @@ struct sxe2_repr_private_data { uint16_t repr_pf_id; uint16_t repr_vf_id; uint16_t repr_vf_vsi_id; - uint16_t repr_vf_k_vsi_id; - uint16_t repr_vf_u_vsi_id; + uint16_t repr_vf_primary_vsi_id; + uint16_t repr_vf_backup_vsi_id; }; struct sxe2_sched_hw_cap { diff --git a/drivers/net/sxe2/sxe2_flow.c b/drivers/net/sxe2/sxe2_flow.c index 63cfc36968..cf54803301 100644 --- a/drivers/net/sxe2/sxe2_flow.c +++ b/drivers/net/sxe2/sxe2_flow.c @@ -380,9 +380,9 @@ static int32_t sxe2_flow_src_split_proc(struct rte_eth_dev *dev, if (adapter->switchdev_info.is_switchdev && adapter->is_dev_repr) { flow_bond_num = 1; flow_src_vsi[SXE2_MAX_DRV_TYPE_DPDK][0] = - adapter->repr_priv_data->repr_vf_u_vsi_id; + adapter->repr_priv_data->repr_vf_backup_vsi_id; flow_src_vsi[SXE2_MAX_DRV_TYPE_KERNEL][0] = - adapter->repr_priv_data->repr_vf_k_vsi_id; + adapter->repr_priv_data->repr_vf_primary_vsi_id; } for (idx = 0; idx < flow_bond_num; idx++) { diff --git a/drivers/net/sxe2/sxe2_switchdev.c b/drivers/net/sxe2/sxe2_switchdev.c index 44703cfb5c..efb1468b91 100644 --- a/drivers/net/sxe2/sxe2_switchdev.c +++ b/drivers/net/sxe2/sxe2_switchdev.c @@ -312,9 +312,9 @@ int32_t sxe2_switchdev_repr_private_data_init(struct rte_eth_dev *dev, repr_priv_data->repr_q_id = repr_id; repr_priv_data->repr_pf_id = parent_adapter->pf_idx; repr_priv_data->repr_vf_id = repr_id; - repr_priv_data->repr_vf_k_vsi_id = + repr_priv_data->repr_vf_primary_vsi_id = parent_adapter->repr_ctxt.repr_vf_id[repr_id].kernel_vsi_id; - repr_priv_data->repr_vf_u_vsi_id = + repr_priv_data->repr_vf_backup_vsi_id = parent_adapter->repr_ctxt.repr_vf_id[repr_id].dpdk_vsi_id; repr_priv_data->repr_vf_vsi_id = -- 2.52.0
