AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-27 17:45:09 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

net/mlx4_core: Remove counters table allocation from VF flow

Browse Source 
Since virtual functions get their counters indices allocation from the PF,
allocate counters indices bitmap only in case the function isn't virtual.

Also, check that the device has counters to allocate before creating the
indices bitmap table.

Signed-off-by: Eran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: Hadar Hen Zion <hadarh@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eran Ben Elisha 2015-06-15 17:58:59 +03:00 committed by David S. Miller
parent 47d8417f59
commit 2632d18d3a
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/ethernet/mellanox/mlx4/main.c
View File

@ -2198,6 +2198,9 @@ static int mlx4_init_counters_table(struct mlx4_dev *dev)
if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_COUNTERS)) if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_COUNTERS))
return -ENOENT; return -ENOENT;
if (!dev->caps.max_counters)
return -ENOSPC;
nent_pow2 = roundup_pow_of_two(dev->caps.max_counters); nent_pow2 = roundup_pow_of_two(dev->caps.max_counters);
/* reserve last counter index for sink counter */ /* reserve last counter index for sink counter */
return mlx4_bitmap_init(&priv->counters_bitmap, nent_pow2, return mlx4_bitmap_init(&priv->counters_bitmap, nent_pow2,
@ -2210,6 +2213,9 @@ static void mlx4_cleanup_counters_table(struct mlx4_dev *dev)
if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_COUNTERS)) if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_COUNTERS))
return; return;
if (!dev->caps.max_counters)
return;
mlx4_bitmap_cleanup(&mlx4_priv(dev)->counters_bitmap); mlx4_bitmap_cleanup(&mlx4_priv(dev)->counters_bitmap);
} }
@ -2425,11 +2431,13 @@ static int mlx4_setup_hca(struct mlx4_dev *dev)
goto err_srq_table_free; goto err_srq_table_free;
} }
if (!mlx4_is_slave(dev)) {
err = mlx4_init_counters_table(dev); err = mlx4_init_counters_table(dev);
if (err && err != -ENOENT) { if (err && err != -ENOENT) {
mlx4_err(dev, "Failed to initialize counters table, aborting\n"); mlx4_err(dev, "Failed to initialize counters table, aborting\n");
goto err_qp_table_free; goto err_qp_table_free;
} }
}
if (!mlx4_is_slave(dev)) { if (!mlx4_is_slave(dev)) {
for (port = 1; port <= dev->caps.num_ports; port++) { for (port = 1; port <= dev->caps.num_ports; port++) {
@ -2470,6 +2478,7 @@ static int mlx4_setup_hca(struct mlx4_dev *dev)
return 0; return 0;
err_counters_table_free: err_counters_table_free:
if (!mlx4_is_slave(dev))
mlx4_cleanup_counters_table(dev); mlx4_cleanup_counters_table(dev);
err_qp_table_free: err_qp_table_free:
@ -3203,6 +3212,7 @@ static int mlx4_load_one(struct pci_dev *pdev, int pci_dev_data,
for (--port; port >= 1; --port) for (--port; port >= 1; --port)
mlx4_cleanup_port_info(&priv->port[port]); mlx4_cleanup_port_info(&priv->port[port]);
if (!mlx4_is_slave(dev))
mlx4_cleanup_counters_table(dev); mlx4_cleanup_counters_table(dev);
mlx4_cleanup_qp_table(dev); mlx4_cleanup_qp_table(dev);
mlx4_cleanup_srq_table(dev); mlx4_cleanup_srq_table(dev);
@ -3501,6 +3511,7 @@ static void mlx4_unload_one(struct pci_dev *pdev)
mlx4_free_resource_tracker(dev, mlx4_free_resource_tracker(dev,
RES_TR_FREE_SLAVES_ONLY); RES_TR_FREE_SLAVES_ONLY);
if (!mlx4_is_slave(dev))
mlx4_cleanup_counters_table(dev); mlx4_cleanup_counters_table(dev);
mlx4_cleanup_qp_table(dev); mlx4_cleanup_qp_table(dev);
mlx4_cleanup_srq_table(dev); mlx4_cleanup_srq_table(dev);