mlxsw: Various updates
Subsystems (3)
Ido Schimmel
maintainercover mlxsw: Various updates
This patchset contains miscellaneous updates for mlxsw. No user visible changes that I am aware of.
Patches #1-#5 rework registration of internal traps in preparation of line cards support.
Patch #6 improves driver resilience against a misbehaving device.
Patch #7 prevents the driver from overwriting device internal actions. See the commit message for more details.
Amit Cohen (1):
mlxsw: spectrum: Guard against invalid local ports
Ido Schimmel (1):
mlxsw: spectrum_acl: Allocate default actions for internal TCAM
regions
Jiri Pirko (5):
mlxsw: spectrum: Set basic trap groups from an array
mlxsw: core: Move basic_trap_groups_set() call out of EMAD init code
mlxsw: core: Move basic trap group initialization from spectrum.c
mlxsw: core: Move functions to register/unregister array of traps to
core.c
mlxsw: core: Consolidate trap groups to a single event group
drivers/net/ethernet/mellanox/mlxsw/core.c | 75 +++++++++++-- drivers/net/ethernet/mellanox/mlxsw/core.h | 10 +- .../net/ethernet/mellanox/mlxsw/core_env.c | 4 +- drivers/net/ethernet/mellanox/mlxsw/reg.h | 4 +- .../net/ethernet/mellanox/mlxsw/resources.h | 2 + .../net/ethernet/mellanox/mlxsw/spectrum.c | 106 +++--------------- .../net/ethernet/mellanox/mlxsw/spectrum.h | 7 ++ .../mellanox/mlxsw/spectrum2_acl_tcam.c | 12 +- .../ethernet/mellanox/mlxsw/spectrum_ptp.c | 3 +- .../mellanox/mlxsw/spectrum_switchdev.c | 3 +- 10 files changed, 116 insertions(+), 110 deletions(-)
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 1/7 mlxsw: spectrum: Set basic trap groups from an array
From: Jiri Pirko <[email protected]>
Instead of calling the same code four times, do it in a loop over array which contains trap grups to be set.
--- .../net/ethernet/mellanox/mlxsw/spectrum.c | 47 +++++++------------ 1 file changed, 18 insertions(+), 29 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +18 -29
@@ -2528,40 +2528,29 @@ static void mlxsw_sp_lag_fini(struct mlxsw_sp *mlxsw_sp)kfree (mlxsw_sp->lags); } +static const u8 mlxsw_sp_basic_trap_groups[] = { +MLXSW_REG_HTGT_TRAP_GROUP_EMAD , +MLXSW_REG_HTGT_TRAP_GROUP_MFDE , +MLXSW_REG_HTGT_TRAP_GROUP_MTWE , +MLXSW_REG_HTGT_TRAP_GROUP_PMPE , +}; +static int mlxsw_sp_basic_trap_groups_set (struct mlxsw_core *mlxsw_core) {char htgt_pl[MLXSW_REG_HTGT_LEN ];int err; +int i; -mlxsw_reg_htgt_pack (htgt_pl,MLXSW_REG_HTGT_TRAP_GROUP_EMAD , -MLXSW_REG_HTGT_INVALID_POLICER , -MLXSW_REG_HTGT_DEFAULT_PRIORITY , -MLXSW_REG_HTGT_DEFAULT_TC ); - err =mlxsw_reg_write (mlxsw_core,MLXSW_REG (htgt), htgt_pl); -if (err) -return err; - -mlxsw_reg_htgt_pack (htgt_pl,MLXSW_REG_HTGT_TRAP_GROUP_MFDE , -MLXSW_REG_HTGT_INVALID_POLICER , -MLXSW_REG_HTGT_DEFAULT_PRIORITY , -MLXSW_REG_HTGT_DEFAULT_TC ); - err =mlxsw_reg_write (mlxsw_core,MLXSW_REG (htgt), htgt_pl); -if (err) -return err; - -mlxsw_reg_htgt_pack (htgt_pl,MLXSW_REG_HTGT_TRAP_GROUP_MTWE , -MLXSW_REG_HTGT_INVALID_POLICER , -MLXSW_REG_HTGT_DEFAULT_PRIORITY , -MLXSW_REG_HTGT_DEFAULT_TC ); - err =mlxsw_reg_write (mlxsw_core,MLXSW_REG (htgt), htgt_pl); -if (err) -return err; - -mlxsw_reg_htgt_pack (htgt_pl,MLXSW_REG_HTGT_TRAP_GROUP_PMPE , -MLXSW_REG_HTGT_INVALID_POLICER , -MLXSW_REG_HTGT_DEFAULT_PRIORITY , -MLXSW_REG_HTGT_DEFAULT_TC ); -return mlxsw_reg_write (mlxsw_core,MLXSW_REG (htgt), htgt_pl); +for (i =0 ; i <ARRAY_SIZE (mlxsw_sp_basic_trap_groups); i++) { +mlxsw_reg_htgt_pack (htgt_pl, mlxsw_sp_basic_trap_groups[i], +MLXSW_REG_HTGT_INVALID_POLICER , +MLXSW_REG_HTGT_DEFAULT_PRIORITY , +MLXSW_REG_HTGT_DEFAULT_TC ); + err =mlxsw_reg_write (mlxsw_core,MLXSW_REG (htgt), htgt_pl); +if (err) +return err; + } +return 0 ; }static const struct mlxsw_sp_ptp_ops mlxsw_sp1_ptp_ops = {
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 2/7 mlxsw: core: Move basic_trap_groups_set() call out of EMAD init code
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
The call inits the EMAD group, but other groups as well. Therefore, move it out of EMAD init code and call it before.
--- drivers/net/ethernet/mellanox/mlxsw/core.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/core.c +10 -6
@@ -212,6 +212,11 @@ struct mlxsw_event_listener_item {void *priv; }; +static int mlxsw_core_trap_groups_set (struct mlxsw_core *mlxsw_core) +{ +return mlxsw_core->driver->basic_trap_groups_set (mlxsw_core); +} +/****************** * EMAD processing ******************/
@@ -777,16 +782,10 @@ static int mlxsw_emad_init(struct mlxsw_core *mlxsw_core)if (err) goto err_trap_register; - err = mlxsw_core->driver->basic_trap_groups_set (mlxsw_core); -if (err) - goto err_emad_trap_set; mlxsw_core->emad.use_emad = true;return 0 ; -err_emad_trap_set: -mlxsw_core_trap_unregister (mlxsw_core, &mlxsw_emad_rx_listener, - mlxsw_core); err_trap_register:destroy_workqueue (mlxsw_core->emad_wq);return err;
@@ -2122,6 +2121,10 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, } } + err =mlxsw_core_trap_groups_set (mlxsw_core); +if (err) + goto err_trap_groups_set; + err =mlxsw_emad_init (mlxsw_core);if (err) goto err_emad_init;
@@ -2181,6 +2184,7 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, err_register_params:mlxsw_emad_fini (mlxsw_core); err_emad_init: +err_trap_groups_set:kfree (mlxsw_core->lag.mapping); err_alloc_lag_mapping:mlxsw_ports_fini (mlxsw_core, reload);
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 3/7 mlxsw: core: Move basic trap group initialization from spectrum.c
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
Instead of initializing the trap groups used by core in spectrum.c over op, do it directly in core.c
--- drivers/net/ethernet/mellanox/mlxsw/core.c | 22 +++++++++++++- drivers/net/ethernet/mellanox/mlxsw/core.h | 1 - .../net/ethernet/mellanox/mlxsw/spectrum.c | 29 ------------------- 3 files changed, 21 insertions(+), 31 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/core.c +21 -1
@@ -212,9 +212,29 @@ struct mlxsw_event_listener_item {void *priv; }; +static const u8 mlxsw_core_trap_groups[] = { +MLXSW_REG_HTGT_TRAP_GROUP_EMAD , +MLXSW_REG_HTGT_TRAP_GROUP_MFDE , +MLXSW_REG_HTGT_TRAP_GROUP_MTWE , +MLXSW_REG_HTGT_TRAP_GROUP_PMPE , +}; +static int mlxsw_core_trap_groups_set (struct mlxsw_core *mlxsw_core) { -return mlxsw_core->driver->basic_trap_groups_set (mlxsw_core); +char htgt_pl[MLXSW_REG_HTGT_LEN ]; +int err; +int i; + +for (i =0 ; i <ARRAY_SIZE (mlxsw_core_trap_groups); i++) { +mlxsw_reg_htgt_pack (htgt_pl, mlxsw_core_trap_groups[i], +MLXSW_REG_HTGT_INVALID_POLICER , +MLXSW_REG_HTGT_DEFAULT_PRIORITY , +MLXSW_REG_HTGT_DEFAULT_TC ); + err =mlxsw_reg_write (mlxsw_core,MLXSW_REG (htgt), htgt_pl); +if (err) +return err; + } +return 0 ; }/******************
drivers/net/ethernet/mellanox/mlxsw/core.h +0 -1
@@ -315,7 +315,6 @@ struct mlxsw_driver {const struct mlxsw_bus_info *mlxsw_bus_info, struct netlink_ext_ack *extack);void (*fini)(struct mlxsw_core *mlxsw_core); -int (*basic_trap_groups_set)(struct mlxsw_core *mlxsw_core);int (*port_type_set)(struct mlxsw_core *mlxsw_core,u16 local_port,enum devlink_port_type new_type); int (*port_split)(struct mlxsw_core *mlxsw_core, u16 local_port,
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +0 -29
@@ -2528,31 +2528,6 @@ static void mlxsw_sp_lag_fini(struct mlxsw_sp *mlxsw_sp)kfree (mlxsw_sp->lags); } -static const u8 mlxsw_sp_basic_trap_groups[] = { -MLXSW_REG_HTGT_TRAP_GROUP_EMAD , -MLXSW_REG_HTGT_TRAP_GROUP_MFDE , -MLXSW_REG_HTGT_TRAP_GROUP_MTWE , -MLXSW_REG_HTGT_TRAP_GROUP_PMPE , -}; - -static int mlxsw_sp_basic_trap_groups_set (struct mlxsw_core *mlxsw_core) -{ -char htgt_pl[MLXSW_REG_HTGT_LEN ]; -int err; -int i; - -for (i =0 ; i <ARRAY_SIZE (mlxsw_sp_basic_trap_groups); i++) { -mlxsw_reg_htgt_pack (htgt_pl, mlxsw_sp_basic_trap_groups[i], -MLXSW_REG_HTGT_INVALID_POLICER , -MLXSW_REG_HTGT_DEFAULT_PRIORITY , -MLXSW_REG_HTGT_DEFAULT_TC ); - err =mlxsw_reg_write (mlxsw_core,MLXSW_REG (htgt), htgt_pl); -if (err) -return err; - } -return 0 ; -} -static const struct mlxsw_sp_ptp_ops mlxsw_sp1_ptp_ops = { .clock_init = mlxsw_sp1_ptp_clock_init, .clock_fini = mlxsw_sp1_ptp_clock_fini,
@@ -3666,7 +3641,6 @@ static struct mlxsw_driver mlxsw_sp1_driver = { .fw_filename = MLXSW_SP1_FW_FILENAME, .init = mlxsw_sp1_init, .fini = mlxsw_sp_fini, - .basic_trap_groups_set = mlxsw_sp_basic_trap_groups_set, .port_split = mlxsw_sp_port_split, .port_unsplit = mlxsw_sp_port_unsplit, .sb_pool_get = mlxsw_sp_sb_pool_get,
@@ -3706,7 +3680,6 @@ static struct mlxsw_driver mlxsw_sp2_driver = { .fw_filename = MLXSW_SP2_FW_FILENAME, .init = mlxsw_sp2_init, .fini = mlxsw_sp_fini, - .basic_trap_groups_set = mlxsw_sp_basic_trap_groups_set, .port_split = mlxsw_sp_port_split, .port_unsplit = mlxsw_sp_port_unsplit, .sb_pool_get = mlxsw_sp_sb_pool_get,
@@ -3747,7 +3720,6 @@ static struct mlxsw_driver mlxsw_sp3_driver = { .fw_filename = MLXSW_SP3_FW_FILENAME, .init = mlxsw_sp3_init, .fini = mlxsw_sp_fini, - .basic_trap_groups_set = mlxsw_sp_basic_trap_groups_set, .port_split = mlxsw_sp_port_split, .port_unsplit = mlxsw_sp_port_unsplit, .sb_pool_get = mlxsw_sp_sb_pool_get,
@@ -3786,7 +3758,6 @@ static struct mlxsw_driver mlxsw_sp4_driver = { .priv_size = sizeof(struct mlxsw_sp), .init = mlxsw_sp4_init, .fini = mlxsw_sp_fini, - .basic_trap_groups_set = mlxsw_sp_basic_trap_groups_set, .port_split = mlxsw_sp_port_split, .port_unsplit = mlxsw_sp_port_unsplit, .sb_pool_get = mlxsw_sp_sb_pool_get,
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 4/7 mlxsw: core: Move functions to register/unregister array of traps to core.c
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
These functions belong to core.c alongside the functions that register/unregister a single trap. Move it there. Make the functions possibly usable by other parts of mlxsw code.
--- drivers/net/ethernet/mellanox/mlxsw/core.c | 39 ++++++++++++ drivers/net/ethernet/mellanox/mlxsw/core.h | 6 ++ .../net/ethernet/mellanox/mlxsw/spectrum.c | 62 ++++--------------- 3 files changed, 58 insertions(+), 49 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/core.c +39 -0
@@ -2564,6 +2564,45 @@ void mlxsw_core_trap_unregister(struct mlxsw_core *mlxsw_core, }EXPORT_SYMBOL (mlxsw_core_trap_unregister); +int mlxsw_core_traps_register (struct mlxsw_core *mlxsw_core, +const struct mlxsw_listener *listeners, +size_t listeners_count,void *priv) +{ +int i, err; + +for (i =0 ; i < listeners_count; i++) { + err =mlxsw_core_trap_register (mlxsw_core, + &listeners[i], + priv); +if (err) + goto err_listener_register; + } +return 0 ; + +err_listener_register: +for (i--; i >=0 ; i--) { +mlxsw_core_trap_unregister (mlxsw_core, + &listeners[i], + priv); + } +return err; +} +EXPORT_SYMBOL (mlxsw_core_traps_register); + +void mlxsw_core_traps_unregister (struct mlxsw_core *mlxsw_core, +const struct mlxsw_listener *listeners, +size_t listeners_count,void *priv) +{ +int i; + +for (i =0 ; i < listeners_count; i++) { +mlxsw_core_trap_unregister (mlxsw_core, + &listeners[i], + priv); + } +} +EXPORT_SYMBOL (mlxsw_core_traps_unregister); +int mlxsw_core_trap_state_set (struct mlxsw_core *mlxsw_core,const struct mlxsw_listener *listener,bool enabled)
drivers/net/ethernet/mellanox/mlxsw/core.h +6 -0
@@ -181,6 +181,12 @@ int mlxsw_core_trap_register(struct mlxsw_core *mlxsw_core,void mlxsw_core_trap_unregister (struct mlxsw_core *mlxsw_core,const struct mlxsw_listener *listener,void *priv); +int mlxsw_core_traps_register (struct mlxsw_core *mlxsw_core, +const struct mlxsw_listener *listeners, +size_t listeners_count,void *priv); +void mlxsw_core_traps_unregister (struct mlxsw_core *mlxsw_core, +const struct mlxsw_listener *listeners, +size_t listeners_count,void *priv);int mlxsw_core_trap_state_set (struct mlxsw_core *mlxsw_core,const struct mlxsw_listener *listener,bool enabled);
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +13 -49
89 lines not on this page · raw message
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 5/7 mlxsw: core: Consolidate trap groups to a single event group
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
For event traps which are used in core, avoid having a separate trap group for each event. Instead of that introduce a single core event trap group and use it for all event traps.
--- drivers/net/ethernet/mellanox/mlxsw/core.c | 6 ++---- drivers/net/ethernet/mellanox/mlxsw/core.h | 3 +++ drivers/net/ethernet/mellanox/mlxsw/core_env.c | 4 ++-- drivers/net/ethernet/mellanox/mlxsw/reg.h | 4 +--- 4 files changed, 8 insertions(+), 9 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/core.c +2 -4
@@ -214,9 +214,7 @@ struct mlxsw_event_listener_item {static const u8 mlxsw_core_trap_groups[] = {MLXSW_REG_HTGT_TRAP_GROUP_EMAD , -MLXSW_REG_HTGT_TRAP_GROUP_MFDE , -MLXSW_REG_HTGT_TRAP_GROUP_MTWE , -MLXSW_REG_HTGT_TRAP_GROUP_PMPE , +MLXSW_REG_HTGT_TRAP_GROUP_CORE_EVENT , };static int mlxsw_core_trap_groups_set (struct mlxsw_core *mlxsw_core)
@@ -1725,7 +1723,7 @@ static void mlxsw_core_health_listener_func(const struct mlxsw_reg_info *reg, }static const struct mlxsw_listener mlxsw_core_health_listener = -MLXSW_EVENTL (mlxsw_core_health_listener_func,MFDE ,MFDE ); +MLXSW_CORE_EVENTL (mlxsw_core_health_listener_func,MFDE ); static int mlxsw_core_health_fw_fatal_dump_fatal_cause(const char *mfde_pl,
drivers/net/ethernet/mellanox/mlxsw/core.h +3 -0
@@ -163,6 +163,9 @@ struct mlxsw_listener { .enabled_on_register = true, \ } +#define MLXSW_CORE_EVENTL (_func, _trap_id) \ + MLXSW_EVENTL(_func, _trap_id, CORE_EVENT) +int mlxsw_core_rx_listener_register (struct mlxsw_core *mlxsw_core,const struct mlxsw_rx_listener *rxl,void *priv,bool enabled);
drivers/net/ethernet/mellanox/mlxsw/core_env.c +2 -2
@@ -825,7 +825,7 @@ mlxsw_env_mtwe_listener_func(const struct mlxsw_reg_info *reg, char *mtwe_pl, }static const struct mlxsw_listener mlxsw_env_temp_warn_listener = -MLXSW_EVENTL (mlxsw_env_mtwe_listener_func,MTWE ,MTWE ); +MLXSW_CORE_EVENTL (mlxsw_env_mtwe_listener_func,MTWE );static int mlxsw_env_temp_warn_event_register (struct mlxsw_core *mlxsw_core) {
@@ -915,7 +915,7 @@ mlxsw_env_pmpe_listener_func(const struct mlxsw_reg_info *reg, char *pmpe_pl, }static const struct mlxsw_listener mlxsw_env_module_plug_listener = -MLXSW_EVENTL (mlxsw_env_pmpe_listener_func,PMPE ,PMPE ); +MLXSW_CORE_EVENTL (mlxsw_env_pmpe_listener_func,PMPE );static int mlxsw_env_module_plug_event_register (struct mlxsw_core *mlxsw_core)
drivers/net/ethernet/mellanox/mlxsw/reg.h +1 -3
@@ -6141,9 +6141,7 @@ MLXSW_ITEM32(reg, htgt, type, 0x00, 8, 4);enum mlxsw_reg_htgt_trap_group {MLXSW_REG_HTGT_TRAP_GROUP_EMAD , -MLXSW_REG_HTGT_TRAP_GROUP_MFDE , -MLXSW_REG_HTGT_TRAP_GROUP_MTWE , -MLXSW_REG_HTGT_TRAP_GROUP_PMPE , +MLXSW_REG_HTGT_TRAP_GROUP_CORE_EVENT ,MLXSW_REG_HTGT_TRAP_GROUP_SP_STP ,MLXSW_REG_HTGT_TRAP_GROUP_SP_LACP ,MLXSW_REG_HTGT_TRAP_GROUP_SP_LLDP ,
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 6/7 mlxsw: spectrum: Guard against invalid local ports
In reply to Ido SchimmelFrom: Amit Cohen <[email protected]>
When processing events generated by the device's firmware, the driver protects itself from events reported for non-existent local ports, but not for the CPU port (local port 0), which exists, but does not have all the fields as any local port.
This can result in a NULL pointer dereference when trying access 'struct mlxsw_sp_port' fields which are not initialized for CPU port.
Commit 63b08b1f6834 ("mlxsw: spectrum: Protect driver from buggy firmware") already handled such issue by bailing early when processing a PUDE event reported for the CPU port.
Generalize the approach by moving the check to a common function and making use of it in all relevant places.
--- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 4 +--- drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 7 +++++++ drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 3 +-- drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 3 +-- 4 files changed, 10 insertions(+), 7 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +1 -3
@@ -2148,13 +2148,11 @@ static void mlxsw_sp_pude_event_func(const struct mlxsw_reg_info *reg,struct mlxsw_sp *mlxsw_sp = priv;struct mlxsw_sp_port *mlxsw_sp_port;enum mlxsw_reg_pude_oper_status status; -unsigned int max_ports;u16 local_port; - max_ports =mlxsw_core_max_ports (mlxsw_sp->core); local_port =mlxsw_reg_pude_local_port_get (pude_pl); -if (WARN_ON_ONCE (!local_port || local_port >= max_ports)) +if (WARN_ON_ONCE (!mlxsw_sp_local_port_is_valid (mlxsw_sp, local_port)))return ; mlxsw_sp_port = mlxsw_sp->ports[local_port];if (!mlxsw_sp_port)
drivers/net/ethernet/mellanox/mlxsw/spectrum.h +7 -0
@@ -481,6 +481,13 @@ int mlxsw_sp_port_vlan_classification_set(struct mlxsw_sp_port *mlxsw_sp_port, bool is_8021ad_tagged, bool is_8021q_tagged); +static inline bool +mlxsw_sp_local_port_is_valid (struct mlxsw_sp *mlxsw_sp,u16 local_port) +{ +unsigned int max_ports =mlxsw_core_max_ports (mlxsw_sp->core); + +return local_port < max_ports && local_port; +}/* spectrum_buffers.c */ struct mlxsw_sp_hdroom_prio {
drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c +1 -2
@@ -568,12 +568,11 @@ void mlxsw_sp1_ptp_got_timestamp(struct mlxsw_sp *mlxsw_sp, bool ingress, u8 domain_number, u16 sequence_id, u64 timestamp) { - unsigned int max_ports = mlxsw_core_max_ports(mlxsw_sp->core); struct mlxsw_sp_port *mlxsw_sp_port;struct mlxsw_sp1_ptp_key key;u8 types; -if (WARN_ON_ONCE (local_port >= max_ports)) +if (WARN_ON_ONCE (!mlxsw_sp_local_port_is_valid (mlxsw_sp, local_port)))return ; mlxsw_sp_port = mlxsw_sp->ports[local_port];if (!mlxsw_sp_port)
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +1 -2
@@ -2616,7 +2616,6 @@ static void mlxsw_sp_fdb_notify_mac_process(struct mlxsw_sp *mlxsw_sp, char *sfn_pl, int rec_index, bool adding) { - unsigned int max_ports = mlxsw_core_max_ports(mlxsw_sp->core); struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan;struct mlxsw_sp_bridge_device *bridge_device;struct mlxsw_sp_bridge_port *bridge_port;
@@ -2630,7 +2629,7 @@ static void mlxsw_sp_fdb_notify_mac_process(struct mlxsw_sp *mlxsw_sp,mlxsw_reg_sfn_mac_unpack (sfn_pl, rec_index, mac, &fid, &local_port); -if (WARN_ON_ONCE (local_port >= max_ports)) +if (WARN_ON_ONCE (!mlxsw_sp_local_port_is_valid (mlxsw_sp, local_port)))return ; mlxsw_sp_port = mlxsw_sp->ports[local_port];if (!mlxsw_sp_port) {
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 7/7 mlxsw: spectrum_acl: Allocate default actions for internal TCAM regions
In reply to Ido SchimmelIn Spectrum-2 and later ASICs, each TCAM region has a default action that is executed in case a packet did not match any rule in the region. The location of the action in the database (KVDL) is computed by adding the region's index to a base value.
Some TCAM regions are not exposed to the host and used internally by the device. Allocate KVDL entries for the default actions of these regions to avoid the host from overwriting them.
With mlxsw, lookups in the internal regions are not currently performed, but it is a good practice not to overwrite their default actions.
--- drivers/net/ethernet/mellanox/mlxsw/resources.h | 2 ++ .../net/ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlxsw/resources.h +2 -0
@@ -33,6 +33,7 @@ enum mlxsw_res_id {MLXSW_RES_ID_ACL_MAX_REGIONS ,MLXSW_RES_ID_ACL_MAX_GROUPS ,MLXSW_RES_ID_ACL_MAX_GROUP_SIZE , +MLXSW_RES_ID_ACL_MAX_DEFAULT_ACTIONS ,MLXSW_RES_ID_ACL_FLEX_KEYS ,MLXSW_RES_ID_ACL_MAX_ACTION_PER_RULE , MLXSW_RES_ID_ACL_ACTIONS_PER_SET,
@@ -90,6 +91,7 @@ static u16 mlxsw_res_ids[] = { [MLXSW_RES_ID_ACL_MAX_REGIONS] = 0x2903, [MLXSW_RES_ID_ACL_MAX_GROUPS] = 0x2904, [MLXSW_RES_ID_ACL_MAX_GROUP_SIZE] = 0x2905, + [MLXSW_RES_ID_ACL_MAX_DEFAULT_ACTIONS] = 0x2908, [MLXSW_RES_ID_ACL_FLEX_KEYS] = 0x2910, [MLXSW_RES_ID_ACL_MAX_ACTION_PER_RULE] = 0x2911, [MLXSW_RES_ID_ACL_ACTIONS_PER_SET] = 0x2912,
drivers/net/ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c +11 -1
@@ -77,7 +77,14 @@ static int mlxsw_sp2_acl_tcam_init(struct mlxsw_sp *mlxsw_sp, void *priv,int i;int err; +/* Some TCAM regions are not exposed to the host and used internally +* by the device. Allocate KVDL entries for the default actions of +* these regions to avoid the host from overwriting them. +*/ tcam->kvdl_count = _tcam->max_regions; +if (MLXSW_CORE_RES_VALID (mlxsw_sp->core,ACL_MAX_DEFAULT_ACTIONS )) + tcam->kvdl_count =MLXSW_CORE_RES_GET (mlxsw_sp->core, +ACL_MAX_DEFAULT_ACTIONS ); err =mlxsw_sp_kvdl_alloc (mlxsw_sp,MLXSW_SP_KVDL_ENTRY_TYPE_ACTSET , tcam->kvdl_count, &tcam->kvdl_index);if (err)
@@ -97,7 +104,10 @@ static int mlxsw_sp2_acl_tcam_init(struct mlxsw_sp *mlxsw_sp, void *priv, goto err_afa_block_continue; enc_actions =mlxsw_afa_block_cur_set (afa_block); -for (i =0 ; i < tcam->kvdl_count; i++) { +/* Only write to KVDL entries used by TCAM regions exposed to the +* host. +*/ +for (i =0 ; i < _tcam->max_regions; i++) {mlxsw_reg_pefa_pack (pefa_pl, tcam->kvdl_index + i, true, enc_actions); err =mlxsw_reg_write (mlxsw_sp->core,MLXSW_REG (pefa), pefa_pl);
Signature · 1 line
2.33.1
This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Thu, 27 Jan 2022 11:02:19 +0200 you wrote:
This patchset contains miscellaneous updates for mlxsw. No user visible changes that I am aware of.
Patches #1-#5 rework registration of internal traps in preparation of line cards support.
Patch #6 improves driver resilience against a misbehaving device.
[...]
Here is the summary with links:
- [net-next,1/7] mlxsw: spectrum: Set basic trap groups from an array
https://git.kernel.org/netdev/net-next/c/7aad5244f000 - [net-next,2/7] mlxsw: core: Move basic_trap_groups_set() call out of EMAD init code https://git.kernel.org/netdev/net-next/c/74e0494d35ac - [net-next,3/7] mlxsw: core: Move basic trap group initialization from spectrum.c https://git.kernel.org/netdev/net-next/c/8ae89cf454b0 - [net-next,4/7] mlxsw: core: Move functions to register/unregister array of traps to core.c https://git.kernel.org/netdev/net-next/c/981f1d18be40 - [net-next,5/7] mlxsw: core: Consolidate trap groups to a single event group https://git.kernel.org/netdev/net-next/c/636d3ad23890 - [net-next,6/7] mlxsw: spectrum: Guard against invalid local ports https://git.kernel.org/netdev/net-next/c/bcdfd615f83b - [net-next,7/7] mlxsw: spectrum_acl: Allocate default actions for internal TCAM regions https://git.kernel.org/netdev/net-next/c/ef14c298b5b0
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html