mlx5-next updates 2026-04-28
Subsystems (5)
Tariq Toukan
maintainercover mlx5-next updates 2026-04-28
Hi,
This series by Moshe contains mlx5 shared updates as preparation for upcoming features.
Regards,
Tariq
Moshe Shemesh (4):
mlx5: Rename the vport number enums for host PF and VF net/mlx5: Add function_id_type for enable/disable_hca cmds net/mlx5: Remove unused host_sf_enable field
net/mlx5: Extend query_esw_functions output for multi-function support
drivers/infiniband/hw/mlx5/counters.c | 4 +- .../mellanox/mlx5/core/esw/devlink_port.c | 7 +- .../ethernet/mellanox/mlx5/core/esw/ipsec.c | 2 +- .../net/ethernet/mellanox/mlx5/core/eswitch.c | 36 +++++---- .../net/ethernet/mellanox/mlx5/core/eswitch.h | 2 +- .../mellanox/mlx5/core/eswitch_offloads.c | 42 +++++++---- .../mlx5/core/sf/mlx5_ifc_vhca_event.h | 8 -- .../net/ethernet/mellanox/mlx5/core/sriov.c | 7 +- .../mellanox/mlx5/core/steering/hws/vport.c | 2 +- include/linux/mlx5/eswitch.h | 2 +- include/linux/mlx5/mlx5_ifc.h | 73 +++++++++++++++++-- include/linux/mlx5/vport.h | 4 +- 12 files changed, 130 insertions(+), 59 deletions(-)
base-commit: 254f49634ee16a731174d2ae34bc50bd5f45e731
Signature · 1 line
2.44.0
Tariq Toukan
maintainerPATCH 1/4 mlx5: Rename the vport number enums for host PF and VF
From: Moshe Shemesh <[email protected]>
Rename the vport number enums MLX5_VPORT_PF to MLX5_VPORT_HOST_PF and MLX5_VPORT_FIRST_VF to MLX5_VPORT_FIRST_HOST_VF to indicate that these vport indices represent the host PF and its VFs. This prepares the code for upcoming support of an additional PF type.
--- drivers/infiniband/hw/mlx5/counters.c | 4 ++-- .../mellanox/mlx5/core/esw/devlink_port.c | 7 +++--- .../ethernet/mellanox/mlx5/core/esw/ipsec.c | 2 +- .../net/ethernet/mellanox/mlx5/core/eswitch.c | 22 +++++++++---------- .../net/ethernet/mellanox/mlx5/core/eswitch.h | 2 +- .../mellanox/mlx5/core/eswitch_offloads.c | 17 ++++++++------ .../mellanox/mlx5/core/steering/hws/vport.c | 2 +- include/linux/mlx5/eswitch.h | 2 +- include/linux/mlx5/vport.h | 4 ++-- 9 files changed, 33 insertions(+), 29 deletions(-)
drivers/infiniband/hw/mlx5/counters.c +2 -2
@@ -697,7 +697,7 @@ static void mlx5_ib_fill_counters(struct mlx5_ib_dev *dev, u32 port_num) {bool is_vport =is_mdev_switchdev_mode (dev->mdev) && - port_num !=MLX5_VPORT_PF ; + port_num !=MLX5_VPORT_HOST_PF ;const struct mlx5_ib_counter *names;int j =0 , i, size;
@@ -802,7 +802,7 @@ static int __mlx5_ib_alloc_counters(struct mlx5_ib_dev *dev, struct mlx5_ib_counters *cnts, u32 port_num) { bool is_vport = is_mdev_switchdev_mode(dev->mdev) && - port_num !=MLX5_VPORT_PF ; + port_num !=MLX5_VPORT_HOST_PF ;u32 num_counters, num_op_counters =0 , size; size = is_vport ? ARRAY_SIZE(vport_basic_q_cnts) :
drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c +4 -3
@@ -13,7 +13,8 @@ mlx5_esw_get_port_parent_id(struct mlx5_core_dev *dev, struct netdev_phys_item_istatic bool mlx5_esw_devlink_port_supported (struct mlx5_eswitch *esw,u16 vport_num) { -return (mlx5_core_is_ecpf (esw->dev) && vport_num ==MLX5_VPORT_PF ) || +return (mlx5_core_is_ecpf (esw->dev) && + vport_num ==MLX5_VPORT_HOST_PF ) ||mlx5_eswitch_is_vf_vport (esw, vport_num) ||mlx5_core_is_ec_vf_vport (esw->dev, vport_num); }
@@ -35,7 +36,7 @@ static void mlx5_esw_offloads_pf_vf_devlink_port_attrs_set(struct mlx5_eswitch *if (external) controller_num = dev->priv.eswitch->offloads.host_number +1 ; -if (vport_num ==MLX5_VPORT_PF ) { +if (vport_num ==MLX5_VPORT_HOST_PF ) {memcpy (dl_port->attrs.switch_id.id, ppid.id, ppid.id_len); dl_port->attrs.switch_id.id_len = ppid.id_len;devlink_port_attrs_pci_pf_set (dl_port, controller_num, pfnum, external);
@@ -216,7 +217,7 @@ int mlx5_esw_offloads_devlink_port_register(struct mlx5_eswitch *esw, struct mlxif (err) goto rate_err; -if (vport_num ==MLX5_VPORT_PF ) { +if (vport_num ==MLX5_VPORT_HOST_PF ) { err =mlx5_esw_devlink_port_res_register (esw, &dl_port->dl_port);if (err)
drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec.c +1 -1
@@ -209,7 +209,7 @@ static int esw_ipsec_vf_offload_set_bytype(struct mlx5_eswitch *esw, struct mlx5struct mlx5_core_dev *dev = esw->dev;int err; -if (vport->vport ==MLX5_VPORT_PF ) +if (vport->vport ==MLX5_VPORT_HOST_PF )return -EOPNOTSUPP ;if (type ==MLX5_ESW_VPORT_IPSEC_CRYPTO_OFFLOAD ) {
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +11 -11
@@ -926,7 +926,7 @@ int mlx5_esw_vport_enable(struct mlx5_eswitch *esw, struct mlx5_vport *vport,/* Sync with current vport context */ vport->enabled_events = enabled_events; vport->enabled = true; -if (vport->vport !=MLX5_VPORT_PF && +if (vport->vport !=MLX5_VPORT_HOST_PF && (vport->info.ipsec_crypto_enabled || vport->info.ipsec_packet_enabled)) esw->enabled_ipsec_vf_count++;
@@ -979,7 +979,7 @@ void mlx5_esw_vport_disable(struct mlx5_eswitch *esw, struct mlx5_vport *vport) MLX5_CAP_GEN(esw->dev, vhca_resource_manager))mlx5_esw_vport_vhca_id_unmap (esw, vport); -if (vport->vport !=MLX5_VPORT_PF && +if (vport->vport !=MLX5_VPORT_HOST_PF && (vport->info.ipsec_crypto_enabled || vport->info.ipsec_packet_enabled)) esw->enabled_ipsec_vf_count--;
@@ -1314,7 +1314,7 @@ int mlx5_esw_host_pf_enable_hca(struct mlx5_core_dev *dev)if (!mlx5_core_is_ecpf (dev) || !mlx5_esw_allowed (esw))return 0 ; - vport =mlx5_eswitch_get_vport (esw,MLX5_VPORT_PF ); + vport =mlx5_eswitch_get_vport (esw,MLX5_VPORT_HOST_PF );if (IS_ERR (vport))return PTR_ERR (vport);
@@ -1340,7 +1340,7 @@ int mlx5_esw_host_pf_disable_hca(struct mlx5_core_dev *dev)if (!mlx5_core_is_ecpf (dev) || !mlx5_esw_allowed (esw))return 0 ; - vport =mlx5_eswitch_get_vport (esw,MLX5_VPORT_PF ); + vport =mlx5_eswitch_get_vport (esw,MLX5_VPORT_HOST_PF );if (IS_ERR (vport))return PTR_ERR (vport);
@@ -1368,7 +1368,7 @@ mlx5_eswitch_enable_pf_vf_vports(struct mlx5_eswitch *esw,/* Enable PF vport */ if (pf_needed &&mlx5_esw_host_functions_enabled (esw->dev)) { - ret =mlx5_eswitch_load_pf_vf_vport (esw,MLX5_VPORT_PF , + ret =mlx5_eswitch_load_pf_vf_vport (esw,MLX5_VPORT_HOST_PF , enabled_events);if (ret)return ret;
@@ -1423,7 +1423,7 @@ mlx5_eswitch_enable_pf_vf_vports(struct mlx5_eswitch *esw,mlx5_esw_host_pf_disable_hca (esw->dev); pf_hca_err:if (pf_needed &&mlx5_esw_host_functions_enabled (esw->dev)) -mlx5_eswitch_unload_pf_vf_vport (esw,MLX5_VPORT_PF ); +mlx5_eswitch_unload_pf_vf_vport (esw,MLX5_VPORT_HOST_PF );return ret; }
@@ -1450,7 +1450,7 @@ void mlx5_eswitch_disable_pf_vf_vports(struct mlx5_eswitch *esw)if ((mlx5_core_is_ecpf_esw_manager (esw->dev) || esw->mode ==MLX5_ESWITCH_LEGACY ) &&mlx5_esw_host_functions_enabled (esw->dev)) -mlx5_eswitch_unload_pf_vf_vport (esw,MLX5_VPORT_PF ); +mlx5_eswitch_unload_pf_vf_vport (esw,MLX5_VPORT_HOST_PF ); }static void mlx5_eswitch_get_devlink_param (struct mlx5_eswitch *esw)
@@ -1822,7 +1822,7 @@ static int mlx5_query_hca_cap_host_pf(struct mlx5_core_dev *dev, void *out)MLX5_SET (query_hca_cap_in, in, opcode,MLX5_CMD_OP_QUERY_HCA_CAP );MLX5_SET (query_hca_cap_in, in, op_mod, opmod); -MLX5_SET (query_hca_cap_in, in, function_id,MLX5_VPORT_PF ); +MLX5_SET (query_hca_cap_in, in, function_id,MLX5_VPORT_HOST_PF );MLX5_SET (query_hca_cap_in, in, other_function, true);return mlx5_cmd_exec_inout (dev, query_hca_cap, in, out); }
@@ -1914,10 +1914,10 @@ static int mlx5_esw_vports_init(struct mlx5_eswitch *esw)xa_init (&esw->vports);if (mlx5_esw_host_functions_enabled (dev)) { - err =mlx5_esw_vport_alloc (esw, idx,MLX5_VPORT_PF ); + err =mlx5_esw_vport_alloc (esw, idx,MLX5_VPORT_HOST_PF );if (err) goto err; -if (esw->first_host_vport ==MLX5_VPORT_PF ) +if (esw->first_host_vport ==MLX5_VPORT_HOST_PF )xa_set_mark (&esw->vports, idx,MLX5_ESW_VPT_HOST_FN ); idx++;for (i =0 ; i <mlx5_core_max_vfs (dev); i++) {
@@ -2195,7 +2195,7 @@ bool mlx5_eswitch_is_vf_vport(struct mlx5_eswitch *esw, u16 vport_num)bool mlx5_eswitch_is_pf_vf_vport (struct mlx5_eswitch *esw,u16 vport_num) { -return vport_num ==MLX5_VPORT_PF || +return vport_num ==MLX5_VPORT_HOST_PF ||mlx5_eswitch_is_vf_vport (esw, vport_num); }
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +1 -1
@@ -684,7 +684,7 @@ static inline bool mlx5_esw_is_owner(struct mlx5_eswitch *esw, u16 vport_num,static inline u16 mlx5_eswitch_first_host_vport_num (struct mlx5_core_dev *dev) {return mlx5_core_is_ecpf_esw_manager (dev) ? -MLX5_VPORT_PF :MLX5_VPORT_FIRST_VF ; +MLX5_VPORT_HOST_PF :MLX5_VPORT_FIRST_HOST_VF ; }static inline bool mlx5_eswitch_is_funcs_handler (const struct mlx5_core_dev *dev)
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +10 -7
@@ -1216,9 +1216,10 @@ static int esw_add_fdb_peer_miss_rules(struct mlx5_eswitch *esw,if (mlx5_core_is_ecpf_esw_manager (peer_dev) &&mlx5_esw_host_functions_enabled (peer_dev)) { - peer_vport =mlx5_eswitch_get_vport (peer_esw,MLX5_VPORT_PF ); + peer_vport =mlx5_eswitch_get_vport (peer_esw, +MLX5_VPORT_HOST_PF );esw_set_peer_miss_rule_source_port (esw, peer_esw, spec, -MLX5_VPORT_PF ); +MLX5_VPORT_HOST_PF ); flow =mlx5_add_flow_rules (mlx5_eswitch_get_slow_fdb (esw), spec, &flow_act, &dest,1 );
@@ -1300,7 +1301,8 @@ static int esw_add_fdb_peer_miss_rules(struct mlx5_eswitch *esw,if (mlx5_core_is_ecpf_esw_manager (peer_dev) &&mlx5_esw_host_functions_enabled (peer_dev)) { - peer_vport =mlx5_eswitch_get_vport (peer_esw,MLX5_VPORT_PF ); + peer_vport =mlx5_eswitch_get_vport (peer_esw, +MLX5_VPORT_HOST_PF );mlx5_del_flow_rules (flows[peer_vport->index]); } add_pf_flow_err:
@@ -1342,7 +1344,8 @@ static void esw_del_fdb_peer_miss_rules(struct mlx5_eswitch *esw,if (mlx5_core_is_ecpf_esw_manager (peer_dev) &&mlx5_esw_host_functions_enabled (peer_dev)) { - peer_vport =mlx5_eswitch_get_vport (peer_esw,MLX5_VPORT_PF ); + peer_vport =mlx5_eswitch_get_vport (peer_esw, +MLX5_VPORT_HOST_PF );mlx5_del_flow_rules (flows[peer_vport->index]); }
@@ -4435,7 +4438,7 @@ static bool mlx5_eswitch_vport_has_rep(const struct mlx5_eswitch *esw, u16 vport_num) {/* Currently, only ECPF based device has representor for host PF. */ -if (vport_num ==MLX5_VPORT_PF && +if (vport_num ==MLX5_VPORT_HOST_PF && (!mlx5_core_is_ecpf_esw_manager (esw->dev) || !mlx5_esw_host_functions_enabled (esw->dev)))return false;
@@ -4791,7 +4794,7 @@ int mlx5_devlink_pf_port_fn_state_get(struct devlink_port *port,const u32 *query_out;bool pf_disabled; -if (vport->vport !=MLX5_VPORT_PF ) { +if (vport->vport !=MLX5_VPORT_HOST_PF ) {NL_SET_ERR_MSG_MOD (extack,"State get is not supported for VF" );return -EOPNOTSUPP ; }
@@ -4820,7 +4823,7 @@ int mlx5_devlink_pf_port_fn_state_set(struct devlink_port *port,struct mlx5_vport *vport =mlx5_devlink_port_vport_get (port);struct mlx5_core_dev *dev; -if (vport->vport !=MLX5_VPORT_PF ) { +if (vport->vport !=MLX5_VPORT_HOST_PF ) {NL_SET_ERR_MSG_MOD (extack,"State set is not supported for VF" );return -EOPNOTSUPP ; }
drivers/net/ethernet/mellanox/mlx5/core/steering/hws/vport.c +1 -1
@@ -50,7 +50,7 @@ static int hws_vport_add_gvmi(struct mlx5hws_context *ctx, u16 vport)static bool hws_vport_is_esw_mgr_vport (struct mlx5hws_context *ctx,u16 vport) {return ctx->caps->is_ecpf ? vport ==MLX5_VPORT_ECPF : - vport ==MLX5_VPORT_PF ; + vport ==MLX5_VPORT_HOST_PF ; }int mlx5hws_vport_get_gvmi (struct mlx5hws_context *ctx,u16 vport,u16 *vport_gvmi)
include/linux/mlx5/eswitch.h +1 -1
@@ -217,7 +217,7 @@ static inline bool is_mdev_switchdev_mode(struct mlx5_core_dev *dev)static inline u16 mlx5_eswitch_manager_vport (struct mlx5_core_dev *dev) {return mlx5_core_is_ecpf_esw_manager (dev) ? -MLX5_VPORT_ECPF :MLX5_VPORT_PF ; +MLX5_VPORT_ECPF :MLX5_VPORT_HOST_PF ; }#endif
include/linux/mlx5/vport.h +2 -2
@@ -51,8 +51,8 @@ enum {/* Vport number for each function must keep unchanged */ enum { -MLX5_VPORT_PF =0x0 , -MLX5_VPORT_FIRST_VF =0x1 , +MLX5_VPORT_HOST_PF =0x0 , +MLX5_VPORT_FIRST_HOST_VF =0x1 ,MLX5_VPORT_ECPF =0xfffe ,MLX5_VPORT_UPLINK =0xffff };
Signature · 1 line
2.44.0
Tariq Toukan
maintainerPATCH 2/4 net/mlx5: Add function_id_type for enable/disable_hca cmds
In reply to Tariq ToukanFrom: Moshe Shemesh <[email protected]>
Add a function_id_type field to the enable_hca and disable_hca command input layouts in mlx5_ifc.h to allow using vhca_id as the function index instead of function_id. The new field support by firmware is indicated by the function_id_type_vhca_id capability bit, which is already exposed in hca caps.
--- include/linux/mlx5/mlx5_ifc.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
include/linux/mlx5/mlx5_ifc.h +6 -2
@@ -8452,7 +8452,9 @@ struct mlx5_ifc_enable_hca_in_bits {u8 op_mod[0x10 ];u8 embedded_cpu_function[0x1 ]; -u8 reserved_at_41[0xf ]; +u8 reserved_at_41[0x2 ]; +u8 function_id_type[0x1 ]; +u8 reserved_at_44[0xc ];u8 function_id[0x10 ];u8 reserved_at_60[0x20 ];
@@ -8497,7 +8499,9 @@ struct mlx5_ifc_disable_hca_in_bits {u8 op_mod[0x10 ];u8 embedded_cpu_function[0x1 ]; -u8 reserved_at_41[0xf ]; +u8 reserved_at_41[0x2 ]; +u8 function_id_type[0x1 ]; +u8 reserved_at_44[0xc ];u8 function_id[0x10 ];u8 reserved_at_60[0x20 ];
Signature · 1 line
2.44.0
[email protected]
AI reviewRe: [PATCH mlx5-next 2/4] net/mlx5: Add function_id_type for enable/disable_hca cmds
Sashiko has reviewed this patch and found no issues.
Quoted 10 lines
From: Moshe Shemesh <[email protected]>
Add a
function_id_typefield to theenable_hcaanddisable_hcacommand input layouts inmlx5_ifc.hto allow usingvhca_idas the function index instead offunction_id. The new field support by firmware is indicated by thefunction_id_type_vhca_idcapability bit, which is already exposed in hca caps.Signed-off-by Moshe Shemesh <[email protected]>Signed-off-by Tariq Toukan <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2
Tariq Toukan
maintainerPATCH 3/4 net/mlx5: Remove unused host_sf_enable field
In reply to Tariq ToukanFrom: Moshe Shemesh <[email protected]>
Drop the unused host_sf_enable array from mlx5_ifc_query_esw_functions_out_bits layout. This field has been deprecated in firmware and is not referenced by the mlx5 driver, so it can be safely removed.
--- include/linux/mlx5/mlx5_ifc.h | 1 - 1 file changed, 1 deletion(-)
include/linux/mlx5/mlx5_ifc.h +0 -1
@@ -12725,7 +12725,6 @@ struct mlx5_ifc_query_esw_functions_out_bits {struct mlx5_ifc_host_params_context_bits host_params_context;u8 reserved_at_280[0x180 ]; -u8 host_sf_enable[][0x40 ]; };struct mlx5_ifc_sf_partition_bits {
Signature · 1 line
2.44.0
[email protected]
AI reviewRe: [PATCH mlx5-next 3/4] net/mlx5: Remove unused host_sf_enable field
Sashiko has reviewed this patch and found no issues.
Quoted 9 lines
From: Moshe Shemesh <[email protected]>
Drop the unused
host_sf_enablearray frommlx5_ifc_query_esw_functions_out_bitslayout. This field has been deprecated in firmware and is not referenced by the mlx5 driver, so it can be safely removed.Signed-off-by Moshe Shemesh <[email protected]>Signed-off-by Tariq Toukan <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3
Tariq Toukan
maintainerPATCH 4/4 net/mlx5: Extend query_esw_functions output for multi-function support
In reply to Tariq ToukanFrom: Moshe Shemesh <[email protected]>
Update the query_esw_functions command to support a new response layout that can report data for multiple network functions. Setting bit 14 of the op_mod field selects the v1 layout with network_function_params entries instead of the legacy host_params_context.
The query_host_net_function_v1 read-only capability indicates firmware support for layout version 1, and query_host_net_function_num_max advertises the maximum number of network function entries.
Define a new network_function_params layout and a net_function_params union that groups host_params_context and network_function_params. Rework the query_esw_functions output to use a flexible array of this union, and adjust existing driver callers to use it.
--- .../net/ethernet/mellanox/mlx5/core/eswitch.c | 14 ++-- .../mellanox/mlx5/core/eswitch_offloads.c | 25 +++++--- .../mlx5/core/sf/mlx5_ifc_vhca_event.h | 8 --- .../net/ethernet/mellanox/mlx5/core/sriov.c | 7 +- include/linux/mlx5/mlx5_ifc.h | 64 +++++++++++++++++-- 5 files changed, 91 insertions(+), 27 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +10 -4
@@ -1045,6 +1045,7 @@ const u32 *mlx5_esw_query_functions(struct mlx5_core_dev *dev)static int mlx5_esw_host_functions_enabled_query (struct mlx5_eswitch *esw) {const u32 *query_host_out; +void *host_params;if (!mlx5_core_is_ecpf_esw_manager (esw->dev))return 0 ;
@@ -1053,9 +1054,11 @@ static int mlx5_esw_host_functions_enabled_query(struct mlx5_eswitch *esw)if (IS_ERR (query_host_out))return PTR_ERR (query_host_out); + host_params =MLX5_ADDR_OF (query_esw_functions_out, + query_host_out, net_function_params); esw->esw_funcs.host_funcs_disabled = -MLX5_GET (query_esw_functions_out, query_host_out, - host_params_context.host_pf_not_exist); +MLX5_GET (host_params_context, host_params, + host_pf_not_exist);kvfree (query_host_out);return 0 ;
@@ -1475,6 +1478,7 @@ static void mlx5_eswitch_get_devlink_param(struct mlx5_eswitch *esw)static void mlx5_eswitch_update_num_of_vfs (struct mlx5_eswitch *esw,int num_vfs) { +void *host_params;const u32 *out;if (num_vfs <0 )
@@ -1489,8 +1493,10 @@ mlx5_eswitch_update_num_of_vfs(struct mlx5_eswitch *esw, int num_vfs)if (IS_ERR (out))return ; - esw->esw_funcs.num_vfs =MLX5_GET (query_esw_functions_out, out, - host_params_context.host_num_of_vfs); + host_params =MLX5_ADDR_OF (query_esw_functions_out, out, + net_function_params); + esw->esw_funcs.num_vfs =MLX5_GET (host_params_context, host_params, + host_num_of_vfs);if (mlx5_core_ec_sriov_enabled (esw->dev)) esw->esw_funcs.num_ec_vfs = num_vfs;
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +17 -8
@@ -3664,6 +3664,7 @@ esw_vfs_changed_event_handler(struct mlx5_eswitch *esw, int work_gen, {struct devlink *devlink;bool host_pf_disabled; +void *host_params;u16 new_num_vfs; devlink =priv_to_devlink (esw->dev);
@@ -3673,10 +3674,12 @@ esw_vfs_changed_event_handler(struct mlx5_eswitch *esw, int work_gen,if (work_gen !=atomic_read (&esw->esw_funcs.generation)) goto unlock; - new_num_vfs =MLX5_GET (query_esw_functions_out, out, - host_params_context.host_num_of_vfs); - host_pf_disabled =MLX5_GET (query_esw_functions_out, out, - host_params_context.host_pf_disabled); + host_params =MLX5_ADDR_OF (query_esw_functions_out, out, + net_function_params); + new_num_vfs =MLX5_GET (host_params_context, host_params, + host_num_of_vfs); + host_pf_disabled =MLX5_GET (host_params_context, host_params, + host_pf_disabled);if (new_num_vfs == esw->esw_funcs.num_vfs || host_pf_disabled) goto unlock;
@@ -3743,6 +3746,7 @@ int mlx5_esw_funcs_changed_handler(struct notifier_block *nb, unsigned long typestatic int mlx5_esw_host_number_init (struct mlx5_eswitch *esw) {const u32 *query_host_out; +void *host_params;if (!mlx5_core_is_ecpf_esw_manager (esw->dev))return 0 ;
@@ -3752,8 +3756,10 @@ static int mlx5_esw_host_number_init(struct mlx5_eswitch *esw)return PTR_ERR (query_host_out);/* Mark non local controller with non zero controller number. */ - esw->offloads.host_number =MLX5_GET (query_esw_functions_out, query_host_out, - host_params_context.host_number); + host_params =MLX5_ADDR_OF (query_esw_functions_out, + query_host_out, net_function_params); + esw->offloads.host_number =MLX5_GET (host_params_context, + host_params, host_number);kvfree (query_host_out);return 0 ; }
@@ -4792,6 +4798,7 @@ int mlx5_devlink_pf_port_fn_state_get(struct devlink_port *port, {struct mlx5_vport *vport =mlx5_devlink_port_vport_get (port);const u32 *query_out; +void *host_params;bool pf_disabled;if (vport->vport !=MLX5_VPORT_HOST_PF ) {
@@ -4806,8 +4813,10 @@ int mlx5_devlink_pf_port_fn_state_get(struct devlink_port *port,if (IS_ERR (query_out))return PTR_ERR (query_out); - pf_disabled =MLX5_GET (query_esw_functions_out, query_out, - host_params_context.host_pf_disabled); + host_params =MLX5_ADDR_OF (query_esw_functions_out, query_out, + net_function_params); + pf_disabled =MLX5_GET (host_params_context, host_params, + host_pf_disabled); *opstate = pf_disabled ?DEVLINK_PORT_FN_OPSTATE_DETACHED :DEVLINK_PORT_FN_OPSTATE_ATTACHED ;
drivers/net/ethernet/mellanox/mlx5/core/sf/mlx5_ifc_vhca_event.h +0 -8
@@ -4,14 +4,6 @@ #ifndef __MLX5_IFC_VHCA_EVENT_H__ #define __MLX5_IFC_VHCA_EVENT_H__ -enum mlx5_ifc_vhca_state { - MLX5_VHCA_STATE_INVALID = 0x0, - MLX5_VHCA_STATE_ALLOCATED = 0x1, - MLX5_VHCA_STATE_ACTIVE = 0x2, - MLX5_VHCA_STATE_IN_USE = 0x3, - MLX5_VHCA_STATE_TEARDOWN_REQUEST = 0x4, -}; - struct mlx5_ifc_vhca_state_context_bits { u8 arm_change_event[0x1]; u8 reserved_at_1[0xb];
drivers/net/ethernet/mellanox/mlx5/core/sriov.c +5 -2
@@ -274,6 +274,7 @@ void mlx5_sriov_detach(struct mlx5_core_dev *dev)static u16 mlx5_get_max_vfs (struct mlx5_core_dev *dev) {u16 host_total_vfs; +void *host_params;const u32 *out;if (mlx5_core_is_ecpf_esw_manager (dev)) {
@@ -284,8 +285,10 @@ static u16 mlx5_get_max_vfs(struct mlx5_core_dev *dev)*/ if (IS_ERR (out)) goto done; - host_total_vfs =MLX5_GET (query_esw_functions_out, out, - host_params_context.host_total_vfs); + host_params =MLX5_ADDR_OF (query_esw_functions_out, out, + net_function_params); + host_total_vfs =MLX5_GET (host_params_context, host_params, + host_total_vfs);kvfree (out);return host_total_vfs; }
include/linux/mlx5/mlx5_ifc.h +59 -5
90 lines not on this page · raw message
Signature · 1 line
2.44.0
[email protected]
AI reviewRe: [PATCH mlx5-next 4/4] net/mlx5: Extend query_esw_functions output for multi-function support
Sashiko has reviewed this patch and found no issues.
Quoted 11 lines
From: Moshe Shemesh <[email protected]>
Update the
query_esw_functionscommand to support a new response layout that can report data for multiple network functions. Setting bit 14 of theop_modfield selects the v1 layout withnetwork_function_paramsentries instead of the legacyhost_params_context.The
query_host_net_function_v1read-only capability indicates firmware support for layout version 1, andquery_host_net_function_num_maxadvertises the maximum number of network function entries.
Quoted 7 lines
Define a new
network_function_paramslayout and anet_function_paramsunion that groupshost_params_contextandnetwork_function_params. Rework thequery_esw_functionsoutput to use a flexible array of this union, and adjust existing driver callers to use it.Signed-off-by Moshe Shemesh <[email protected]>Signed-off-by Tariq Toukan <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=4
Leon Romanovsky
AppliedQuoted 6 lines · Tariq Toukan
This series by Moshe contains mlx5 shared updates as preparation for upcoming features.
Regards,
Tariq
Quoted 7 lines
Moshe Shemesh (4):
mlx5: Rename the vport number enums for host PF and VF net/mlx5: Addfunction_id_typefor enable/disable_hca cmds net/mlx5: Remove unusedhost_sf_enablefield
net/mlx5: Extendquery_esw_functionsoutput for multi-function support[...]
Applied, thanks!
[1/4] mlx5: Rename the vport number enums for host PF and VF
https://git.kernel.org/rdma/rdma/c/5ffd937ea4050e [2/4] net/mlx5: Add function_id_type for enable/disable_hca cmds https://git.kernel.org/rdma/rdma/c/a750f4674a6338 [3/4] net/mlx5: Remove unused host_sf_enable field https://git.kernel.org/rdma/rdma/c/e2337517e127b7 [4/4] net/mlx5: Extend query_esw_functions output for multi-function support https://git.kernel.org/rdma/rdma/c/02c54621e81ccd
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>