mlx5 updates 2023-06-21
Subsystems (6)
From: Saeed Mahameed <[email protected]>
v1->v2:
- Correct Fixes tag for patch #11
This series provides minor cleanups and bug fixes for net-next branch.
Please pull and let me know if there is any problem.
Thanks,
Saeed.
The following changes since commit faaa5fd30344f9a7b3816ae7a6b58ccd5a34998f:
dt-bindings: net: altr,tse: Fix error in "compatible" conditional schema (2023-06-23 12:49:11 +0200)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux.git tags/mlx5-updates-2023-06-21
for you to fetch changes up to 29e4c95faee52a9b7a4f1293cb92cd17a0b5fd91:
net/mlx5: Remove pointless vport lookup from mlx5_esw_check_port_type() (2023-06-23 12:27:35 -0700)
----------------------------------------------------------------
mlx5-updates-2023-06-21
mlx5 driver minor cleanup and fixes to net-next
----------------------------------------------------------------
Dan Carpenter (1):
net/mlx5: Fix error code in mlx5_is_reset_now_capable()
Jiri Pirko (4):
net/mlx5: Remove redundant MLX5_ESWITCH_MANAGER() check from is_ib_rep_supported() net/mlx5: Remove redundant is_mdev_switchdev_mode() check from is_ib_rep_supported() net/mlx5: Remove redundant check from mlx5_esw_query_vport_vhca_id() net/mlx5: Remove pointless vport lookup from mlx5_esw_check_port_type()
Lama Kayal (1):
net/mlx5: Fix reserved at offset in hca_cap register
Roi Dayan (7):
net/mlx5: Lag, Remove duplicate code checking lag is supported net/mlx5e: Use vhca_id for device index in vport rx rules net/mlx5e: E-Switch, Add peer fdb miss rules for vport manager or ecpf net/mlx5e: E-Switch, Use xarray for devcom paired device index net/mlx5e: E-Switch, Pass other_vport flag if vport is not 0 net/mlx5e: Remove redundant comment
net/mlx5e: E-Switch, Fix shared fdb error flow
Shay Drory (2):
net/mlx5: Fix UAF in mlx5_eswitch_cleanup() net/mlx5: Fix SFs kernel documentation error
.../ethernet/mellanox/mlx5/switchdev.rst | 22 ++++---- drivers/net/ethernet/mellanox/mlx5/core/dev.c | 6 --- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 6 +-- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 24 +++------ drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 2 +- .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 61 ++++++++++++++++------ drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 15 ++++-- drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h | 10 +--- include/linux/mlx5/mlx5_ifc.h | 4 +- 10 files changed, 84 insertions(+), 68 deletions(-)
PATCH v2 1/15 net/mlx5: Fix UAF in mlx5_eswitch_cleanup()
From: Shay Drory <[email protected]>
mlx5_eswitch_cleanup() is using esw right after freeing it for releasing devlink_param.
Fix it by releasing the devlink_param before freeing the esw, and adjust the create function accordingly.
--- .../net/ethernet/mellanox/mlx5/core/eswitch.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +8 -10
@@ -1751,16 +1751,14 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev)if (!MLX5_VPORT_MANAGER (dev) && !MLX5_ESWITCH_MANAGER (dev))return 0 ; + esw =kzalloc (sizeof (*esw),GFP_KERNEL ); +if (!esw) +return -ENOMEM ; + err =devl_params_register (priv_to_devlink (dev), mlx5_eswitch_params,ARRAY_SIZE (mlx5_eswitch_params));if (err) -return err; - - esw =kzalloc (sizeof (*esw),GFP_KERNEL ); -if (!esw) { - err = -ENOMEM ; - goto unregister_param; - } + goto free_esw; esw->dev = dev; esw->manager_vport =mlx5_eswitch_manager_vport (dev);
@@ -1821,10 +1819,10 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev)if (esw->work_queue)destroy_workqueue (esw->work_queue);debugfs_remove_recursive (esw->debugfs_root); -kfree (esw); -unregister_param:devl_params_unregister (priv_to_devlink (dev), mlx5_eswitch_params,ARRAY_SIZE (mlx5_eswitch_params)); +free_esw: +kfree (esw);return err; }
@@ -1848,9 +1846,9 @@ void mlx5_eswitch_cleanup(struct mlx5_eswitch *esw)esw_offloads_cleanup (esw);mlx5_esw_vports_cleanup (esw);debugfs_remove_recursive (esw->debugfs_root); -kfree (esw);devl_params_unregister (priv_to_devlink (esw->dev), mlx5_eswitch_params,ARRAY_SIZE (mlx5_eswitch_params)); +kfree (esw); }/* Vport Administration */
Signature · 1 line
2.41.0
PATCH v2 2/15 net/mlx5: Fix SFs kernel documentation error
In reply to Saeed MahameedFrom: Shay Drory <[email protected]>
Indent SFs probe code example in order to fix the below error:
Documentation/networking/device_drivers/ethernet/mellanox/mlx5/switchdev.rst:57: ERROR: Unexpected indentation. Documentation/networking/device_drivers/ethernet/mellanox/mlx5/switchdev.rst:61: ERROR: Unexpected indentation.
--- .../ethernet/mellanox/mlx5/switchdev.rst | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-)
Documentation/networking/device_drivers/ethernet/mellanox/mlx5/switchdev.rst +12 -10
@@ -51,19 +51,21 @@ This will allow user to configure the SF before the SF have been fully probed, which will save time. Usage example: -Create SF: -$ devlink port add pci/0000:08:00.0 flavour pcisf pfnum 0 sfnum 11 -$ devlink port function set pci/0000:08:00.0/32768 \ - hw_addr 00:00:00:00:00:11 state active -Enable ETH auxiliary device: -$ devlink dev param set auxiliary/mlx5_core.sf.1 \ - name enable_eth value true cmode driverinit +- Create SF:: -Now, in order to fully probe the SF, use devlink reload: -$ devlink dev reload auxiliary/mlx5_core.sf.1 + $ devlink port add pci/0000:08:00.0 flavour pcisf pfnum 0 sfnum 11 + $ devlink port function set pci/0000:08:00.0/32768 hw_addr 00:00:00:00:00:11 state active -mlx5 supports ETH,rdma and vdpa (vnet) auxiliary devices devlink params (see :ref:`Documentation/networking/devlink/devlink-params.rst`) +- Enable ETH auxiliary device:: + + $ devlink dev param set auxiliary/mlx5_core.sf.1 name enable_eth value true cmode driverinit + +- Now, in order to fully probe the SF, use devlink reload:: + + $ devlink dev reload auxiliary/mlx5_core.sf.1 + +mlx5 supports ETH,rdma and vdpa (vnet) auxiliary devices devlink params (see :ref:`Documentation/networking/devlink/devlink-params.rst <devlink_params_generic>`). mlx5 supports subfunction management using devlink port (see :ref:`Documentation/networking/devlink/devlink-port.rst <devlink_port>`) interface.
Signature · 1 line
2.41.0
PATCH v2 3/15 net/mlx5: Fix reserved at offset in hca_cap register
In reply to Saeed MahameedFrom: Lama Kayal <[email protected]>
A member of struct mlx5_ifc_cmd_hca_cap_bits has been mistakenly assigned the wrong reserved_at offset value. Correct it to align to the right value, thus avoid future miscalculation.
--- include/linux/mlx5/mlx5_ifc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/mlx5/mlx5_ifc.h +2 -2
@@ -1710,9 +1710,9 @@ struct mlx5_ifc_cmd_hca_cap_bits {u8 regexp_params[0x1 ];u8 uar_sz[0x6 ];u8 port_selection_cap[0x1 ]; -u8 reserved_at_248[0x1 ]; +u8 reserved_at_251[0x1 ];u8 umem_uid_0[0x1 ]; -u8 reserved_at_250[0x5 ]; +u8 reserved_at_253[0x5 ];u8 log_pg_sz[0x8 ];u8 bf[0x1 ];
Signature · 1 line
2.41.0
PATCH v2 4/15 net/mlx5: Fix error code in mlx5_is_reset_now_capable()
In reply to Saeed MahameedFrom: Dan Carpenter <[email protected]>
The mlx5_is_reset_now_capable() function returns bool, not negative error codes. So if fast teardown is not supported it should return false instead of -EOPNOTSUPP.
--- drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c +1 -1
@@ -327,7 +327,7 @@ static bool mlx5_is_reset_now_capable(struct mlx5_core_dev *dev)if (!MLX5_CAP_GEN (dev, fast_teardown)) {mlx5_core_warn (dev,"fast teardown is not supported by firmware\n" ); -return -EOPNOTSUPP ; +return false; } err =pci_read_config_word (dev->pdev,PCI_DEVICE_ID , &dev_id);
Signature · 1 line
2.41.0
PATCH v2 5/15 net/mlx5: Lag, Remove duplicate code checking lag is supported
In reply to Saeed MahameedFrom: Roi Dayan <[email protected]>
Remove duplicate function for checking if device has lag support.
--- .../mellanox/mlx5/core/eswitch_offloads.c | 4 ++-- drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 15 +++++++++++---- drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h | 10 +--------- 3 files changed, 14 insertions(+), 15 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +2 -2
@@ -2868,7 +2868,7 @@ void mlx5_esw_offloads_devcom_init(struct mlx5_eswitch *esw)if (!MLX5_CAP_ESW (esw->dev, merged_eswitch))return ; -if (!mlx5_is_lag_supported (esw->dev)) +if (!mlx5_lag_is_supported (esw->dev))return ; mlx5_devcom_register_component(devcom,
@@ -2890,7 +2890,7 @@ void mlx5_esw_offloads_devcom_cleanup(struct mlx5_eswitch *esw)if (!MLX5_CAP_ESW (esw->dev, merged_eswitch))return ; -if (!mlx5_is_lag_supported (esw->dev)) +if (!mlx5_lag_is_supported (esw->dev))return ; mlx5_devcom_send_event(devcom, MLX5_DEVCOM_ESW_OFFLOADS,
drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c +11 -4
@@ -1268,14 +1268,21 @@ void mlx5_lag_remove_mdev(struct mlx5_core_dev *dev)mlx5_ldev_put (ldev); } +bool mlx5_lag_is_supported (struct mlx5_core_dev *dev) +{ +if (!MLX5_CAP_GEN (dev, vport_group_manager) || + !MLX5_CAP_GEN (dev, lag_master) || +MLX5_CAP_GEN (dev, num_lag_ports) <2 || +MLX5_CAP_GEN (dev, num_lag_ports) >MLX5_MAX_PORTS ) +return false; +return true; +} +void mlx5_lag_add_mdev (struct mlx5_core_dev *dev) {int err; -if (!MLX5_CAP_GEN (dev, vport_group_manager) || - !MLX5_CAP_GEN (dev, lag_master) || - (MLX5_CAP_GEN (dev, num_lag_ports) >MLX5_MAX_PORTS || -MLX5_CAP_GEN (dev, num_lag_ports) <=1 )) +if (!mlx5_lag_is_supported (dev))return ; recheck:
drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h +1 -9
@@ -74,15 +74,7 @@ struct mlx5_lag {struct lag_mpesw lag_mpesw; }; -static inline bool mlx5_is_lag_supported (struct mlx5_core_dev *dev) -{ -if (!MLX5_CAP_GEN (dev, vport_group_manager) || - !MLX5_CAP_GEN (dev, lag_master) || -MLX5_CAP_GEN (dev, num_lag_ports) <2 || -MLX5_CAP_GEN (dev, num_lag_ports) >MLX5_MAX_PORTS ) -return false; -return true; -} +bool mlx5_lag_is_supported (struct mlx5_core_dev *dev);static inline struct mlx5_lag *mlx5_lag_dev (struct mlx5_core_dev *dev)
Signature · 1 line
2.41.0
PATCH v2 6/15 net/mlx5e: Use vhca_id for device index in vport rx rules
In reply to Saeed MahameedFrom: Roi Dayan <[email protected]>
Device index is like PF index and limited to max physical ports. For example, SFs created under PF the device index is the PF device index. Use vhca_id which gets the FW index per vport, for vport rx rules and vport pair events.
--- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +3 -3
@@ -408,7 +408,7 @@ static int mlx5e_sqs2vport_add_peers_rules(struct mlx5_eswitch *esw, struct mlx5mlx5_devcom_for_each_peer_entry (devcom,MLX5_DEVCOM_ESW_OFFLOADS , peer_esw, tmp) { -int peer_rule_idx =mlx5_get_dev_index (peer_esw->dev); +u16 peer_rule_idx =MLX5_CAP_GEN (peer_esw->dev, vhca_id);struct mlx5e_rep_sq_peer *sq_peer;int err;
@@ -1581,7 +1581,7 @@ static void *mlx5e_vport_rep_get_proto_dev(struct mlx5_eswitch_rep *rep)static void mlx5e_vport_rep_event_unpair (struct mlx5_eswitch_rep *rep,struct mlx5_eswitch *peer_esw) { -int i =mlx5_get_dev_index (peer_esw->dev); +u16 i =MLX5_CAP_GEN (peer_esw->dev, vhca_id);struct mlx5e_rep_priv *rpriv;struct mlx5e_rep_sq *rep_sq;
@@ -1603,7 +1603,7 @@ static int mlx5e_vport_rep_event_pair(struct mlx5_eswitch *esw,struct mlx5_eswitch_rep *rep, struct mlx5_eswitch *peer_esw) { - int i = mlx5_get_dev_index(peer_esw->dev); + u16 i = MLX5_CAP_GEN(peer_esw->dev, vhca_id);struct mlx5_flow_handle *flow_rule;struct mlx5e_rep_sq_peer *sq_peer;struct mlx5e_rep_priv *rpriv;
Signature · 1 line
2.41.0
PATCH v2 7/15 net/mlx5e: E-Switch, Add peer fdb miss rules for vport manager or ecpf
In reply to Saeed MahameedFrom: Roi Dayan <[email protected]>
Add peer fdb rules for E-Switch that are vport managers or ecpf device. It is not needed for other devices.
--- .../net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +9 -1
@@ -1069,6 +1069,9 @@ static int esw_add_fdb_peer_miss_rules(struct mlx5_eswitch *esw,void *misc;int err; +if (!MLX5_VPORT_MANAGER (esw->dev) && !mlx5_core_is_ecpf_esw_manager (esw->dev)) +return 0 ; + spec =kvzalloc (sizeof (*spec),GFP_KERNEL );if (!spec)return -ENOMEM ;
@@ -1177,11 +1180,14 @@ static int esw_add_fdb_peer_miss_rules(struct mlx5_eswitch *esw,static void esw_del_fdb_peer_miss_rules (struct mlx5_eswitch *esw,struct mlx5_core_dev *peer_dev) { +u16 peer_index =mlx5_get_dev_index (peer_dev);struct mlx5_flow_handle **flows;struct mlx5_vport *vport;unsigned long i; - flows = esw->fdb_table.offloads.peer_miss_rules[mlx5_get_dev_index (peer_dev)]; + flows = esw->fdb_table.offloads.peer_miss_rules[peer_index]; +if (!flows) +return ;if (mlx5_core_ec_sriov_enabled (esw->dev)) {mlx5_esw_for_each_ec_vf_vport (esw, i, vport,mlx5_core_max_ec_vfs (esw->dev)) {
@@ -1206,7 +1212,9 @@ static void esw_del_fdb_peer_miss_rules(struct mlx5_eswitch *esw, vport =mlx5_eswitch_get_vport (esw,MLX5_VPORT_PF );mlx5_del_flow_rules (flows[vport->index]); } +kvfree (flows); + esw->fdb_table.offloads.peer_miss_rules[peer_index] =NULL ; }static int esw_add_fdb_miss_rule (struct mlx5_eswitch *esw)
Signature · 1 line
2.41.0
PATCH v2 8/15 net/mlx5e: E-Switch, Use xarray for devcom paired device index
In reply to Saeed MahameedFrom: Roi Dayan <[email protected]>
To allow devcom events on E-Switch that is not a vport group manager, use vhca id as an index instead of device index which might be shared between several E-Switches. for example SF and its PF.
--- .../net/ethernet/mellanox/mlx5/core/eswitch.h | 2 +- .../mellanox/mlx5/core/eswitch_offloads.c | 30 +++++++++++++++---- 2 files changed, 25 insertions(+), 7 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +1 -1
@@ -353,7 +353,7 @@ struct mlx5_eswitch {u32 large_group_num; } params;struct blocking_notifier_head n_head; -bool paired[MLX5_MAX_PORTS ]; +struct xarray paired; };void esw_offloads_disable (struct mlx5_eswitch *esw);
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +24 -6
@@ -2807,15 +2807,21 @@ static int mlx5_esw_offloads_devcom_event(int event,struct mlx5_eswitch *esw = my_data;struct mlx5_devcom *devcom = esw->dev->priv.devcom;struct mlx5_eswitch *peer_esw = event_data; +u16 esw_i, peer_esw_i; +bool esw_paired;int err; + peer_esw_i =MLX5_CAP_GEN (peer_esw->dev, vhca_id); + esw_i =MLX5_CAP_GEN (esw->dev, vhca_id); + esw_paired = !!xa_load (&esw->paired, peer_esw_i); +switch (event) {case ESW_OFFLOADS_DEVCOM_PAIR :if (mlx5_eswitch_vport_match_metadata_enabled (esw) !=mlx5_eswitch_vport_match_metadata_enabled (peer_esw))break ; -if (esw->paired[mlx5_get_dev_index (peer_esw->dev)]) +if (esw_paired)break ; err =mlx5_esw_offloads_set_ns_peer (esw, peer_esw, true);
@@ -2829,23 +2835,29 @@ static int mlx5_esw_offloads_devcom_event(int event,if (err) goto err_pair; - esw->paired[mlx5_get_dev_index (peer_esw->dev)] = true; - peer_esw->paired[mlx5_get_dev_index (esw->dev)] = true; + err =xa_insert (&esw->paired, peer_esw_i, peer_esw,GFP_KERNEL ); +if (err) + goto err_xa; + + err =xa_insert (&peer_esw->paired, esw_i, esw,GFP_KERNEL ); +if (err) + goto err_peer_xa; + esw->num_peers++; peer_esw->num_peers++;mlx5_devcom_comp_set_ready (devcom,MLX5_DEVCOM_ESW_OFFLOADS , true);break ;case ESW_OFFLOADS_DEVCOM_UNPAIR : -if (!esw->paired[mlx5_get_dev_index (peer_esw->dev)]) +if (!esw_paired)break ; peer_esw->num_peers--; esw->num_peers--;if (!esw->num_peers && !peer_esw->num_peers)mlx5_devcom_comp_set_ready (devcom,MLX5_DEVCOM_ESW_OFFLOADS , false); - esw->paired[mlx5_get_dev_index (peer_esw->dev)] = false; - peer_esw->paired[mlx5_get_dev_index (esw->dev)] = false; +xa_erase (&peer_esw->paired, esw_i); +xa_erase (&esw->paired, peer_esw_i);mlx5_esw_offloads_unpair (peer_esw, esw);mlx5_esw_offloads_unpair (esw, peer_esw);mlx5_esw_offloads_set_ns_peer (esw, peer_esw, false);
@@ -2854,6 +2866,10 @@ static int mlx5_esw_offloads_devcom_event(int event,return 0 ; +err_peer_xa: +xa_erase (&esw->paired, peer_esw_i); +err_xa: +mlx5_esw_offloads_unpair (peer_esw, esw); err_pair:mlx5_esw_offloads_unpair (esw, peer_esw); err_peer:
@@ -2879,6 +2895,7 @@ void mlx5_esw_offloads_devcom_init(struct mlx5_eswitch *esw)if (!mlx5_lag_is_supported (esw->dev))return ; +xa_init (&esw->paired); mlx5_devcom_register_component(devcom, MLX5_DEVCOM_ESW_OFFLOADS, mlx5_esw_offloads_devcom_event,
@@ -2906,6 +2923,7 @@ void mlx5_esw_offloads_devcom_cleanup(struct mlx5_eswitch *esw) ESW_OFFLOADS_DEVCOM_UNPAIR, esw);mlx5_devcom_unregister_component (devcom,MLX5_DEVCOM_ESW_OFFLOADS ); +xa_destroy (&esw->paired); }bool mlx5_esw_vport_match_metadata_supported (const struct mlx5_eswitch *esw)
Signature · 1 line
2.41.0
PATCH v2 9/15 net/mlx5e: E-Switch, Pass other_vport flag if vport is not 0
In reply to Saeed MahameedFrom: Roi Dayan <[email protected]>
When creating flow table for shared fdb resources, there is only need to pass other_vport flag if vport is not 0 or if the port is ECPF in BlueField.
--- .../net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +6 -3
@@ -2551,13 +2551,13 @@ static int __esw_set_master_egress_rule(struct mlx5_core_dev *master,return err; } -static int esw_master_egress_create_resources (struct mlx5_flow_namespace *egress_ns, +static int esw_master_egress_create_resources (struct mlx5_eswitch *esw, +struct mlx5_flow_namespace *egress_ns,struct mlx5_vport *vport,size_t count) {int inlen =MLX5_ST_SZ_BYTES (create_flow_group_in);struct mlx5_flow_table_attr ft_attr = { .max_fte = count, .prio =0 , .level =0 , - .flags =MLX5_FLOW_TABLE_OTHER_VPORT , };struct mlx5_flow_table *acl;struct mlx5_flow_group *g;
@@ -2572,6 +2572,9 @@ static int esw_master_egress_create_resources(struct mlx5_flow_namespace *egressif (!flow_group_in)return -ENOMEM ; +if (vport->vport ||mlx5_core_is_ecpf (esw->dev)) + ft_attr.flags =MLX5_FLOW_TABLE_OTHER_VPORT ; + acl =mlx5_create_vport_flow_table (egress_ns, &ft_attr, vport->vport);if (IS_ERR (acl)) { err =PTR_ERR (acl);
@@ -2642,7 +2645,7 @@ static int esw_set_master_egress_rule(struct mlx5_core_dev *master,if (vport->egress.acl && vport->egress.type !=VPORT_EGRESS_ACL_TYPE_SHARED_FDB )return 0 ; - err =esw_master_egress_create_resources (egress_ns, vport, count); + err =esw_master_egress_create_resources (esw, egress_ns, vport, count);if (err)return err;
Signature · 1 line
2.41.0
PATCH v2 10/15 net/mlx5e: Remove redundant comment
In reply to Saeed MahameedFrom: Roi Dayan <[email protected]>
The function comment says what it is and the comment is redundant.
--- drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +0 -1
@@ -1904,7 +1904,6 @@ static int esw_create_vport_rx_group(struct mlx5_eswitch *esw)if (!flow_group_in)return -ENOMEM ; -/* create vport rx group */ mlx5_esw_set_flow_group_source_port (esw, flow_group_in,0 );MLX5_SET (create_flow_group_in, flow_group_in, start_flow_index,0 );
Signature · 1 line
2.41.0
PATCH v2 11/15 net/mlx5e: E-Switch, Fix shared fdb error flow
In reply to Saeed MahameedFrom: Roi Dayan <[email protected]>
On error flow resources being freed in esw_master_egress_destroy_resources() but pointers not being set to null if error flow is from creating a bounce rule. Then in esw_acl_egress_ofld_cleanup() we try to access already freed pointers. Fix it by resetting the pointers to null.
Also if error is from creating a second or later bounce rule then the flow group and table being used and cannot and should not be freed. Add a check to destroy the flow group and table if there are no bounce rules.
mlx5_core.sf mlx5_core.sf.2: mlx5_destroy_flow_group:2306:(pid 2235): Flow group 4 wasn't destroyed, refcount > 1 mlx5_core.sf mlx5_core.sf.2: mlx5_destroy_flow_table:2295:(pid 2235): Flow table 3 wasn't destroyed, refcount > 1
--- drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +4 -0
@@ -2618,8 +2618,12 @@ static int esw_master_egress_create_resources(struct mlx5_eswitch *esw,static void esw_master_egress_destroy_resources (struct mlx5_vport *vport) { +if (!xa_empty (&vport->egress.offloads.bounce_rules)) +return ;mlx5_destroy_flow_group (vport->egress.offloads.bounce_grp); + vport->egress.offloads.bounce_grp =NULL ;mlx5_destroy_flow_table (vport->egress.acl); + vport->egress.acl =NULL ; } static int esw_set_master_egress_rule(struct mlx5_core_dev *master,
Signature · 1 line
2.41.0
PATCH v2 12/15 net/mlx5: Remove redundant MLX5_ESWITCH_MANAGER() check from is_ib_rep_supported()
In reply to Saeed MahameedFrom: Jiri Pirko <[email protected]>
MLX5_ESWITCH_MANAGER() check is done in is_eth_rep_supported(). Function is_ib_rep_supported() calls is_eth_rep_supported(). Remove the redundant check from it.
--- drivers/net/ethernet/mellanox/mlx5/core/dev.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/dev.c +0 -3
@@ -151,9 +151,6 @@ static bool is_ib_rep_supported(struct mlx5_core_dev *dev)if (!is_eth_rep_supported (dev))return false; -if (!MLX5_ESWITCH_MANAGER (dev)) -return false; -if (!is_mdev_switchdev_mode (dev))return false;
Signature · 1 line
2.41.0
PATCH v2 13/15 net/mlx5: Remove redundant is_mdev_switchdev_mode() check from is_ib_rep_supported()
In reply to Saeed MahameedFrom: Jiri Pirko <[email protected]>
is_mdev_switchdev_mode() check is done in is_eth_rep_supported(). Function is_ib_rep_supported() calls is_eth_rep_supported(). Remove the redundant check from it.
--- drivers/net/ethernet/mellanox/mlx5/core/dev.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/dev.c +0 -3
@@ -151,9 +151,6 @@ static bool is_ib_rep_supported(struct mlx5_core_dev *dev)if (!is_eth_rep_supported (dev))return false; -if (!is_mdev_switchdev_mode (dev)) -return false; -if (mlx5_core_mp_enabled (dev))return false;
Signature · 1 line
2.41.0
PATCH v2 14/15 net/mlx5: Remove redundant check from mlx5_esw_query_vport_vhca_id()
In reply to Saeed MahameedFrom: Jiri Pirko <[email protected]>
Since mlx5_esw_query_vport_vhca_id() could be called either from mlx5_esw_vport_enable() or mlx5_esw_vport_disable() where the the check is done, this is always false here.
Remove the redundant check.
--- drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +0 -3
@@ -3961,9 +3961,6 @@ static int mlx5_esw_query_vport_vhca_id(struct mlx5_eswitch *esw, u16 vport_num,int err; *vhca_id =0 ; -if (mlx5_esw_is_manager_vport (esw, vport_num) || - !MLX5_CAP_GEN (esw->dev, vhca_resource_manager)) -return -EPERM ; query_ctx =kzalloc (query_out_sz,GFP_KERNEL );if (!query_ctx)
Signature · 1 line
2.41.0
PATCH v2 15/15 net/mlx5: Remove pointless vport lookup from mlx5_esw_check_port_type()
In reply to Saeed MahameedFrom: Jiri Pirko <[email protected]>
As xa_get_mark() returns false in case the entry is not present, no need to redundantly check if vport is present. Remove the lookup.
--- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +0 -6
@@ -1908,12 +1908,6 @@ int mlx5_eswitch_set_vport_mac(struct mlx5_eswitch *esw,static bool mlx5_esw_check_port_type (struct mlx5_eswitch *esw,u16 vport_num,xa_mark_t mark) { -struct mlx5_vport *vport; - - vport =mlx5_eswitch_get_vport (esw, vport_num); -if (IS_ERR (vport)) -return false; -return xa_get_mark (&esw->vports, vport_num, mark); }
Signature · 1 line
2.41.0
Re: [net-next V2 01/15] net/mlx5: Fix UAF in mlx5_eswitch_cleanup()
In reply to Saeed MahameedThis series was applied to netdev/net-next.git (main) by Saeed Mahameed <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Saeed Mahameed <[email protected]>:
Quoted 8 lines · On Fri, 23 Jun 2023 12:28:53 -0700 you wrote:
From: Shay Drory <[email protected]>
mlx5_eswitch_cleanup()is using esw right after freeing it for releasingdevlink_param.
Fix it by releasing thedevlink_parambefore freeing the esw, and adjust the create function accordingly.[...]
Here is the summary with links:
- [net-next,V2,01/15] net/mlx5: Fix UAF in mlx5_eswitch_cleanup()
https://git.kernel.org/netdev/net-next/c/da744fd1362c - [net-next,V2,02/15] net/mlx5: Fix SFs kernel documentation error https://git.kernel.org/netdev/net-next/c/25c24801d7da - [net-next,V2,03/15] net/mlx5: Fix reserved at offset in hca_cap register https://git.kernel.org/netdev/net-next/c/9ee473c259de - [net-next,V2,04/15] net/mlx5: Fix error code in mlx5_is_reset_now_capable() https://git.kernel.org/netdev/net-next/c/690ad62fc6e4 - [net-next,V2,05/15] net/mlx5: Lag, Remove duplicate code checking lag is supported https://git.kernel.org/netdev/net-next/c/8ec91f5d077c - [net-next,V2,06/15] net/mlx5e: Use vhca_id for device index in vport rx rules https://git.kernel.org/netdev/net-next/c/1da9f36252d4 - [net-next,V2,07/15] net/mlx5e: E-Switch, Add peer fdb miss rules for vport manager or ecpf https://git.kernel.org/netdev/net-next/c/1552e9b51810 - [net-next,V2,08/15] net/mlx5e: E-Switch, Use xarray for devcom paired device index https://git.kernel.org/netdev/net-next/c/70c364383935 - [net-next,V2,09/15] net/mlx5e: E-Switch, Pass other_vport flag if vport is not 0 https://git.kernel.org/netdev/net-next/c/4575ab3b7de0 - [net-next,V2,10/15] net/mlx5e: Remove redundant comment https://git.kernel.org/netdev/net-next/c/ae4de894931d - [net-next,V2,11/15] net/mlx5e: E-Switch, Fix shared fdb error flow https://git.kernel.org/netdev/net-next/c/15ddd72ee323 - [net-next,V2,12/15] net/mlx5: Remove redundant MLX5_ESWITCH_MANAGER() check from is_ib_rep_supported() https://git.kernel.org/netdev/net-next/c/61955da523d9 - [net-next,V2,13/15] net/mlx5: Remove redundant is_mdev_switchdev_mode() check from is_ib_rep_supported() https://git.kernel.org/netdev/net-next/c/0d0946d6488e - [net-next,V2,14/15] net/mlx5: Remove redundant check from mlx5_esw_query_vport_vhca_id() https://git.kernel.org/netdev/net-next/c/899862b653d7 - [net-next,V2,15/15] net/mlx5: Remove pointless vport lookup from mlx5_esw_check_port_type() https://git.kernel.org/netdev/net-next/c/29e4c95faee5
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html