Convert mlx5 to use auxiliary bus
Subsystems (8)
cover Convert mlx5 to use auxiliary bus
From: Leon Romanovsky <[email protected]>
Hi,
This patch set converts mlx5 driver to use auxiliary bus [1].
In this series, we are connecting three subsystems (VDPA, netdev and RDMA) through mlx5_core PCI driver. That driver is responsible to create proper devices based on supported firmware.
First four patches are preparitions and fixes that were spotted during code development, rest is the conversion itself.
Thanks
[1] https://lore.kernel.org/lkml/[email protected]
Leon Romanovsky (11):
net/mlx5: Don't skip vport check
net/mlx5: Properly convey driver version to firmware net/mlx5_core: Clean driver version and name vdpa/mlx5: Make hardware definitions visible to all mlx5 devices net/mlx5: Register mlx5 devices to auxiliary virtual bus vdpa/mlx5: Connect mlx5_vdpa to auxiliary bus net/mlx5e: Connect ethernet part to auxiliary bus RDMA/mlx5: Convert mlx5_ib to use auxiliary bus net/mlx5: Delete custom device management logic net/mlx5: Simplify eswitch mode check
RDMA/mlx5: Remove IB representors dead code
drivers/infiniband/hw/mlx5/counters.c | 7 - drivers/infiniband/hw/mlx5/ib_rep.c | 113 ++-- drivers/infiniband/hw/mlx5/ib_rep.h | 45 +- drivers/infiniband/hw/mlx5/main.c | 148 +++-- drivers/infiniband/hw/mlx5/mlx5_ib.h | 4 +- .../net/ethernet/mellanox/mlx5/core/Kconfig | 1 + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 504 ++++++++++-------- .../net/ethernet/mellanox/mlx5/core/devlink.c | 4 +- .../ethernet/mellanox/mlx5/core/en_ethtool.c | 4 +- .../net/ethernet/mellanox/mlx5/core/en_main.c | 135 ++--- .../net/ethernet/mellanox/mlx5/core/en_rep.c | 42 +- .../net/ethernet/mellanox/mlx5/core/en_rep.h | 6 +- .../net/ethernet/mellanox/mlx5/core/en_tc.c | 8 +- .../mellanox/mlx5/core/esw/devlink_port.c | 2 +- .../net/ethernet/mellanox/mlx5/core/eswitch.c | 28 +- .../mellanox/mlx5/core/eswitch_offloads.c | 6 + .../mellanox/mlx5/core/ipoib/ethtool.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/lag.c | 58 +- .../net/ethernet/mellanox/mlx5/core/main.c | 43 +- .../ethernet/mellanox/mlx5/core/mlx5_core.h | 28 +- drivers/vdpa/mlx5/Makefile | 2 +- drivers/vdpa/mlx5/net/main.c | 76 --- drivers/vdpa/mlx5/net/mlx5_vnet.c | 55 +- drivers/vdpa/mlx5/net/mlx5_vnet.h | 24 - include/linux/mlx5/driver.h | 36 +- include/linux/mlx5/eswitch.h | 8 +- .../linux/mlx5/mlx5_ifc_vdpa.h | 6 +- 27 files changed, 731 insertions(+), 664 deletions(-) delete mode 100644 drivers/vdpa/mlx5/net/main.c delete mode 100644 drivers/vdpa/mlx5/net/mlx5_vnet.h rename drivers/vdpa/mlx5/core/mlx5_vdpa_ifc.h => include/linux/mlx5/mlx5_ifc_vdpa.h (97%)
--
2.26.2
PATCH 1/11 net/mlx5: Don't skip vport check
From: Leon Romanovsky <[email protected]>
Users of mlx5_eswitch_get_vport() are required to check return value prior to passing mlx5_vport further. Fix all the places to do not skip that check.
--- drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 7 +++++++ drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c +1 -1
@@ -120,5 +120,5 @@ struct devlink_port *mlx5_esw_offloads_devlink_port(struct mlx5_eswitch *esw, u1struct mlx5_vport *vport; vport =mlx5_eswitch_get_vport (esw, vport_num); -return vport->dl_port; +return IS_ERR (vport) ?ERR_CAST (vport) : vport->dl_port; }
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +7 -0
@@ -1142,6 +1142,9 @@ int mlx5_esw_modify_vport_rate(struct mlx5_eswitch *esw, u16 vport_num,struct mlx5_vport *vport; vport =mlx5_eswitch_get_vport (esw, vport_num); +if (IS_ERR (vport)) +return PTR_ERR (vport); +MLX5_SET (scheduling_context, ctx, max_average_bw, rate_mbps); return mlx5_modify_scheduling_element_cmd(esw->dev,
@@ -1276,6 +1279,8 @@ static int esw_enable_vport(struct mlx5_eswitch *esw, u16 vport_num,int ret; vport =mlx5_eswitch_get_vport (esw, vport_num); +if (IS_ERR (vport)) +return PTR_ERR (vport);mutex_lock (&esw->state_lock);WARN_ON (vport->enabled);
@@ -1311,6 +1316,8 @@ static void esw_disable_vport(struct mlx5_eswitch *esw, u16 vport_num)struct mlx5_vport *vport; vport =mlx5_eswitch_get_vport (esw, vport_num); +if (IS_ERR (vport)) +return ;mutex_lock (&esw->state_lock);if (!vport->enabled)
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +6 -0
@@ -2159,6 +2159,9 @@ static int esw_create_uplink_offloads_acl_tables(struct mlx5_eswitch *esw)struct mlx5_vport *vport; vport =mlx5_eswitch_get_vport (esw,MLX5_VPORT_UPLINK ); +if (IS_ERR (vport)) +return PTR_ERR (vport); +return esw_vport_create_offloads_acl_tables (esw, vport); }
@@ -2167,6 +2170,9 @@ static void esw_destroy_uplink_offloads_acl_tables(struct mlx5_eswitch *esw)struct mlx5_vport *vport; vport =mlx5_eswitch_get_vport (esw,MLX5_VPORT_UPLINK ); +if (IS_ERR (vport)) +return ; +esw_vport_destroy_offloads_acl_tables (esw, vport); }
--
2.26.2
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH 2/11 net/mlx5: Properly convey driver version to firmware
In reply to Leon RomanovskyFrom: Leon Romanovsky <[email protected]>
mlx5 firmware expects driver version in specific format X.X.X, so make it always correct and based on real kernel version aligned with the driver.
--- drivers/net/ethernet/mellanox/mlx5/core/main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/main.c +5 -1
@@ -50,6 +50,7 @@#ifdef CONFIG_RFS_ACCEL #include <linux/cpu_rmap.h> #endif +#include <linux/version.h> #include <net/devlink.h> #include "mlx5_core.h" #include "lib/eq.h"
@@ -233,7 +234,10 @@ static void mlx5_set_driver_version(struct mlx5_core_dev *dev)strncat (string,"," , remaining_size); remaining_size =max_t (int,0 , driver_ver_sz -strlen (string)); -strncat (string,DRIVER_VERSION , remaining_size); + +snprintf (string +strlen (string), remaining_size,"%u.%u.%u" , + (u8)(LINUX_VERSION_CODE >>16 ), (u8)(LINUX_VERSION_CODE >>8 ), + (u16)(LINUX_VERSION_CODE &0xff ));/*Send the command*/ MLX5_SET(set_driver_version_in, in, opcode,
--
2.26.2
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH 4/11 vdpa/mlx5: Make hardware definitions visible to all mlx5 devices
In reply to Leon RomanovskyFrom: Leon Romanovsky <[email protected]>
Move mlx5_vdpa IFC header file to the general include folder, so mlx5_core will be able to reuse it to check if VDPA is supported prior to creating an auxiliary device.
As part of this move, update the header file name to mlx5 general naming scheme.
--- drivers/vdpa/mlx5/net/main.c | 2 +- drivers/vdpa/mlx5/net/mlx5_vnet.c | 2 +- .../mlx5_vdpa_ifc.h => include/linux/mlx5/mlx5_ifc_vdpa.h | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename drivers/vdpa/mlx5/core/mlx5_vdpa_ifc.h => include/linux/mlx5/mlx5_ifc_vdpa.h (97%)
drivers/vdpa/mlx5/net/main.c +1 -1
@@ -4,7 +4,7 @@#include <linux/module.h> #include <linux/mlx5/driver.h> #include <linux/mlx5/device.h> -#include "mlx5_vdpa_ifc.h" +#include <linux/mlx5/mlx5_ifc_vdpa.h> #include "mlx5_vnet.h" MODULE_AUTHOR ("Eli Cohen <[email protected]>" );
drivers/vdpa/mlx5/net/mlx5_vnet.c +1 -1
@@ -9,8 +9,8 @@#include <linux/mlx5/vport.h> #include <linux/mlx5/fs.h> #include <linux/mlx5/device.h> +#include <linux/mlx5/mlx5_ifc_vdpa.h> #include "mlx5_vnet.h" -#include "mlx5_vdpa_ifc.h" #include "mlx5_vdpa.h" #define to_mvdev (__vdev) container_of((__vdev), struct mlx5_vdpa_dev, vdev)
include/linux/mlx5/mlx5_ifc_vdpa.h renamed from drivers/vdpa/mlx5/core/mlx5_vdpa_ifc.h +3 -3
@@ -1,8 +1,8 @@/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */ /* Copyright (c) 2020 Mellanox Technologies Ltd. */ -#ifndef __MLX5_VDPA_IFC_H_ -#define __MLX5_VDPA_IFC_H_ +#ifndef __MLX5_IFC_VDPA_H_ +#define __MLX5_IFC_VDPA_H_#include <linux/mlx5/mlx5_ifc.h>
@@ -165,4 +165,4 @@ struct mlx5_ifc_modify_virtio_net_q_out_bits { struct mlx5_ifc_general_obj_out_cmd_hdr_bits general_obj_out_cmd_hdr; }; -#endif /* __MLX5_VDPA_IFC_H_ */ +#endif /* __MLX5_IFC_VDPA_H_ */
--
2.26.2
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH 5/11 net/mlx5: Register mlx5 devices to auxiliary virtual bus
In reply to Leon RomanovskyFrom: Leon Romanovsky <[email protected]>
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
[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
[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
--- .../net/ethernet/mellanox/mlx5/core/Kconfig | 1 + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 193 +++++++++++++++++- .../net/ethernet/mellanox/mlx5/core/main.c | 13 +- .../ethernet/mellanox/mlx5/core/mlx5_core.h | 13 +- include/linux/mlx5/driver.h | 28 ++- 5 files changed, 239 insertions(+), 9 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/Kconfig +1 -0
@@ -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
drivers/net/ethernet/mellanox/mlx5/core/dev.c +189 -4
260 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/main.c +12 -1
@@ -1222,7 +1222,9 @@ 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); +if (err) + goto err_register; }else {mlx5_attach_device (dev); }
@@ -1230,6 +1232,8 @@ int mlx5_load_one(struct mlx5_core_dev *dev, bool boot)mutex_unlock (&dev->intf_state_mutex);return 0 ; +err_register: +mlx5_devlink_unregister (priv_to_devlink (dev)); err_devlink_reg:clear_bit (MLX5_INTERFACE_STATE_UP , &dev->intf_state);mlx5_unload (dev);
@@ -1306,8 +1310,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 +1334,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);
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h +12 -1
@@ -183,7 +183,7 @@ void mlx5_remove_device(struct mlx5_interface *intf, struct mlx5_priv *priv);void 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 +232,17 @@ static inline int mlx5_lag_is_lacp_owner(struct mlx5_core_dev *dev)MLX5_CAP_GEN (dev, lag_master); } +int _mlx5_rescan_drivers (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 (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);
include/linux/mlx5/driver.h +25 -3
@@ -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;
@@ -947,6 +962,8 @@ int mlx5_cmd_free_uar(struct mlx5_core_dev *dev, u32 uarn);void mlx5_health_flush (struct mlx5_core_dev *dev);void mlx5_health_cleanup (struct mlx5_core_dev *dev);int mlx5_health_init (struct mlx5_core_dev *dev); +void mlx5_adev_cleanup (struct mlx5_core_dev *dev); +int mlx5_adev_init (struct mlx5_core_dev *dev);void mlx5_start_health_poll (struct mlx5_core_dev *dev);void mlx5_stop_health_poll (struct mlx5_core_dev *dev,bool disable_health);void mlx5_drain_health_wq (struct mlx5_core_dev *dev);
@@ -1063,9 +1080,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 {
--
2.26.2
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH 6/11 vdpa/mlx5: Connect mlx5_vdpa to auxiliary bus
In reply to Leon RomanovskyFrom: Leon Romanovsky <[email protected]>
Change module registration logic to use auxiliary bus instead of custom made mlx5 register interface.
--- drivers/net/ethernet/mellanox/mlx5/core/dev.c | 28 ++++++- drivers/vdpa/mlx5/Makefile | 2 +- drivers/vdpa/mlx5/net/main.c | 76 ------------------- drivers/vdpa/mlx5/net/mlx5_vnet.c | 53 +++++++++++-- drivers/vdpa/mlx5/net/mlx5_vnet.h | 24 ------ 5 files changed, 73 insertions(+), 110 deletions(-) delete mode 100644 drivers/vdpa/mlx5/net/main.c delete mode 100644 drivers/vdpa/mlx5/net/mlx5_vnet.h
drivers/net/ethernet/mellanox/mlx5/core/dev.c +27 -1
@@ -31,6 +31,7 @@*/ #include <linux/mlx5/driver.h> +#include <linux/mlx5/mlx5_ifc_vdpa.h> #include "mlx5_core.h" static LIST_HEAD (intf_list);
@@ -51,10 +52,35 @@ enum { MLX5_INTERFACE_ATTACHED, }; +static bool is_vnet_supported (struct mlx5_core_dev *dev) +{ +if (!IS_ENABLED (CONFIG_MLX5_VDPA_NET )) +return false; + +if (mlx5_core_is_pf (dev)) +return false; + +if (!(MLX5_CAP_GEN_64 (dev, general_obj_types) & +MLX5_GENERAL_OBJ_TYPES_CAP_VIRTIO_NET_Q )) +return false; + +if (!(MLX5_CAP_DEV_VDPA_EMULATION (dev, event_mode) & +MLX5_VIRTIO_Q_EVENT_MODE_QP_MODE )) +return false; + +if (!MLX5_CAP_DEV_VDPA_EMULATION (dev, eth_frame_offload_type)) +return false; + +return true; +} +static const struct mlx5_adev_device {const char *suffix;bool (*is_supported)(struct mlx5_core_dev *dev); -} mlx5_adev_devices[1 ] = {}; +} mlx5_adev_devices[] = { + [MLX5_INTERFACE_PROTOCOL_VDPA ] = { .suffix ="vnet" , + .is_supported = &is_vnet_supported }, +};int mlx5_adev_init (struct mlx5_core_dev *dev) {
drivers/vdpa/mlx5/Makefile +1 -1
@@ -1,4 +1,4 @@ subdir-ccflags-y += -I$(srctree)/drivers/vdpa/mlx5/core obj-$(CONFIG_MLX5_VDPA_NET) += mlx5_vdpa.o -mlx5_vdpa-$(CONFIG_MLX5_VDPA_NET) += net/main.o net/mlx5_vnet.o core/resources.o core/mr.o +mlx5_vdpa-$(CONFIG_MLX5_VDPA_NET) += net/mlx5_vnet.o core/resources.o core/mr.o
drivers/vdpa/mlx5/net/main.c deleted +0 -76
76 lines not on this page · raw message
drivers/vdpa/mlx5/net/mlx5_vnet.c +45 -8
101 lines not on this page · raw message
drivers/vdpa/mlx5/net/mlx5_vnet.h deleted +0 -24
@@ -1,24 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */ -/* Copyright (c) 2020 Mellanox Technologies Ltd. */ - -#ifndef __MLX5_VNET_H_ -#define __MLX5_VNET_H_ - -#include <linux/vdpa.h> -#include <linux/virtio_net.h> -#include <linux/vringh.h> -#include <linux/mlx5/driver.h> -#include <linux/mlx5/cq.h> -#include <linux/mlx5/qp.h> -#include "mlx5_vdpa.h" - -static inline u32 mlx5_vdpa_max_qps (int max_vqs) -{ -return max_vqs /2 ; -} - -#define to_mlx5_vdpa_ndev (__mvdev) container_of(__mvdev, struct mlx5_vdpa_net, mvdev) -void *mlx5_vdpa_add_dev (struct mlx5_core_dev *mdev); -void mlx5_vdpa_remove_dev (struct mlx5_vdpa_dev *mvdev); - -#endif /* __MLX5_VNET_H_ */
--
2.26.2
PATCH 3/11 net/mlx5_core: Clean driver version and name
In reply to Leon RomanovskyFrom: Leon Romanovsky <[email protected]>
Remove exposed driver version as it was done in other drivers, so module version will work correctly by displaying the kernel version for which it is compiled.
And move mlx5_core module name to general include, so auxiliary drivers will be able to use it as a basis for a name in their device ID tables.
--- drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 4 +--- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 1 - .../net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 11 +++++++---- drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h | 3 --- include/linux/mlx5/driver.h | 2 ++ 7 files changed, 12 insertions(+), 13 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/devlink.c +1 -1
@@ -52,7 +52,7 @@ mlx5_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req,u32 running_fw, stored_fw;int err; - err =devlink_info_driver_name_put (req,DRIVER_NAME ); + err =devlink_info_driver_name_put (req,KBUILD_MODNAME );if (err)return err;
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +1 -3
@@ -40,9 +40,7 @@ void mlx5e_ethtool_get_drvinfo(struct mlx5e_priv *priv, {struct mlx5_core_dev *mdev = priv->mdev; -strlcpy (drvinfo->driver,DRIVER_NAME ,sizeof (drvinfo->driver)); -strlcpy (drvinfo->version,DRIVER_VERSION , -sizeof (drvinfo->version)); +strlcpy (drvinfo->driver,KBUILD_MODNAME ,sizeof (drvinfo->driver)); snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), "%d.%d.%04d (%.16s)", fw_rev_maj(mdev), fw_rev_min(mdev), fw_rev_sub(mdev),
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +0 -1
@@ -64,7 +64,6 @@ static void mlx5e_rep_get_drvinfo(struct net_device *dev,strlcpy (drvinfo->driver, mlx5e_rep_driver_name,sizeof (drvinfo->driver)); -strlcpy (drvinfo->version,UTS_RELEASE ,sizeof (drvinfo->version)); snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), "%d.%d.%04d (%.16s)", fw_rev_maj(mdev), fw_rev_min(mdev),
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c +1 -1
@@ -39,7 +39,7 @@ static void mlx5i_get_drvinfo(struct net_device *dev,struct mlx5e_priv *priv =mlx5i_epriv (dev);mlx5e_ethtool_get_drvinfo (priv, drvinfo); -strlcpy (drvinfo->driver,DRIVER_NAME "[ib_ipoib]" , +strlcpy (drvinfo->driver,KBUILD_MODNAME "[ib_ipoib]" ,sizeof (drvinfo->driver)); }
drivers/net/ethernet/mellanox/mlx5/core/main.c +7 -4
@@ -77,7 +77,6 @@MODULE_AUTHOR ("Eli Cohen <[email protected]>" );MODULE_DESCRIPTION ("Mellanox 5th generation network adapters (ConnectX series) core driver" );MODULE_LICENSE ("Dual BSD/GPL" ); -MODULE_VERSION (DRIVER_VERSION );unsigned int mlx5_core_debug_mask;module_param_named (debug_mask, mlx5_core_debug_mask, uint,0644 );
@@ -228,7 +227,7 @@ static void mlx5_set_driver_version(struct mlx5_core_dev *dev)strncat (string,"," , remaining_size); remaining_size =max_t (int,0 , driver_ver_sz -strlen (string)); -strncat (string,DRIVER_NAME , remaining_size); +strncat (string,KBUILD_MODNAME , remaining_size); remaining_size =max_t (int,0 , driver_ver_sz -strlen (string));strncat (string,"," , remaining_size);
@@ -313,7 +312,7 @@ static int request_bar(struct pci_dev *pdev)return -ENODEV ; } - err =pci_request_regions (pdev,DRIVER_NAME ); + err =pci_request_regions (pdev,KBUILD_MODNAME );if (err)dev_err (&pdev->dev,"Couldn't get PCI resources, aborting\n" );
@@ -1617,7 +1616,7 @@ void mlx5_recover_device(struct mlx5_core_dev *dev) }static struct pci_driver mlx5_core_driver = { - .name =DRIVER_NAME , + .name =KBUILD_MODNAME , .id_table = mlx5_core_pci_table, .probe = init_one, .remove = remove_one,
@@ -1643,6 +1642,10 @@ static int __init init(void) {int err; +WARN_ONCE (strcmp (MLX5_ADEV_NAME ,KBUILD_MODNAME ) || +strlen (MLX5_ADEV_NAME ) !=strlen (KBUILD_MODNAME ), +"mlx5_core name not in sync with kernel module name" ); +get_random_bytes (&sw_owner_id,sizeof (sw_owner_id));mlx5_core_verify_params ();
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h +0 -3
@@ -42,9 +42,6 @@#include <linux/mlx5/fs.h> #include <linux/mlx5/driver.h> -#define DRIVER_NAME "mlx5_core" -#define DRIVER_VERSION "5.0-0" -extern uint mlx5_core_debug_mask;#define mlx5_core_dbg (__dev, format, ...) \
include/linux/mlx5/driver.h +2 -0
@@ -56,6 +56,8 @@#include <linux/ptp_clock_kernel.h> #include <net/devlink.h> +#define MLX5_ADEV_NAME "mlx5_core" +enum {MLX5_BOARD_ID_LEN =64 , };
--
2.26.2
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH 8/11 RDMA/mlx5: Convert mlx5_ib to use auxiliary bus
In reply to Leon RomanovskyFrom: Leon Romanovsky <[email protected]>
The conversion to auxiliary bus solves long standing issue with existing mlx5_ib<->mlx5_core coupling. It required to have both modules in initramfs if one of them needed for the boot.
--- drivers/infiniband/hw/mlx5/ib_rep.c | 77 ++++++--- drivers/infiniband/hw/mlx5/ib_rep.h | 8 +- drivers/infiniband/hw/mlx5/main.c | 148 +++++++++++------- drivers/infiniband/hw/mlx5/mlx5_ib.h | 4 +- drivers/net/ethernet/mellanox/mlx5/core/dev.c | 66 ++++++++ .../net/ethernet/mellanox/mlx5/core/eswitch.c | 11 +- drivers/net/ethernet/mellanox/mlx5/core/lag.c | 38 +++-- .../net/ethernet/mellanox/mlx5/core/main.c | 3 - 8 files changed, 251 insertions(+), 104 deletions(-)
drivers/infiniband/hw/mlx5/ib_rep.c +59 -18
@@ -33,6 +33,7 @@ mlx5_ib_vport_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep)const struct mlx5_ib_profile *profile;struct mlx5_ib_dev *ibdev;int vport_index; +int ret;if (rep->vport ==MLX5_VPORT_UPLINK ) profile = &raw_eth_profile;
@@ -46,8 +47,8 @@ mlx5_ib_vport_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep) ibdev->port =kcalloc (num_ports,sizeof (*ibdev->port),GFP_KERNEL );if (!ibdev->port) { -ib_dealloc_device (&ibdev->ib_dev); -return -ENOMEM ; + ret = -ENOMEM ; + goto fail_port; } ibdev->is_rep = true;
@@ -58,12 +59,19 @@ mlx5_ib_vport_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep) ibdev->mdev = dev; ibdev->num_ports = num_ports; -if (!__mlx5_ib_add (ibdev, profile)) -return -EINVAL ; + ret =__mlx5_ib_add (ibdev, profile); +if (ret) + goto fail_add; rep->rep_data[REP_IB ].priv = ibdev;return 0 ; + +fail_add: +kfree (ibdev->port); +fail_port: +ib_dealloc_device (&ibdev->ib_dev); +return ret; } static void
@@ -94,20 +102,6 @@ static const struct mlx5_eswitch_rep_ops rep_ops = { .get_proto_dev = mlx5_ib_vport_get_proto_dev, }; -void mlx5_ib_register_vport_reps (struct mlx5_core_dev *mdev) -{ -struct mlx5_eswitch *esw = mdev->priv.eswitch; - -mlx5_eswitch_register_vport_reps (esw, &rep_ops,REP_IB ); -} - -void mlx5_ib_unregister_vport_reps (struct mlx5_core_dev *mdev) -{ -struct mlx5_eswitch *esw = mdev->priv.eswitch; - -mlx5_eswitch_unregister_vport_reps (esw,REP_IB ); -} -u8 mlx5_ib_eswitch_mode (struct mlx5_eswitch *esw) {return mlx5_eswitch_mode (esw);
@@ -154,3 +148,50 @@ struct mlx5_flow_handle *create_flow_rule_vport_sq(struct mlx5_ib_dev *dev,return mlx5_eswitch_add_send_to_vport_rule (esw, rep->vport, sq->base.mqp.qpn); } + +static int mlx5r_rep_probe (struct auxiliary_device *adev, +const struct auxiliary_device_id *id) +{ + struct mlx5_adev *idev = container_of(adev, struct mlx5_adev, adev); +struct mlx5_core_dev *mdev = idev->mdev; +struct mlx5_eswitch *esw; + + esw = mdev->priv.eswitch; +mlx5_eswitch_register_vport_reps (esw, &rep_ops,REP_IB ); +return 0 ; +} + +static int mlx5r_rep_remove (struct auxiliary_device *adev) +{ + struct mlx5_adev *idev = container_of(adev, struct mlx5_adev, adev); +struct mlx5_core_dev *mdev = idev->mdev; +struct mlx5_eswitch *esw; + + esw = mdev->priv.eswitch; +mlx5_eswitch_unregister_vport_reps (esw,REP_IB ); +return 0 ; +} + +static const struct auxiliary_device_id mlx5r_rep_id_table[] = { + { .name =MLX5_ADEV_NAME ".rdma-rep" , }, + {}, +}; + +MODULE_DEVICE_TABLE (auxiliary, mlx5r_rep_id_table); + +static struct auxiliary_driver mlx5r_rep_driver = { + .name ="rep" , + .probe = mlx5r_rep_probe, + .remove = mlx5r_rep_remove, + .id_table = mlx5r_rep_id_table, +}; + +int mlx5r_rep_init (void ) +{ +return auxiliary_driver_register (&mlx5r_rep_driver); +} + +void mlx5r_rep_cleanup (void ) +{ +auxiliary_driver_unregister (&mlx5r_rep_driver); +}
drivers/infiniband/hw/mlx5/ib_rep.h +4 -4
@@ -18,8 +18,8 @@ struct mlx5_ib_dev *mlx5_ib_get_rep_ibdev(struct mlx5_eswitch *esw,struct mlx5_ib_dev *mlx5_ib_get_uplink_ibdev (struct mlx5_eswitch *esw);struct mlx5_eswitch_rep *mlx5_ib_vport_rep (struct mlx5_eswitch *esw,u16 vport_num); -void mlx5_ib_register_vport_reps (struct mlx5_core_dev *mdev); -void mlx5_ib_unregister_vport_reps (struct mlx5_core_dev *mdev); +int mlx5r_rep_init (void ); +void mlx5r_rep_cleanup (void );struct mlx5_flow_handle *create_flow_rule_vport_sq (struct mlx5_ib_dev *dev,struct mlx5_ib_sq *sq,u16 port);
@@ -51,8 +51,8 @@ struct mlx5_eswitch_rep *mlx5_ib_vport_rep(struct mlx5_eswitch *esw,return NULL ; } -static inline void mlx5_ib_register_vport_reps (struct mlx5_core_dev *mdev) {} -static inline void mlx5_ib_unregister_vport_reps (struct mlx5_core_dev *mdev) {} +static inline int mlx5r_rep_init (void ) {return 0 ; } +static inline void mlx5r_rep_cleanup (void ) {}static inline struct mlx5_flow_handle *create_flow_rule_vport_sq(struct mlx5_ib_dev *dev, struct mlx5_ib_sq *sq,
drivers/infiniband/hw/mlx5/main.c +93 -55
235 lines not on this page · raw message
drivers/infiniband/hw/mlx5/mlx5_ib.h +2 -2
@@ -1383,8 +1383,8 @@ extern const struct mmu_interval_notifier_ops mlx5_mn_ops;void __mlx5_ib_remove (struct mlx5_ib_dev *dev,const struct mlx5_ib_profile *profile,int stage); -void *__mlx5_ib_add (struct mlx5_ib_dev *dev, -const struct mlx5_ib_profile *profile); +int __mlx5_ib_add (struct mlx5_ib_dev *dev, +const struct mlx5_ib_profile *profile);int mlx5_ib_get_vf_config (struct ib_device *device,int vf,u8 port,struct ifla_vf_info *info);
drivers/net/ethernet/mellanox/mlx5/core/dev.c +66 -0
82 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +4 -7
@@ -1617,7 +1617,6 @@ int mlx5_eswitch_enable_locked(struct mlx5_eswitch *esw, int mode, int num_vfs) err =esw_legacy_enable (esw); }else {mlx5_rescan_drivers (esw->dev); -mlx5_reload_interface (esw->dev,MLX5_INTERFACE_PROTOCOL_IB ); err =esw_offloads_enable (esw); }
@@ -1635,10 +1634,9 @@ int mlx5_eswitch_enable_locked(struct mlx5_eswitch *esw, int mode, int num_vfs) abort: esw->mode =MLX5_ESWITCH_NONE ; -if (mode ==MLX5_ESWITCH_OFFLOADS ) { -mlx5_reload_interface (esw->dev,MLX5_INTERFACE_PROTOCOL_IB ); +if (mode ==MLX5_ESWITCH_OFFLOADS )mlx5_rescan_drivers (esw->dev); - } +esw_destroy_tsar (esw);return err; }
@@ -1699,10 +1697,9 @@ void mlx5_eswitch_disable_locked(struct mlx5_eswitch *esw, bool clear_vf)mlx5_lag_update (esw->dev); -if (old_mode ==MLX5_ESWITCH_OFFLOADS ) { -mlx5_reload_interface (esw->dev,MLX5_INTERFACE_PROTOCOL_IB ); +if (old_mode ==MLX5_ESWITCH_OFFLOADS )mlx5_rescan_drivers (esw->dev); - } +esw_destroy_tsar (esw);if (clear_vf)
drivers/net/ethernet/mellanox/mlx5/core/lag.c +23 -15
@@ -243,24 +243,30 @@ static bool mlx5_lag_check_prereq(struct mlx5_lag *ldev)#endif } -static void mlx5_lag_add_ib_devices (struct mlx5_lag *ldev) +static void mlx5_lag_add_devices (struct mlx5_lag *ldev) {int i; -for (i =0 ; i <MLX5_MAX_PORTS ; i++) -if (ldev->pf[i].dev) -mlx5_add_dev_by_protocol (ldev->pf[i].dev, -MLX5_INTERFACE_PROTOCOL_IB ); +for (i =0 ; i <MLX5_MAX_PORTS ; i++) { +if (!ldev->pf[i].dev) +continue ; + + ldev->pf[i].dev->priv.flags &= ~MLX5_PRIV_FLAGS_DISABLE_IB_ADEV ; +_mlx5_rescan_drivers (ldev->pf[i].dev); + } } -static void mlx5_lag_remove_ib_devices (struct mlx5_lag *ldev) +static void mlx5_lag_remove_devices (struct mlx5_lag *ldev) {int i; -for (i =0 ; i <MLX5_MAX_PORTS ; i++) -if (ldev->pf[i].dev) -mlx5_remove_dev_by_protocol (ldev->pf[i].dev, -MLX5_INTERFACE_PROTOCOL_IB ); +for (i =0 ; i <MLX5_MAX_PORTS ; i++) { +if (!ldev->pf[i].dev) +continue ; + + ldev->pf[i].dev->priv.flags |=MLX5_PRIV_FLAGS_DISABLE_IB_ADEV ; +_mlx5_rescan_drivers (ldev->pf[i].dev); + } }static void mlx5_do_bond (struct mlx5_lag *ldev)
@@ -290,20 +296,21 @@ static void mlx5_do_bond(struct mlx5_lag *ldev)#endif if (roce_lag) -mlx5_lag_remove_ib_devices (ldev); +mlx5_lag_remove_devices (ldev); err =mlx5_activate_lag (ldev, &tracker, roce_lag ?MLX5_LAG_FLAG_ROCE :MLX5_LAG_FLAG_SRIOV );if (err) {if (roce_lag) -mlx5_lag_add_ib_devices (ldev); +mlx5_lag_add_devices (ldev);return ; }if (roce_lag) { -mlx5_add_dev_by_protocol (dev0,MLX5_INTERFACE_PROTOCOL_IB ); + dev0->priv.flags &= ~MLX5_PRIV_FLAGS_DISABLE_IB_ADEV ; +_mlx5_rescan_drivers (dev0);mlx5_nic_vport_enable_roce (dev1); } }else if (do_bond &&__mlx5_lag_is_active (ldev)) {
@@ -312,7 +319,8 @@ static void mlx5_do_bond(struct mlx5_lag *ldev) roce_lag =__mlx5_lag_is_roce (ldev);if (roce_lag) { -mlx5_remove_dev_by_protocol (dev0,MLX5_INTERFACE_PROTOCOL_IB ); + dev0->priv.flags |=MLX5_PRIV_FLAGS_DISABLE_IB_ADEV ; +_mlx5_rescan_drivers (dev0);mlx5_nic_vport_disable_roce (dev1); }
@@ -321,7 +329,7 @@ static void mlx5_do_bond(struct mlx5_lag *ldev)return ;if (roce_lag) -mlx5_lag_add_ib_devices (ldev); +mlx5_lag_add_devices (ldev); } }
drivers/net/ethernet/mellanox/mlx5/core/main.c +0 -3
@@ -1345,7 +1345,6 @@ static void mlx5_mdev_uninit(struct mlx5_core_dev *dev)mutex_destroy (&dev->intf_state_mutex); } -#define MLX5_IB_MOD "mlx5_ib"static int init_one (struct pci_dev *pdev,const struct pci_device_id *id) {struct mlx5_core_dev *dev;
@@ -1383,8 +1382,6 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *id) goto err_load_one; } -request_module_nowait (MLX5_IB_MOD ); - err =mlx5_crdump_enable (dev);if (err)dev_err (&pdev->dev,"mlx5_crdump_enable failed with error code %d\n" , err);
--
2.26.2
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH 9/11 net/mlx5: Delete custom device management logic
In reply to Leon RomanovskyFrom: Leon Romanovsky <[email protected]>
After conversion to use auxiliary bus, all custom device management is not needed anymore, delete it.
--- drivers/net/ethernet/mellanox/mlx5/core/dev.c | 299 +----------------- drivers/net/ethernet/mellanox/mlx5/core/lag.c | 18 -- .../net/ethernet/mellanox/mlx5/core/main.c | 4 - .../ethernet/mellanox/mlx5/core/mlx5_core.h | 10 - include/linux/mlx5/driver.h | 22 -- 5 files changed, 17 insertions(+), 336 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/dev.c +17 -282
@@ -35,24 +35,10 @@#include <linux/mlx5/mlx5_ifc_vdpa.h> #include "mlx5_core.h" -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; -struct mlx5_interface *intf; -void *context; -unsigned long state; -}; - -enum { -MLX5_INTERFACE_ADDED , -MLX5_INTERFACE_ATTACHED , -}; -static bool is_eth_rep_supported (struct mlx5_core_dev *dev) {if (!IS_ENABLED (CONFIG_MLX5_ESWITCH ))
@@ -204,6 +190,17 @@ static bool is_ib_supported(struct mlx5_core_dev *dev)return true; } +enum { +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 , +}; + static const struct mlx5_adev_device { const char *suffix; bool (*is_supported)(struct mlx5_core_dev *dev);
@@ -248,148 +245,6 @@ void mlx5_adev_cleanup(struct mlx5_core_dev *dev)kfree (priv->adev); } -void mlx5_add_device (struct mlx5_interface *intf,struct mlx5_priv *priv) -{ -struct mlx5_device_context *dev_ctx; - struct mlx5_core_dev *dev = container_of(priv, struct mlx5_core_dev, priv); - -if (!mlx5_lag_intf_add (intf, priv)) -return ; - - dev_ctx =kzalloc (sizeof (*dev_ctx),GFP_KERNEL ); -if (!dev_ctx) -return ; - - dev_ctx->intf = intf; - - dev_ctx->context = intf->add (dev); -if (dev_ctx->context) { -set_bit (MLX5_INTERFACE_ADDED , &dev_ctx->state); -if (intf->attach) -set_bit (MLX5_INTERFACE_ATTACHED , &dev_ctx->state); - -spin_lock_irq (&priv->ctx_lock); -list_add_tail (&dev_ctx->list, &priv->ctx_list); -spin_unlock_irq (&priv->ctx_lock); - } - -if (!dev_ctx->context) -kfree (dev_ctx); -} - -static struct mlx5_device_context *mlx5_get_device (struct mlx5_interface *intf, -struct mlx5_priv *priv) -{ -struct mlx5_device_context *dev_ctx; - -list_for_each_entry (dev_ctx, &priv->ctx_list, list) -if (dev_ctx->intf == intf) -return dev_ctx; -return NULL ; -} - -void mlx5_remove_device (struct mlx5_interface *intf,struct mlx5_priv *priv) -{ -struct mlx5_device_context *dev_ctx; - struct mlx5_core_dev *dev = container_of(priv, struct mlx5_core_dev, priv); - - dev_ctx =mlx5_get_device (intf, priv); -if (!dev_ctx) -return ; - -spin_lock_irq (&priv->ctx_lock); -list_del (&dev_ctx->list); -spin_unlock_irq (&priv->ctx_lock); - -if (test_bit (MLX5_INTERFACE_ADDED , &dev_ctx->state)) - intf->remove (dev, dev_ctx->context); - -kfree (dev_ctx); -} - -static void mlx5_attach_interface (struct mlx5_interface *intf,struct mlx5_priv *priv) -{ -struct mlx5_device_context *dev_ctx; - struct mlx5_core_dev *dev = container_of(priv, struct mlx5_core_dev, priv); - - dev_ctx =mlx5_get_device (intf, priv); -if (!dev_ctx) -return ; - -if (intf->attach) { -if (test_bit (MLX5_INTERFACE_ATTACHED , &dev_ctx->state)) -return ; -if (intf->attach (dev, dev_ctx->context)) -return ; -set_bit (MLX5_INTERFACE_ATTACHED , &dev_ctx->state); - }else { -if (test_bit (MLX5_INTERFACE_ADDED , &dev_ctx->state)) -return ; - dev_ctx->context = intf->add (dev); -if (!dev_ctx->context) -return ; -set_bit (MLX5_INTERFACE_ADDED , &dev_ctx->state); - } -} - -void mlx5_attach_device (struct mlx5_core_dev *dev) -{ -struct mlx5_priv *priv = &dev->priv; -struct mlx5_interface *intf; - -mutex_lock (&mlx5_intf_mutex); -list_for_each_entry (intf, &intf_list, list) -mlx5_attach_interface (intf, priv); -mutex_unlock (&mlx5_intf_mutex); -} - -static void mlx5_detach_interface (struct mlx5_interface *intf,struct mlx5_priv *priv) -{ -struct mlx5_device_context *dev_ctx; - struct mlx5_core_dev *dev = container_of(priv, struct mlx5_core_dev, priv); - - dev_ctx =mlx5_get_device (intf, priv); -if (!dev_ctx) -return ; - -if (intf->detach) { -if (!test_bit (MLX5_INTERFACE_ATTACHED , &dev_ctx->state)) -return ; - intf->detach (dev, dev_ctx->context); -clear_bit (MLX5_INTERFACE_ATTACHED , &dev_ctx->state); - }else { -if (!test_bit (MLX5_INTERFACE_ADDED , &dev_ctx->state)) -return ; - intf->remove (dev, dev_ctx->context); -clear_bit (MLX5_INTERFACE_ADDED , &dev_ctx->state); - } -} - -void mlx5_detach_device (struct mlx5_core_dev *dev) -{ -struct mlx5_priv *priv = &dev->priv; -struct mlx5_interface *intf; - -mutex_lock (&mlx5_intf_mutex); -list_for_each_entry (intf, &intf_list, list) -mlx5_detach_interface (intf, priv); -mutex_unlock (&mlx5_intf_mutex); -} - -bool mlx5_device_registered (struct mlx5_core_dev *dev) -{ -struct mlx5_priv *priv; -bool found = false; - -mutex_lock (&mlx5_intf_mutex); -list_for_each_entry (priv, &mlx5_dev_list, dev_list) -if (priv == &dev->priv) - found = true; -mutex_unlock (&mlx5_intf_mutex); - -return found; -} -static void adev_release (struct device *dev) { struct mlx5_adev *mlx5_adev =
@@ -442,8 +297,6 @@ static void del_adev(struct auxiliary_device *adev)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);
@@ -451,65 +304,19 @@ int mlx5_register_device(struct mlx5_core_dev *dev) ret =_mlx5_rescan_drivers (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 ; +mlx5_unregister_device (dev); -add_err: -mlx5_unregister_device (dev);return ret; }void mlx5_unregister_device (struct mlx5_core_dev *dev) { -struct mlx5_priv *priv = &dev->priv; -struct mlx5_interface *intf; -mutex_lock (&mlx5_intf_mutex); -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 (dev);mutex_unlock (&mlx5_intf_mutex); } -int mlx5_register_interface (struct mlx5_interface *intf) -{ -struct mlx5_priv *priv; - -if (!intf->add || !intf->remove) -return -EINVAL ; - -mutex_lock (&mlx5_intf_mutex); -list_add_tail (&intf->list, &intf_list); -list_for_each_entry (priv, &mlx5_dev_list, dev_list) -mlx5_add_device (intf, priv); -mutex_unlock (&mlx5_intf_mutex); - -return 0 ; -} -EXPORT_SYMBOL (mlx5_register_interface); - -void mlx5_unregister_interface (struct mlx5_interface *intf) -{ -struct mlx5_priv *priv; - -mutex_lock (&mlx5_intf_mutex); -list_for_each_entry (priv, &mlx5_dev_list, dev_list) -mlx5_remove_device (intf, priv); -list_del (&intf->list); -mutex_unlock (&mlx5_intf_mutex); -} -EXPORT_SYMBOL (mlx5_unregister_interface); -/* This function is used after mlx5_core_dev is reconfigured. */ int _mlx5_rescan_drivers (struct mlx5_core_dev *dev)
@@ -567,59 +374,6 @@ int _mlx5_rescan_drivers(struct mlx5_core_dev *dev)return ret; } -/* Must be called with intf_mutex held */ -static bool mlx5_has_added_dev_by_protocol (struct mlx5_core_dev *mdev,int protocol) -{ -struct mlx5_device_context *dev_ctx; -struct mlx5_interface *intf; -bool found = false; - -list_for_each_entry (intf, &intf_list, list) { -if (intf->protocol == protocol) { - dev_ctx =mlx5_get_device (intf, &mdev->priv); -if (dev_ctx &&test_bit (MLX5_INTERFACE_ADDED , &dev_ctx->state)) - found = true; -break ; - } - } - -return found; -} - -void mlx5_reload_interface (struct mlx5_core_dev *mdev,int protocol) -{ -mutex_lock (&mlx5_intf_mutex); -if (mlx5_has_added_dev_by_protocol (mdev, protocol)) { -mlx5_remove_dev_by_protocol (mdev, protocol); -mlx5_add_dev_by_protocol (mdev, protocol); - } -mutex_unlock (&mlx5_intf_mutex); -} - -/* Must be called with intf_mutex held */ -void mlx5_add_dev_by_protocol (struct mlx5_core_dev *dev,int protocol) -{ -struct mlx5_interface *intf; - -list_for_each_entry (intf, &intf_list, list) -if (intf->protocol == protocol) { -mlx5_add_device (intf, &dev->priv); -break ; - } -} - -/* Must be called with intf_mutex held */ -void mlx5_remove_dev_by_protocol (struct mlx5_core_dev *dev,int protocol) -{ -struct mlx5_interface *intf; - -list_for_each_entry (intf, &intf_list, list) -if (intf->protocol == protocol) { -mlx5_remove_device (intf, &dev->priv); -break ; - } -} -static u32 mlx5_gen_pci_id (const struct mlx5_core_dev *dev) { return (u32)((pci_domain_nr(dev->pdev->bus) << 16) |
@@ -651,44 +405,25 @@ static int next_phys_dev(struct device *dev, const void *data)*/ 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); -if (!mlx5_core_is_pf (tmp_dev)) -continue ; - -if ((dev != tmp_dev) && (mlx5_gen_pci_id (tmp_dev) == pci_id)) { - res = tmp_dev; -break ; - } - } +if (!adev) +return NULL ; -return res; + madev = container_of(adev, struct mlx5_adev, adev); +put_device (&adev->dev); +return madev->mdev; }void mlx5_dev_list_lock (void ) {mutex_lock (&mlx5_intf_mutex); } -void mlx5_dev_list_unlock (void ) {mutex_unlock (&mlx5_intf_mutex);
drivers/net/ethernet/mellanox/mlx5/core/lag.c +0 -18
@@ -749,24 +749,6 @@ u8 mlx5_lag_get_slave_port(struct mlx5_core_dev *dev, }EXPORT_SYMBOL (mlx5_lag_get_slave_port); -bool mlx5_lag_intf_add (struct mlx5_interface *intf,struct mlx5_priv *priv) -{ - struct mlx5_core_dev *dev = container_of(priv, struct mlx5_core_dev, - priv); -struct mlx5_lag *ldev; - -if (intf->protocol !=MLX5_INTERFACE_PROTOCOL_IB ) -return true; - - ldev =mlx5_lag_dev_get (dev); -if (!ldev || !__mlx5_lag_is_roce (ldev) || - ldev->pf[MLX5_LAG_P1 ].dev == dev) -return true; - -/* If bonded, we do not add an IB device for PF1. */ -return false; -} - int mlx5_lag_query_cong_counters(struct mlx5_core_dev *dev, u64 *values, int num_counters,
drivers/net/ethernet/mellanox/mlx5/core/main.c +0 -4
@@ -1225,8 +1225,6 @@ int mlx5_load_one(struct mlx5_core_dev *dev, bool boot) err =mlx5_register_device (dev);if (err) goto err_register; - }else { -mlx5_attach_device (dev); }mutex_unlock (&dev->intf_state_mutex);
@@ -1256,8 +1254,6 @@ void mlx5_unload_one(struct mlx5_core_dev *dev, bool cleanup)if (cleanup) {mlx5_unregister_device (dev);mlx5_devlink_unregister (priv_to_devlink (dev)); - }else { -mlx5_detach_device (dev); }if (!test_bit (MLX5_INTERFACE_STATE_UP , &dev->intf_state)) {
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h +0 -10
@@ -178,22 +178,13 @@ 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); -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); -void mlx5_detach_device (struct mlx5_core_dev *dev); -bool mlx5_device_registered (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);struct mlx5_core_dev *mlx5_get_next_phys_dev (struct mlx5_core_dev *dev);void mlx5_dev_list_lock (void );void mlx5_dev_list_unlock (void );int mlx5_dev_list_trylock (void ); -bool mlx5_lag_intf_add (struct mlx5_interface *intf,struct mlx5_priv *priv); -int mlx5_query_mtpps (struct mlx5_core_dev *dev,u32 *mtpps,u32 mtpps_size);int mlx5_set_mtpps (struct mlx5_core_dev *mdev,u32 *mtpps,u32 mtpps_size);int mlx5_query_mtppse (struct mlx5_core_dev *mdev,u8 pin,u8 *arm,u8 *mode);
@@ -243,7 +234,6 @@ static inline int mlx5_rescan_drivers(struct mlx5_core_dev *dev)return ret; } -void mlx5_reload_interface (struct mlx5_core_dev *mdev,int protocol);void mlx5_lag_update (struct mlx5_core_dev *dev);enum {
include/linux/mlx5/driver.h +0 -22
@@ -1079,28 +1079,6 @@ enum { MAX_MR_CACHE_ENTRIES }; -enum { -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 { -void * (*add)(struct mlx5_core_dev *dev); -void (*remove)(struct mlx5_core_dev *dev,void *context); -int (*attach)(struct mlx5_core_dev *dev,void *context); -void (*detach)(struct mlx5_core_dev *dev,void *context); -int protocol; -struct list_head list; -}; - -int mlx5_register_interface (struct mlx5_interface *intf); -void mlx5_unregister_interface (struct mlx5_interface *intf);int mlx5_notifier_register (struct mlx5_core_dev *dev,struct notifier_block *nb);int mlx5_notifier_unregister (struct mlx5_core_dev *dev,struct notifier_block *nb);int mlx5_eq_notifier_register (struct mlx5_core_dev *dev,struct mlx5_nb *nb);
--
2.26.2
PATCH 7/11 net/mlx5e: Connect ethernet part to auxiliary bus
In reply to Leon RomanovskyFrom: Leon Romanovsky <[email protected]>
Reuse auxiliary bus to perform device management of the ethernet part of the mlx5 driver.
--- drivers/net/ethernet/mellanox/mlx5/core/dev.c | 74 ++++++++++ .../net/ethernet/mellanox/mlx5/core/en_main.c | 133 ++++++++---------- .../net/ethernet/mellanox/mlx5/core/en_rep.c | 41 +++++- .../net/ethernet/mellanox/mlx5/core/en_rep.h | 6 +- .../net/ethernet/mellanox/mlx5/core/eswitch.c | 6 +- drivers/net/ethernet/mellanox/mlx5/core/lag.c | 2 + .../net/ethernet/mellanox/mlx5/core/main.c | 6 +- .../ethernet/mellanox/mlx5/core/mlx5_core.h | 2 +- 8 files changed, 181 insertions(+), 89 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/dev.c +74 -0
@@ -31,6 +31,7 @@*/ #include <linux/mlx5/driver.h> +#include <linux/mlx5/eswitch.h> #include <linux/mlx5/mlx5_ifc_vdpa.h> #include "mlx5_core.h"
@@ -52,6 +53,75 @@ enum { MLX5_INTERFACE_ATTACHED, }; +static bool is_eth_rep_supported (struct mlx5_core_dev *dev) +{ +if (!IS_ENABLED (CONFIG_MLX5_ESWITCH )) +return false; + +if (!MLX5_ESWITCH_MANAGER (dev)) +return false; + +if (mlx5_eswitch_mode (dev->priv.eswitch) !=MLX5_ESWITCH_OFFLOADS ) +return false; + +return true; +} + +static bool is_eth_supported (struct mlx5_core_dev *dev) +{ +if (!IS_ENABLED (CONFIG_MLX5_CORE_EN )) +return false; + +if (is_eth_rep_supported (dev)) +return false; + +if (MLX5_CAP_GEN (dev, port_type) !=MLX5_CAP_PORT_TYPE_ETH ) +return false; + +if (!MLX5_CAP_GEN (dev, eth_net_offloads)) { +mlx5_core_warn (dev,"Missing eth_net_offloads capability\n" ); +return false; + } + +if (!MLX5_CAP_GEN (dev, nic_flow_table)) { +mlx5_core_warn (dev,"Missing nic_flow_table capability\n" ); +return false; + } + +if (!MLX5_CAP_ETH (dev, csum_cap)) { +mlx5_core_warn (dev,"Missing csum_cap capability\n" ); +return false; + } + +if (!MLX5_CAP_ETH (dev, max_lso_cap)) { +mlx5_core_warn (dev,"Missing max_lso_cap capability\n" ); +return false; + } + +if (!MLX5_CAP_ETH (dev, vlan_cap)) { +mlx5_core_warn (dev,"Missing vlan_cap capability\n" ); +return false; + } + +if (!MLX5_CAP_ETH (dev, rss_ind_tbl_cap)) { +mlx5_core_warn (dev,"Missing rss_ind_tbl_cap capability\n" ); +return false; + } + +if (MLX5_CAP_FLOWTABLE (dev, + flow_table_properties_nic_receive.max_ft_level) <3 ) { +mlx5_core_warn (dev,"max_ft_level < 3\n" ); +return false; + } + +if (!MLX5_CAP_ETH (dev, self_lb_en_modifiable)) +mlx5_core_warn (dev,"Self loop back prevention is not supported\n" ); +if (!MLX5_CAP_GEN (dev, cq_moderation)) +mlx5_core_warn (dev,"CQ moderation is not supported\n" ); + +return true; +} +static bool is_vnet_supported (struct mlx5_core_dev *dev) {if (!IS_ENABLED (CONFIG_MLX5_VDPA_NET ))
@@ -80,6 +150,10 @@ static const struct mlx5_adev_device { } mlx5_adev_devices[] = { [MLX5_INTERFACE_PROTOCOL_VDPA] = { .suffix = "vnet", .is_supported = &is_vnet_supported }, + [MLX5_INTERFACE_PROTOCOL_ETH] = { .suffix = "eth", + .is_supported = &is_eth_supported }, + [MLX5_INTERFACE_PROTOCOL_ETH_REP] = { .suffix = "eth-rep", + .is_supported = &is_eth_rep_supported }, };int mlx5_adev_init (struct mlx5_core_dev *dev)
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +55 -78
208 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +37 -4
53 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/en_rep.h +4 -2
@@ -203,8 +203,8 @@ struct mlx5e_rep_sq {struct list_head list; }; -void mlx5e_rep_register_vport_reps (struct mlx5_core_dev *mdev); -void mlx5e_rep_unregister_vport_reps (struct mlx5_core_dev *mdev); +int mlx5e_rep_init (void ); +void mlx5e_rep_cleanup (void );int mlx5e_rep_bond_init (struct mlx5e_rep_priv *rpriv);void mlx5e_rep_bond_cleanup (struct mlx5e_rep_priv *rpriv); int mlx5e_rep_bond_enslave(struct mlx5_eswitch *esw, struct net_device *netdev,
@@ -232,6 +232,8 @@ static inline bool mlx5e_eswitch_rep(struct net_device *netdev)static inline bool mlx5e_is_uplink_rep (struct mlx5e_priv *priv) {return false; }static inline int mlx5e_add_sqs_fwd_rules (struct mlx5e_priv *priv) {return 0 ; }static inline void mlx5e_remove_sqs_fwd_rules (struct mlx5e_priv *priv) {} +static inline int mlx5e_rep_init (void ) {return 0 ; }; +static inline void mlx5e_rep_cleanup (void ) {};#endif static inline bool mlx5e_is_vport_rep (struct mlx5e_priv *priv)
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +3 -3
@@ -1616,7 +1616,7 @@ int mlx5_eswitch_enable_locked(struct mlx5_eswitch *esw, int mode, int num_vfs)if (mode ==MLX5_ESWITCH_LEGACY ) { err =esw_legacy_enable (esw); }else { -mlx5_reload_interface (esw->dev,MLX5_INTERFACE_PROTOCOL_ETH ); +mlx5_rescan_drivers (esw->dev);mlx5_reload_interface (esw->dev,MLX5_INTERFACE_PROTOCOL_IB ); err =esw_offloads_enable (esw); }
@@ -1637,7 +1637,7 @@ int mlx5_eswitch_enable_locked(struct mlx5_eswitch *esw, int mode, int num_vfs)if (mode ==MLX5_ESWITCH_OFFLOADS ) {mlx5_reload_interface (esw->dev,MLX5_INTERFACE_PROTOCOL_IB ); -mlx5_reload_interface (esw->dev,MLX5_INTERFACE_PROTOCOL_ETH ); +mlx5_rescan_drivers (esw->dev); }esw_destroy_tsar (esw);return err;
@@ -1701,7 +1701,7 @@ void mlx5_eswitch_disable_locked(struct mlx5_eswitch *esw, bool clear_vf)if (old_mode ==MLX5_ESWITCH_OFFLOADS ) {mlx5_reload_interface (esw->dev,MLX5_INTERFACE_PROTOCOL_IB ); -mlx5_reload_interface (esw->dev,MLX5_INTERFACE_PROTOCOL_ETH ); +mlx5_rescan_drivers (esw->dev); }esw_destroy_tsar (esw);
drivers/net/ethernet/mellanox/mlx5/core/lag.c +2 -0
@@ -596,6 +596,8 @@ void mlx5_lag_add(struct mlx5_core_dev *dev, struct net_device *netdev)if (err)mlx5_core_err (dev,"Failed to init multipath lag err=%d\n" , err); + +return ; }/* Must be called with intf_mutex held */
drivers/net/ethernet/mellanox/mlx5/core/main.c +5 -1
@@ -1668,7 +1668,11 @@ static int __init init(void) goto err_debug;#ifdef CONFIG_MLX5_CORE_EN -mlx5e_init (); + err =mlx5e_init (); +if (err) { +pci_unregister_driver (&mlx5_core_driver); + goto err_debug; + }#endif return 0 ;
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h +1 -1
@@ -212,7 +212,7 @@ int mlx5_firmware_flash(struct mlx5_core_dev *dev, const struct firmware *fw,int mlx5_fw_version_query (struct mlx5_core_dev *dev,u32 *running_ver,u32 *stored_ver); -void mlx5e_init (void ); +int mlx5e_init (void );void mlx5e_cleanup (void );static inline bool mlx5_sriov_is_enabled (struct mlx5_core_dev *dev)
--
2.26.2
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH 11/11 RDMA/mlx5: Remove IB representors dead code
In reply to Leon RomanovskyFrom: Leon Romanovsky <[email protected]>
Delete dead code.
--- drivers/infiniband/hw/mlx5/ib_rep.c | 31 +++++-------------- drivers/infiniband/hw/mlx5/ib_rep.h | 31 ------------------- drivers/net/ethernet/mellanox/mlx5/core/dev.c | 4 +-- 3 files changed, 9 insertions(+), 57 deletions(-)
drivers/infiniband/hw/mlx5/ib_rep.c +7 -24
@@ -13,7 +13,7 @@ mlx5_ib_set_vport_rep(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep)struct mlx5_ib_dev *ibdev;int vport_index; - ibdev =mlx5_ib_get_uplink_ibdev (dev->priv.eswitch); + ibdev =mlx5_eswitch_uplink_get_proto_dev (dev->priv.eswitch,REP_IB ); vport_index = rep->vport_index; ibdev->port[vport_index].rep = rep;
@@ -74,6 +74,11 @@ mlx5_ib_vport_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep)return ret; } +static void *mlx5_ib_rep_to_dev (struct mlx5_eswitch_rep *rep) +{ +return rep->rep_data[REP_IB ].priv; +} +static void mlx5_ib_vport_rep_unload (struct mlx5_eswitch_rep *rep) {
@@ -91,40 +96,18 @@ mlx5_ib_vport_rep_unload(struct mlx5_eswitch_rep *rep)__mlx5_ib_remove (dev, dev->profile,MLX5_IB_STAGE_MAX ); } -static void *mlx5_ib_vport_get_proto_dev (struct mlx5_eswitch_rep *rep) -{ -return mlx5_ib_rep_to_dev (rep); -} -static const struct mlx5_eswitch_rep_ops rep_ops = { .load = mlx5_ib_vport_rep_load, .unload = mlx5_ib_vport_rep_unload, - .get_proto_dev = mlx5_ib_vport_get_proto_dev, + .get_proto_dev = mlx5_ib_rep_to_dev, }; -struct mlx5_ib_dev *mlx5_ib_get_rep_ibdev (struct mlx5_eswitch *esw, -u16 vport_num) -{ -return mlx5_eswitch_get_proto_dev (esw, vport_num,REP_IB ); -} -struct net_device *mlx5_ib_get_rep_netdev (struct mlx5_eswitch *esw,u16 vport_num) {return mlx5_eswitch_get_proto_dev (esw, vport_num,REP_ETH ); } -struct mlx5_ib_dev *mlx5_ib_get_uplink_ibdev (struct mlx5_eswitch *esw) -{ -return mlx5_eswitch_uplink_get_proto_dev (esw,REP_IB ); -} - -struct mlx5_eswitch_rep *mlx5_ib_vport_rep (struct mlx5_eswitch *esw, -u16 vport_num) -{ -return mlx5_eswitch_vport_rep (esw, vport_num); -} -struct mlx5_flow_handle *create_flow_rule_vport_sq (struct mlx5_ib_dev *dev,struct mlx5_ib_sq *sq,u16 port)
drivers/infiniband/hw/mlx5/ib_rep.h +0 -31
@@ -12,11 +12,6 @@extern const struct mlx5_ib_profile raw_eth_profile;#ifdef CONFIG_MLX5_ESWITCH -struct mlx5_ib_dev *mlx5_ib_get_rep_ibdev (struct mlx5_eswitch *esw, -u16 vport_num); -struct mlx5_ib_dev *mlx5_ib_get_uplink_ibdev (struct mlx5_eswitch *esw); -struct mlx5_eswitch_rep *mlx5_ib_vport_rep (struct mlx5_eswitch *esw, -u16 vport_num);int mlx5r_rep_init (void );void mlx5r_rep_cleanup (void ); struct mlx5_flow_handle *create_flow_rule_vport_sq(struct mlx5_ib_dev *dev,
@@ -25,26 +20,6 @@ struct mlx5_flow_handle *create_flow_rule_vport_sq(struct mlx5_ib_dev *dev,struct net_device *mlx5_ib_get_rep_netdev (struct mlx5_eswitch *esw,u16 vport_num);#else /* CONFIG_MLX5_ESWITCH */ -static inline -struct mlx5_ib_dev *mlx5_ib_get_rep_ibdev (struct mlx5_eswitch *esw, -u16 vport_num) -{ -return NULL ; -} - -static inline -struct mlx5_ib_dev *mlx5_ib_get_uplink_ibdev (struct mlx5_eswitch *esw) -{ -return NULL ; -} - -static inline -struct mlx5_eswitch_rep *mlx5_ib_vport_rep (struct mlx5_eswitch *esw, -u16 vport_num) -{ -return NULL ; -} -static inline int mlx5r_rep_init (void ) {return 0 ; }static inline void mlx5r_rep_cleanup (void ) {} static inline
@@ -62,10 +37,4 @@ struct net_device *mlx5_ib_get_rep_netdev(struct mlx5_eswitch *esw,return NULL ; }#endif - -static inline -struct mlx5_ib_dev *mlx5_ib_rep_to_dev (struct mlx5_eswitch_rep *rep) -{ -return rep->rep_data[REP_IB ].priv; -}#endif /* __MLX5_IB_REP_H__ */
drivers/net/ethernet/mellanox/mlx5/core/dev.c +2 -2
@@ -198,14 +198,14 @@ enum {MLX5_INTERFACE_PROTOCOL_MPIB ,MLX5_INTERFACE_PROTOCOL_IB , - MLX5_INTERFACE_PROTOCOL_VDPA, + MLX5_INTERFACE_PROTOCOL_VNET, };static const struct mlx5_adev_device {const char *suffix;bool (*is_supported)(struct mlx5_core_dev *dev); } mlx5_adev_devices[] = { - [MLX5_INTERFACE_PROTOCOL_VDPA ] = { .suffix ="vnet" , + [MLX5_INTERFACE_PROTOCOL_VNET ] = { .suffix ="vnet" , .is_supported = &is_vnet_supported }, [MLX5_INTERFACE_PROTOCOL_IB ] = { .suffix ="rdma" , .is_supported = &is_ib_supported },
--
2.26.2
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH 10/11 net/mlx5: Simplify eswitch mode check
In reply to Leon RomanovskyFrom: Leon Romanovsky <[email protected]>
Provide mlx5_core device instead of "priv" pointer while checking eswith mode.
--- drivers/infiniband/hw/mlx5/counters.c | 7 ------- drivers/infiniband/hw/mlx5/ib_rep.c | 5 ----- drivers/infiniband/hw/mlx5/ib_rep.h | 6 ------ drivers/net/ethernet/mellanox/mlx5/core/dev.c | 4 ++-- drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 8 +++----- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 4 +++- include/linux/mlx5/eswitch.h | 8 ++++++-- 9 files changed, 16 insertions(+), 30 deletions(-)
drivers/infiniband/hw/mlx5/counters.c +0 -7
@@ -138,13 +138,6 @@ static int mlx5_ib_create_counters(struct ib_counters *counters, } -static bool is_mdev_switchdev_mode (const struct mlx5_core_dev *mdev) -{ -return MLX5_ESWITCH_MANAGER (mdev) && -mlx5_ib_eswitch_mode (mdev->priv.eswitch) == -MLX5_ESWITCH_OFFLOADS ; -} -static const struct mlx5_ib_counters *get_counters (struct mlx5_ib_dev *dev,u8 port_num) {
drivers/infiniband/hw/mlx5/ib_rep.c +0 -5
@@ -102,11 +102,6 @@ static const struct mlx5_eswitch_rep_ops rep_ops = { .get_proto_dev = mlx5_ib_vport_get_proto_dev, }; -u8 mlx5_ib_eswitch_mode (struct mlx5_eswitch *esw) -{ -return mlx5_eswitch_mode (esw); -} -struct mlx5_ib_dev *mlx5_ib_get_rep_ibdev (struct mlx5_eswitch *esw,u16 vport_num) {
drivers/infiniband/hw/mlx5/ib_rep.h +0 -6
@@ -12,7 +12,6 @@extern const struct mlx5_ib_profile raw_eth_profile;#ifdef CONFIG_MLX5_ESWITCH -u8 mlx5_ib_eswitch_mode (struct mlx5_eswitch *esw);struct mlx5_ib_dev *mlx5_ib_get_rep_ibdev (struct mlx5_eswitch *esw,u16 vport_num);struct mlx5_ib_dev *mlx5_ib_get_uplink_ibdev (struct mlx5_eswitch *esw);
@@ -26,11 +25,6 @@ struct mlx5_flow_handle *create_flow_rule_vport_sq(struct mlx5_ib_dev *dev,struct net_device *mlx5_ib_get_rep_netdev (struct mlx5_eswitch *esw,u16 vport_num);#else /* CONFIG_MLX5_ESWITCH */ -static inline u8 mlx5_ib_eswitch_mode (struct mlx5_eswitch *esw) -{ -return MLX5_ESWITCH_NONE ; -} -static inline struct mlx5_ib_dev *mlx5_ib_get_rep_ibdev (struct mlx5_eswitch *esw,u16 vport_num)
drivers/net/ethernet/mellanox/mlx5/core/dev.c +2 -2
@@ -47,7 +47,7 @@ static bool is_eth_rep_supported(struct mlx5_core_dev *dev)if (!MLX5_ESWITCH_MANAGER (dev))return false; -if (mlx5_eswitch_mode (dev->priv.eswitch) !=MLX5_ESWITCH_OFFLOADS ) +if (!is_mdev_switchdev_mode (dev))return false;return true;
@@ -144,7 +144,7 @@ static bool is_ib_rep_supported(struct mlx5_core_dev *dev)if (!MLX5_ESWITCH_MANAGER (dev))return false; -if (mlx5_eswitch_mode (dev->priv.eswitch) !=MLX5_ESWITCH_OFFLOADS ) +if (!is_mdev_switchdev_mode (dev))return false;if (mlx5_core_mp_enabled (dev))
drivers/net/ethernet/mellanox/mlx5/core/devlink.c +1 -1
@@ -221,7 +221,7 @@ static int mlx5_devlink_fs_mode_validate(struct devlink *devlink, u32 id,u8 eswitch_mode;bool smfs_cap; - eswitch_mode =mlx5_eswitch_mode (dev->priv.eswitch); + eswitch_mode =mlx5_eswitch_mode (dev); smfs_cap =mlx5_fs_dr_is_supported (dev);if (!smfs_cap) {
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +1 -1
@@ -3135,7 +3135,7 @@ static void mlx5e_modify_admin_state(struct mlx5_core_dev *mdev,mlx5_set_port_admin_status (mdev, state); -if (!MLX5_ESWITCH_MANAGER (mdev) ||mlx5_eswitch_mode (esw) ==MLX5_ESWITCH_OFFLOADS ) +if (mlx5_eswitch_mode (mdev) !=MLX5_ESWITCH_LEGACY )return ;if (state ==MLX5_PORT_UP )
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +3 -5
@@ -271,8 +271,6 @@ mlx5e_tc_match_to_reg_set(struct mlx5_core_dev *mdev,return 0 ; } -#define esw_offloads_mode (esw) (mlx5_eswitch_mode(esw) == MLX5_ESWITCH_OFFLOADS) -static struct mlx5_tc_ct_priv *get_ct_priv (struct mlx5e_priv *priv) {
@@ -280,7 +278,7 @@ get_ct_priv(struct mlx5e_priv *priv)struct mlx5_rep_uplink_priv *uplink_priv;struct mlx5e_rep_priv *uplink_rpriv; -if (esw_offloads_mode (esw)) { +if (is_mdev_switchdev_mode (priv->mdev)) { uplink_rpriv =mlx5_eswitch_get_uplink_priv (esw,REP_ETH ); uplink_priv = &uplink_rpriv->uplink_priv;
@@ -297,7 +295,7 @@ mlx5_tc_rule_insert(struct mlx5e_priv *priv, {struct mlx5_eswitch *esw = priv->mdev->priv.eswitch; -if (esw_offloads_mode (esw)) +if (is_mdev_switchdev_mode (priv->mdev))return mlx5_eswitch_add_offloaded_rule (esw, spec, attr);return mlx5e_add_offloaded_nic_rule (priv, spec, attr);
@@ -310,7 +308,7 @@ mlx5_tc_rule_delete(struct mlx5e_priv *priv, {struct mlx5_eswitch *esw = priv->mdev->priv.eswitch; -if (esw_offloads_mode (esw)) { +if (is_mdev_switchdev_mode (priv->mdev)) {mlx5_eswitch_del_offloaded_rule (esw, rule, attr);return ;
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +3 -1
@@ -2439,8 +2439,10 @@ int mlx5_eswitch_get_vport_stats(struct mlx5_eswitch *esw,return err; } -u8 mlx5_eswitch_mode (struct mlx5_eswitch *esw) +u8 mlx5_eswitch_mode (struct mlx5_core_dev *dev) { +struct mlx5_eswitch *esw = dev->priv.eswitch; +return ESW_ALLOWED (esw) ? esw->mode :MLX5_ESWITCH_NONE ; }EXPORT_SYMBOL_GPL (mlx5_eswitch_mode);
include/linux/mlx5/eswitch.h +6 -2
@@ -96,10 +96,10 @@ static inline u32 mlx5_eswitch_get_vport_metadata_mask(void)u32 mlx5_eswitch_get_vport_metadata_for_match (struct mlx5_eswitch *esw,u16 vport_num); -u8 mlx5_eswitch_mode (struct mlx5_eswitch *esw); +u8 mlx5_eswitch_mode (struct mlx5_core_dev *dev);#else /* CONFIG_MLX5_ESWITCH */ -static inline u8 mlx5_eswitch_mode (struct mlx5_eswitch *esw) +static inline u8 mlx5_eswitch_mode (struct mlx5_core_dev *dev) {return MLX5_ESWITCH_NONE ; }
@@ -136,4 +136,8 @@ mlx5_eswitch_get_vport_metadata_mask(void) }#endif /* CONFIG_MLX5_ESWITCH */ +static inline bool is_mdev_switchdev_mode (struct mlx5_core_dev *dev) +{ +return mlx5_eswitch_mode (dev) ==MLX5_ESWITCH_OFFLOADS ; +}#endif
--
2.26.2
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization