From cdbdcd46a2b915c0781ecb2f48f412237daf03da Mon Sep 17 00:00:00 2001 From: Dong Zhou Date: Wed, 4 Nov 2020 08:04:55 +0200 Subject: [PATCH] net/mlx5: fix switch port id when representor in bonding In the bonding configurations the port switch id for representors was composed of pf index in bonding as the 1 MSB and the representor's index as the remaining 15 LSBs. The special corner case for the host PF representor on BF setups with representor id 0xFFFF was missed as well. The new switch port id consists of 4 MSBs for the pf bonding index and the remaining 12 LSBs for the representor index. The switch port id ranges for each type of representors are as follows: Uplink representor(AKA master): 0xFFFF Host PF representor: 0xFFF VF representor: 0x[0-FFE] Fixes: bee57a0a3565 ("net/mlx5: update switch port id in bonding configuration") Cc: stable@dpdk.org Signed-off-by: Dong Zhou Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_defs.h | 2 +- drivers/net/mlx5/mlx5_ethdev.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5_defs.h b/drivers/net/mlx5/mlx5_defs.h index 3c34234152..aa55db3750 100644 --- a/drivers/net/mlx5/mlx5_defs.h +++ b/drivers/net/mlx5/mlx5_defs.h @@ -50,7 +50,7 @@ /* Switch port ID parameters for bonding configurations. */ #define MLX5_PORT_ID_BONDING_PF_MASK 0xf -#define MLX5_PORT_ID_BONDING_PF_SHIFT 0xf +#define MLX5_PORT_ID_BONDING_PF_SHIFT 12 /* Alarm timeout. */ #define MLX5_ALARM_TIMEOUT_US 100000 diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index ee97480dcb..a3910cf922 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -338,14 +338,22 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info) * representors (more than 4K) or PFs (more than 15) * this approach must be reconsidered. */ - if ((info->switch_info.port_id >> - MLX5_PORT_ID_BONDING_PF_SHIFT) || + /* Switch port ID for VF representors: 0 - 0xFFE */ + if ((info->switch_info.port_id != 0xffff && + info->switch_info.port_id >= + ((1 << MLX5_PORT_ID_BONDING_PF_SHIFT) - 1)) || priv->pf_bond > MLX5_PORT_ID_BONDING_PF_MASK) { DRV_LOG(ERR, "can't update switch port ID" " for bonding device"); MLX5_ASSERT(false); return -ENODEV; } + /* + * Switch port ID for Host PF representor + * (representor_id is -1) , set to 0xFFF + */ + if (info->switch_info.port_id == 0xffff) + info->switch_info.port_id = 0xfff; info->switch_info.port_id |= priv->pf_bond << MLX5_PORT_ID_BONDING_PF_SHIFT; } -- 2.20.1