]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net/mlx5e: IPoIB, Block PKEY interfaces with less rx queues than parent
authorDragos Tatulea <dtatulea@nvidia.com>
Fri, 25 Nov 2022 15:51:19 +0000 (17:51 +0200)
committerSaeed Mahameed <saeedm@nvidia.com>
Tue, 10 Jan 2023 06:08:34 +0000 (22:08 -0800)
A user is able to configure an arbitrary number of rx queues when
creating an interface via netlink. This doesn't work for child PKEY
interfaces because the child interface uses the parent receive channels.

Although the child shares the parent's receive channels, the number of
rx queues is important for the channel_stats array: the parent's rx
channel index is used to access the child's channel_stats. So the array
has to be at least as large as the parent's rx queue size for the
counting to work correctly and to prevent out of bound accesses.

This patch checks for the mentioned scenario and returns an error when
trying to create the interface. The error is propagated to the user.

Fixes: be98737a4faa ("net/mlx5e: Use dynamic per-channel allocations in stats")
Signed-off-by: Dragos Tatulea <dtatulea@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c

index 28795fb6bccc3fb7a6f2391f68b3c9773dbde43e..03e681297937f8687d4f5373399898b91d541136 100644 (file)
@@ -168,6 +168,15 @@ static int mlx5i_pkey_dev_init(struct net_device *dev)
                return -EINVAL;
        }
 
+       if (dev->num_rx_queues < parent_dev->real_num_rx_queues) {
+               mlx5_core_warn(priv->mdev,
+                              "failed to create child device with rx queues [%d] less than parent's [%d]\n",
+                              dev->num_rx_queues,
+                              parent_dev->real_num_rx_queues);
+               mlx5i_parent_put(dev);
+               return -EINVAL;
+       }
+
        /* Get QPN to netdevice hash table from parent */
        parent_ipriv = netdev_priv(parent_dev);
        ipriv->qpn_htbl = parent_ipriv->qpn_htbl;