mlx5 updates 2022-07-13
Subsystems (5)
From: Saeed Mahameed <[email protected]>
This series provides misc updates to mlx5 driver.
For more information please see tag log below.
Please pull and let me know if there is any problem.
Thanks,
Saeed.
The following changes since commit 6a605eb1d71ea8cec50bdf7151c772c599a5fb70:
octeontx2-af: returning uninitialized variable (2022-07-13 14:51:34 +0100)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux.git tags/mlx5-updates-2022-07-13
for you to fetch changes up to 1a55048674379f9b093e0a6dbef586d28b55f9ae:
net/mlx5e: Remove the duplicating check for striding RQ when enabling LRO (2022-07-13 15:56:49 -0700)
----------------------------------------------------------------
mlx5-updates-2022-07-13
1) Support 802.1ad for bridge offloads
Vlad Buslov Says:
=================
Current mlx5 bridge VLAN offload implementation only supports 802.1Q VLAN Ethernet protocol. That protocol type is assumed by default and SWITCHDEV_ATTR_ID_BRIDGE_VLAN_PROTOCOL notification is ignored.
In order to support dynamically setting VLAN protocol handle SWITCHDEV_ATTR_ID_BRIDGE_VLAN_PROTOCOL notification by flushing FDB and re-creating VLAN modify header actions with a new protocol. Implement support for 802.1ad protocol by saving the current VLAN protocol to per-bridge variable and re-create the necessary flow groups according to its current value (either use cvlan or svlan flow fields).
==================
2) debugfs to count ongoing FW commands
3) debugfs to query eswitch vport firmware diagnostic counters
4) Add missing meter configuration in flow action
5) Some misc cleanup
----------------------------------------------------------------
Christophe JAILLET (1):
net/mlx5: Use the bitmap API to allocate bitmaps
Jianbo Liu (1):
net/mlx5e: configure meter in flow action
Maxim Mikityanskiy (2):
net/mlx5e: Move the LRO-XSK check to mlx5e_fix_features net/mlx5e: Remove the duplicating check for striding RQ when enabling LRO
Michael Guralnik (1):
net/mlx5: Expose vnic diagnostic counters for eswitch managed vports
Rustam Subkhankulov (1):
net/mlx5e: Removed useless code in function
Tariq Toukan (1):
net/mlx5: debugfs, Add num of in-use FW command interface slots
Vlad Buslov (6):
net/mlx5: Bridge, refactor groups sizes and indices net/mlx5: Bridge, rename filter fg to vlan_filter net/mlx5: Bridge, extract VLAN push/pop actions creation net/mlx5: Bridge, implement infrastructure for VLAN protocol change net/mlx5: Bridge, implement QinQ support
net/mlx5e: Extend flower police validation
Yishai Hadas (2):
net/mlx5: Introduce ifc bits for using software vhca id net/mlx5: Use software VHCA id when it's supported
drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 24 ++ .../ethernet/mellanox/mlx5/core/en/rep/bridge.c | 6 + .../ethernet/mellanox/mlx5/core/en/tc/act/police.c | 6 + .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 5 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 18 +- .../net/ethernet/mellanox/mlx5/core/esw/bridge.c | 408 +++++++++++++++++---- .../net/ethernet/mellanox/mlx5/core/esw/bridge.h | 6 +- .../net/ethernet/mellanox/mlx5/core/esw/debugfs.c | 182 +++++++++ drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 6 + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 5 + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 21 ++ drivers/net/ethernet/mellanox/mlx5/core/fw.c | 4 + drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c | 19 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 49 +++ drivers/net/ethernet/mellanox/mlx5/core/vport.c | 14 +- include/linux/mlx5/driver.h | 1 + include/linux/mlx5/mlx5_ifc.h | 25 +- 18 files changed, 684 insertions(+), 117 deletions(-) create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/esw/debugfs.c
PATCH 1/15 net/mlx5: Use the bitmap API to allocate bitmaps
From: Christophe JAILLET <[email protected]>
Use bitmap_zalloc()/bitmap_free() instead of hand-writing them.
It is less verbose and it improves the semantic.
--- .../net/ethernet/mellanox/mlx5/core/lib/dm.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c +8 -11
@@ -38,8 +38,7 @@ struct mlx5_dm *mlx5_dm_create(struct mlx5_core_dev *dev) MLX5_LOG_SW_ICM_BLOCK_SIZE(dev)); dm->steering_sw_icm_alloc_blocks = -kcalloc (BITS_TO_LONGS (steering_icm_blocks), -sizeof (unsigned long ),GFP_KERNEL ); +bitmap_zalloc (steering_icm_blocks,GFP_KERNEL );if (!dm->steering_sw_icm_alloc_blocks) goto err_steering; }
@@ -50,8 +49,7 @@ struct mlx5_dm *mlx5_dm_create(struct mlx5_core_dev *dev) MLX5_LOG_SW_ICM_BLOCK_SIZE(dev)); dm->header_modify_sw_icm_alloc_blocks = -kcalloc (BITS_TO_LONGS (header_modify_icm_blocks), -sizeof (unsigned long ),GFP_KERNEL ); +bitmap_zalloc (header_modify_icm_blocks,GFP_KERNEL );if (!dm->header_modify_sw_icm_alloc_blocks) goto err_modify_hdr; }
@@ -66,8 +64,7 @@ struct mlx5_dm *mlx5_dm_create(struct mlx5_core_dev *dev) MLX5_LOG_SW_ICM_BLOCK_SIZE(dev)); dm->header_modify_pattern_sw_icm_alloc_blocks = -kcalloc (BITS_TO_LONGS (header_modify_pattern_icm_blocks), -sizeof (unsigned long ),GFP_KERNEL ); +bitmap_zalloc (header_modify_pattern_icm_blocks,GFP_KERNEL );if (!dm->header_modify_pattern_sw_icm_alloc_blocks) goto err_pattern; }
@@ -75,10 +72,10 @@ struct mlx5_dm *mlx5_dm_create(struct mlx5_core_dev *dev)return dm; err_pattern: -kfree (dm->header_modify_sw_icm_alloc_blocks); +bitmap_free (dm->header_modify_sw_icm_alloc_blocks); err_modify_hdr: -kfree (dm->steering_sw_icm_alloc_blocks); +bitmap_free (dm->steering_sw_icm_alloc_blocks); err_steering:kfree (dm);
@@ -97,7 +94,7 @@ void mlx5_dm_cleanup(struct mlx5_core_dev *dev)WARN_ON (!bitmap_empty (dm->steering_sw_icm_alloc_blocks,BIT (MLX5_CAP_DEV_MEM (dev, log_steering_sw_icm_size) -MLX5_LOG_SW_ICM_BLOCK_SIZE (dev)))); -kfree (dm->steering_sw_icm_alloc_blocks); +bitmap_free (dm->steering_sw_icm_alloc_blocks); }if (dm->header_modify_sw_icm_alloc_blocks) {
@@ -105,7 +102,7 @@ void mlx5_dm_cleanup(struct mlx5_core_dev *dev)BIT (MLX5_CAP_DEV_MEM (dev, log_header_modify_sw_icm_size) - MLX5_LOG_SW_ICM_BLOCK_SIZE(dev)))); -kfree (dm->header_modify_sw_icm_alloc_blocks); +bitmap_free (dm->header_modify_sw_icm_alloc_blocks); }if (dm->header_modify_pattern_sw_icm_alloc_blocks) {
@@ -113,7 +110,7 @@ void mlx5_dm_cleanup(struct mlx5_core_dev *dev)BIT (MLX5_CAP_DEV_MEM (dev, log_header_modify_pattern_sw_icm_size) - MLX5_LOG_SW_ICM_BLOCK_SIZE(dev)))); -kfree (dm->header_modify_pattern_sw_icm_alloc_blocks); +bitmap_free (dm->header_modify_pattern_sw_icm_alloc_blocks); }kfree (dm);
Signature · 1 line
2.36.1
Re: [net-next 01/15] net/mlx5: Use the bitmap API to allocate bitmaps
This series was applied to netdev/net-next.git (master) by Saeed Mahameed <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by Saeed Mahameed <[email protected]>:
Quoted 10 lines · On Wed, 13 Jul 2022 15:58:45 -0700 you wrote:
From: Christophe JAILLET <[email protected]>
Use bitmap_zalloc()/bitmap_free() instead of hand-writing them.
It is less verbose and it improves the semantic.
Signed-off-by Christophe JAILLET <[email protected]>Signed-off-by Saeed Mahameed <[email protected]>[...]
Here is the summary with links:
- [net-next,01/15] net/mlx5: Use the bitmap API to allocate bitmaps
https://git.kernel.org/netdev/net-next/c/32ea2776a81b - [net-next,02/15] net/mlx5: Introduce ifc bits for using software vhca id https://git.kernel.org/netdev/net-next/c/0372c546eca5 - [net-next,03/15] net/mlx5: Use software VHCA id when it's supported https://git.kernel.org/netdev/net-next/c/dc402ccc0d7b - [net-next,04/15] net/mlx5: Expose vnic diagnostic counters for eswitch managed vports https://git.kernel.org/netdev/net-next/c/606e6a72e29d - [net-next,05/15] net/mlx5: debugfs, Add num of in-use FW command interface slots https://git.kernel.org/netdev/net-next/c/e723f8662de7 - [net-next,06/15] net/mlx5: Bridge, refactor groups sizes and indices https://git.kernel.org/netdev/net-next/c/55d3654c1658 - [net-next,07/15] net/mlx5: Bridge, rename filter fg to vlan_filter https://git.kernel.org/netdev/net-next/c/d4893978f9f1 - [net-next,08/15] net/mlx5: Bridge, extract VLAN push/pop actions creation https://git.kernel.org/netdev/net-next/c/5a9db8d47a49 - [net-next,09/15] net/mlx5: Bridge, implement infrastructure for VLAN protocol change https://git.kernel.org/netdev/net-next/c/c5fcac93a3c2 - [net-next,10/15] net/mlx5: Bridge, implement QinQ support https://git.kernel.org/netdev/net-next/c/9c0ca9baaa04 - [net-next,11/15] net/mlx5e: Removed useless code in function https://git.kernel.org/netdev/net-next/c/bbf0b4234bdc - [net-next,12/15] net/mlx5e: configure meter in flow action https://git.kernel.org/netdev/net-next/c/9153da4635fe - [net-next,13/15] net/mlx5e: Extend flower police validation https://git.kernel.org/netdev/net-next/c/f7434ba0abfc - [net-next,14/15] net/mlx5e: Move the LRO-XSK check to mlx5e_fix_features https://git.kernel.org/netdev/net-next/c/1c31cb922199 - [net-next,15/15] net/mlx5e: Remove the duplicating check for striding RQ when enabling LRO https://git.kernel.org/netdev/net-next/c/1a5504867437
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
PATCH 2/15 net/mlx5: Introduce ifc bits for using software vhca id
In reply to Saeed MahameedFrom: Yishai Hadas <[email protected]>
Introduce ifc related stuff to enable using software vhca id functionality.
--- include/linux/mlx5/mlx5_ifc.h | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-)
include/linux/mlx5/mlx5_ifc.h +21 -4
@@ -1826,7 +1826,14 @@ struct mlx5_ifc_cmd_hca_cap_2_bits {u8 max_reformat_remove_size[0x8 ];u8 max_reformat_remove_offset[0x8 ]; -u8 reserved_at_c0[0x740 ]; +u8 reserved_at_c0[0x160 ]; + +u8 reserved_at_220[0x1 ]; +u8 sw_vhca_id_valid[0x1 ]; +u8 sw_vhca_id[0xe ]; +u8 reserved_at_230[0x10 ]; + +u8 reserved_at_240[0x5c0 ]; };enum mlx5_ifc_flow_destination_type {
@@ -3782,6 +3789,11 @@ struct mlx5_ifc_rmpc_bits {struct mlx5_ifc_wq_bits wq; }; +enum { +VHCA_ID_TYPE_HW =0 , +VHCA_ID_TYPE_SW =1 , +}; +struct mlx5_ifc_nic_vport_context_bits {u8 reserved_at_0[0x5 ];u8 min_wqe_inline_mode[0x3 ];
@@ -3798,8 +3810,8 @@ struct mlx5_ifc_nic_vport_context_bits {u8 event_on_mc_address_change[0x1 ];u8 event_on_uc_address_change[0x1 ]; -u8 reserved_at_40[0xc ]; - +u8 vhca_id_type[0x1 ]; +u8 reserved_at_41[0xb ];u8 affiliation_criteria[0x4 ];u8 affiliated_vhca_id[0x10 ];
@@ -7259,7 +7271,12 @@ struct mlx5_ifc_init_hca_in_bits {u8 reserved_at_20[0x10 ];u8 op_mod[0x10 ]; -u8 reserved_at_40[0x40 ]; +u8 reserved_at_40[0x20 ]; + +u8 reserved_at_60[0x2 ]; +u8 sw_vhca_id[0xe ]; +u8 reserved_at_70[0x10 ]; +u8 sw_owner_id[4 ][0x20 ]; };
Signature · 1 line
2.36.1
PATCH 3/15 net/mlx5: Use software VHCA id when it's supported
In reply to Saeed MahameedFrom: Yishai Hadas <[email protected]>
Use software VHCA id when it's supported by the firmware.
A unique id is allocated upon mlx5_mdev_init() and freed upon mlx5_mdev_uninit(), as such it stays the same during the full life cycle of the device including upon health recovery if occurred.
The conjunction of sw_vhca_id with sw_owner_id will be a global unique id per function which uses mlx5_core.
The sw_vhca_id is set upon init_hca command and is used to specify the VHCA that the NIC vport is affiliated with.
This functionality is needed upon migration of VM which is MPV based. (i.e. multi port device).
--- drivers/net/ethernet/mellanox/mlx5/core/fw.c | 4 ++ .../net/ethernet/mellanox/mlx5/core/main.c | 49 +++++++++++++++++++ .../net/ethernet/mellanox/mlx5/core/vport.c | 14 ++++-- include/linux/mlx5/driver.h | 1 + 4 files changed, 65 insertions(+), 3 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/fw.c +4 -0
@@ -289,6 +289,10 @@ int mlx5_cmd_init_hca(struct mlx5_core_dev *dev, uint32_t *sw_owner_id) sw_owner_id[i]); } +if (MLX5_CAP_GEN_2_MAX (dev, sw_vhca_id_valid) && + dev->priv.sw_vhca_id >0 ) +MLX5_SET (init_hca_in, in, sw_vhca_id, dev->priv.sw_vhca_id); +return mlx5_cmd_exec_in (dev, init_hca, in); }
drivers/net/ethernet/mellanox/mlx5/core/main.c +49 -0
79 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/vport.c +11 -3
@@ -1086,9 +1086,17 @@ int mlx5_nic_vport_affiliate_multiport(struct mlx5_core_dev *master_mdev, goto free;MLX5_SET (modify_nic_vport_context_in, in, field_select.affiliation,1 ); -MLX5_SET (modify_nic_vport_context_in, in, - nic_vport_context.affiliated_vhca_id, -MLX5_CAP_GEN (master_mdev, vhca_id)); +if (MLX5_CAP_GEN_2 (master_mdev, sw_vhca_id_valid)) { +MLX5_SET (modify_nic_vport_context_in, in, + nic_vport_context.vhca_id_type,VHCA_ID_TYPE_SW ); +MLX5_SET (modify_nic_vport_context_in, in, + nic_vport_context.affiliated_vhca_id, +MLX5_CAP_GEN_2 (master_mdev, sw_vhca_id)); + }else { +MLX5_SET (modify_nic_vport_context_in, in, + nic_vport_context.affiliated_vhca_id, +MLX5_CAP_GEN (master_mdev, vhca_id)); + }MLX5_SET (modify_nic_vport_context_in, in, nic_vport_context.affiliation_criteria,MLX5_CAP_GEN (port_mdev, affiliate_nic_vport_criteria));
include/linux/mlx5/driver.h +1 -0
@@ -610,6 +610,7 @@ struct mlx5_priv {spinlock_t ctx_lock;struct mlx5_adev **adev;int adev_idx; +int sw_vhca_id;struct mlx5_events *events;struct mlx5_flow_steering *steering;
Signature · 1 line
2.36.1
PATCH 4/15 net/mlx5: Expose vnic diagnostic counters for eswitch managed vports
In reply to Saeed MahameedFrom: Michael Guralnik <[email protected]>
Expose on vport group managers debug counters for their managed vports.
Counters are exposed through debugfs, the directory will be present only for functions that are eswitch managers and only counters that are supported on their specific HW/FW will be exposed.
Example:
$ ls /sys/kernel/debug/mlx5/0000:08:00.0/esw/ pf sf_8 vf_0 vf_1
$ ls -l /sys/kernel/debug/mlx5/0000:08:00.0/esw/vf_0/vnic_diag/ cq_overrun quota_exceeded_command total_q_under_processor_handle invalid_command send_queue_priority_update_flow
List of all counter added:total_q_under_processor_handle - number of queues in error state due to an async error or errored command. send_queue_priority_update_flow - number of QP/SQ priority/SL update events.cq_overrun - number of times CQ entered an error state due to an overflow.async_eq_overrun -number of time an EQ mapped to async events was overrun.comp_eq_overrun - number of time an EQ mapped to completion events was overrun.quota_exceeded_command - number of commands issued and failed due to quota exceeded.invalid_command - number of commands issued and failed dues to any reason other than quota exceeded.
--- .../net/ethernet/mellanox/mlx5/core/Makefile | 2 +- .../ethernet/mellanox/mlx5/core/esw/debugfs.c | 182 ++++++++++++++++++ .../net/ethernet/mellanox/mlx5/core/eswitch.c | 6 + .../net/ethernet/mellanox/mlx5/core/eswitch.h | 5 + .../mellanox/mlx5/core/eswitch_offloads.c | 3 + 5 files changed, 197 insertions(+), 1 deletion(-) create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/esw/debugfs.c
drivers/net/ethernet/mellanox/mlx5/core/Makefile +1 -1
@@ -68,7 +68,7 @@ mlx5_core-$(CONFIG_MLX5_TC_SAMPLE) += en/tc/sample.o # mlx5_core-$(CONFIG_MLX5_ESWITCH) += eswitch.o eswitch_offloads.o eswitch_offloads_termtbl.o \ ecpf.o rdma.o esw/legacy.o \ - esw/devlink_port.o esw/vporttbl.o esw/qos.o + esw/debugfs.o esw/devlink_port.o esw/vporttbl.o esw/qos.o mlx5_core-$(CONFIG_MLX5_ESWITCH) += esw/acl/helper.o \ esw/acl/egress_lgcy.o esw/acl/egress_ofld.o \
drivers/net/ethernet/mellanox/mlx5/core/esw/debugfs.c new file +182 -0
182 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +6 -0
@@ -36,6 +36,7 @@#include <linux/mlx5/vport.h> #include <linux/mlx5/fs.h> #include <linux/mlx5/mpfs.h> +#include <linux/debugfs.h> #include "esw/acl/lgcy.h" #include "esw/legacy.h" #include "esw/qos.h"
@@ -1002,6 +1003,7 @@ int mlx5_eswitch_load_vport(struct mlx5_eswitch *esw, u16 vport_num,if (err)return err; +mlx5_esw_vport_debugfs_create (esw, vport_num, false,0 ); err =esw_offloads_load_rep (esw, vport_num);if (err) goto err_rep;
@@ -1009,6 +1011,7 @@ int mlx5_eswitch_load_vport(struct mlx5_eswitch *esw, u16 vport_num,return err; err_rep: +mlx5_esw_vport_debugfs_destroy (esw, vport_num);mlx5_esw_vport_disable (esw, vport_num);return err; }
@@ -1016,6 +1019,7 @@ int mlx5_eswitch_load_vport(struct mlx5_eswitch *esw, u16 vport_num,void mlx5_eswitch_unload_vport (struct mlx5_eswitch *esw,u16 vport_num) {esw_offloads_unload_rep (esw, vport_num); +mlx5_esw_vport_debugfs_destroy (esw, vport_num);mlx5_esw_vport_disable (esw, vport_num); }
@@ -1622,6 +1626,7 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev) dev->priv.eswitch = esw;BLOCKING_INIT_NOTIFIER_HEAD (&esw->n_head); + esw->dbgfs =debugfs_create_dir ("esw" ,mlx5_debugfs_get_dev_root (esw->dev)); esw_info(dev, "Total vports %d, per vport: max uc(%d) max mc(%d)\n", esw->total_vports,
@@ -1645,6 +1650,7 @@ void mlx5_eswitch_cleanup(struct mlx5_eswitch *esw)esw_info (esw->dev,"cleanup\n" ); +debugfs_remove_recursive (esw->dbgfs); esw->dev->priv.eswitch =NULL ;destroy_workqueue (esw->work_queue);WARN_ON (refcount_read (&esw->qos.refcnt));
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +5 -0
@@ -191,6 +191,7 @@ struct mlx5_vport {enum mlx5_eswitch_vport_event enabled_events;int index;struct devlink_port *dl_port; +struct dentry *dbgfs; };struct mlx5_esw_indir_table ;
@@ -336,6 +337,7 @@ struct mlx5_eswitch {u32 large_group_num; } params;struct blocking_notifier_head n_head; +struct dentry *dbgfs; };void esw_offloads_disable (struct mlx5_eswitch *esw);
@@ -684,6 +686,9 @@ int mlx5_esw_offloads_devlink_port_register(struct mlx5_eswitch *esw, u16 vport_void mlx5_esw_offloads_devlink_port_unregister (struct mlx5_eswitch *esw,u16 vport_num);struct devlink_port *mlx5_esw_offloads_devlink_port (struct mlx5_eswitch *esw,u16 vport_num); +void mlx5_esw_vport_debugfs_create (struct mlx5_eswitch *esw,u16 vport_num,bool is_sf,u16 sf_num); +void mlx5_esw_vport_debugfs_destroy (struct mlx5_eswitch *esw,u16 vport_num); +int mlx5_esw_devlink_sf_port_register (struct mlx5_eswitch *esw,struct devlink_port *dl_port,u16 vport_num,u32 controller,u32 sfnum);void mlx5_esw_devlink_sf_port_unregister (struct mlx5_eswitch *esw,u16 vport_num);
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +3 -0
@@ -3704,12 +3704,14 @@ int mlx5_esw_offloads_sf_vport_enable(struct mlx5_eswitch *esw, struct devlink_pif (err) goto devlink_err; +mlx5_esw_vport_debugfs_create (esw, vport_num, true, sfnum); err =mlx5_esw_offloads_rep_load (esw, vport_num);if (err) goto rep_err;return 0 ; rep_err: +mlx5_esw_vport_debugfs_destroy (esw, vport_num);mlx5_esw_devlink_sf_port_unregister (esw, vport_num); devlink_err:mlx5_esw_vport_disable (esw, vport_num);
@@ -3719,6 +3721,7 @@ int mlx5_esw_offloads_sf_vport_enable(struct mlx5_eswitch *esw, struct devlink_pvoid mlx5_esw_offloads_sf_vport_disable (struct mlx5_eswitch *esw,u16 vport_num) {mlx5_esw_offloads_rep_unload (esw, vport_num); +mlx5_esw_vport_debugfs_destroy (esw, vport_num);mlx5_esw_devlink_sf_port_unregister (esw, vport_num);mlx5_esw_vport_disable (esw, vport_num); }
Signature · 1 line
2.36.1
PATCH 5/15 net/mlx5: debugfs, Add num of in-use FW command interface slots
In reply to Saeed MahameedFrom: Tariq Toukan <[email protected]>
Expose the number of busy / in-use slots in the FW command interface via a read-only debugfs entry. This improves observability and helps in the performance bottleneck analysis.
--- .../net/ethernet/mellanox/mlx5/core/debugfs.c | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/debugfs.c +24 -0
@@ -166,6 +166,28 @@ static const struct file_operations stats_fops = { .write = average_write, }; +static ssize_t slots_read (struct file *filp,char __user *buf,size_t count, +loff_t *pos) +{ +struct mlx5_cmd *cmd; +char tbuf[6 ]; +int weight; +int field; +int ret; + + cmd = filp->private_data; + weight =bitmap_weight (&cmd->bitmask, cmd->max_reg_cmds); + field = cmd->max_reg_cmds - weight; + ret =snprintf (tbuf,sizeof (tbuf),"%d\n" , field); +return simple_read_from_buffer (buf, count, pos, tbuf, ret); +} + +static const struct file_operations slots_fops = { + .owner =THIS_MODULE , + .open = simple_open, + .read = slots_read, +}; +void mlx5_cmdif_debugfs_init (struct mlx5_core_dev *dev) {struct mlx5_cmd_stats *stats;
@@ -176,6 +198,8 @@ void mlx5_cmdif_debugfs_init(struct mlx5_core_dev *dev) cmd = &dev->priv.dbg.cmdif_debugfs; *cmd =debugfs_create_dir ("commands" , dev->priv.dbg.dbg_root); +debugfs_create_file ("slots_inuse" ,0400 , *cmd, &dev->cmd, &slots_fops); +for (i =0 ; i <MLX5_CMD_OP_MAX ; i++) { stats = &dev->cmd.stats[i]; namep =mlx5_command_str (i);
Signature · 1 line
2.36.1
PATCH 6/15 net/mlx5: Bridge, refactor groups sizes and indices
In reply to Saeed MahameedFrom: Vlad Buslov <[email protected]>
Following patches in the series introduce additional flow groups for QinQ support. With increased number of groups it becomes cumbersome to calculate groups sizes as fractions of the table size. Instead, manually define sizes of specific group types and ensure that totals are still correct by static assertions. Having specific table size is important for firmware resource management.
This commit doesn't change functionality.
--- .../ethernet/mellanox/mlx5/core/esw/bridge.c | 41 +++++++++++++------ 1 file changed, 29 insertions(+), 12 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c +29 -12
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB /* Copyright (c) 2021 Mellanox Technologies. */ +#include <linux/build_bug.h> #include <linux/list.h> #include <linux/notifier.h> #include <net/netevent.h>
@@ -12,26 +13,42 @@#define CREATE_TRACE_POINTS #include "diag/bridge_tracepoint.h" -#define MLX5_ESW_BRIDGE_INGRESS_TABLE_SIZE 64000 +#define MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_SIZE 16000 +#define MLX5_ESW_BRIDGE_INGRESS_TABLE_UNTAGGED_GRP_SIZE 32000#define MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_IDX_FROM 0 -#define MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_IDX_TO (MLX5_ESW_BRIDGE_INGRESS_TABLE_SIZE / 4 - 1) -#define MLX5_ESW_BRIDGE_INGRESS_TABLE_FILTER_GRP_IDX_FROM \ +#define MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_IDX_TO \ + (MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_SIZE - 1) +#define MLX5_ESW_BRIDGE_INGRESS_TABLE_FILTER_GRP_IDX_FROM \ (MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_IDX_TO + 1) -#define MLX5_ESW_BRIDGE_INGRESS_TABLE_FILTER_GRP_IDX_TO \ - (MLX5_ESW_BRIDGE_INGRESS_TABLE_SIZE / 2 - 1) -#define MLX5_ESW_BRIDGE_INGRESS_TABLE_MAC_GRP_IDX_FROM \ +#define MLX5_ESW_BRIDGE_INGRESS_TABLE_FILTER_GRP_IDX_TO \ + (MLX5_ESW_BRIDGE_INGRESS_TABLE_FILTER_GRP_IDX_FROM + \ + MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_SIZE - 1) +#define MLX5_ESW_BRIDGE_INGRESS_TABLE_MAC_GRP_IDX_FROM \ (MLX5_ESW_BRIDGE_INGRESS_TABLE_FILTER_GRP_IDX_TO + 1) -#define MLX5_ESW_BRIDGE_INGRESS_TABLE_MAC_GRP_IDX_TO (MLX5_ESW_BRIDGE_INGRESS_TABLE_SIZE - 1) - -#define MLX5_ESW_BRIDGE_EGRESS_TABLE_SIZE 64000 +#define MLX5_ESW_BRIDGE_INGRESS_TABLE_MAC_GRP_IDX_TO \ + (MLX5_ESW_BRIDGE_INGRESS_TABLE_MAC_GRP_IDX_FROM + \ + MLX5_ESW_BRIDGE_INGRESS_TABLE_UNTAGGED_GRP_SIZE - 1) +#define MLX5_ESW_BRIDGE_INGRESS_TABLE_SIZE \ + (MLX5_ESW_BRIDGE_INGRESS_TABLE_MAC_GRP_IDX_TO + 1) +static_assert (MLX5_ESW_BRIDGE_INGRESS_TABLE_SIZE ==64000 ); + +#define MLX5_ESW_BRIDGE_EGRESS_TABLE_VLAN_GRP_SIZE 32000 +#define MLX5_ESW_BRIDGE_EGRESS_TABLE_MAC_GRP_SIZE (32000 - 1)#define MLX5_ESW_BRIDGE_EGRESS_TABLE_VLAN_GRP_IDX_FROM 0 -#define MLX5_ESW_BRIDGE_EGRESS_TABLE_VLAN_GRP_IDX_TO (MLX5_ESW_BRIDGE_EGRESS_TABLE_SIZE / 2 - 1) +#define MLX5_ESW_BRIDGE_EGRESS_TABLE_VLAN_GRP_IDX_TO \ + (MLX5_ESW_BRIDGE_EGRESS_TABLE_VLAN_GRP_SIZE - 1)#define MLX5_ESW_BRIDGE_EGRESS_TABLE_MAC_GRP_IDX_FROM \ (MLX5_ESW_BRIDGE_EGRESS_TABLE_VLAN_GRP_IDX_TO + 1) -#define MLX5_ESW_BRIDGE_EGRESS_TABLE_MAC_GRP_IDX_TO (MLX5_ESW_BRIDGE_EGRESS_TABLE_SIZE - 2) +#define MLX5_ESW_BRIDGE_EGRESS_TABLE_MAC_GRP_IDX_TO \ + (MLX5_ESW_BRIDGE_EGRESS_TABLE_MAC_GRP_IDX_FROM + \ + MLX5_ESW_BRIDGE_EGRESS_TABLE_MAC_GRP_SIZE - 1)#define MLX5_ESW_BRIDGE_EGRESS_TABLE_MISS_GRP_IDX_FROM \ (MLX5_ESW_BRIDGE_EGRESS_TABLE_MAC_GRP_IDX_TO + 1) -#define MLX5_ESW_BRIDGE_EGRESS_TABLE_MISS_GRP_IDX_TO (MLX5_ESW_BRIDGE_EGRESS_TABLE_SIZE - 1) +#define MLX5_ESW_BRIDGE_EGRESS_TABLE_MISS_GRP_IDX_TO \ + MLX5_ESW_BRIDGE_EGRESS_TABLE_MISS_GRP_IDX_FROM +#define MLX5_ESW_BRIDGE_EGRESS_TABLE_SIZE \ + (MLX5_ESW_BRIDGE_EGRESS_TABLE_MISS_GRP_IDX_TO + 1) +static_assert (MLX5_ESW_BRIDGE_EGRESS_TABLE_SIZE ==64000 );#define MLX5_ESW_BRIDGE_SKIP_TABLE_SIZE 0
Signature · 1 line
2.36.1
PATCH 7/15 net/mlx5: Bridge, rename filter fg to vlan_filter
In reply to Saeed MahameedFrom: Vlad Buslov <[email protected]>
Following patches in series introduce new qinq filtering group. To improve readability rename the existing group in function, variable and definition names to include "vlan" in order to make it easy to distinguish from upcoming qinq group.
--- .../ethernet/mellanox/mlx5/core/esw/bridge.c | 38 +++++++++---------- .../ethernet/mellanox/mlx5/core/esw/bridge.h | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c +19 -19
@@ -18,13 +18,13 @@#define MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_IDX_FROM 0#define MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_IDX_TO \ (MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_SIZE - 1) -#define MLX5_ESW_BRIDGE_INGRESS_TABLE_FILTER_GRP_IDX_FROM \ +#define MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_FILTER_GRP_IDX_FROM \ (MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_IDX_TO + 1) -#define MLX5_ESW_BRIDGE_INGRESS_TABLE_FILTER_GRP_IDX_TO \ - (MLX5_ESW_BRIDGE_INGRESS_TABLE_FILTER_GRP_IDX_FROM + \ +#define MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_FILTER_GRP_IDX_TO \ + (MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_FILTER_GRP_IDX_FROM + \ MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_SIZE - 1) -#define MLX5_ESW_BRIDGE_INGRESS_TABLE_MAC_GRP_IDX_FROM \ - (MLX5_ESW_BRIDGE_INGRESS_TABLE_FILTER_GRP_IDX_TO + 1) +#define MLX5_ESW_BRIDGE_INGRESS_TABLE_MAC_GRP_IDX_FROM \ + (MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_FILTER_GRP_IDX_TO + 1)#define MLX5_ESW_BRIDGE_INGRESS_TABLE_MAC_GRP_IDX_TO \ (MLX5_ESW_BRIDGE_INGRESS_TABLE_MAC_GRP_IDX_FROM + \ MLX5_ESW_BRIDGE_INGRESS_TABLE_UNTAGGED_GRP_SIZE - 1)
@@ -193,8 +193,8 @@ mlx5_esw_bridge_ingress_vlan_fg_create(struct mlx5_eswitch *esw, struct mlx5_flo }static struct mlx5_flow_group * -mlx5_esw_bridge_ingress_filter_fg_create (struct mlx5_eswitch *esw, -struct mlx5_flow_table *ingress_ft) +mlx5_esw_bridge_ingress_vlan_filter_fg_create (struct mlx5_eswitch *esw, +struct mlx5_flow_table *ingress_ft) {int inlen =MLX5_ST_SZ_BYTES (create_flow_group_in);struct mlx5_flow_group *fg;
@@ -216,9 +216,9 @@ mlx5_esw_bridge_ingress_filter_fg_create(struct mlx5_eswitch *esw, mlx5_eswitch_get_vport_metadata_mask());MLX5_SET (create_flow_group_in, in, start_flow_index, -MLX5_ESW_BRIDGE_INGRESS_TABLE_FILTER_GRP_IDX_FROM ); +MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_FILTER_GRP_IDX_FROM );MLX5_SET (create_flow_group_in, in, end_flow_index, -MLX5_ESW_BRIDGE_INGRESS_TABLE_FILTER_GRP_IDX_TO ); +MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_FILTER_GRP_IDX_TO ); fg =mlx5_create_flow_group (ingress_ft, in);if (IS_ERR (fg))
@@ -363,7 +363,7 @@ mlx5_esw_bridge_egress_miss_fg_create(struct mlx5_eswitch *esw, struct mlx5_flowstatic int mlx5_esw_bridge_ingress_table_init (struct mlx5_esw_bridge_offloads *br_offloads) { -struct mlx5_flow_group *mac_fg, *filter_fg, *vlan_fg; +struct mlx5_flow_group *mac_fg, *vlan_filter_fg, *vlan_fg;struct mlx5_flow_table *ingress_ft, *skip_ft;struct mlx5_eswitch *esw = br_offloads->esw;int err;
@@ -391,10 +391,10 @@ mlx5_esw_bridge_ingress_table_init(struct mlx5_esw_bridge_offloads *br_offloads) goto err_vlan_fg; } - filter_fg =mlx5_esw_bridge_ingress_filter_fg_create (esw, ingress_ft); -if (IS_ERR (filter_fg)) { - err =PTR_ERR (filter_fg); - goto err_filter_fg; + vlan_filter_fg =mlx5_esw_bridge_ingress_vlan_filter_fg_create (esw, ingress_ft); +if (IS_ERR (vlan_filter_fg)) { + err =PTR_ERR (vlan_filter_fg); + goto err_vlan_filter_fg; } mac_fg =mlx5_esw_bridge_ingress_mac_fg_create (esw, ingress_ft);
@@ -406,13 +406,13 @@ mlx5_esw_bridge_ingress_table_init(struct mlx5_esw_bridge_offloads *br_offloads) br_offloads->ingress_ft = ingress_ft; br_offloads->skip_ft = skip_ft; br_offloads->ingress_vlan_fg = vlan_fg; - br_offloads->ingress_filter_fg = filter_fg; + br_offloads->ingress_vlan_filter_fg = vlan_filter_fg; br_offloads->ingress_mac_fg = mac_fg;return 0 ; err_mac_fg: -mlx5_destroy_flow_group (filter_fg); -err_filter_fg: +mlx5_destroy_flow_group (vlan_filter_fg); +err_vlan_filter_fg:mlx5_destroy_flow_group (vlan_fg); err_vlan_fg:mlx5_destroy_flow_table (skip_ft);
@@ -426,8 +426,8 @@ mlx5_esw_bridge_ingress_table_cleanup(struct mlx5_esw_bridge_offloads *br_offloa {mlx5_destroy_flow_group (br_offloads->ingress_mac_fg); br_offloads->ingress_mac_fg =NULL ; -mlx5_destroy_flow_group (br_offloads->ingress_filter_fg); - br_offloads->ingress_filter_fg =NULL ; +mlx5_destroy_flow_group (br_offloads->ingress_vlan_filter_fg); + br_offloads->ingress_vlan_filter_fg =NULL ;mlx5_destroy_flow_group (br_offloads->ingress_vlan_fg); br_offloads->ingress_vlan_fg =NULL ;mlx5_destroy_flow_table (br_offloads->skip_ft);
drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.h +1 -1
@@ -26,7 +26,7 @@ struct mlx5_esw_bridge_offloads {struct mlx5_flow_table *ingress_ft;struct mlx5_flow_group *ingress_vlan_fg; -struct mlx5_flow_group *ingress_filter_fg; +struct mlx5_flow_group *ingress_vlan_filter_fg;struct mlx5_flow_group *ingress_mac_fg;struct mlx5_flow_table *skip_ft;
Signature · 1 line
2.36.1
PATCH 8/15 net/mlx5: Bridge, extract VLAN push/pop actions creation
In reply to Saeed MahameedFrom: Vlad Buslov <[email protected]>
Following patches in series need to re-create VLAN actions when user changes VLAN protocol. Extract the code that creates VLAN push/pop actions into dedicated function in order to be reused in next patch.
--- .../ethernet/mellanox/mlx5/core/esw/bridge.c | 52 +++++++++++++------ 1 file changed, 36 insertions(+), 16 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c +36 -16
@@ -1025,36 +1025,58 @@ mlx5_esw_bridge_vlan_push_mark_cleanup(struct mlx5_esw_bridge_vlan *vlan, struct vlan->pkt_mod_hdr_push_mark =NULL ; } -static struct mlx5_esw_bridge_vlan * -mlx5_esw_bridge_vlan_create (u16 vid,u16 flags,struct mlx5_esw_bridge_port *port, -struct mlx5_eswitch *esw) +static int +mlx5_esw_bridge_vlan_push_pop_create (u16 flags,struct mlx5_esw_bridge_vlan *vlan, +struct mlx5_eswitch *esw) { -struct mlx5_esw_bridge_vlan *vlan;int err; - vlan =kvzalloc (sizeof (*vlan),GFP_KERNEL ); -if (!vlan) -return ERR_PTR (-ENOMEM ); - - vlan->vid = vid; - vlan->flags = flags; -INIT_LIST_HEAD (&vlan->fdb_list); -if (flags &BRIDGE_VLAN_INFO_PVID ) { err =mlx5_esw_bridge_vlan_push_create (vlan, esw);if (err) - goto err_vlan_push; +return err; err =mlx5_esw_bridge_vlan_push_mark_create (vlan, esw);if (err) goto err_vlan_push_mark; } +if (flags &BRIDGE_VLAN_INFO_UNTAGGED ) { err =mlx5_esw_bridge_vlan_pop_create (vlan, esw);if (err) goto err_vlan_pop; } +return 0 ; + +err_vlan_pop: +if (vlan->pkt_mod_hdr_push_mark) +mlx5_esw_bridge_vlan_push_mark_cleanup (vlan, esw); +err_vlan_push_mark: +if (vlan->pkt_reformat_push) +mlx5_esw_bridge_vlan_push_cleanup (vlan, esw); +return err; +} + +static struct mlx5_esw_bridge_vlan * +mlx5_esw_bridge_vlan_create (u16 vid,u16 flags,struct mlx5_esw_bridge_port *port, +struct mlx5_eswitch *esw) +{ +struct mlx5_esw_bridge_vlan *vlan; +int err; + + vlan =kvzalloc (sizeof (*vlan),GFP_KERNEL ); +if (!vlan) +return ERR_PTR (-ENOMEM ); + + vlan->vid = vid; + vlan->flags = flags; +INIT_LIST_HEAD (&vlan->fdb_list); + + err =mlx5_esw_bridge_vlan_push_pop_create (flags, vlan, esw); +if (err) + goto err_vlan_push_pop; + err =xa_insert (&port->vlans, vid, vlan,GFP_KERNEL );if (err) goto err_xa_insert;
@@ -1065,13 +1087,11 @@ mlx5_esw_bridge_vlan_create(u16 vid, u16 flags, struct mlx5_esw_bridge_port *por err_xa_insert:if (vlan->pkt_reformat_pop)mlx5_esw_bridge_vlan_pop_cleanup (vlan, esw); -err_vlan_pop:if (vlan->pkt_mod_hdr_push_mark)mlx5_esw_bridge_vlan_push_mark_cleanup (vlan, esw); -err_vlan_push_mark:if (vlan->pkt_reformat_push)mlx5_esw_bridge_vlan_push_cleanup (vlan, esw); -err_vlan_push: +err_vlan_push_pop:kvfree (vlan);return ERR_PTR (err); }
Signature · 1 line
2.36.1
PATCH 9/15 net/mlx5: Bridge, implement infrastructure for VLAN protocol change
In reply to Saeed MahameedFrom: Vlad Buslov <[email protected]>
Current implementation only supports 802.1Q VLAN Ethernet protocol. That protocol type is assumed by default and SWITCHDEV_ATTR_ID_BRIDGE_VLAN_PROTOCOL notification is ignored. To prepare for supporting 802.1ad protocol in following patches implement the necessary infrastructure to allow the user to dynamically change the VLAN protocol:
- Handle SWITCHDEV_ATTR_ID_BRIDGE_VLAN_PROTOCOL notification by flushing FDB and re-creating VLAN modify header actions with new protocol. In this patch the only allowed dynamic VLAN protocol value is ETH_P_8021Q.
- Save current VLAN protocol in per-bridge instance variable. Use the dynamic variable instead of hardcoded values in mlx5 bridge code. Create VLAN flow groups and flows based on current mlx5_esw_bridge->vlan_proto value instead of assuming 802.1Q ethertype.
- Extract common flow group creation code into dedicated functions in order to be reused for creating QinQ groups in following patches.
--- .../mellanox/mlx5/core/en/rep/bridge.c | 6 + .../ethernet/mellanox/mlx5/core/esw/bridge.c | 194 ++++++++++++++---- .../ethernet/mellanox/mlx5/core/esw/bridge.h | 2 + 3 files changed, 160 insertions(+), 42 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en/rep/bridge.c +6 -0
@@ -269,6 +269,12 @@ mlx5_esw_bridge_port_obj_attr_set(struct net_device *dev, err =mlx5_esw_bridge_vlan_filtering_set (vport_num, esw_owner_vhca_id, attr->u.vlan_filtering, br_offloads);break ; +case SWITCHDEV_ATTR_ID_BRIDGE_VLAN_PROTOCOL : + err =mlx5_esw_bridge_vlan_proto_set (vport_num, + esw_owner_vhca_id, + attr->u.vlan_protocol, + br_offloads); +break ;default : err = -EOPNOTSUPP ; }
drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c +152 -42
341 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.h +2 -0
@@ -60,6 +60,8 @@ int mlx5_esw_bridge_ageing_time_set(u16 vport_num, u16 esw_owner_vhca_id, unsign struct mlx5_esw_bridge_offloads *br_offloads);int mlx5_esw_bridge_vlan_filtering_set (u16 vport_num,u16 esw_owner_vhca_id,bool enable,struct mlx5_esw_bridge_offloads *br_offloads); +int mlx5_esw_bridge_vlan_proto_set (u16 vport_num,u16 esw_owner_vhca_id,u16 proto, +struct mlx5_esw_bridge_offloads *br_offloads);int mlx5_esw_bridge_port_vlan_add (u16 vport_num,u16 esw_owner_vhca_id,u16 vid,u16 flags,struct mlx5_esw_bridge_offloads *br_offloads,struct netlink_ext_ack *extack);
Signature · 1 line
2.36.1
PATCH 10/15 net/mlx5: Bridge, implement QinQ support
In reply to Saeed MahameedFrom: Vlad Buslov <[email protected]>
Implement support for new 802.1ad VLAN protocol type. Create new flow groups that handle svlan tags. Create FDB flows with svlan tag match when bridge VLAN is set to QinQ.
--- .../ethernet/mellanox/mlx5/core/esw/bridge.c | 117 ++++++++++++++++-- .../ethernet/mellanox/mlx5/core/esw/bridge.h | 2 + 2 files changed, 111 insertions(+), 8 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c +109 -8
@@ -13,8 +13,8 @@#define CREATE_TRACE_POINTS #include "diag/bridge_tracepoint.h" -#define MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_SIZE 16000 -#define MLX5_ESW_BRIDGE_INGRESS_TABLE_UNTAGGED_GRP_SIZE 32000 +#define MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_SIZE 12000 +#define MLX5_ESW_BRIDGE_INGRESS_TABLE_UNTAGGED_GRP_SIZE 16000#define MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_IDX_FROM 0#define MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_IDX_TO \ (MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_SIZE - 1)
@@ -23,8 +23,18 @@#define MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_FILTER_GRP_IDX_TO \ (MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_FILTER_GRP_IDX_FROM + \ MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_SIZE - 1) -#define MLX5_ESW_BRIDGE_INGRESS_TABLE_MAC_GRP_IDX_FROM \ +#define MLX5_ESW_BRIDGE_INGRESS_TABLE_QINQ_GRP_IDX_FROM \ (MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_FILTER_GRP_IDX_TO + 1) +#define MLX5_ESW_BRIDGE_INGRESS_TABLE_QINQ_GRP_IDX_TO \ + (MLX5_ESW_BRIDGE_INGRESS_TABLE_QINQ_GRP_IDX_FROM + \ + MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_SIZE - 1) +#define MLX5_ESW_BRIDGE_INGRESS_TABLE_QINQ_FILTER_GRP_IDX_FROM \ + (MLX5_ESW_BRIDGE_INGRESS_TABLE_QINQ_GRP_IDX_TO + 1) +#define MLX5_ESW_BRIDGE_INGRESS_TABLE_QINQ_FILTER_GRP_IDX_TO \ + (MLX5_ESW_BRIDGE_INGRESS_TABLE_QINQ_FILTER_GRP_IDX_FROM + \ + MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_SIZE - 1) +#define MLX5_ESW_BRIDGE_INGRESS_TABLE_MAC_GRP_IDX_FROM \ + (MLX5_ESW_BRIDGE_INGRESS_TABLE_QINQ_FILTER_GRP_IDX_TO + 1)#define MLX5_ESW_BRIDGE_INGRESS_TABLE_MAC_GRP_IDX_TO \ (MLX5_ESW_BRIDGE_INGRESS_TABLE_MAC_GRP_IDX_FROM + \ MLX5_ESW_BRIDGE_INGRESS_TABLE_UNTAGGED_GRP_SIZE - 1)
@@ -32,13 +42,18 @@ (MLX5_ESW_BRIDGE_INGRESS_TABLE_MAC_GRP_IDX_TO + 1)static_assert (MLX5_ESW_BRIDGE_INGRESS_TABLE_SIZE ==64000 ); -#define MLX5_ESW_BRIDGE_EGRESS_TABLE_VLAN_GRP_SIZE 32000 +#define MLX5_ESW_BRIDGE_EGRESS_TABLE_VLAN_GRP_SIZE 16000#define MLX5_ESW_BRIDGE_EGRESS_TABLE_MAC_GRP_SIZE (32000 - 1)#define MLX5_ESW_BRIDGE_EGRESS_TABLE_VLAN_GRP_IDX_FROM 0#define MLX5_ESW_BRIDGE_EGRESS_TABLE_VLAN_GRP_IDX_TO \ (MLX5_ESW_BRIDGE_EGRESS_TABLE_VLAN_GRP_SIZE - 1) -#define MLX5_ESW_BRIDGE_EGRESS_TABLE_MAC_GRP_IDX_FROM \ +#define MLX5_ESW_BRIDGE_EGRESS_TABLE_QINQ_GRP_IDX_FROM \ (MLX5_ESW_BRIDGE_EGRESS_TABLE_VLAN_GRP_IDX_TO + 1) +#define MLX5_ESW_BRIDGE_EGRESS_TABLE_QINQ_GRP_IDX_TO \ + (MLX5_ESW_BRIDGE_EGRESS_TABLE_QINQ_GRP_IDX_FROM + \ + MLX5_ESW_BRIDGE_EGRESS_TABLE_VLAN_GRP_SIZE - 1) +#define MLX5_ESW_BRIDGE_EGRESS_TABLE_MAC_GRP_IDX_FROM \ + (MLX5_ESW_BRIDGE_EGRESS_TABLE_QINQ_GRP_IDX_TO + 1)#define MLX5_ESW_BRIDGE_EGRESS_TABLE_MAC_GRP_IDX_TO \ (MLX5_ESW_BRIDGE_EGRESS_TABLE_MAC_GRP_IDX_FROM + \ MLX5_ESW_BRIDGE_EGRESS_TABLE_MAC_GRP_SIZE - 1)
@@ -80,6 +95,7 @@ struct mlx5_esw_bridge {struct mlx5_flow_table *egress_ft;struct mlx5_flow_group *egress_vlan_fg; +struct mlx5_flow_group *egress_qinq_fg;struct mlx5_flow_group *egress_mac_fg;struct mlx5_flow_group *egress_miss_fg;struct mlx5_pkt_reformat *egress_miss_pkt_reformat;
@@ -176,6 +192,8 @@ mlx5_esw_bridge_ingress_vlan_proto_fg_create(unsigned int from, unsigned int to,MLX5_SET_TO_ONES (fte_match_param, match, outer_headers.smac_15_0);if (vlan_proto ==ETH_P_8021Q )MLX5_SET_TO_ONES (fte_match_param, match, outer_headers.cvlan_tag); +else if (vlan_proto ==ETH_P_8021AD ) +MLX5_SET_TO_ONES (fte_match_param, match, outer_headers.svlan_tag);MLX5_SET_TO_ONES (fte_match_param, match, outer_headers.first_vid); MLX5_SET(fte_match_param, match, misc_parameters_2.metadata_reg_c_0,
@@ -204,6 +222,17 @@ mlx5_esw_bridge_ingress_vlan_fg_create(struct mlx5_eswitch *esw,return mlx5_esw_bridge_ingress_vlan_proto_fg_create (from, to,ETH_P_8021Q , esw, ingress_ft); } +static struct mlx5_flow_group * +mlx5_esw_bridge_ingress_qinq_fg_create (struct mlx5_eswitch *esw, +struct mlx5_flow_table *ingress_ft) +{ +unsigned int from =MLX5_ESW_BRIDGE_INGRESS_TABLE_QINQ_GRP_IDX_FROM ; +unsigned int to =MLX5_ESW_BRIDGE_INGRESS_TABLE_QINQ_GRP_IDX_TO ; + +return mlx5_esw_bridge_ingress_vlan_proto_fg_create (from, to,ETH_P_8021AD , esw, + ingress_ft); +} +static struct mlx5_flow_group * mlx5_esw_bridge_ingress_vlan_proto_filter_fg_create(unsigned int from, unsigned int to, u16 vlan_proto, struct mlx5_eswitch *esw,
@@ -225,6 +254,8 @@ mlx5_esw_bridge_ingress_vlan_proto_filter_fg_create(unsigned int from, unsignedMLX5_SET_TO_ONES (fte_match_param, match, outer_headers.smac_15_0);if (vlan_proto ==ETH_P_8021Q )MLX5_SET_TO_ONES (fte_match_param, match, outer_headers.cvlan_tag); +else if (vlan_proto ==ETH_P_8021AD ) +MLX5_SET_TO_ONES (fte_match_param, match, outer_headers.svlan_tag);MLX5_SET (fte_match_param, match, misc_parameters_2.metadata_reg_c_0,mlx5_eswitch_get_vport_metadata_mask ());
@@ -251,6 +282,17 @@ mlx5_esw_bridge_ingress_vlan_filter_fg_create(struct mlx5_eswitch *esw, ingress_ft); } +static struct mlx5_flow_group * +mlx5_esw_bridge_ingress_qinq_filter_fg_create (struct mlx5_eswitch *esw, +struct mlx5_flow_table *ingress_ft) +{ +unsigned int from =MLX5_ESW_BRIDGE_INGRESS_TABLE_QINQ_FILTER_GRP_IDX_FROM ; +unsigned int to =MLX5_ESW_BRIDGE_INGRESS_TABLE_QINQ_FILTER_GRP_IDX_TO ; + +return mlx5_esw_bridge_ingress_vlan_proto_filter_fg_create (from, to,ETH_P_8021AD , esw, + ingress_ft); +} +static struct mlx5_flow_group *mlx5_esw_bridge_ingress_mac_fg_create (struct mlx5_eswitch *esw,struct mlx5_flow_table *ingress_ft) {
@@ -307,6 +349,8 @@ mlx5_esw_bridge_egress_vlan_proto_fg_create(unsigned int from, unsigned int to,MLX5_SET_TO_ONES (fte_match_param, match, outer_headers.dmac_15_0);if (vlan_proto ==ETH_P_8021Q )MLX5_SET_TO_ONES (fte_match_param, match, outer_headers.cvlan_tag); +else if (vlan_proto ==ETH_P_8021AD ) +MLX5_SET_TO_ONES (fte_match_param, match, outer_headers.svlan_tag);MLX5_SET_TO_ONES (fte_match_param, match, outer_headers.first_vid);MLX5_SET (create_flow_group_in, in, start_flow_index, from);
@@ -330,6 +374,16 @@ mlx5_esw_bridge_egress_vlan_fg_create(struct mlx5_eswitch *esw, struct mlx5_flowreturn mlx5_esw_bridge_egress_vlan_proto_fg_create (from, to,ETH_P_8021Q , esw, egress_ft); } +static struct mlx5_flow_group * +mlx5_esw_bridge_egress_qinq_fg_create (struct mlx5_eswitch *esw, +struct mlx5_flow_table *egress_ft) +{ +unsigned int from =MLX5_ESW_BRIDGE_EGRESS_TABLE_QINQ_GRP_IDX_FROM ; +unsigned int to =MLX5_ESW_BRIDGE_EGRESS_TABLE_QINQ_GRP_IDX_TO ; + +return mlx5_esw_bridge_egress_vlan_proto_fg_create (from, to,ETH_P_8021AD , esw, egress_ft); +} +static struct mlx5_flow_group *mlx5_esw_bridge_egress_mac_fg_create (struct mlx5_eswitch *esw,struct mlx5_flow_table *egress_ft) {
@@ -394,7 +448,7 @@ mlx5_esw_bridge_egress_miss_fg_create(struct mlx5_eswitch *esw, struct mlx5_flowstatic int mlx5_esw_bridge_ingress_table_init (struct mlx5_esw_bridge_offloads *br_offloads) { -struct mlx5_flow_group *mac_fg, *vlan_filter_fg, *vlan_fg; +struct mlx5_flow_group *mac_fg, *qinq_filter_fg, *qinq_fg, *vlan_filter_fg, *vlan_fg;struct mlx5_flow_table *ingress_ft, *skip_ft;struct mlx5_eswitch *esw = br_offloads->esw;int err;
@@ -428,6 +482,18 @@ mlx5_esw_bridge_ingress_table_init(struct mlx5_esw_bridge_offloads *br_offloads) goto err_vlan_filter_fg; } + qinq_fg =mlx5_esw_bridge_ingress_qinq_fg_create (esw, ingress_ft); +if (IS_ERR (qinq_fg)) { + err =PTR_ERR (qinq_fg); + goto err_qinq_fg; + } + + qinq_filter_fg =mlx5_esw_bridge_ingress_qinq_filter_fg_create (esw, ingress_ft); +if (IS_ERR (qinq_filter_fg)) { + err =PTR_ERR (qinq_filter_fg); + goto err_qinq_filter_fg; + } + mac_fg =mlx5_esw_bridge_ingress_mac_fg_create (esw, ingress_ft);if (IS_ERR (mac_fg)) { err =PTR_ERR (mac_fg);
@@ -438,10 +504,16 @@ mlx5_esw_bridge_ingress_table_init(struct mlx5_esw_bridge_offloads *br_offloads) br_offloads->skip_ft = skip_ft; br_offloads->ingress_vlan_fg = vlan_fg; br_offloads->ingress_vlan_filter_fg = vlan_filter_fg; + br_offloads->ingress_qinq_fg = qinq_fg; + br_offloads->ingress_qinq_filter_fg = qinq_filter_fg; br_offloads->ingress_mac_fg = mac_fg;return 0 ; err_mac_fg: +mlx5_destroy_flow_group (qinq_filter_fg); +err_qinq_filter_fg: +mlx5_destroy_flow_group (qinq_fg); +err_qinq_fg:mlx5_destroy_flow_group (vlan_filter_fg); err_vlan_filter_fg:mlx5_destroy_flow_group (vlan_fg);
@@ -457,6 +529,10 @@ mlx5_esw_bridge_ingress_table_cleanup(struct mlx5_esw_bridge_offloads *br_offloa {mlx5_destroy_flow_group (br_offloads->ingress_mac_fg); br_offloads->ingress_mac_fg =NULL ; +mlx5_destroy_flow_group (br_offloads->ingress_qinq_filter_fg); + br_offloads->ingress_qinq_filter_fg =NULL ; +mlx5_destroy_flow_group (br_offloads->ingress_qinq_fg); + br_offloads->ingress_qinq_fg =NULL ;mlx5_destroy_flow_group (br_offloads->ingress_vlan_filter_fg); br_offloads->ingress_vlan_filter_fg =NULL ;mlx5_destroy_flow_group (br_offloads->ingress_vlan_fg);
@@ -476,7 +552,7 @@ static int mlx5_esw_bridge_egress_table_init(struct mlx5_esw_bridge_offloads *br_offloads, struct mlx5_esw_bridge *bridge) { - struct mlx5_flow_group *miss_fg = NULL, *mac_fg, *vlan_fg; + struct mlx5_flow_group *miss_fg = NULL, *mac_fg, *vlan_fg, *qinq_fg;struct mlx5_pkt_reformat *miss_pkt_reformat =NULL ;struct mlx5_flow_handle *miss_handle =NULL ;struct mlx5_eswitch *esw = br_offloads->esw;
@@ -495,6 +571,12 @@ mlx5_esw_bridge_egress_table_init(struct mlx5_esw_bridge_offloads *br_offloads, goto err_vlan_fg; } + qinq_fg =mlx5_esw_bridge_egress_qinq_fg_create (esw, egress_ft); +if (IS_ERR (qinq_fg)) { + err =PTR_ERR (qinq_fg); + goto err_qinq_fg; + } + mac_fg =mlx5_esw_bridge_egress_mac_fg_create (esw, egress_ft);if (IS_ERR (mac_fg)) { err =PTR_ERR (mac_fg);
@@ -539,6 +621,7 @@ mlx5_esw_bridge_egress_table_init(struct mlx5_esw_bridge_offloads *br_offloads, bridge->egress_ft = egress_ft; bridge->egress_vlan_fg = vlan_fg; + bridge->egress_qinq_fg = qinq_fg; bridge->egress_mac_fg = mac_fg; bridge->egress_miss_fg = miss_fg; bridge->egress_miss_pkt_reformat = miss_pkt_reformat;
@@ -546,6 +629,8 @@ mlx5_esw_bridge_egress_table_init(struct mlx5_esw_bridge_offloads *br_offloads,return 0 ; err_mac_fg: +mlx5_destroy_flow_group (qinq_fg); +err_qinq_fg:mlx5_destroy_flow_group (vlan_fg); err_vlan_fg:mlx5_destroy_flow_table (egress_ft);
@@ -563,6 +648,7 @@ mlx5_esw_bridge_egress_table_cleanup(struct mlx5_esw_bridge *bridge)if (bridge->egress_miss_fg)mlx5_destroy_flow_group (bridge->egress_miss_fg);mlx5_destroy_flow_group (bridge->egress_mac_fg); +mlx5_destroy_flow_group (bridge->egress_qinq_fg);mlx5_destroy_flow_group (bridge->egress_vlan_fg);mlx5_destroy_flow_table (bridge->egress_ft); }
@@ -612,6 +698,11 @@ mlx5_esw_bridge_ingress_flow_with_esw_create(u16 vport_num, const unsigned char outer_headers.cvlan_tag);MLX5_SET_TO_ONES (fte_match_param, rule_spec->match_value, outer_headers.cvlan_tag); + }else if (bridge->vlan_proto ==ETH_P_8021AD ) { +MLX5_SET_TO_ONES (fte_match_param, rule_spec->match_criteria, + outer_headers.svlan_tag); +MLX5_SET_TO_ONES (fte_match_param, rule_spec->match_value, + outer_headers.svlan_tag); }MLX5_SET_TO_ONES (fte_match_param, rule_spec->match_criteria, outer_headers.first_vid);
@@ -700,6 +791,11 @@ mlx5_esw_bridge_ingress_filter_flow_create(u16 vport_num, const unsigned char *a outer_headers.cvlan_tag);MLX5_SET_TO_ONES (fte_match_param, rule_spec->match_value, outer_headers.cvlan_tag); + }else if (bridge->vlan_proto ==ETH_P_8021AD ) { +MLX5_SET_TO_ONES (fte_match_param, rule_spec->match_criteria, + outer_headers.svlan_tag); +MLX5_SET_TO_ONES (fte_match_param, rule_spec->match_value, + outer_headers.svlan_tag); } handle =mlx5_add_flow_rules (br_offloads->ingress_ft, rule_spec, &flow_act, &dest,1 );
@@ -753,6 +849,11 @@ mlx5_esw_bridge_egress_flow_create(u16 vport_num, u16 esw_owner_vhca_id, const u outer_headers.cvlan_tag);MLX5_SET_TO_ONES (fte_match_param, rule_spec->match_value, outer_headers.cvlan_tag); + }else if (bridge->vlan_proto ==ETH_P_8021AD ) { +MLX5_SET_TO_ONES (fte_match_param, rule_spec->match_criteria, + outer_headers.svlan_tag); +MLX5_SET_TO_ONES (fte_match_param, rule_spec->match_value, + outer_headers.svlan_tag); }MLX5_SET_TO_ONES (fte_match_param, rule_spec->match_criteria, outer_headers.first_vid);
@@ -1421,7 +1522,7 @@ int mlx5_esw_bridge_vlan_proto_set(u16 vport_num, u16 esw_owner_vhca_id, u16 pro bridge = port->bridge;if (bridge->vlan_proto == proto)return 0 ; -if (proto !=ETH_P_8021Q ) { +if (proto !=ETH_P_8021Q && proto !=ETH_P_8021AD ) {esw_warn (br_offloads->esw->dev,"Can't set unsupported VLAN protocol %x" , proto);return -EOPNOTSUPP ; }
drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.h +2 -0
@@ -27,6 +27,8 @@ struct mlx5_esw_bridge_offloads {struct mlx5_flow_table *ingress_ft;struct mlx5_flow_group *ingress_vlan_fg;struct mlx5_flow_group *ingress_vlan_filter_fg; +struct mlx5_flow_group *ingress_qinq_fg; +struct mlx5_flow_group *ingress_qinq_filter_fg;struct mlx5_flow_group *ingress_mac_fg;struct mlx5_flow_table *skip_ft;
Signature · 1 line
2.36.1
PATCH 11/15 net/mlx5e: Removed useless code in function
In reply to Saeed MahameedFrom: Rustam Subkhankulov <[email protected]>
Comparison of eth_ft->ft with NULL is useless, because get_flow_table() returns either pointer 'eth_ft' such that eth_ft->ft != NULL, or an erroneous value that is handled on return, causing mlx5e_ethtool_flow_replace() to terminate before checking whether eth_ft->ft equals NULL.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c +1 -4
@@ -742,10 +742,7 @@ mlx5e_ethtool_flow_replace(struct mlx5e_priv *priv, eth_rule->flow_spec = *fs; eth_rule->eth_ft = eth_ft; -if (!eth_ft->ft) { - err = -EINVAL ; - goto del_ethtool_rule; - } + rule =add_ethtool_flow_rule (priv, eth_rule, eth_ft->ft, fs, rss_context);if (IS_ERR (rule)) { err =PTR_ERR (rule);
Signature · 1 line
2.36.1
PATCH 12/15 net/mlx5e: configure meter in flow action
In reply to Saeed MahameedFrom: Jianbo Liu <[email protected]>
After police action is parsed, set meter data in flow action, so they can be used when adding FTE.
--- .../mellanox/mlx5/core/eswitch_offloads.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +18 -0
@@ -512,6 +512,20 @@ esw_cleanup_dests(struct mlx5_eswitch *esw, } } +static void +esw_setup_meter (struct mlx5_flow_attr *attr,struct mlx5_flow_act *flow_act) +{ +struct mlx5e_flow_meter_handle *meter; + + meter = attr->meter_attr.meter; + flow_act->exe_aso.type = attr->exe_aso_type; + flow_act->exe_aso.object_id = meter->obj_id; + flow_act->exe_aso.flow_meter.meter_idx = meter->idx; + flow_act->exe_aso.flow_meter.init_color =MLX5_FLOW_METER_COLOR_GREEN ; +/* use metadata reg 5 for packet color */ + flow_act->exe_aso.return_reg_id =5 ; +} +struct mlx5_flow_handle * mlx5_eswitch_add_offloaded_rule(struct mlx5_eswitch *esw, struct mlx5_flow_spec *spec,
@@ -579,6 +593,10 @@ mlx5_eswitch_add_offloaded_rule(struct mlx5_eswitch *esw,if (flow_act.action &MLX5_FLOW_CONTEXT_ACTION_MOD_HDR ) flow_act.modify_hdr = attr->modify_hdr; +if ((flow_act.action &MLX5_FLOW_CONTEXT_ACTION_EXECUTE_ASO ) && + attr->exe_aso_type ==MLX5_EXE_ASO_FLOW_METER ) +esw_setup_meter (attr, &flow_act); +if (split) { fwd_attr.chain = attr->chain; fwd_attr.prio = attr->prio;
Signature · 1 line
2.36.1
PATCH 13/15 net/mlx5e: Extend flower police validation
In reply to Saeed MahameedFrom: Vlad Buslov <[email protected]>
Recent net commit 4d1e07d83ccc ("net/mlx5e: Fix matchall police parameters validation") removed notexceed action id validation from mlx5e_police_validate() and left it up to callers. However, since tc_act_can_offload_police() only exists in net-next its validation is extended in this dedicated followup patch.
--- drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/police.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/police.c +6 -0
@@ -10,6 +10,12 @@ tc_act_can_offload_police(struct mlx5e_tc_act_parse_state *parse_state, int act_index, struct mlx5_flow_attr *attr) { +if (act->police.notexceed.act_id !=FLOW_ACTION_PIPE && + act->police.notexceed.act_id !=FLOW_ACTION_ACCEPT ) { +NL_SET_ERR_MSG_MOD (parse_state->extack, +"Offload not supported when conform action is not pipe or ok" ); +return false; + }if (mlx5e_policer_validate (parse_state->flow_action, act, parse_state->extack))return false;
Signature · 1 line
2.36.1
PATCH 14/15 net/mlx5e: Move the LRO-XSK check to mlx5e_fix_features
In reply to Saeed MahameedFrom: Maxim Mikityanskiy <[email protected]>
LRO is mutually exclusive with XSK. When LRO is enabled, it checks whether XSK is active. This commit moves this check to a more correct place at mlx5e_fix_features.
--- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +5 -7
@@ -3594,13 +3594,6 @@ static int set_feature_lro(struct net_device *netdev, bool enable)mutex_lock (&priv->state_lock); -if (enable && priv->xsk.refcnt) { -netdev_warn (netdev,"LRO is incompatible with AF_XDP (%u XSKs are active)\n" , - priv->xsk.refcnt); - err = -EINVAL ; - goto out; - } - cur_params = &priv->channels.params;if (enable && !MLX5E_GET_PFLAG (cur_params,MLX5E_PFLAG_RX_STRIDING_RQ )) {netdev_warn (netdev,"can't set LRO with legacy RQ\n" );
@@ -3916,6 +3909,11 @@ static netdev_features_t mlx5e_fix_features(struct net_device *netdev, }if (priv->xsk.refcnt) { +if (features &NETIF_F_LRO ) { +netdev_warn (netdev,"LRO is incompatible with AF_XDP (%u XSKs are active)\n" , + priv->xsk.refcnt); + features &= ~NETIF_F_LRO ; + }if (features &NETIF_F_GRO_HW ) {netdev_warn (netdev,"HW GRO is incompatible with AF_XDP (%u XSKs are active)\n" , priv->xsk.refcnt);
Signature · 1 line
2.36.1
PATCH 15/15 net/mlx5e: Remove the duplicating check for striding RQ when enabling LRO
In reply to Saeed MahameedFrom: Maxim Mikityanskiy <[email protected]>
LRO requires striding RQ and checks that it's enabled at two places:mlx5e_fix_features and set_feature_lro. This commit keeps only one check at mlx5e_fix_features and removes the duplicating one in set_feature_lro.
--- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +0 -6
@@ -3595,12 +3595,6 @@ static int set_feature_lro(struct net_device *netdev, bool enable)mutex_lock (&priv->state_lock); cur_params = &priv->channels.params; -if (enable && !MLX5E_GET_PFLAG (cur_params,MLX5E_PFLAG_RX_STRIDING_RQ )) { -netdev_warn (netdev,"can't set LRO with legacy RQ\n" ); - err = -EINVAL ; - goto out; - } - new_params = *cur_params;if (enable)
Signature · 1 line
2.36.1