| Message ID | 20201101201542.2027568-6-leon@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | Convert mlx5 to use auxiliary bus | expand |
On Sun, 2020-11-01 at 22:15 +0200, Leon Romanovsky wrote: > From: Leon Romanovsky <leonro@nvidia.com> > > Create auxiliary devices under new virtual bus. This will replace > the custom-made mlx5 ->add()/->remove() interfaces and next patches > will fill the missing callback and remove the old interface logic. > > The attachment of auxiliary drivers to the devices is possible in > 1-to-1 manner only and it requires us to create device for every > protocol, > so that device (module) will be able to connect to it. > > System with 2 IB and 1 RoCE cards: > [leonro@vm ~]$ lspci |grep nox > 00:09.0 Ethernet controller: Mellanox Technologies MT27800 Family > [ConnectX-5] > 00:0a.0 Ethernet controller: Mellanox Technologies MT28908 Family > [ConnectX-6] > 00:0b.0 Ethernet controller: Mellanox Technologies MT2910 Family > [ConnectX-7] > [leonro@vm ~]$ ls -l /sys/bus/auxiliary/devices/ > mlx5_core.eth.2 -> > ../../../devices/pci0000:00/0000:00:0b.0/mlx5_core.eth.2 > mlx5_core.rdma.0 -> > ../../../devices/pci0000:00/0000:00:09.0/mlx5_core.rdma.0 > mlx5_core.rdma.1 -> > ../../../devices/pci0000:00/0000:00:0a.0/mlx5_core.rdma.1 > mlx5_core.rdma.2 -> > ../../../devices/pci0000:00/0000:00:0b.0/mlx5_core.rdma.2 > mlx5_core.vdpa.1 -> > ../../../devices/pci0000:00/0000:00:0a.0/mlx5_core.vdpa.1 > mlx5_core.vdpa.2 -> > ../../../devices/pci0000:00/0000:00:0b.0/mlx5_core.vdpa.2 > [leonro@vm ~]$ rdma dev > 0: ibp0s9: node_type ca fw 4.6.9999 node_guid 5254:00c0:fe12:3455 > sys_image_guid 5254:00c0:fe12:3455 > 1: ibp0s10: node_type ca fw 4.6.9999 node_guid 5254:00c0:fe12:3456 > sys_image_guid 5254:00c0:fe12:3456 > 2: rdmap0s11: node_type ca fw 4.6.9999 node_guid 5254:00c0:fe12:3457 > sys_image_guid 5254:00c0:fe12:3457 > > System with RoCE SR-IOV card with 4 VFs: > [leonro@vm ~]$ lspci |grep nox > 01:00.0 Ethernet controller: Mellanox Technologies MT28908 Family > [ConnectX-6] > 01:00.1 Ethernet controller: Mellanox Technologies MT28908 Family > [ConnectX-6 Virtual Function] > 01:00.2 Ethernet controller: Mellanox Technologies MT28908 Family > [ConnectX-6 Virtual Function] > 01:00.3 Ethernet controller: Mellanox Technologies MT28908 Family > [ConnectX-6 Virtual Function] > 01:00.4 Ethernet controller: Mellanox Technologies MT28908 Family > [ConnectX-6 Virtual Function] > [leonro@vm ~]$ ls -l /sys/bus/auxiliary/devices/ > mlx5_core.eth.0 -> > ../../../devices/pci0000:00/0000:00:09.0/0000:01:00.0/mlx5_core.eth.0 > mlx5_core.eth.1 -> > ../../../devices/pci0000:00/0000:00:09.0/0000:01:00.1/mlx5_core.eth.1 > mlx5_core.eth.2 -> > ../../../devices/pci0000:00/0000:00:09.0/0000:01:00.2/mlx5_core.eth.2 > mlx5_core.eth.3 -> > ../../../devices/pci0000:00/0000:00:09.0/0000:01:00.3/mlx5_core.eth.3 > mlx5_core.eth.4 -> > ../../../devices/pci0000:00/0000:00:09.0/0000:01:00.4/mlx5_core.eth.4 > mlx5_core.rdma.0 -> > ../../../devices/pci0000:00/0000:00:09.0/0000:01:00.0/mlx5_core.rdma. > 0 > mlx5_core.rdma.1 -> > ../../../devices/pci0000:00/0000:00:09.0/0000:01:00.1/mlx5_core.rdma. > 1 > mlx5_core.rdma.2 -> > ../../../devices/pci0000:00/0000:00:09.0/0000:01:00.2/mlx5_core.rdma. > 2 > mlx5_core.rdma.3 -> > ../../../devices/pci0000:00/0000:00:09.0/0000:01:00.3/mlx5_core.rdma. > 3 > mlx5_core.rdma.4 -> > ../../../devices/pci0000:00/0000:00:09.0/0000:01:00.4/mlx5_core.rdma. > 4 > mlx5_core.vdpa.1 -> > ../../../devices/pci0000:00/0000:00:09.0/0000:01:00.1/mlx5_core.vdpa. > 1 > mlx5_core.vdpa.2 -> > ../../../devices/pci0000:00/0000:00:09.0/0000:01:00.2/mlx5_core.vdpa. > 2 > mlx5_core.vdpa.3 -> > ../../../devices/pci0000:00/0000:00:09.0/0000:01:00.3/mlx5_core.vdpa. > 3 > mlx5_core.vdpa.4 -> > ../../../devices/pci0000:00/0000:00:09.0/0000:01:00.4/mlx5_core.vdpa. > 4 > [leonro@vm ~]$ rdma dev > 0: rocep1s0f0: node_type ca fw 4.6.9999 node_guid 5254:00c0:fe12:3455 > sys_image_guid 5254:00c0:fe12:3455 > 1: rocep1s0f0v0: node_type ca fw 4.6.9999 node_guid > 0000:0000:0000:0000 sys_image_guid 5254:00c0:fe12:3456 > 2: rocep1s0f0v1: node_type ca fw 4.6.9999 node_guid > 0000:0000:0000:0000 sys_image_guid 5254:00c0:fe12:3457 > 3: rocep1s0f0v2: node_type ca fw 4.6.9999 node_guid > 0000:0000:0000:0000 sys_image_guid 5254:00c0:fe12:3458 > 4: rocep1s0f0v3: node_type ca fw 4.6.9999 node_guid > 0000:0000:0000:0000 sys_image_guid 5254:00c0:fe12:3459 > > Signed-off-by: Leon Romanovsky <leonro@nvidia.com> > --- > .../net/ethernet/mellanox/mlx5/core/Kconfig | 1 + > drivers/net/ethernet/mellanox/mlx5/core/dev.c | 265 > +++++++++++++++++- > .../net/ethernet/mellanox/mlx5/core/main.c | 24 +- > .../ethernet/mellanox/mlx5/core/mlx5_core.h | 20 +- > include/linux/mlx5/driver.h | 26 +- > 5 files changed, 325 insertions(+), 11 deletions(-) > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig > b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig > index 99f1ec3b2575..485478979b1a 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig > +++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig > @@ -6,6 +6,7 @@ > config MLX5_CORE > tristate "Mellanox 5th generation network adapters (ConnectX > series) core driver" > depends on PCI > + select AUXILIARY_BUS > select NET_DEVLINK > depends on VXLAN || !VXLAN > depends on MLXFW || !MLXFW > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/dev.c > b/drivers/net/ethernet/mellanox/mlx5/core/dev.c > index 1972ddd12704..8ddf469b2d05 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/dev.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/dev.c > @@ -37,6 +37,7 @@ static LIST_HEAD(intf_list); > static LIST_HEAD(mlx5_dev_list); > /* intf dev list mutex */ > static DEFINE_MUTEX(mlx5_intf_mutex); > +static DEFINE_IDA(mlx5_adev_ida); > > struct mlx5_device_context { > struct list_head list; > @@ -50,6 +51,39 @@ enum { > MLX5_INTERFACE_ATTACHED, > }; > > +static const struct mlx5_adev_device { > + const char *suffix; > + bool (*is_supported)(struct mlx5_core_dev *dev); > +} mlx5_adev_devices[1] = {}; > + > +int mlx5_adev_idx_alloc(void) > +{ > + return ida_alloc(&mlx5_adev_ida, GFP_KERNEL); > +} > + > +void mlx5_adev_idx_free(int idx) > +{ > + ida_free(&mlx5_adev_ida, idx); > +} > + > +int mlx5_adev_init(struct mlx5_core_dev *dev) > +{ > + struct mlx5_priv *priv = &dev->priv; > + > + priv->adev = kcalloc(ARRAY_SIZE(mlx5_adev_devices), > + sizeof(struct mlx5_adev *), GFP_KERNEL); > + if (!priv->adev) > + return -ENOMEM; > + > + return 0; > +} > + > +void mlx5_adev_cleanup(struct mlx5_core_dev *dev) > +{ > + struct mlx5_priv *priv = &dev->priv; > + > + kfree(priv->adev); > +} > > void mlx5_add_device(struct mlx5_interface *intf, struct mlx5_priv > *priv) > { > @@ -135,15 +169,99 @@ static void mlx5_attach_interface(struct > mlx5_interface *intf, struct mlx5_priv > } > } > > -void mlx5_attach_device(struct mlx5_core_dev *dev) > +static void adev_release(struct device *dev) > +{ > + struct mlx5_adev *mlx5_adev = > + container_of(dev, struct mlx5_adev, adev.dev); > + struct mlx5_priv *priv = &mlx5_adev->mdev->priv; > + int idx = mlx5_adev->idx; > + > + kfree(mlx5_adev); > + priv->adev[idx] = NULL; > +} > + > +static struct mlx5_adev *add_adev(struct mlx5_core_dev *dev, int > idx) > +{ > + const char *suffix = mlx5_adev_devices[idx].suffix; > + struct auxiliary_device *adev; > + struct mlx5_adev *madev; > + int ret; > + > + madev = kzalloc(sizeof(*madev), GFP_KERNEL); > + if (!madev) > + return ERR_PTR(-ENOMEM); > + > + adev = &madev->adev; > + adev->id = dev->priv.adev_idx; > + adev->name = suffix; > + adev->dev.parent = dev->device; > + adev->dev.release = adev_release; > + madev->mdev = dev; > + madev->idx = idx; > + > + ret = auxiliary_device_init(adev); > + if (ret) { > + kfree(madev); > + return ERR_PTR(ret); > + } > + > + ret = auxiliary_device_add(adev); > + if (ret) { > + auxiliary_device_uninit(adev); > + return ERR_PTR(ret); > + } > + return madev; > +} > + > +static void del_adev(struct auxiliary_device *adev) > +{ > + auxiliary_device_delete(adev); > + auxiliary_device_uninit(adev); > +} > + > +int mlx5_attach_device(struct mlx5_core_dev *dev) > { > struct mlx5_priv *priv = &dev->priv; > + struct auxiliary_device *adev; > + struct auxiliary_driver *adrv; > struct mlx5_interface *intf; > + int ret = 0, i; > > mutex_lock(&mlx5_intf_mutex); > + for (i = 0; i < ARRAY_SIZE(mlx5_adev_devices); i++) { > + if (!priv->adev[i]) { > + bool is_supported = false; > + > + if (mlx5_adev_devices[i].is_supported) > + is_supported = > mlx5_adev_devices[i].is_supported(dev); > + > + if (!is_supported) > + continue; > + > + priv->adev[i] = add_adev(dev, i); > + if (IS_ERR(priv->adev[i])) { > + ret = PTR_ERR(priv->adev[i]); > + priv->adev[i] = NULL; > + } > + } else { > + adev = &priv->adev[i]->adev; > + adrv = to_auxiliary_drv(adev->dev.driver); > + > + if (adrv->resume) > + ret = adrv->resume(adev); > + } > + if (ret) { > + mlx5_core_warn(dev, "Device[%d] (%s) failed to > load\n", > + i, mlx5_adev_devices[i].suffix); > + > + break; > + } > + } > + > list_for_each_entry(intf, &intf_list, list) > mlx5_attach_interface(intf, priv); > mutex_unlock(&mlx5_intf_mutex); > + return ret; > } > > static void mlx5_detach_interface(struct mlx5_interface *intf, > struct mlx5_priv *priv) > @@ -171,9 +289,29 @@ static void mlx5_detach_interface(struct > mlx5_interface *intf, struct mlx5_priv > void mlx5_detach_device(struct mlx5_core_dev *dev) > { > struct mlx5_priv *priv = &dev->priv; > + struct auxiliary_device *adev; > + struct auxiliary_driver *adrv; > struct mlx5_interface *intf; > + pm_message_t pm = {}; > + int i; > > mutex_lock(&mlx5_intf_mutex); > + for (i = ARRAY_SIZE(mlx5_adev_devices) - 1; i >= 0; i--) { > + if (!priv->adev[i]) > + continue; > + > + adev = &priv->adev[i]->adev; > + adrv = to_auxiliary_drv(adev->dev.driver); > + > + if (adrv->suspend) { > + adrv->suspend(adev, pm); > + continue; > + } > + > + del_adev(&priv->adev[i]->adev); > + priv->adev[i] = NULL; > + } > + > list_for_each_entry(intf, &intf_list, list) > mlx5_detach_interface(intf, priv); > mutex_unlock(&mlx5_intf_mutex); > @@ -193,16 +331,30 @@ bool mlx5_device_registered(struct > mlx5_core_dev *dev) > return found; > } > > -void mlx5_register_device(struct mlx5_core_dev *dev) > +int mlx5_register_device(struct mlx5_core_dev *dev) > { > struct mlx5_priv *priv = &dev->priv; > struct mlx5_interface *intf; > + int ret; > + > + mutex_lock(&mlx5_intf_mutex); > + dev->priv.flags &= ~MLX5_PRIV_FLAGS_DISABLE_ALL_ADEV; > + ret = mlx5_rescan_drivers_locked(dev); > + mutex_unlock(&mlx5_intf_mutex); > + if (ret) > + goto add_err; > > mutex_lock(&mlx5_intf_mutex); > list_add_tail(&priv->dev_list, &mlx5_dev_list); > list_for_each_entry(intf, &intf_list, list) > mlx5_add_device(intf, priv); > mutex_unlock(&mlx5_intf_mutex); > + > + return 0; > + > +add_err: > + mlx5_unregister_device(dev); > + return ret; > } > > void mlx5_unregister_device(struct mlx5_core_dev *dev) > @@ -214,6 +366,9 @@ void mlx5_unregister_device(struct mlx5_core_dev > *dev) > list_for_each_entry_reverse(intf, &intf_list, list) > mlx5_remove_device(intf, priv); > list_del(&priv->dev_list); > + > + dev->priv.flags |= MLX5_PRIV_FLAGS_DISABLE_ALL_ADEV; > + mlx5_rescan_drivers_locked(dev); > mutex_unlock(&mlx5_intf_mutex); > } > > @@ -246,6 +401,77 @@ void mlx5_unregister_interface(struct > mlx5_interface *intf) > } > EXPORT_SYMBOL(mlx5_unregister_interface); > > +static int add_drivers(struct mlx5_core_dev *dev) > +{ > + struct mlx5_priv *priv = &dev->priv; > + int i, ret = 0; > + > + for (i = 0; i < ARRAY_SIZE(mlx5_adev_devices); i++) { > + bool is_supported = false; > + > + if (priv->adev[i]) > + continue; > + > + if (mlx5_adev_devices[i].is_supported) > + is_supported = > mlx5_adev_devices[i].is_supported(dev); > + > + if (!is_supported) > + continue; > + I think this is wrong for two reasons. 1. is_supported should belong to the ulp aux device itself, and must be performed before probe. drivers should be added unconditionally and is_supproted should be checked only prior to probe. 2. you can always load a driver without its underlying device existed. for example, you can load a pci device driver/module and it will load and wait for pci devices to pop up, the subsysetem infrastructure will match between drivers and devices and probe them. Aux should be the same with the small change that all ulp aux devices should implement is_supported if they need, since they are virtual devices they might have some other constrains other than just matching device ids. I would suggest the following infra/API semantics changes: Aux bus parent device: mlx5_core pci device load/probe(pci_dev) { struct aux_device *mlx5_aux_dev = alloc_aux_device() mlx5_aux_dev->priv = pci_dev; register_aux_device("mlx5_core", mlx5_aux_dev); } Aux ULP driver: struct aux_driver mlx5_vpda_aux_driver { .name = "vdpa", /* match this driver with mlx5_core devices */ .id_table = {"mlx5_core"}, .ops { /* called before probe on actual aux mlx5_core device */ .is_supported(struct aux_device); .probe = mlx5v_probe, .remove = mlx5v_remove, } } mlx5_vdpa_module_init(): register_aux_driver(mlx5_vpda_aux_driver); Aux infrastructure semantics: a) on register_aux_device("mlx5_core", mlx5_aux_dev); it will match all drivers and probe them if is_supported is true, reveres flow on unregister_aux_device() b) on register_aux_driver(); probe driver on all current devices with matching ids if is_supported() returned ture So you don't really need to re-implement mlx5_rescan_drivers_locked and mlx5_add_drivers in each and every aux device/driver providers, this should be a aux bus infra' logic.
On Thu, Nov 05, 2020 at 12:59:20PM -0800, Saeed Mahameed wrote: > 2. you can always load a driver without its underlying device existed. > for example, you can load a pci device driver/module and it will load > and wait for pci devices to pop up, the subsysetem infrastructure will > match between drivers and devices and probe them. Yes, this works fine with this design > struct aux_driver mlx5_vpda_aux_driver { > > .name = "vdpa", > /* match this driver with mlx5_core devices */ > .id_table = {"mlx5_core"}, > .ops { > /* called before probe on actual aux mlx5_core device */ > .is_supported(struct aux_device); This means module auto loading is impossible, we can't tell to load the module until we load the module to call the is_supported code .. Jason
On Thu, Nov 05, 2020 at 05:09:48PM -0400, Jason Gunthorpe wrote: > On Thu, Nov 05, 2020 at 12:59:20PM -0800, Saeed Mahameed wrote: > > > 2. you can always load a driver without its underlying device existed. > > for example, you can load a pci device driver/module and it will load > > and wait for pci devices to pop up, the subsysetem infrastructure will > > match between drivers and devices and probe them. > > Yes, this works fine with this design > > > struct aux_driver mlx5_vpda_aux_driver { > > > > .name = "vdpa", > > /* match this driver with mlx5_core devices */ > > .id_table = {"mlx5_core"}, > > .ops { > > /* called before probe on actual aux mlx5_core device */ > > .is_supported(struct aux_device); > > This means module auto loading is impossible, we can't tell to load > the module until we load the module to call the is_supported code .. Right, and if we can, it will be violation of everything we know in driver model, because the call "is_supported" will need to be called for every registered driver without any relation to existed devices. And mlx5_rescan_drivers() came as a need to overcome LAG and eswitch craziness in everything related to their reprobe flows. Once they will be changed to work like normal drivers, we will be able to simplify it. So let's talk offline to see how can we improve mlx5_core even more after this series is merged. Thanks > > Jason
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig index 99f1ec3b2575..485478979b1a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig +++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig @@ -6,6 +6,7 @@ config MLX5_CORE tristate "Mellanox 5th generation network adapters (ConnectX series) core driver" depends on PCI + select AUXILIARY_BUS select NET_DEVLINK depends on VXLAN || !VXLAN depends on MLXFW || !MLXFW diff --git a/drivers/net/ethernet/mellanox/mlx5/core/dev.c b/drivers/net/ethernet/mellanox/mlx5/core/dev.c index 1972ddd12704..8ddf469b2d05 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/dev.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/dev.c @@ -37,6 +37,7 @@ static LIST_HEAD(intf_list); static LIST_HEAD(mlx5_dev_list); /* intf dev list mutex */ static DEFINE_MUTEX(mlx5_intf_mutex); +static DEFINE_IDA(mlx5_adev_ida); struct mlx5_device_context { struct list_head list; @@ -50,6 +51,39 @@ enum { MLX5_INTERFACE_ATTACHED, }; +static const struct mlx5_adev_device { + const char *suffix; + bool (*is_supported)(struct mlx5_core_dev *dev); +} mlx5_adev_devices[1] = {}; + +int mlx5_adev_idx_alloc(void) +{ + return ida_alloc(&mlx5_adev_ida, GFP_KERNEL); +} + +void mlx5_adev_idx_free(int idx) +{ + ida_free(&mlx5_adev_ida, idx); +} + +int mlx5_adev_init(struct mlx5_core_dev *dev) +{ + struct mlx5_priv *priv = &dev->priv; + + priv->adev = kcalloc(ARRAY_SIZE(mlx5_adev_devices), + sizeof(struct mlx5_adev *), GFP_KERNEL); + if (!priv->adev) + return -ENOMEM; + + return 0; +} + +void mlx5_adev_cleanup(struct mlx5_core_dev *dev) +{ + struct mlx5_priv *priv = &dev->priv; + + kfree(priv->adev); +} void mlx5_add_device(struct mlx5_interface *intf, struct mlx5_priv *priv) { @@ -135,15 +169,99 @@ static void mlx5_attach_interface(struct mlx5_interface *intf, struct mlx5_priv } } -void mlx5_attach_device(struct mlx5_core_dev *dev) +static void adev_release(struct device *dev) +{ + struct mlx5_adev *mlx5_adev = + container_of(dev, struct mlx5_adev, adev.dev); + struct mlx5_priv *priv = &mlx5_adev->mdev->priv; + int idx = mlx5_adev->idx; + + kfree(mlx5_adev); + priv->adev[idx] = NULL; +} + +static struct mlx5_adev *add_adev(struct mlx5_core_dev *dev, int idx) +{ + const char *suffix = mlx5_adev_devices[idx].suffix; + struct auxiliary_device *adev; + struct mlx5_adev *madev; + int ret; + + madev = kzalloc(sizeof(*madev), GFP_KERNEL); + if (!madev) + return ERR_PTR(-ENOMEM); + + adev = &madev->adev; + adev->id = dev->priv.adev_idx; + adev->name = suffix; + adev->dev.parent = dev->device; + adev->dev.release = adev_release; + madev->mdev = dev; + madev->idx = idx; + + ret = auxiliary_device_init(adev); + if (ret) { + kfree(madev); + return ERR_PTR(ret); + } + + ret = auxiliary_device_add(adev); + if (ret) { + auxiliary_device_uninit(adev); + return ERR_PTR(ret); + } + return madev; +} + +static void del_adev(struct auxiliary_device *adev) +{ + auxiliary_device_delete(adev); + auxiliary_device_uninit(adev); +} + +int mlx5_attach_device(struct mlx5_core_dev *dev) { struct mlx5_priv *priv = &dev->priv; + struct auxiliary_device *adev; + struct auxiliary_driver *adrv; struct mlx5_interface *intf; + int ret = 0, i; mutex_lock(&mlx5_intf_mutex); + for (i = 0; i < ARRAY_SIZE(mlx5_adev_devices); i++) { + if (!priv->adev[i]) { + bool is_supported = false; + + if (mlx5_adev_devices[i].is_supported) + is_supported = mlx5_adev_devices[i].is_supported(dev); + + if (!is_supported) + continue; + + priv->adev[i] = add_adev(dev, i); + if (IS_ERR(priv->adev[i])) { + ret = PTR_ERR(priv->adev[i]); + priv->adev[i] = NULL; + } + } else { + adev = &priv->adev[i]->adev; + adrv = to_auxiliary_drv(adev->dev.driver); + + if (adrv->resume) + ret = adrv->resume(adev); + } + if (ret) { + mlx5_core_warn(dev, "Device[%d] (%s) failed to load\n", + i, mlx5_adev_devices[i].suffix); + + break; + } + } + list_for_each_entry(intf, &intf_list, list) mlx5_attach_interface(intf, priv); mutex_unlock(&mlx5_intf_mutex); + return ret; } static void mlx5_detach_interface(struct mlx5_interface *intf, struct mlx5_priv *priv) @@ -171,9 +289,29 @@ static void mlx5_detach_interface(struct mlx5_interface *intf, struct mlx5_priv void mlx5_detach_device(struct mlx5_core_dev *dev) { struct mlx5_priv *priv = &dev->priv; + struct auxiliary_device *adev; + struct auxiliary_driver *adrv; struct mlx5_interface *intf; + pm_message_t pm = {}; + int i; mutex_lock(&mlx5_intf_mutex); + for (i = ARRAY_SIZE(mlx5_adev_devices) - 1; i >= 0; i--) { + if (!priv->adev[i]) + continue; + + adev = &priv->adev[i]->adev; + adrv = to_auxiliary_drv(adev->dev.driver); + + if (adrv->suspend) { + adrv->suspend(adev, pm); + continue; + } + + del_adev(&priv->adev[i]->adev); + priv->adev[i] = NULL; + } + list_for_each_entry(intf, &intf_list, list) mlx5_detach_interface(intf, priv); mutex_unlock(&mlx5_intf_mutex); @@ -193,16 +331,30 @@ bool mlx5_device_registered(struct mlx5_core_dev *dev) return found; } -void mlx5_register_device(struct mlx5_core_dev *dev) +int mlx5_register_device(struct mlx5_core_dev *dev) { struct mlx5_priv *priv = &dev->priv; struct mlx5_interface *intf; + int ret; + + mutex_lock(&mlx5_intf_mutex); + dev->priv.flags &= ~MLX5_PRIV_FLAGS_DISABLE_ALL_ADEV; + ret = mlx5_rescan_drivers_locked(dev); + mutex_unlock(&mlx5_intf_mutex); + if (ret) + goto add_err; mutex_lock(&mlx5_intf_mutex); list_add_tail(&priv->dev_list, &mlx5_dev_list); list_for_each_entry(intf, &intf_list, list) mlx5_add_device(intf, priv); mutex_unlock(&mlx5_intf_mutex); + + return 0; + +add_err: + mlx5_unregister_device(dev); + return ret; } void mlx5_unregister_device(struct mlx5_core_dev *dev) @@ -214,6 +366,9 @@ void mlx5_unregister_device(struct mlx5_core_dev *dev) list_for_each_entry_reverse(intf, &intf_list, list) mlx5_remove_device(intf, priv); list_del(&priv->dev_list); + + dev->priv.flags |= MLX5_PRIV_FLAGS_DISABLE_ALL_ADEV; + mlx5_rescan_drivers_locked(dev); mutex_unlock(&mlx5_intf_mutex); } @@ -246,6 +401,77 @@ void mlx5_unregister_interface(struct mlx5_interface *intf) } EXPORT_SYMBOL(mlx5_unregister_interface); +static int add_drivers(struct mlx5_core_dev *dev) +{ + struct mlx5_priv *priv = &dev->priv; + int i, ret = 0; + + for (i = 0; i < ARRAY_SIZE(mlx5_adev_devices); i++) { + bool is_supported = false; + + if (priv->adev[i]) + continue; + + if (mlx5_adev_devices[i].is_supported) + is_supported = mlx5_adev_devices[i].is_supported(dev); + + if (!is_supported) + continue; + + priv->adev[i] = add_adev(dev, i); + if (IS_ERR(priv->adev[i])) { + mlx5_core_warn(dev, "Device[%d] (%s) failed to load\n", + i, mlx5_adev_devices[i].suffix); + /* We continue to rescan drivers and leave to the caller + * to make decision if to release everything or continue. + */ + ret = PTR_ERR(priv->adev[i]); + priv->adev[i] = NULL; + } + } + return ret; +} + +static void delete_drivers(struct mlx5_core_dev *dev) +{ + struct mlx5_priv *priv = &dev->priv; + bool delete_all; + int i; + + delete_all = priv->flags & MLX5_PRIV_FLAGS_DISABLE_ALL_ADEV; + + for (i = ARRAY_SIZE(mlx5_adev_devices) - 1; i >= 0; i--) { + bool is_supported = false; + + if (!priv->adev[i]) + continue; + + if (mlx5_adev_devices[i].is_supported && !delete_all) + is_supported = mlx5_adev_devices[i].is_supported(dev); + + if (is_supported) + continue; + + del_adev(&priv->adev[i]->adev); + priv->adev[i] = NULL; + } +} + +/* This function is used after mlx5_core_dev is reconfigured. + */ +int mlx5_rescan_drivers_locked(struct mlx5_core_dev *dev) +{ + struct mlx5_priv *priv = &dev->priv; + + lockdep_assert_held(&mlx5_intf_mutex); + + delete_drivers(dev); + if (priv->flags & MLX5_PRIV_FLAGS_DISABLE_ALL_ADEV) + return 0; + + return add_drivers(dev); +} + /* Must be called with intf_mutex held */ static bool mlx5_has_added_dev_by_protocol(struct mlx5_core_dev *mdev, int protocol) { @@ -299,24 +525,55 @@ void mlx5_remove_dev_by_protocol(struct mlx5_core_dev *dev, int protocol) } } -static u32 mlx5_gen_pci_id(struct mlx5_core_dev *dev) +static u32 mlx5_gen_pci_id(const struct mlx5_core_dev *dev) { return (u32)((pci_domain_nr(dev->pdev->bus) << 16) | (dev->pdev->bus->number << 8) | PCI_SLOT(dev->pdev->devfn)); } -/* Must be called with intf_mutex held */ +static int next_phys_dev(struct device *dev, const void *data) +{ + struct mlx5_adev *madev = container_of(dev, struct mlx5_adev, adev.dev); + struct mlx5_core_dev *mdev = madev->mdev; + const struct mlx5_core_dev *curr = data; + + if (!mlx5_core_is_pf(mdev)) + return 0; + + if (mdev == curr) + return 0; + + if (mlx5_gen_pci_id(mdev) != mlx5_gen_pci_id(curr)) + return 0; + + return 1; +} + +/* This function is called with two flows: + * 1. During initialization of mlx5_core_dev and we don't need to lock it. + * 2. During LAG configure stage and caller holds &mlx5_intf_mutex. + */ struct mlx5_core_dev *mlx5_get_next_phys_dev(struct mlx5_core_dev *dev) { struct mlx5_core_dev *res = NULL; struct mlx5_core_dev *tmp_dev; + struct auxiliary_device *adev; + struct mlx5_adev *madev; struct mlx5_priv *priv; u32 pci_id; if (!mlx5_core_is_pf(dev)) return NULL; + adev = auxiliary_find_device(NULL, dev, &next_phys_dev); + if (adev) { + madev = container_of(adev, struct mlx5_adev, adev); + + put_device(&adev->dev); + return madev->mdev; + } + pci_id = mlx5_gen_pci_id(dev); list_for_each_entry(priv, &mlx5_dev_list, dev_list) { tmp_dev = container_of(priv, struct mlx5_core_dev, priv); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c index 9827127cb674..9397762c3a69 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c @@ -1222,14 +1222,21 @@ int mlx5_load_one(struct mlx5_core_dev *dev, bool boot) err = mlx5_devlink_register(priv_to_devlink(dev), dev->device); if (err) goto err_devlink_reg; - mlx5_register_device(dev); + + err = mlx5_register_device(dev); } else { - mlx5_attach_device(dev); + err = mlx5_attach_device(dev); } + if (err) + goto err_register; + mutex_unlock(&dev->intf_state_mutex); return 0; +err_register: + if (boot) + mlx5_devlink_unregister(priv_to_devlink(dev)); err_devlink_reg: clear_bit(MLX5_INTERFACE_STATE_UP, &dev->intf_state); mlx5_unload(dev); @@ -1306,8 +1313,14 @@ static int mlx5_mdev_init(struct mlx5_core_dev *dev, int profile_idx) if (err) goto err_pagealloc_init; + err = mlx5_adev_init(dev); + if (err) + goto err_adev_init; + return 0; +err_adev_init: + mlx5_pagealloc_cleanup(dev); err_pagealloc_init: mlx5_health_cleanup(dev); err_health_init: @@ -1324,6 +1337,7 @@ static void mlx5_mdev_uninit(struct mlx5_core_dev *dev) { struct mlx5_priv *priv = &dev->priv; + mlx5_adev_cleanup(dev); mlx5_pagealloc_cleanup(dev); mlx5_health_cleanup(dev); debugfs_remove_recursive(dev->priv.dbg_root); @@ -1354,6 +1368,10 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *id) dev->coredev_type = id->driver_data & MLX5_PCI_DEV_IS_VF ? MLX5_COREDEV_VF : MLX5_COREDEV_PF; + dev->priv.adev_idx = mlx5_adev_idx_alloc(); + if (dev->priv.adev_idx < 0) + return dev->priv.adev_idx; + err = mlx5_mdev_init(dev, prof_sel); if (err) goto mdev_init_err; @@ -1387,6 +1405,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *id) pci_init_err: mlx5_mdev_uninit(dev); mdev_init_err: + mlx5_adev_idx_free(dev->priv.adev_idx); mlx5_devlink_free(devlink); return err; @@ -1403,6 +1422,7 @@ static void remove_one(struct pci_dev *pdev) mlx5_unload_one(dev, true); mlx5_pci_close(dev); mlx5_mdev_uninit(dev); + mlx5_adev_idx_free(dev->priv.adev_idx); mlx5_devlink_free(devlink); } diff --git a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h index b285f1515e4e..11195381a870 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h @@ -178,12 +178,17 @@ void mlx5_events_cleanup(struct mlx5_core_dev *dev); void mlx5_events_start(struct mlx5_core_dev *dev); void mlx5_events_stop(struct mlx5_core_dev *dev); +int mlx5_adev_idx_alloc(void); +void mlx5_adev_idx_free(int idx); +void mlx5_adev_cleanup(struct mlx5_core_dev *dev); +int mlx5_adev_init(struct mlx5_core_dev *dev); + void mlx5_add_device(struct mlx5_interface *intf, struct mlx5_priv *priv); void mlx5_remove_device(struct mlx5_interface *intf, struct mlx5_priv *priv); -void mlx5_attach_device(struct mlx5_core_dev *dev); +int mlx5_attach_device(struct mlx5_core_dev *dev); void mlx5_detach_device(struct mlx5_core_dev *dev); bool mlx5_device_registered(struct mlx5_core_dev *dev); -void mlx5_register_device(struct mlx5_core_dev *dev); +int mlx5_register_device(struct mlx5_core_dev *dev); void mlx5_unregister_device(struct mlx5_core_dev *dev); void mlx5_add_dev_by_protocol(struct mlx5_core_dev *dev, int protocol); void mlx5_remove_dev_by_protocol(struct mlx5_core_dev *dev, int protocol); @@ -232,6 +237,17 @@ static inline int mlx5_lag_is_lacp_owner(struct mlx5_core_dev *dev) MLX5_CAP_GEN(dev, lag_master); } +int mlx5_rescan_drivers_locked(struct mlx5_core_dev *dev); +static inline int mlx5_rescan_drivers(struct mlx5_core_dev *dev) +{ + int ret; + + mlx5_dev_list_lock(); + ret = mlx5_rescan_drivers_locked(dev); + mlx5_dev_list_unlock(); + return ret; +} + void mlx5_reload_interface(struct mlx5_core_dev *mdev, int protocol); void mlx5_lag_update(struct mlx5_core_dev *dev); diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h index ed1d030658d2..f35ee4855777 100644 --- a/include/linux/mlx5/driver.h +++ b/include/linux/mlx5/driver.h @@ -48,6 +48,7 @@ #include <linux/idr.h> #include <linux/notifier.h> #include <linux/refcount.h> +#include <linux/auxiliary_bus.h> #include <linux/mlx5/device.h> #include <linux/mlx5/doorbell.h> @@ -536,6 +537,17 @@ struct mlx5_core_roce { struct mlx5_flow_handle *allow_rule; }; +enum { + MLX5_PRIV_FLAGS_DISABLE_IB_ADEV = 1 << 0, + MLX5_PRIV_FLAGS_DISABLE_ALL_ADEV = 1 << 1, +}; + +struct mlx5_adev { + struct auxiliary_device adev; + struct mlx5_core_dev *mdev; + int idx; +}; + struct mlx5_priv { /* IRQ table valid only for real pci devices PF or VF */ struct mlx5_irq_table *irq_table; @@ -573,6 +585,8 @@ struct mlx5_priv { struct list_head dev_list; struct list_head ctx_list; spinlock_t ctx_lock; + struct mlx5_adev **adev; + int adev_idx; struct mlx5_events *events; struct mlx5_flow_steering *steering; @@ -580,6 +594,7 @@ struct mlx5_priv { struct mlx5_eswitch *eswitch; struct mlx5_core_sriov sriov; struct mlx5_lag *lag; + u32 flags; struct mlx5_devcom *devcom; struct mlx5_fw_reset *fw_reset; struct mlx5_core_roce roce; @@ -1063,9 +1078,14 @@ enum { }; enum { - MLX5_INTERFACE_PROTOCOL_IB = 0, - MLX5_INTERFACE_PROTOCOL_ETH = 1, - MLX5_INTERFACE_PROTOCOL_VDPA = 2, + MLX5_INTERFACE_PROTOCOL_ETH_REP, + MLX5_INTERFACE_PROTOCOL_ETH, + + MLX5_INTERFACE_PROTOCOL_IB_REP, + MLX5_INTERFACE_PROTOCOL_MPIB, + MLX5_INTERFACE_PROTOCOL_IB, + + MLX5_INTERFACE_PROTOCOL_VDPA, }; struct mlx5_interface {