Commit 00ada910 authored by Moni Shoua's avatar Moni Shoua Committed by David S. Miller

net/mlx4_core: Check the correct limitation on VFs for HA mode

The limit of 63 is only for virtual functions while the actual enforcement
was for VFs plus physical functions, fix that.

Fixes: e57968a1 ('net/mlx4_core: Support the HA mode for SRIOV VFs too')
Signed-off-by: default avatarMoni Shoua <monis@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 03a79f31
...@@ -1256,6 +1256,7 @@ static ssize_t set_port_ib_mtu(struct device *dev, ...@@ -1256,6 +1256,7 @@ static ssize_t set_port_ib_mtu(struct device *dev,
static int mlx4_mf_bond(struct mlx4_dev *dev) static int mlx4_mf_bond(struct mlx4_dev *dev)
{ {
int err = 0; int err = 0;
int nvfs;
struct mlx4_slaves_pport slaves_port1; struct mlx4_slaves_pport slaves_port1;
struct mlx4_slaves_pport slaves_port2; struct mlx4_slaves_pport slaves_port2;
DECLARE_BITMAP(slaves_port_1_2, MLX4_MFUNC_MAX); DECLARE_BITMAP(slaves_port_1_2, MLX4_MFUNC_MAX);
...@@ -1272,11 +1273,18 @@ static int mlx4_mf_bond(struct mlx4_dev *dev) ...@@ -1272,11 +1273,18 @@ static int mlx4_mf_bond(struct mlx4_dev *dev)
return -EINVAL; return -EINVAL;
} }
/* number of virtual functions is number of total functions minus one
* physical function for each port.
*/
nvfs = bitmap_weight(slaves_port1.slaves, dev->persist->num_vfs + 1) +
bitmap_weight(slaves_port2.slaves, dev->persist->num_vfs + 1) - 2;
/* limit on maximum allowed VFs */ /* limit on maximum allowed VFs */
if ((bitmap_weight(slaves_port1.slaves, dev->persist->num_vfs + 1) + if (nvfs > MAX_MF_BOND_ALLOWED_SLAVES) {
bitmap_weight(slaves_port2.slaves, dev->persist->num_vfs + 1)) > mlx4_warn(dev, "HA mode is not supported for %d VFs (max %d are allowed)\n",
MAX_MF_BOND_ALLOWED_SLAVES) nvfs, MAX_MF_BOND_ALLOWED_SLAVES);
return -EINVAL; return -EINVAL;
}
if (dev->caps.steering_mode != MLX4_STEERING_MODE_DEVICE_MANAGED) { if (dev->caps.steering_mode != MLX4_STEERING_MODE_DEVICE_MANAGED) {
mlx4_warn(dev, "HA mode unsupported for NON DMFS steering\n"); mlx4_warn(dev, "HA mode unsupported for NON DMFS steering\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment