Commit 6ed63d84 authored by Jack Morgenstein's avatar Jack Morgenstein Committed by David S. Miller

net/mlx4_core: Use cq quota in SRIOV when creating completion EQs

When creating EQs to handle CQ completion events for the PF
or for VFs, we create enough EQE entries to handle completions
for the max number of CQs that can use that EQ.

When SRIOV is activated, the max number of CQs a VF (or the PF) can
obtain is its CQ quota (determined by the Hypervisor resource tracker).
Therefore, when creating an EQ, the number of EQE entries that the VF
should request for that EQ is the CQ quota value (and not the total
number of CQs available in the FW).

Under SRIOV, the PF, also must use its CQ quota, because
the resource tracker also controls how many CQs the PF can obtain.

Using the FW total CQs instead of the CQ quota when creating EQs resulted
wasting MTT entries, due to allocating more EQEs than were needed.

Fixes: 5a0d0a61 ("mlx4: Structures and init/teardown for VF resource quotas")
Signed-off-by: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
Reported-by: default avatarDexuan Cui <decui@microsoft.com>
Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 95f1ba9a
...@@ -1249,9 +1249,8 @@ int mlx4_init_eq_table(struct mlx4_dev *dev) ...@@ -1249,9 +1249,8 @@ int mlx4_init_eq_table(struct mlx4_dev *dev)
mlx4_warn(dev, "Failed adding irq rmap\n"); mlx4_warn(dev, "Failed adding irq rmap\n");
} }
#endif #endif
err = mlx4_create_eq(dev, dev->caps.num_cqs - err = mlx4_create_eq(dev, dev->quotas.cq +
dev->caps.reserved_cqs + MLX4_NUM_SPARE_EQE,
MLX4_NUM_SPARE_EQE,
(dev->flags & MLX4_FLAG_MSI_X) ? (dev->flags & MLX4_FLAG_MSI_X) ?
i + 1 - !!(i > MLX4_EQ_ASYNC) : 0, i + 1 - !!(i > MLX4_EQ_ASYNC) : 0,
eq); eq);
......
...@@ -3501,6 +3501,8 @@ static int mlx4_load_one(struct pci_dev *pdev, int pci_dev_data, ...@@ -3501,6 +3501,8 @@ static int mlx4_load_one(struct pci_dev *pdev, int pci_dev_data,
goto err_disable_msix; goto err_disable_msix;
} }
mlx4_init_quotas(dev);
err = mlx4_setup_hca(dev); err = mlx4_setup_hca(dev);
if (err == -EBUSY && (dev->flags & MLX4_FLAG_MSI_X) && if (err == -EBUSY && (dev->flags & MLX4_FLAG_MSI_X) &&
!mlx4_is_mfunc(dev)) { !mlx4_is_mfunc(dev)) {
...@@ -3513,7 +3515,6 @@ static int mlx4_load_one(struct pci_dev *pdev, int pci_dev_data, ...@@ -3513,7 +3515,6 @@ static int mlx4_load_one(struct pci_dev *pdev, int pci_dev_data,
if (err) if (err)
goto err_steer; goto err_steer;
mlx4_init_quotas(dev);
/* When PF resources are ready arm its comm channel to enable /* When PF resources are ready arm its comm channel to enable
* getting commands * getting commands
*/ */
......
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