iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net/mlx4_core: Defer VF initialization till PF is fully initialized

Browse Source 
Fix in commit [1] is not sufficient since a deferred VF initialization
could happen after pci_enable_sriov() is finished, but before the PF is
fully initialized.
Need to prevent VFs from initializing till the PF is fully ready and
comm channel is operational.

[1] - 9798935 "net/mlx4_core: mlx4_init_slave() shouldn't access comm
      channel before PF is ready"

CC: Stuart Hayes <Stuart_Hayes@Dell.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Amir Vadai 2014-04-14 11:17:22 +03:00 committed by David S. Miller
parent 77d149c4eb
commit e1a5ddc506
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2369,10 +2369,10 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data)
} else { } else {
atomic_inc(&pf_loading); atomic_inc(&pf_loading);
err = pci_enable_sriov(pdev, total_vfs); err = pci_enable_sriov(pdev, total_vfs);
atomic_dec(&pf_loading);
if (err) { if (err) {
mlx4_err(dev, "Failed to enable SR-IOV, continuing without SR-IOV (err = %d).\n", mlx4_err(dev, "Failed to enable SR-IOV, continuing without SR-IOV (err = %d).\n",
err); err);
atomic_dec(&pf_loading);
err = 0; err = 0;
} else { } else {
mlx4_warn(dev, "Running in master mode\n"); mlx4_warn(dev, "Running in master mode\n");
@ -2532,6 +2532,9 @@ slave_start:
priv->removed = 0; priv->removed = 0;
if (mlx4_is_master(dev) && dev->num_vfs)
atomic_dec(&pf_loading);
return 0; return 0;
err_port: err_port:
@ -2582,6 +2585,9 @@ err_rel_own:
if (!mlx4_is_slave(dev)) if (!mlx4_is_slave(dev))
mlx4_free_ownership(dev); mlx4_free_ownership(dev);
if (mlx4_is_master(dev) && dev->num_vfs)
atomic_dec(&pf_loading);
kfree(priv->dev.dev_vfs); kfree(priv->dev.dev_vfs);
err_free_dev: err_free_dev:
@ -2675,6 +2681,7 @@ static void __mlx4_remove_one(struct pci_dev *pdev)
if (dev->flags & MLX4_FLAG_SRIOV) { if (dev->flags & MLX4_FLAG_SRIOV) {
mlx4_warn(dev, "Disabling SR-IOV\n"); mlx4_warn(dev, "Disabling SR-IOV\n");
pci_disable_sriov(pdev); pci_disable_sriov(pdev);
dev->num_vfs = 0;
} }
if (!mlx4_is_slave(dev)) if (!mlx4_is_slave(dev))