mlx5 updates 2023-08-22
From: Saeed Mahameed <[email protected]>
This series provides misc updates and cleanups to mlx5. 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 6176b8c4a19e150c4176b1ed93174e2f5965c4b5:
Merge tag 'nf-next-23-08-22' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next (2023-08-22 18:47:35 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux.git tags/mlx5-updates-2023-08-22
for you to fetch changes up to b8c697e177bba0f802232c3f06b7769b1e1fc516:
net/mlx5e: Support IPsec upper TCP protocol selector (2023-08-22 21:34:18 -0700)
----------------------------------------------------------------
mlx5-updates-2023-08-22
1) Patches #1..#13 From Jiri:
The goal of this patchset is to make the SF code cleaner.
Benefit from previously introduced devlink_port struct containerization to avoid unnecessary lookups in devlink port ops.
Also, benefit from the devlink locking changes and avoid unnecessary reference counting.
2) Patches #14,#15:
Add ability to configure proto both UDP and TCP selectors in RX and TX directions.
----------------------------------------------------------------
Emeel Hakim (1):
net/mlx5e: Support IPsec upper protocol selector field offload for RX
Jiri Pirko (13):
net/mlx5: Rework devlink port alloc/free into init/cleanup
net/mlx5: Push out SF devlink port init and cleanup code to separate helpers net/mlx5: Push devlink port PF/VF init/cleanup calls out of devlink_port_register/unregister() net/mlx5: Allow mlx5_esw_offloads_devlink_port_register() to register SFs net/mlx5: Introduce mlx5_eswitch_load/unload_sf_vport() and use it from SF code net/mlx5: Remove no longer used mlx5_esw_offloads_sf_vport_enable/disable() net/mlx5: Don't register ops for non-PF/VF/SF port and avoid checks in ops net/mlx5: Embed struct devlink_port into driver structure
net/mlx5: Reduce number of vport lookups passing vport pointer instead of index net/mlx5: Return -EOPNOTSUPP in mlx5_devlink_port_fn_migratable_set() directly net/mlx5: Relax mlx5_devlink_eswitch_get() return value checking
net/mlx5: Check vhca_resource_manager capability in each op and add extack msg net/mlx5: Store vport in struct mlx5_devlink_port and use it in port ops
Leon Romanovsky (1):
net/mlx5e: Support IPsec upper TCP protocol selector
.../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 13 +- .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 45 +++-- .../ethernet/mellanox/mlx5/core/esw/devlink_port.c | 169 ++++++++--------- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 158 ++++++++++++---- drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 74 ++++++-- .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 203 +++++++-------------- .../net/ethernet/mellanox/mlx5/core/sf/devlink.c | 12 +- 7 files changed, 371 insertions(+), 303 deletions(-)
PATCH 1/15 net/mlx5: Rework devlink port alloc/free into init/cleanup
From: Jiri Pirko <[email protected]>
In order to prepare the devlink port registration function to be common for PFs/VFs and SFs, change the existing devlink port allocation and free functions into PF/VF init and cleanup, so similar helpers could be later on introduced for SFs. Make the init/cleanup helpers responsible for setting/clearing the vport->dl_port pointer.
--- .../mellanox/mlx5/core/esw/devlink_port.c | 65 ++++++++++++------- 1 file changed, 43 insertions(+), 22 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c +43 -22
@@ -21,19 +21,16 @@ static bool mlx5_esw_devlink_port_supported(struct mlx5_eswitch *esw, u16 vport_mlx5_core_is_ec_vf_vport (esw->dev, vport_num); } -static struct devlink_port *mlx5_esw_dl_port_alloc (struct mlx5_eswitch *esw,u16 vport_num) +static void mlx5_esw_offloads_pf_vf_devlink_port_attrs_set (struct mlx5_eswitch *esw, +u16 vport_num, +struct devlink_port *dl_port) {struct mlx5_core_dev *dev = esw->dev;struct netdev_phys_item_id ppid = {}; -struct devlink_port *dl_port;u32 controller_num =0 ;bool external;u16 pfnum; - dl_port =kzalloc (sizeof (*dl_port),GFP_KERNEL ); -if (!dl_port) -return NULL ; -mlx5_esw_get_port_parent_id (dev, &ppid); pfnum =mlx5_get_dev_index (dev); external =mlx5_core_is_ecpf_esw_manager (dev);
@@ -55,12 +52,40 @@ static struct devlink_port *mlx5_esw_dl_port_alloc(struct mlx5_eswitch *esw, u16devlink_port_attrs_pci_vf_set (dl_port,0 , pfnum, vport_num -1 , false); } -return dl_port; } -static void mlx5_esw_dl_port_free (struct devlink_port *dl_port) +static int mlx5_esw_offloads_pf_vf_devlink_port_init (struct mlx5_eswitch *esw,u16 vport_num) +{ +struct devlink_port *dl_port; +struct mlx5_vport *vport; + +if (!mlx5_esw_devlink_port_supported (esw, vport_num)) +return 0 ; + + vport =mlx5_eswitch_get_vport (esw, vport_num); +if (IS_ERR (vport)) +return PTR_ERR (vport); + + dl_port =kzalloc (sizeof (*dl_port),GFP_KERNEL ); +if (!dl_port) +return -ENOMEM ; + +mlx5_esw_offloads_pf_vf_devlink_port_attrs_set (esw, vport_num, dl_port); + + vport->dl_port = dl_port; +return 0 ; +} + +static void mlx5_esw_offloads_pf_vf_devlink_port_cleanup (struct mlx5_eswitch *esw,u16 vport_num) { -kfree (dl_port); +struct mlx5_vport *vport; + + vport =mlx5_eswitch_get_vport (esw, vport_num); +if (IS_ERR (vport) || !vport->dl_port) +return ; + +kfree (vport->dl_port); + vport->dl_port =NULL ; }static const struct devlink_port_ops mlx5_esw_pf_vf_dl_port_ops = {
@@ -81,16 +106,17 @@ int mlx5_esw_offloads_devlink_port_register(struct mlx5_eswitch *esw, u16 vport_struct devlink *devlink;int err; -if (!mlx5_esw_devlink_port_supported (esw, vport_num)) -return 0 ; - vport =mlx5_eswitch_get_vport (esw, vport_num);if (IS_ERR (vport))return PTR_ERR (vport); - dl_port =mlx5_esw_dl_port_alloc (esw, vport_num); + err =mlx5_esw_offloads_pf_vf_devlink_port_init (esw, vport_num); +if (err) +return err; + + dl_port = vport->dl_port;if (!dl_port) -return -ENOMEM ; +return 0 ; devlink =priv_to_devlink (dev); dl_port_index =mlx5_esw_vport_to_devlink_port_index (dev, vport_num);
@@ -103,13 +129,12 @@ int mlx5_esw_offloads_devlink_port_register(struct mlx5_eswitch *esw, u16 vport_if (err) goto rate_err; - vport->dl_port = dl_port;return 0 ; rate_err:devl_port_unregister (dl_port); reg_err: -mlx5_esw_dl_port_free (dl_port); +mlx5_esw_offloads_pf_vf_devlink_port_cleanup (esw, vport_num);return err; }
@@ -117,19 +142,15 @@ void mlx5_esw_offloads_devlink_port_unregister(struct mlx5_eswitch *esw, u16 vpo {struct mlx5_vport *vport; -if (!mlx5_esw_devlink_port_supported (esw, vport_num)) -return ; - vport =mlx5_eswitch_get_vport (esw, vport_num); -if (IS_ERR (vport)) +if (IS_ERR (vport) || !vport->dl_port)return ;mlx5_esw_qos_vport_update_group (esw, vport,NULL ,NULL );devl_rate_leaf_destroy (vport->dl_port);devl_port_unregister (vport->dl_port); -mlx5_esw_dl_port_free (vport->dl_port); - vport->dl_port =NULL ; +mlx5_esw_offloads_pf_vf_devlink_port_cleanup (esw, vport_num); }struct devlink_port *mlx5_esw_offloads_devlink_port (struct mlx5_eswitch *esw,u16 vport_num)
Signature · 1 line
2.41.0
Re: [net-next 01/15] net/mlx5: Rework devlink port alloc/free into init/cleanup
This 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 9 lines · On Tue, 22 Aug 2023 22:09:58 -0700 you wrote:
From: Jiri Pirko <[email protected]>
In order to prepare the devlink port registration function to be common for PFs/VFs and SFs, change the existing devlink port allocation and free functions into PF/VF init and cleanup, so similar helpers could be later on introduced for SFs. Make the init/cleanup helpers responsible for setting/clearing the
vport->dl_portpointer.[...]
Here is the summary with links:
- [net-next,01/15] net/mlx5: Rework devlink port alloc/free into init/cleanup
https://git.kernel.org/netdev/net-next/c/4c0dac1ef8ab - [net-next,02/15] net/mlx5: Push out SF devlink port init and cleanup code to separate helpers https://git.kernel.org/netdev/net-next/c/638002252544 - [net-next,03/15] net/mlx5: Push devlink port PF/VF init/cleanup calls out of devlink_port_register/unregister() https://git.kernel.org/netdev/net-next/c/d9833bcfe840 - [net-next,04/15] net/mlx5: Allow mlx5_esw_offloads_devlink_port_register() to register SFs https://git.kernel.org/netdev/net-next/c/382fe5747b8a - [net-next,05/15] net/mlx5: Introduce mlx5_eswitch_load/unload_sf_vport() and use it from SF code https://git.kernel.org/netdev/net-next/c/e855afd71565 - [net-next,06/15] net/mlx5: Remove no longer used mlx5_esw_offloads_sf_vport_enable/disable() https://git.kernel.org/netdev/net-next/c/b940ec4b25be - [net-next,07/15] net/mlx5: Don't register ops for non-PF/VF/SF port and avoid checks in ops https://git.kernel.org/netdev/net-next/c/13f878a22c20 - [net-next,08/15] net/mlx5: Embed struct devlink_port into driver structure https://git.kernel.org/netdev/net-next/c/2c5f33f6b940 - [net-next,09/15] net/mlx5: Reduce number of vport lookups passing vport pointer instead of index https://git.kernel.org/netdev/net-next/c/2caa2a39116f - [net-next,10/15] net/mlx5: Return -EOPNOTSUPP in mlx5_devlink_port_fn_migratable_set() directly https://git.kernel.org/netdev/net-next/c/c0ae00929272 - [net-next,11/15] net/mlx5: Relax mlx5_devlink_eswitch_get() return value checking https://git.kernel.org/netdev/net-next/c/5c632cc352e1 - [net-next,12/15] net/mlx5: Check vhca_resource_manager capability in each op and add extack msg https://git.kernel.org/netdev/net-next/c/eb555e34f084 - [net-next,13/15] net/mlx5: Store vport in struct mlx5_devlink_port and use it in port ops https://git.kernel.org/netdev/net-next/c/7d8335200c94 - [net-next,14/15] net/mlx5e: Support IPsec upper protocol selector field offload for RX https://git.kernel.org/netdev/net-next/c/c338325f7a18 - [net-next,15/15] net/mlx5e: Support IPsec upper TCP protocol selector https://git.kernel.org/netdev/net-next/c/b8c697e177bb
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: Push out SF devlink port init and cleanup code to separate helpers
In reply to Saeed MahameedFrom: Jiri Pirko <[email protected]>
Similar to what was done for PFs/VFs, introduce devlink port init and cleanup helpers for SFs and manage the vport->dl_port pointer there.
--- .../mellanox/mlx5/core/esw/devlink_port.c | 61 ++++++++++++++++--- 1 file changed, 51 insertions(+), 10 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c +51 -10
@@ -97,6 +97,48 @@ static const struct devlink_port_ops mlx5_esw_pf_vf_dl_port_ops = { .port_fn_migratable_set = mlx5_devlink_port_fn_migratable_set, }; +static void mlx5_esw_offloads_sf_devlink_port_attrs_set (struct mlx5_eswitch *esw, +struct devlink_port *dl_port, +u32 controller,u32 sfnum) +{ +struct mlx5_core_dev *dev = esw->dev; +struct netdev_phys_item_id ppid = {}; +u16 pfnum; + + pfnum =mlx5_get_dev_index (dev); +mlx5_esw_get_port_parent_id (dev, &ppid); +memcpy (dl_port->attrs.switch_id.id, &ppid.id[0 ], ppid.id_len); + dl_port->attrs.switch_id.id_len = ppid.id_len; +devlink_port_attrs_pci_sf_set (dl_port, controller, pfnum, sfnum, !!controller); +} + +static int mlx5_esw_offloads_sf_devlink_port_init (struct mlx5_eswitch *esw,u16 vport_num, +struct devlink_port *dl_port, +u32 controller,u32 sfnum) +{ +struct mlx5_vport *vport; + + vport =mlx5_eswitch_get_vport (esw, vport_num); +if (IS_ERR (vport)) +return PTR_ERR (vport); + +mlx5_esw_offloads_sf_devlink_port_attrs_set (esw, dl_port, controller, sfnum); + + vport->dl_port = dl_port; +return 0 ; +} + +static void mlx5_esw_offloads_sf_devlink_port_cleanup (struct mlx5_eswitch *esw,u16 vport_num) +{ +struct mlx5_vport *vport; + + vport =mlx5_eswitch_get_vport (esw, vport_num); +if (IS_ERR (vport)) +return ; + + vport->dl_port =NULL ; +} +int mlx5_esw_offloads_devlink_port_register (struct mlx5_eswitch *esw,u16 vport_num) {struct mlx5_core_dev *dev = esw->dev;
@@ -179,38 +221,37 @@ int mlx5_esw_devlink_sf_port_register(struct mlx5_eswitch *esw, struct devlink_p u16 vport_num, u32 controller, u32 sfnum) { struct mlx5_core_dev *dev = esw->dev; -struct netdev_phys_item_id ppid = {};unsigned int dl_port_index;struct mlx5_vport *vport;struct devlink *devlink; -u16 pfnum;int err; vport =mlx5_eswitch_get_vport (esw, vport_num);if (IS_ERR (vport))return PTR_ERR (vport); - pfnum =mlx5_get_dev_index (dev); -mlx5_esw_get_port_parent_id (dev, &ppid); -memcpy (dl_port->attrs.switch_id.id, &ppid.id[0 ], ppid.id_len); - dl_port->attrs.switch_id.id_len = ppid.id_len; -devlink_port_attrs_pci_sf_set (dl_port, controller, pfnum, sfnum, !!controller); + err =mlx5_esw_offloads_sf_devlink_port_init (esw, vport_num, dl_port, controller, sfnum); +if (err) +return err; + devlink =priv_to_devlink (dev); dl_port_index =mlx5_esw_vport_to_devlink_port_index (dev, vport_num); err =devl_port_register_with_ops (devlink, dl_port, dl_port_index, &mlx5_esw_dl_sf_port_ops);if (err) -return err; + goto reg_err; err =devl_rate_leaf_create (dl_port, vport,NULL );if (err) goto rate_err; - vport->dl_port = dl_port;return 0 ; rate_err:devl_port_unregister (dl_port); + +reg_err: +mlx5_esw_offloads_sf_devlink_port_cleanup (esw, vport_num);return err; }
@@ -226,5 +267,5 @@ void mlx5_esw_devlink_sf_port_unregister(struct mlx5_eswitch *esw, u16 vport_numdevl_rate_leaf_destroy (vport->dl_port);devl_port_unregister (vport->dl_port); - vport->dl_port =NULL ; +mlx5_esw_offloads_sf_devlink_port_cleanup (esw, vport_num); }
Signature · 1 line
2.41.0
PATCH 3/15 net/mlx5: Push devlink port PF/VF init/cleanup calls out of devlink_port_register/unregister()
In reply to Saeed MahameedFrom: Jiri Pirko <[email protected]>
In order to prepare for mlx5_esw_offloads_devlink_port_register/unregister() to be used for SFs as well, push out the PF/VF specific init/cleanup calls outside. Introduce mlx5_eswitch_load/unload_pf_vf_vport() and call them from there. Use these new helpers of PF/VF loading and make mlx5_eswitch_local/unload_vport() reusable for SFs.
--- .../mellanox/mlx5/core/esw/devlink_port.c | 13 ++---- .../net/ethernet/mellanox/mlx5/core/eswitch.c | 45 ++++++++++++++----- .../net/ethernet/mellanox/mlx5/core/eswitch.h | 4 ++ .../mellanox/mlx5/core/eswitch_offloads.c | 16 +++++++ 4 files changed, 58 insertions(+), 20 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c +3 -10
@@ -54,7 +54,7 @@ static void mlx5_esw_offloads_pf_vf_devlink_port_attrs_set(struct mlx5_eswitch * } } -static int mlx5_esw_offloads_pf_vf_devlink_port_init (struct mlx5_eswitch *esw,u16 vport_num) +int mlx5_esw_offloads_pf_vf_devlink_port_init (struct mlx5_eswitch *esw,u16 vport_num) {struct devlink_port *dl_port;struct mlx5_vport *vport;
@@ -76,7 +76,7 @@ static int mlx5_esw_offloads_pf_vf_devlink_port_init(struct mlx5_eswitch *esw, ureturn 0 ; } -static void mlx5_esw_offloads_pf_vf_devlink_port_cleanup (struct mlx5_eswitch *esw,u16 vport_num) +void mlx5_esw_offloads_pf_vf_devlink_port_cleanup (struct mlx5_eswitch *esw,u16 vport_num) {struct mlx5_vport *vport;
@@ -152,10 +152,6 @@ int mlx5_esw_offloads_devlink_port_register(struct mlx5_eswitch *esw, u16 vport_if (IS_ERR (vport))return PTR_ERR (vport); - err =mlx5_esw_offloads_pf_vf_devlink_port_init (esw, vport_num); -if (err) -return err; - dl_port = vport->dl_port;if (!dl_port)return 0 ;
@@ -165,7 +161,7 @@ int mlx5_esw_offloads_devlink_port_register(struct mlx5_eswitch *esw, u16 vport_ err =devl_port_register_with_ops (devlink, dl_port, dl_port_index, &mlx5_esw_pf_vf_dl_port_ops);if (err) - goto reg_err; +return err; err =devl_rate_leaf_create (dl_port, vport,NULL );if (err)
@@ -175,8 +171,6 @@ int mlx5_esw_offloads_devlink_port_register(struct mlx5_eswitch *esw, u16 vport_ rate_err:devl_port_unregister (dl_port); -reg_err: -mlx5_esw_offloads_pf_vf_devlink_port_cleanup (esw, vport_num);return err; }
@@ -192,7 +186,6 @@ void mlx5_esw_offloads_devlink_port_unregister(struct mlx5_eswitch *esw, u16 vpodevl_rate_leaf_destroy (vport->dl_port);devl_port_unregister (vport->dl_port); -mlx5_esw_offloads_pf_vf_devlink_port_cleanup (esw, vport_num); }struct devlink_port *mlx5_esw_offloads_devlink_port (struct mlx5_eswitch *esw,u16 vport_num)
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +35 -10
105 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +4 -0
@@ -729,6 +729,8 @@ void mlx5_esw_set_spec_source_port(struct mlx5_eswitch *esw,u16 vport, struct mlx5_flow_spec *spec); +int mlx5_esw_offloads_init_pf_vf_rep (struct mlx5_eswitch *esw,u16 vport_num); +void mlx5_esw_offloads_cleanup_pf_vf_rep (struct mlx5_eswitch *esw,u16 vport_num);int mlx5_esw_offloads_load_rep (struct mlx5_eswitch *esw,u16 vport_num);void mlx5_esw_offloads_unload_rep (struct mlx5_eswitch *esw,u16 vport_num);
@@ -736,6 +738,8 @@ int mlx5_eswitch_load_vf_vports(struct mlx5_eswitch *esw, u16 num_vfs, enum mlx5_eswitch_vport_event enabled_events);void mlx5_eswitch_unload_vf_vports (struct mlx5_eswitch *esw,u16 num_vfs); +int mlx5_esw_offloads_pf_vf_devlink_port_init (struct mlx5_eswitch *esw,u16 vport_num); +void mlx5_esw_offloads_pf_vf_devlink_port_cleanup (struct mlx5_eswitch *esw,u16 vport_num);int mlx5_esw_offloads_devlink_port_register (struct mlx5_eswitch *esw,u16 vport_num);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);
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +16 -0
@@ -2535,6 +2535,22 @@ static void mlx5_esw_offloads_rep_unload(struct mlx5_eswitch *esw, u16 vport_num__esw_offloads_unload_rep (esw, rep, rep_type); } +int mlx5_esw_offloads_init_pf_vf_rep (struct mlx5_eswitch *esw,u16 vport_num) +{ +if (esw->mode !=MLX5_ESWITCH_OFFLOADS ) +return 0 ; + +return mlx5_esw_offloads_pf_vf_devlink_port_init (esw, vport_num); +} + +void mlx5_esw_offloads_cleanup_pf_vf_rep (struct mlx5_eswitch *esw,u16 vport_num) +{ +if (esw->mode !=MLX5_ESWITCH_OFFLOADS ) +return ; + +mlx5_esw_offloads_pf_vf_devlink_port_cleanup (esw, vport_num); +} +int mlx5_esw_offloads_load_rep (struct mlx5_eswitch *esw,u16 vport_num) {int err;
Signature · 1 line
2.41.0
PATCH 4/15 net/mlx5: Allow mlx5_esw_offloads_devlink_port_register() to register SFs
In reply to Saeed MahameedFrom: Jiri Pirko <[email protected]>
Currently there is a separate set of functions used to register/unregister the SF. The only difference is currently the ops struct. Move the struct up and use it for SFs in mlx5_esw_offloads_devlink_port_register().
--- .../mellanox/mlx5/core/esw/devlink_port.c | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c +21 -16
@@ -139,9 +139,24 @@ static void mlx5_esw_offloads_sf_devlink_port_cleanup(struct mlx5_eswitch *esw, vport->dl_port =NULL ; } +static const struct devlink_port_ops mlx5_esw_dl_sf_port_ops = { +#ifdef CONFIG_MLX5_SF_MANAGER + .port_del = mlx5_devlink_sf_port_del, +#endif + .port_fn_hw_addr_get = mlx5_devlink_port_fn_hw_addr_get, + .port_fn_hw_addr_set = mlx5_devlink_port_fn_hw_addr_set, + .port_fn_roce_get = mlx5_devlink_port_fn_roce_get, + .port_fn_roce_set = mlx5_devlink_port_fn_roce_set, +#ifdef CONFIG_MLX5_SF_MANAGER + .port_fn_state_get = mlx5_devlink_sf_port_fn_state_get, + .port_fn_state_set = mlx5_devlink_sf_port_fn_state_set, +#endif +}; +int mlx5_esw_offloads_devlink_port_register (struct mlx5_eswitch *esw,u16 vport_num) {struct mlx5_core_dev *dev = esw->dev; +const struct devlink_port_ops *ops;struct devlink_port *dl_port;unsigned int dl_port_index;struct mlx5_vport *vport;
@@ -156,10 +171,14 @@ int mlx5_esw_offloads_devlink_port_register(struct mlx5_eswitch *esw, u16 vport_if (!dl_port)return 0 ; +if (mlx5_esw_is_sf_vport (esw, vport_num)) + ops = &mlx5_esw_dl_sf_port_ops; +else + ops = &mlx5_esw_pf_vf_dl_port_ops; + devlink =priv_to_devlink (dev); dl_port_index =mlx5_esw_vport_to_devlink_port_index (dev, vport_num); - err =devl_port_register_with_ops (devlink, dl_port, dl_port_index, - &mlx5_esw_pf_vf_dl_port_ops); + err =devl_port_register_with_ops (devlink, dl_port, dl_port_index, ops);if (err)return err;
@@ -196,20 +215,6 @@ struct devlink_port *mlx5_esw_offloads_devlink_port(struct mlx5_eswitch *esw, u1return IS_ERR (vport) ?ERR_CAST (vport) : vport->dl_port; } -static const struct devlink_port_ops mlx5_esw_dl_sf_port_ops = { -#ifdef CONFIG_MLX5_SF_MANAGER - .port_del = mlx5_devlink_sf_port_del, -#endif - .port_fn_hw_addr_get = mlx5_devlink_port_fn_hw_addr_get, - .port_fn_hw_addr_set = mlx5_devlink_port_fn_hw_addr_set, - .port_fn_roce_get = mlx5_devlink_port_fn_roce_get, - .port_fn_roce_set = mlx5_devlink_port_fn_roce_set, -#ifdef CONFIG_MLX5_SF_MANAGER - .port_fn_state_get = mlx5_devlink_sf_port_fn_state_get, - .port_fn_state_set = mlx5_devlink_sf_port_fn_state_set, -#endif -}; -int mlx5_esw_devlink_sf_port_register (struct mlx5_eswitch *esw,struct devlink_port *dl_port,u16 vport_num,u32 controller,u32 sfnum) {
Signature · 1 line
2.41.0
PATCH 5/15 net/mlx5: Introduce mlx5_eswitch_load/unload_sf_vport() and use it from SF code
In reply to Saeed MahameedFrom: Jiri Pirko <[email protected]>
Similar to the PF/VF helpers, introduce a set of load/unload helpers for SF vports. From there, call mlx5_eswitch_load/unload_vport() which are common for PFs/VFs and newly introduced SF helpers.
--- .../mellanox/mlx5/core/esw/devlink_port.c | 8 +++--- .../net/ethernet/mellanox/mlx5/core/eswitch.c | 27 +++++++++++++++++++ .../net/ethernet/mellanox/mlx5/core/eswitch.h | 17 ++++++++++++ .../mellanox/mlx5/core/eswitch_offloads.c | 12 +++++++++ .../ethernet/mellanox/mlx5/core/sf/devlink.c | 8 +++--- 5 files changed, 64 insertions(+), 8 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c +4 -4
@@ -112,9 +112,9 @@ static void mlx5_esw_offloads_sf_devlink_port_attrs_set(struct mlx5_eswitch *eswdevlink_port_attrs_pci_sf_set (dl_port, controller, pfnum, sfnum, !!controller); } -static int mlx5_esw_offloads_sf_devlink_port_init (struct mlx5_eswitch *esw,u16 vport_num, -struct devlink_port *dl_port, -u32 controller,u32 sfnum) +int mlx5_esw_offloads_sf_devlink_port_init (struct mlx5_eswitch *esw,u16 vport_num, +struct devlink_port *dl_port, +u32 controller,u32 sfnum) {struct mlx5_vport *vport;
@@ -128,7 +128,7 @@ static int mlx5_esw_offloads_sf_devlink_port_init(struct mlx5_eswitch *esw, u16return 0 ; } -static void mlx5_esw_offloads_sf_devlink_port_cleanup (struct mlx5_eswitch *esw,u16 vport_num) +void mlx5_esw_offloads_sf_devlink_port_cleanup (struct mlx5_eswitch *esw,u16 vport_num) {struct mlx5_vport *vport;
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +27 -0
@@ -1119,6 +1119,33 @@ static void mlx5_eswitch_unload_pf_vf_vport(struct mlx5_eswitch *esw, u16 vport_mlx5_esw_offloads_cleanup_pf_vf_rep (esw, vport_num); } +int mlx5_eswitch_load_sf_vport (struct mlx5_eswitch *esw,u16 vport_num, +enum mlx5_eswitch_vport_event enabled_events, +struct devlink_port *dl_port,u32 controller,u32 sfnum) +{ +int err; + + err =mlx5_esw_offloads_init_sf_rep (esw, vport_num, dl_port, controller, sfnum); +if (err) +return err; + + err =mlx5_eswitch_load_vport (esw, vport_num, enabled_events); +if (err) + goto err_load; + +return 0 ; + +err_load: +mlx5_esw_offloads_cleanup_sf_rep (esw, vport_num); +return err; +} + +void mlx5_eswitch_unload_sf_vport (struct mlx5_eswitch *esw,u16 vport_num) +{ +mlx5_eswitch_unload_vport (esw, vport_num); +mlx5_esw_offloads_cleanup_sf_rep (esw, vport_num); +} +void mlx5_eswitch_unload_vf_vports (struct mlx5_eswitch *esw,u16 num_vfs) {struct mlx5_vport *vport;
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +17 -0
@@ -731,15 +731,32 @@ void mlx5_esw_set_spec_source_port(struct mlx5_eswitch *esw,int mlx5_esw_offloads_init_pf_vf_rep (struct mlx5_eswitch *esw,u16 vport_num);void mlx5_esw_offloads_cleanup_pf_vf_rep (struct mlx5_eswitch *esw,u16 vport_num); + +int mlx5_esw_offloads_init_sf_rep (struct mlx5_eswitch *esw,u16 vport_num, +struct devlink_port *dl_port, +u32 controller,u32 sfnum); +void mlx5_esw_offloads_cleanup_sf_rep (struct mlx5_eswitch *esw,u16 vport_num); +int mlx5_esw_offloads_load_rep (struct mlx5_eswitch *esw,u16 vport_num);void mlx5_esw_offloads_unload_rep (struct mlx5_eswitch *esw,u16 vport_num); +int mlx5_eswitch_load_sf_vport (struct mlx5_eswitch *esw,u16 vport_num, +enum mlx5_eswitch_vport_event enabled_events, +struct devlink_port *dl_port,u32 controller,u32 sfnum); +void mlx5_eswitch_unload_sf_vport (struct mlx5_eswitch *esw,u16 vport_num); +int mlx5_eswitch_load_vf_vports (struct mlx5_eswitch *esw,u16 num_vfs,enum mlx5_eswitch_vport_event enabled_events);void mlx5_eswitch_unload_vf_vports (struct mlx5_eswitch *esw,u16 num_vfs);int mlx5_esw_offloads_pf_vf_devlink_port_init (struct mlx5_eswitch *esw,u16 vport_num);void mlx5_esw_offloads_pf_vf_devlink_port_cleanup (struct mlx5_eswitch *esw,u16 vport_num); + +int mlx5_esw_offloads_sf_devlink_port_init (struct mlx5_eswitch *esw,u16 vport_num, +struct devlink_port *dl_port, +u32 controller,u32 sfnum); +void mlx5_esw_offloads_sf_devlink_port_cleanup (struct mlx5_eswitch *esw,u16 vport_num); +int mlx5_esw_offloads_devlink_port_register (struct mlx5_eswitch *esw,u16 vport_num);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);
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +12 -0
@@ -2551,6 +2551,18 @@ void mlx5_esw_offloads_cleanup_pf_vf_rep(struct mlx5_eswitch *esw, u16 vport_nummlx5_esw_offloads_pf_vf_devlink_port_cleanup (esw, vport_num); } +int mlx5_esw_offloads_init_sf_rep (struct mlx5_eswitch *esw,u16 vport_num, +struct devlink_port *dl_port, +u32 controller,u32 sfnum) +{ +return mlx5_esw_offloads_sf_devlink_port_init (esw, vport_num, dl_port, controller, sfnum); +} + +void mlx5_esw_offloads_cleanup_sf_rep (struct mlx5_eswitch *esw,u16 vport_num) +{ +mlx5_esw_offloads_sf_devlink_port_cleanup (esw, vport_num); +} +int mlx5_esw_offloads_load_rep (struct mlx5_eswitch *esw,u16 vport_num) {int err;
drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c +4 -4
@@ -292,8 +292,8 @@ static int mlx5_sf_add(struct mlx5_core_dev *dev, struct mlx5_sf_table *table,if (IS_ERR (sf))return PTR_ERR (sf); - err =mlx5_esw_offloads_sf_vport_enable (esw, &sf->dl_port, sf->hw_fn_id, - new_attr->controller, new_attr->sfnum); + err =mlx5_eswitch_load_sf_vport (esw, sf->hw_fn_id,MLX5_VPORT_UC_ADDR_CHANGE , + &sf->dl_port, new_attr->controller, new_attr->sfnum);if (err) goto esw_err; *dl_port = &sf->dl_port;
@@ -400,7 +400,7 @@ int mlx5_devlink_sf_port_del(struct devlink *devlink, goto sf_err; } -mlx5_esw_offloads_sf_vport_disable (esw, sf->hw_fn_id); +mlx5_eswitch_unload_sf_vport (esw, sf->hw_fn_id);mlx5_sf_id_erase (table, sf);mutex_lock (&table->sf_state_lock);
@@ -472,7 +472,7 @@ static void mlx5_sf_deactivate_all(struct mlx5_sf_table *table)* arrive. It is safe to destroy all user created SFs. */ xa_for_each (&table->port_indices, index, sf) { -mlx5_esw_offloads_sf_vport_disable (esw, sf->hw_fn_id); +mlx5_eswitch_unload_sf_vport (esw, sf->hw_fn_id);mlx5_sf_id_erase (table, sf);mlx5_sf_dealloc (table, sf); }
Signature · 1 line
2.41.0
PATCH 6/15 net/mlx5: Remove no longer used mlx5_esw_offloads_sf_vport_enable/disable()
In reply to Saeed MahameedFrom: Jiri Pirko <[email protected]>
Since the previous patch removed the only users of these functions, remove them.
--- .../mellanox/mlx5/core/esw/devlink_port.c | 53 ------------------- .../net/ethernet/mellanox/mlx5/core/eswitch.h | 7 --- .../mellanox/mlx5/core/eswitch_offloads.c | 32 ----------- 3 files changed, 92 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c +0 -53
@@ -214,56 +214,3 @@ struct devlink_port *mlx5_esw_offloads_devlink_port(struct mlx5_eswitch *esw, u1 vport =mlx5_eswitch_get_vport (esw, vport_num);return IS_ERR (vport) ?ERR_CAST (vport) : vport->dl_port; } - -int mlx5_esw_devlink_sf_port_register (struct mlx5_eswitch *esw,struct devlink_port *dl_port, -u16 vport_num,u32 controller,u32 sfnum) -{ -struct mlx5_core_dev *dev = esw->dev; -unsigned int dl_port_index; -struct mlx5_vport *vport; -struct devlink *devlink; -int err; - - vport =mlx5_eswitch_get_vport (esw, vport_num); -if (IS_ERR (vport)) -return PTR_ERR (vport); - - err =mlx5_esw_offloads_sf_devlink_port_init (esw, vport_num, dl_port, controller, sfnum); -if (err) -return err; - - devlink =priv_to_devlink (dev); - dl_port_index =mlx5_esw_vport_to_devlink_port_index (dev, vport_num); - err =devl_port_register_with_ops (devlink, dl_port, dl_port_index, - &mlx5_esw_dl_sf_port_ops); -if (err) - goto reg_err; - - err =devl_rate_leaf_create (dl_port, vport,NULL ); -if (err) - goto rate_err; - -return 0 ; - -rate_err: -devl_port_unregister (dl_port); - -reg_err: -mlx5_esw_offloads_sf_devlink_port_cleanup (esw, vport_num); -return err; -} - -void mlx5_esw_devlink_sf_port_unregister (struct mlx5_eswitch *esw,u16 vport_num) -{ -struct mlx5_vport *vport; - - vport =mlx5_eswitch_get_vport (esw, vport_num); -if (IS_ERR (vport)) -return ; - -mlx5_esw_qos_vport_update_group (esw, vport,NULL ,NULL ); -devl_rate_leaf_destroy (vport->dl_port); - -devl_port_unregister (vport->dl_port); -mlx5_esw_offloads_sf_devlink_port_cleanup (esw, vport_num); -}
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +0 -7
@@ -761,13 +761,6 @@ 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); -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); - -int mlx5_esw_offloads_sf_vport_enable (struct mlx5_eswitch *esw,struct devlink_port *dl_port, -u16 vport_num,u32 controller,u32 sfnum); -void mlx5_esw_offloads_sf_vport_disable (struct mlx5_eswitch *esw,u16 vport_num);int mlx5_esw_sf_max_hpf_functions (struct mlx5_core_dev *dev,u16 *max_sfs,u16 *sf_base_id);int mlx5_esw_vport_vhca_id_set (struct mlx5_eswitch *esw,u16 vport_num);
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +0 -32
@@ -4130,38 +4130,6 @@ u32 mlx5_eswitch_get_vport_metadata_for_match(struct mlx5_eswitch *esw, }EXPORT_SYMBOL (mlx5_eswitch_get_vport_metadata_for_match); -int mlx5_esw_offloads_sf_vport_enable (struct mlx5_eswitch *esw,struct devlink_port *dl_port, -u16 vport_num,u32 controller,u32 sfnum) -{ -int err; - - err =mlx5_esw_vport_enable (esw, vport_num,MLX5_VPORT_UC_ADDR_CHANGE ); -if (err) -return err; - - err =mlx5_esw_devlink_sf_port_register (esw, dl_port, vport_num, controller, sfnum); -if (err) - goto devlink_err; - - err =mlx5_esw_offloads_rep_load (esw, vport_num); -if (err) - goto rep_err; -return 0 ; - -rep_err: -mlx5_esw_devlink_sf_port_unregister (esw, vport_num); -devlink_err: -mlx5_esw_vport_disable (esw, vport_num); -return err; -} - -void mlx5_esw_offloads_sf_vport_disable (struct mlx5_eswitch *esw,u16 vport_num) -{ -mlx5_esw_offloads_rep_unload (esw, vport_num); -mlx5_esw_devlink_sf_port_unregister (esw, vport_num); -mlx5_esw_vport_disable (esw, vport_num); -} -static int mlx5_esw_query_vport_vhca_id (struct mlx5_eswitch *esw,u16 vport_num,u16 *vhca_id) {int query_out_sz =MLX5_ST_SZ_BYTES (query_hca_cap_out);
Signature · 1 line
2.41.0
PATCH 7/15 net/mlx5: Don't register ops for non-PF/VF/SF port and avoid checks in ops
In reply to Saeed MahameedFrom: Jiri Pirko <[email protected]>
Currently each PF/VF/SF devlink port op called into mlx5 code calls is_port_function_supported() to check if the port is either PF, VF or SF. So make sure that the ops are registered with devlink port only for those and avoid the is_port_function_supported() checks in ops.
--- .../mellanox/mlx5/core/esw/devlink_port.c | 4 +++- .../net/ethernet/mellanox/mlx5/core/eswitch.c | 6 ++++++ .../net/ethernet/mellanox/mlx5/core/eswitch.h | 1 + .../mellanox/mlx5/core/eswitch_offloads.c | 18 ------------------ 4 files changed, 10 insertions(+), 19 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c +3 -1
@@ -173,8 +173,10 @@ int mlx5_esw_offloads_devlink_port_register(struct mlx5_eswitch *esw, u16 vport_if (mlx5_esw_is_sf_vport (esw, vport_num)) ops = &mlx5_esw_dl_sf_port_ops; -else +else if (mlx5_eswitch_is_pf_vf_vport (esw, vport_num)) ops = &mlx5_esw_pf_vf_dl_port_ops; +else + ops =NULL ; devlink =priv_to_devlink (dev); dl_port_index =mlx5_esw_vport_to_devlink_port_index (dev, vport_num);
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +6 -0
@@ -1970,6 +1970,12 @@ bool mlx5_eswitch_is_vf_vport(struct mlx5_eswitch *esw, u16 vport_num)return mlx5_esw_check_port_type (esw, vport_num,MLX5_ESW_VPT_VF ); } +bool mlx5_eswitch_is_pf_vf_vport (struct mlx5_eswitch *esw,u16 vport_num) +{ +return vport_num ==MLX5_VPORT_PF || +mlx5_eswitch_is_vf_vport (esw, vport_num); +} +bool mlx5_esw_is_sf_vport (struct mlx5_eswitch *esw,u16 vport_num) {return mlx5_esw_check_port_type (esw, vport_num,MLX5_ESW_VPT_SF );
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +1 -0
@@ -680,6 +680,7 @@ struct mlx5_vport *__must_check mlx5_eswitch_get_vport(struct mlx5_eswitch *esw, u16 vport_num);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);bool mlx5_esw_is_sf_vport (struct mlx5_eswitch *esw,u16 vport_num);int mlx5_esw_funcs_changed_handler (struct notifier_block *nb,unsigned long type,void *data);
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +0 -18
@@ -4218,14 +4218,6 @@ u32 mlx5_eswitch_get_vport_metadata_for_set(struct mlx5_eswitch *esw, }EXPORT_SYMBOL (mlx5_eswitch_get_vport_metadata_for_set); -static bool -is_port_function_supported (struct mlx5_eswitch *esw,u16 vport_num) -{ -return vport_num ==MLX5_VPORT_PF || -mlx5_eswitch_is_vf_vport (esw, vport_num) || -mlx5_esw_is_sf_vport (esw, vport_num); -} -int mlx5_devlink_port_fn_hw_addr_get (struct devlink_port *port,u8 *hw_addr,int *hw_addr_len,struct netlink_ext_ack *extack)
@@ -4239,8 +4231,6 @@ int mlx5_devlink_port_fn_hw_addr_get(struct devlink_port *port,return PTR_ERR (esw); vport_num =mlx5_esw_devlink_port_index_to_vport_num (port->index); -if (!is_port_function_supported (esw, vport_num)) -return -EOPNOTSUPP ; vport =mlx5_eswitch_get_vport (esw, vport_num);if (IS_ERR (vport)) {
@@ -4269,11 +4259,6 @@ int mlx5_devlink_port_fn_hw_addr_set(struct devlink_port *port, } vport_num =mlx5_esw_devlink_port_index_to_vport_num (port->index); -if (!is_port_function_supported (esw, vport_num)) { -NL_SET_ERR_MSG_MOD (extack,"Port doesn't support set hw_addr" ); -return -EINVAL ; - } -return mlx5_eswitch_set_vport_mac (esw, vport_num, hw_addr); }
@@ -4286,9 +4271,6 @@ mlx5_devlink_port_fn_get_vport(struct devlink_port *port, struct mlx5_eswitch *ereturn ERR_PTR (-EOPNOTSUPP ); vport_num =mlx5_esw_devlink_port_index_to_vport_num (port->index); -if (!is_port_function_supported (esw, vport_num)) -return ERR_PTR (-EOPNOTSUPP ); -return mlx5_eswitch_get_vport (esw, vport_num); }
Signature · 1 line
2.41.0
PATCH 8/15 net/mlx5: Embed struct devlink_port into driver structure
In reply to Saeed MahameedFrom: Jiri Pirko <[email protected]>
Struct devlink_port is usually embedded in a driver-specific struct which allows to carry driver context to devlink port ops.
Introduce a container struct to include devlink_port struct in preparation to also include driver context for devlink port ops.
--- .../mellanox/mlx5/core/esw/devlink_port.c | 25 +++++++++++-------- .../net/ethernet/mellanox/mlx5/core/eswitch.c | 2 +- .../net/ethernet/mellanox/mlx5/core/eswitch.h | 12 ++++++--- .../mellanox/mlx5/core/eswitch_offloads.c | 2 +- .../ethernet/mellanox/mlx5/core/sf/devlink.c | 4 +-- 5 files changed, 26 insertions(+), 19 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c +14 -11
@@ -56,7 +56,7 @@ static void mlx5_esw_offloads_pf_vf_devlink_port_attrs_set(struct mlx5_eswitch *int mlx5_esw_offloads_pf_vf_devlink_port_init (struct mlx5_eswitch *esw,u16 vport_num) { -struct devlink_port *dl_port; +struct mlx5_devlink_port *dl_port;struct mlx5_vport *vport;if (!mlx5_esw_devlink_port_supported (esw, vport_num))
@@ -70,7 +70,8 @@ int mlx5_esw_offloads_pf_vf_devlink_port_init(struct mlx5_eswitch *esw, u16 vporif (!dl_port)return -ENOMEM ; -mlx5_esw_offloads_pf_vf_devlink_port_attrs_set (esw, vport_num, dl_port); +mlx5_esw_offloads_pf_vf_devlink_port_attrs_set (esw, vport_num, + &dl_port->dl_port); vport->dl_port = dl_port;return 0 ;
@@ -113,7 +114,7 @@ static void mlx5_esw_offloads_sf_devlink_port_attrs_set(struct mlx5_eswitch *esw }int mlx5_esw_offloads_sf_devlink_port_init (struct mlx5_eswitch *esw,u16 vport_num, -struct devlink_port *dl_port, +struct mlx5_devlink_port *dl_port,u32 controller,u32 sfnum) {struct mlx5_vport *vport;
@@ -122,7 +123,7 @@ int mlx5_esw_offloads_sf_devlink_port_init(struct mlx5_eswitch *esw, u16 vport_nif (IS_ERR (vport))return PTR_ERR (vport); -mlx5_esw_offloads_sf_devlink_port_attrs_set (esw, dl_port, controller, sfnum); +mlx5_esw_offloads_sf_devlink_port_attrs_set (esw, &dl_port->dl_port, controller, sfnum); vport->dl_port = dl_port;return 0 ;
@@ -157,7 +158,7 @@ int mlx5_esw_offloads_devlink_port_register(struct mlx5_eswitch *esw, u16 vport_ {struct mlx5_core_dev *dev = esw->dev;const struct devlink_port_ops *ops; -struct devlink_port *dl_port; +struct mlx5_devlink_port *dl_port;unsigned int dl_port_index;struct mlx5_vport *vport;struct devlink *devlink;
@@ -180,33 +181,35 @@ int mlx5_esw_offloads_devlink_port_register(struct mlx5_eswitch *esw, u16 vport_ devlink =priv_to_devlink (dev); dl_port_index =mlx5_esw_vport_to_devlink_port_index (dev, vport_num); - err =devl_port_register_with_ops (devlink, dl_port, dl_port_index, ops); + err =devl_port_register_with_ops (devlink, &dl_port->dl_port, dl_port_index, ops);if (err)return err; - err =devl_rate_leaf_create (dl_port, vport,NULL ); + err =devl_rate_leaf_create (&dl_port->dl_port, vport,NULL );if (err) goto rate_err;return 0 ; rate_err: -devl_port_unregister (dl_port); +devl_port_unregister (&dl_port->dl_port);return err; }void mlx5_esw_offloads_devlink_port_unregister (struct mlx5_eswitch *esw,u16 vport_num) { +struct mlx5_devlink_port *dl_port;struct mlx5_vport *vport; vport =mlx5_eswitch_get_vport (esw, vport_num);if (IS_ERR (vport) || !vport->dl_port)return ; + dl_port = vport->dl_port;mlx5_esw_qos_vport_update_group (esw, vport,NULL ,NULL ); -devl_rate_leaf_destroy (vport->dl_port); +devl_rate_leaf_destroy (&dl_port->dl_port); -devl_port_unregister (vport->dl_port); +devl_port_unregister (&dl_port->dl_port); }struct devlink_port *mlx5_esw_offloads_devlink_port (struct mlx5_eswitch *esw,u16 vport_num)
@@ -214,5 +217,5 @@ struct devlink_port *mlx5_esw_offloads_devlink_port(struct mlx5_eswitch *esw, u1struct mlx5_vport *vport; vport =mlx5_eswitch_get_vport (esw, vport_num); -return IS_ERR (vport) ?ERR_CAST (vport) : vport->dl_port; +return IS_ERR (vport) ?ERR_CAST (vport) : &vport->dl_port->dl_port; }
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +1 -1
@@ -1121,7 +1121,7 @@ static void mlx5_eswitch_unload_pf_vf_vport(struct mlx5_eswitch *esw, u16 vport_int mlx5_eswitch_load_sf_vport (struct mlx5_eswitch *esw,u16 vport_num,enum mlx5_eswitch_vport_event enabled_events, -struct devlink_port *dl_port,u32 controller,u32 sfnum) +struct mlx5_devlink_port *dl_port,u32 controller,u32 sfnum) {int err;
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +8 -4
@@ -172,6 +172,10 @@ enum mlx5_eswitch_vport_event { MLX5_VPORT_PROMISC_CHANGE = BIT(3), }; +struct mlx5_devlink_port { +struct devlink_port dl_port; +}; +struct mlx5_vport {struct mlx5_core_dev *dev;struct hlist_head uc_list[MLX5_L2_ADDR_HASH_SIZE ];
@@ -200,7 +204,7 @@ struct mlx5_vport {bool enabled;enum mlx5_eswitch_vport_event enabled_events;int index; -struct devlink_port *dl_port; +struct mlx5_devlink_port *dl_port; };struct mlx5_esw_indir_table ;
@@ -734,7 +738,7 @@ int mlx5_esw_offloads_init_pf_vf_rep(struct mlx5_eswitch *esw, u16 vport_num);void mlx5_esw_offloads_cleanup_pf_vf_rep (struct mlx5_eswitch *esw,u16 vport_num);int mlx5_esw_offloads_init_sf_rep (struct mlx5_eswitch *esw,u16 vport_num, -struct devlink_port *dl_port, +struct mlx5_devlink_port *dl_port,u32 controller,u32 sfnum);void mlx5_esw_offloads_cleanup_sf_rep (struct mlx5_eswitch *esw,u16 vport_num);
@@ -743,7 +747,7 @@ void mlx5_esw_offloads_unload_rep(struct mlx5_eswitch *esw, u16 vport_num);int mlx5_eswitch_load_sf_vport (struct mlx5_eswitch *esw,u16 vport_num,enum mlx5_eswitch_vport_event enabled_events, -struct devlink_port *dl_port,u32 controller,u32 sfnum); +struct mlx5_devlink_port *dl_port,u32 controller,u32 sfnum);void mlx5_eswitch_unload_sf_vport (struct mlx5_eswitch *esw,u16 vport_num); int mlx5_eswitch_load_vf_vports(struct mlx5_eswitch *esw, u16 num_vfs,
@@ -754,7 +758,7 @@ int mlx5_esw_offloads_pf_vf_devlink_port_init(struct mlx5_eswitch *esw, u16 vporvoid mlx5_esw_offloads_pf_vf_devlink_port_cleanup (struct mlx5_eswitch *esw,u16 vport_num);int mlx5_esw_offloads_sf_devlink_port_init (struct mlx5_eswitch *esw,u16 vport_num, -struct devlink_port *dl_port, +struct mlx5_devlink_port *dl_port,u32 controller,u32 sfnum);void mlx5_esw_offloads_sf_devlink_port_cleanup (struct mlx5_eswitch *esw,u16 vport_num);
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +1 -1
@@ -2552,7 +2552,7 @@ void mlx5_esw_offloads_cleanup_pf_vf_rep(struct mlx5_eswitch *esw, u16 vport_num }int mlx5_esw_offloads_init_sf_rep (struct mlx5_eswitch *esw,u16 vport_num, -struct devlink_port *dl_port, +struct mlx5_devlink_port *dl_port,u32 controller,u32 sfnum) {return mlx5_esw_offloads_sf_devlink_port_init (esw, vport_num, dl_port, controller, sfnum);
drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c +2 -2
@@ -12,7 +12,7 @@#include "diag/sf_tracepoint.h" struct mlx5_sf { -struct devlink_port dl_port; +struct mlx5_devlink_port dl_port;unsigned int port_index;u32 controller;u16 id;
@@ -296,7 +296,7 @@ static int mlx5_sf_add(struct mlx5_core_dev *dev, struct mlx5_sf_table *table, &sf->dl_port, new_attr->controller, new_attr->sfnum);if (err) goto esw_err; - *dl_port = &sf->dl_port; + *dl_port = &sf->dl_port.dl_port;trace_mlx5_sf_add (dev, sf->port_index, sf->controller, sf->hw_fn_id, new_attr->sfnum);return 0 ;
Signature · 1 line
2.41.0
PATCH 9/15 net/mlx5: Reduce number of vport lookups passing vport pointer instead of index
In reply to Saeed MahameedFrom: Jiri Pirko <[email protected]>
During devlink port init/cleanup and register/unregister calls, there are many lookups of vport. Instead of passing vport_num as argument to functions, pass the vport struct pointer directly and avoid repeated lookups.
--- .../mellanox/mlx5/core/esw/devlink_port.c | 47 +++-------- .../net/ethernet/mellanox/mlx5/core/eswitch.c | 79 +++++++++++-------- .../net/ethernet/mellanox/mlx5/core/eswitch.h | 30 +++---- .../mellanox/mlx5/core/eswitch_offloads.c | 30 +++---- 4 files changed, 90 insertions(+), 96 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c +12 -35
@@ -54,18 +54,15 @@ static void mlx5_esw_offloads_pf_vf_devlink_port_attrs_set(struct mlx5_eswitch * } } -int mlx5_esw_offloads_pf_vf_devlink_port_init (struct mlx5_eswitch *esw,u16 vport_num) +int mlx5_esw_offloads_pf_vf_devlink_port_init (struct mlx5_eswitch *esw, +struct mlx5_vport *vport) {struct mlx5_devlink_port *dl_port; -struct mlx5_vport *vport; +u16 vport_num = vport->vport;if (!mlx5_esw_devlink_port_supported (esw, vport_num))return 0 ; - vport =mlx5_eswitch_get_vport (esw, vport_num); -if (IS_ERR (vport)) -return PTR_ERR (vport); - dl_port =kzalloc (sizeof (*dl_port),GFP_KERNEL );if (!dl_port)return -ENOMEM ;
@@ -77,12 +74,10 @@ int mlx5_esw_offloads_pf_vf_devlink_port_init(struct mlx5_eswitch *esw, u16 vporreturn 0 ; } -void mlx5_esw_offloads_pf_vf_devlink_port_cleanup (struct mlx5_eswitch *esw,u16 vport_num) +void mlx5_esw_offloads_pf_vf_devlink_port_cleanup (struct mlx5_eswitch *esw, +struct mlx5_vport *vport) { -struct mlx5_vport *vport; - - vport =mlx5_eswitch_get_vport (esw, vport_num); -if (IS_ERR (vport) || !vport->dl_port) +if (!vport->dl_port)return ;kfree (vport->dl_port);
@@ -113,30 +108,18 @@ static void mlx5_esw_offloads_sf_devlink_port_attrs_set(struct mlx5_eswitch *eswdevlink_port_attrs_pci_sf_set (dl_port, controller, pfnum, sfnum, !!controller); } -int mlx5_esw_offloads_sf_devlink_port_init (struct mlx5_eswitch *esw,u16 vport_num, +int mlx5_esw_offloads_sf_devlink_port_init (struct mlx5_eswitch *esw,struct mlx5_vport *vport,struct mlx5_devlink_port *dl_port,u32 controller,u32 sfnum) { -struct mlx5_vport *vport; - - vport =mlx5_eswitch_get_vport (esw, vport_num); -if (IS_ERR (vport)) -return PTR_ERR (vport); -mlx5_esw_offloads_sf_devlink_port_attrs_set (esw, &dl_port->dl_port, controller, sfnum); vport->dl_port = dl_port;return 0 ; } -void mlx5_esw_offloads_sf_devlink_port_cleanup (struct mlx5_eswitch *esw,u16 vport_num) +void mlx5_esw_offloads_sf_devlink_port_cleanup (struct mlx5_eswitch *esw,struct mlx5_vport *vport) { -struct mlx5_vport *vport; - - vport =mlx5_eswitch_get_vport (esw, vport_num); -if (IS_ERR (vport)) -return ; - vport->dl_port =NULL ; }
@@ -154,20 +137,16 @@ static const struct devlink_port_ops mlx5_esw_dl_sf_port_ops = {#endif }; -int mlx5_esw_offloads_devlink_port_register (struct mlx5_eswitch *esw,u16 vport_num) +int mlx5_esw_offloads_devlink_port_register (struct mlx5_eswitch *esw,struct mlx5_vport *vport) {struct mlx5_core_dev *dev = esw->dev;const struct devlink_port_ops *ops;struct mlx5_devlink_port *dl_port; +u16 vport_num = vport->vport;unsigned int dl_port_index; -struct mlx5_vport *vport;struct devlink *devlink;int err; - vport =mlx5_eswitch_get_vport (esw, vport_num); -if (IS_ERR (vport)) -return PTR_ERR (vport); - dl_port = vport->dl_port;if (!dl_port)return 0 ;
@@ -196,13 +175,11 @@ int mlx5_esw_offloads_devlink_port_register(struct mlx5_eswitch *esw, u16 vport_return err; } -void mlx5_esw_offloads_devlink_port_unregister (struct mlx5_eswitch *esw,u16 vport_num) +void mlx5_esw_offloads_devlink_port_unregister (struct mlx5_eswitch *esw,struct mlx5_vport *vport) {struct mlx5_devlink_port *dl_port; -struct mlx5_vport *vport; - vport =mlx5_eswitch_get_vport (esw, vport_num); -if (IS_ERR (vport) || !vport->dl_port) +if (!vport->dl_port)return ; dl_port = vport->dl_port;
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +47 -32
176 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +16 -14
@@ -694,9 +694,9 @@ mlx5_eswitch_enable_pf_vf_vports(struct mlx5_eswitch *esw, enum mlx5_eswitch_vport_event enabled_events);void mlx5_eswitch_disable_pf_vf_vports (struct mlx5_eswitch *esw); -int mlx5_esw_vport_enable (struct mlx5_eswitch *esw,u16 vport_num, +int mlx5_esw_vport_enable (struct mlx5_eswitch *esw,struct mlx5_vport *vport,enum mlx5_eswitch_vport_event enabled_events); -void mlx5_esw_vport_disable (struct mlx5_eswitch *esw,u16 vport_num); +void mlx5_esw_vport_disable (struct mlx5_eswitch *esw,struct mlx5_vport *vport); int esw_vport_create_offloads_acl_tables(struct mlx5_eswitch *esw,
@@ -734,16 +734,16 @@ void mlx5_esw_set_spec_source_port(struct mlx5_eswitch *esw,u16 vport, struct mlx5_flow_spec *spec); -int mlx5_esw_offloads_init_pf_vf_rep (struct mlx5_eswitch *esw,u16 vport_num); -void mlx5_esw_offloads_cleanup_pf_vf_rep (struct mlx5_eswitch *esw,u16 vport_num); +int mlx5_esw_offloads_init_pf_vf_rep (struct mlx5_eswitch *esw,struct mlx5_vport *vport); +void mlx5_esw_offloads_cleanup_pf_vf_rep (struct mlx5_eswitch *esw,struct mlx5_vport *vport); -int mlx5_esw_offloads_init_sf_rep (struct mlx5_eswitch *esw,u16 vport_num, +int mlx5_esw_offloads_init_sf_rep (struct mlx5_eswitch *esw,struct mlx5_vport *vport,struct mlx5_devlink_port *dl_port,u32 controller,u32 sfnum); -void mlx5_esw_offloads_cleanup_sf_rep (struct mlx5_eswitch *esw,u16 vport_num); +void mlx5_esw_offloads_cleanup_sf_rep (struct mlx5_eswitch *esw,struct mlx5_vport *vport); -int mlx5_esw_offloads_load_rep (struct mlx5_eswitch *esw,u16 vport_num); -void mlx5_esw_offloads_unload_rep (struct mlx5_eswitch *esw,u16 vport_num); +int mlx5_esw_offloads_load_rep (struct mlx5_eswitch *esw,struct mlx5_vport *vport); +void mlx5_esw_offloads_unload_rep (struct mlx5_eswitch *esw,struct mlx5_vport *vport); int mlx5_eswitch_load_sf_vport(struct mlx5_eswitch *esw, u16 vport_num, enum mlx5_eswitch_vport_event enabled_events,
@@ -754,16 +754,18 @@ int mlx5_eswitch_load_vf_vports(struct mlx5_eswitch *esw, u16 num_vfs, enum mlx5_eswitch_vport_event enabled_events);void mlx5_eswitch_unload_vf_vports (struct mlx5_eswitch *esw,u16 num_vfs); -int mlx5_esw_offloads_pf_vf_devlink_port_init (struct mlx5_eswitch *esw,u16 vport_num); -void mlx5_esw_offloads_pf_vf_devlink_port_cleanup (struct mlx5_eswitch *esw,u16 vport_num); +int mlx5_esw_offloads_pf_vf_devlink_port_init (struct mlx5_eswitch *esw, +struct mlx5_vport *vport); +void mlx5_esw_offloads_pf_vf_devlink_port_cleanup (struct mlx5_eswitch *esw, +struct mlx5_vport *vport); -int mlx5_esw_offloads_sf_devlink_port_init (struct mlx5_eswitch *esw,u16 vport_num, +int mlx5_esw_offloads_sf_devlink_port_init (struct mlx5_eswitch *esw,struct mlx5_vport *vport,struct mlx5_devlink_port *dl_port,u32 controller,u32 sfnum); -void mlx5_esw_offloads_sf_devlink_port_cleanup (struct mlx5_eswitch *esw,u16 vport_num); +void mlx5_esw_offloads_sf_devlink_port_cleanup (struct mlx5_eswitch *esw,struct mlx5_vport *vport); -int mlx5_esw_offloads_devlink_port_register (struct mlx5_eswitch *esw,u16 vport_num); -void mlx5_esw_offloads_devlink_port_unregister (struct mlx5_eswitch *esw,u16 vport_num); +int mlx5_esw_offloads_devlink_port_register (struct mlx5_eswitch *esw,struct mlx5_vport *vport); +void mlx5_esw_offloads_devlink_port_unregister (struct mlx5_eswitch *esw,struct mlx5_vport *vport);struct devlink_port *mlx5_esw_offloads_devlink_port (struct mlx5_eswitch *esw,u16 vport_num);int mlx5_esw_sf_max_hpf_functions (struct mlx5_core_dev *dev,u16 *max_sfs,u16 *sf_base_id);
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +15 -15
@@ -2535,63 +2535,63 @@ static void mlx5_esw_offloads_rep_unload(struct mlx5_eswitch *esw, u16 vport_num__esw_offloads_unload_rep (esw, rep, rep_type); } -int mlx5_esw_offloads_init_pf_vf_rep (struct mlx5_eswitch *esw,u16 vport_num) +int mlx5_esw_offloads_init_pf_vf_rep (struct mlx5_eswitch *esw,struct mlx5_vport *vport) {if (esw->mode !=MLX5_ESWITCH_OFFLOADS )return 0 ; -return mlx5_esw_offloads_pf_vf_devlink_port_init (esw, vport_num); +return mlx5_esw_offloads_pf_vf_devlink_port_init (esw, vport); } -void mlx5_esw_offloads_cleanup_pf_vf_rep (struct mlx5_eswitch *esw,u16 vport_num) +void mlx5_esw_offloads_cleanup_pf_vf_rep (struct mlx5_eswitch *esw,struct mlx5_vport *vport) {if (esw->mode !=MLX5_ESWITCH_OFFLOADS )return ; -mlx5_esw_offloads_pf_vf_devlink_port_cleanup (esw, vport_num); +mlx5_esw_offloads_pf_vf_devlink_port_cleanup (esw, vport); } -int mlx5_esw_offloads_init_sf_rep (struct mlx5_eswitch *esw,u16 vport_num, +int mlx5_esw_offloads_init_sf_rep (struct mlx5_eswitch *esw,struct mlx5_vport *vport,struct mlx5_devlink_port *dl_port,u32 controller,u32 sfnum) { -return mlx5_esw_offloads_sf_devlink_port_init (esw, vport_num, dl_port, controller, sfnum); +return mlx5_esw_offloads_sf_devlink_port_init (esw, vport, dl_port, controller, sfnum); } -void mlx5_esw_offloads_cleanup_sf_rep (struct mlx5_eswitch *esw,u16 vport_num) +void mlx5_esw_offloads_cleanup_sf_rep (struct mlx5_eswitch *esw,struct mlx5_vport *vport) { -mlx5_esw_offloads_sf_devlink_port_cleanup (esw, vport_num); +mlx5_esw_offloads_sf_devlink_port_cleanup (esw, vport); } -int mlx5_esw_offloads_load_rep (struct mlx5_eswitch *esw,u16 vport_num) +int mlx5_esw_offloads_load_rep (struct mlx5_eswitch *esw,struct mlx5_vport *vport) {int err;if (esw->mode !=MLX5_ESWITCH_OFFLOADS )return 0 ; - err =mlx5_esw_offloads_devlink_port_register (esw, vport_num); + err =mlx5_esw_offloads_devlink_port_register (esw, vport);if (err)return err; - err =mlx5_esw_offloads_rep_load (esw, vport_num); + err =mlx5_esw_offloads_rep_load (esw, vport->vport);if (err) goto load_err;return err; load_err: -mlx5_esw_offloads_devlink_port_unregister (esw, vport_num); +mlx5_esw_offloads_devlink_port_unregister (esw, vport);return err; } -void mlx5_esw_offloads_unload_rep (struct mlx5_eswitch *esw,u16 vport_num) +void mlx5_esw_offloads_unload_rep (struct mlx5_eswitch *esw,struct mlx5_vport *vport) {if (esw->mode !=MLX5_ESWITCH_OFFLOADS )return ; -mlx5_esw_offloads_rep_unload (esw, vport_num); +mlx5_esw_offloads_rep_unload (esw, vport->vport); -mlx5_esw_offloads_devlink_port_unregister (esw, vport_num); +mlx5_esw_offloads_devlink_port_unregister (esw, vport); } static int esw_set_slave_root_fdb(struct mlx5_core_dev *master,
Signature · 1 line
2.41.0
PATCH 10/15 net/mlx5: Return -EOPNOTSUPP in mlx5_devlink_port_fn_migratable_set() directly
In reply to Saeed MahameedFrom: Jiri Pirko <[email protected]>
Instead of initializing "err" variable, just return "-EOPNOTSUPP" directly where it is needed.
--- drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +2 -2
@@ -4309,7 +4309,7 @@ int mlx5_devlink_port_fn_migratable_set(struct devlink_port *port, bool enable,struct mlx5_vport *vport;void *query_ctx;void *hca_caps; -int err = -EOPNOTSUPP ; +int err; esw =mlx5_devlink_eswitch_get (port->devlink);if (IS_ERR (esw))
@@ -4317,7 +4317,7 @@ int mlx5_devlink_port_fn_migratable_set(struct devlink_port *port, bool enable,if (!MLX5_CAP_GEN (esw->dev, migration)) {NL_SET_ERR_MSG_MOD (extack,"Device doesn't support migration" ); -return err; +return -EOPNOTSUPP ; } vport =mlx5_devlink_port_fn_get_vport (port, esw);
Signature · 1 line
2.41.0
PATCH 11/15 net/mlx5: Relax mlx5_devlink_eswitch_get() return value checking
In reply to Saeed MahameedFrom: Jiri Pirko <[email protected]>
If called from port ops, it is not needed to perform the checks in mlx5_devlink_eswitch_get(). The reason is devlink port would not be registered if the checks are not true. Introduce relaxed version mlx5_devlink_eswitch_nocheck_get() and use it in port ops.
--- .../net/ethernet/mellanox/mlx5/core/eswitch.c | 21 ++++++++-- .../net/ethernet/mellanox/mlx5/core/eswitch.h | 6 ++- .../mellanox/mlx5/core/eswitch_offloads.c | 39 ++++--------------- 3 files changed, 29 insertions(+), 37 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +17 -4
@@ -77,18 +77,31 @@ static int mlx5_eswitch_check(const struct mlx5_core_dev *dev)return 0 ; } -struct mlx5_eswitch *mlx5_devlink_eswitch_get (struct devlink *devlink) +static struct mlx5_eswitch *__mlx5_devlink_eswitch_get (struct devlink *devlink,bool check) {struct mlx5_core_dev *dev =devlink_priv (devlink);int err; - err =mlx5_eswitch_check (dev); -if (err) -return ERR_PTR (err); +if (check) { + err =mlx5_eswitch_check (dev); +if (err) +return ERR_PTR (err); + }return dev->priv.eswitch; } +struct mlx5_eswitch *__must_check +mlx5_devlink_eswitch_get (struct devlink *devlink) +{ +return __mlx5_devlink_eswitch_get (devlink, true); +} + +struct mlx5_eswitch *mlx5_devlink_eswitch_nocheck_get (struct devlink *devlink) +{ +return __mlx5_devlink_eswitch_get (devlink, false); +} +struct mlx5_vport *__must_check mlx5_eswitch_get_vport (struct mlx5_eswitch *esw,u16 vport_num) {
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +5 -1
@@ -679,7 +679,11 @@ void mlx5e_tc_clean_fdb_peer_flows(struct mlx5_eswitch *esw); MLX5_CAP_GEN_2((esw->dev), ec_vf_vport_base) +\ (last) - 1) -struct mlx5_eswitch *mlx5_devlink_eswitch_get (struct devlink *devlink); +struct mlx5_eswitch *__must_check +mlx5_devlink_eswitch_get (struct devlink *devlink); + +struct mlx5_eswitch *mlx5_devlink_eswitch_nocheck_get (struct devlink *devlink); +struct mlx5_vport *__must_check mlx5_eswitch_get_vport (struct mlx5_eswitch *esw,u16 vport_num);
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +7 -32
@@ -3634,7 +3634,7 @@ static bool esw_offloads_devlink_ns_eq_netdev_ns(struct devlink *devlink)struct net *devl_net, *netdev_net;struct mlx5_eswitch *esw; - esw =mlx5_devlink_eswitch_get (devlink); + esw =mlx5_devlink_eswitch_nocheck_get (devlink); netdev_net =dev_net (esw->dev->mlx5e_res.uplink_netdev); devl_net =devlink_net (devlink);
@@ -4222,13 +4222,10 @@ int mlx5_devlink_port_fn_hw_addr_get(struct devlink_port *port, u8 *hw_addr, int *hw_addr_len, struct netlink_ext_ack *extack) { -struct mlx5_eswitch *esw; +struct mlx5_eswitch *esw =mlx5_devlink_eswitch_nocheck_get (port->devlink);struct mlx5_vport *vport;u16 vport_num; - esw =mlx5_devlink_eswitch_get (port->devlink); -if (IS_ERR (esw)) -return PTR_ERR (esw); vport_num =mlx5_esw_devlink_port_index_to_vport_num (port->index);
@@ -4249,15 +4246,9 @@ int mlx5_devlink_port_fn_hw_addr_set(struct devlink_port *port, const u8 *hw_addr, int hw_addr_len, struct netlink_ext_ack *extack) { - struct mlx5_eswitch *esw; + struct mlx5_eswitch *esw = mlx5_devlink_eswitch_nocheck_get(port->devlink);u16 vport_num; - esw =mlx5_devlink_eswitch_get (port->devlink); -if (IS_ERR (esw)) { -NL_SET_ERR_MSG_MOD (extack,"Eswitch doesn't support set hw_addr" ); -return PTR_ERR (esw); - } - vport_num =mlx5_esw_devlink_port_index_to_vport_num (port->index);return mlx5_eswitch_set_vport_mac (esw, vport_num, hw_addr); }
@@ -4277,13 +4268,9 @@ mlx5_devlink_port_fn_get_vport(struct devlink_port *port, struct mlx5_eswitch *eint mlx5_devlink_port_fn_migratable_get (struct devlink_port *port,bool *is_enabled,struct netlink_ext_ack *extack) { -struct mlx5_eswitch *esw; +struct mlx5_eswitch *esw =mlx5_devlink_eswitch_nocheck_get (port->devlink);struct mlx5_vport *vport; - esw =mlx5_devlink_eswitch_get (port->devlink); -if (IS_ERR (esw)) -return PTR_ERR (esw); -if (!MLX5_CAP_GEN (esw->dev, migration)) {NL_SET_ERR_MSG_MOD (extack,"Device doesn't support migration" );return -EOPNOTSUPP ;
@@ -4304,17 +4291,13 @@ int mlx5_devlink_port_fn_migratable_get(struct devlink_port *port, bool *is_enabint mlx5_devlink_port_fn_migratable_set (struct devlink_port *port,bool enable,struct netlink_ext_ack *extack) { +struct mlx5_eswitch *esw =mlx5_devlink_eswitch_nocheck_get (port->devlink);int query_out_sz =MLX5_ST_SZ_BYTES (query_hca_cap_out); -struct mlx5_eswitch *esw;struct mlx5_vport *vport;void *query_ctx;void *hca_caps;int err; - esw =mlx5_devlink_eswitch_get (port->devlink); -if (IS_ERR (esw)) -return PTR_ERR (esw); -if (!MLX5_CAP_GEN (esw->dev, migration)) {NL_SET_ERR_MSG_MOD (extack,"Device doesn't support migration" );return -EOPNOTSUPP ;
@@ -4368,13 +4351,9 @@ int mlx5_devlink_port_fn_migratable_set(struct devlink_port *port, bool enable,int mlx5_devlink_port_fn_roce_get (struct devlink_port *port,bool *is_enabled,struct netlink_ext_ack *extack) { -struct mlx5_eswitch *esw; +struct mlx5_eswitch *esw =mlx5_devlink_eswitch_nocheck_get (port->devlink);struct mlx5_vport *vport; - esw =mlx5_devlink_eswitch_get (port->devlink); -if (IS_ERR (esw)) -return PTR_ERR (esw); - vport =mlx5_devlink_port_fn_get_vport (port, esw);if (IS_ERR (vport)) {NL_SET_ERR_MSG_MOD (extack,"Invalid port" );
@@ -4390,18 +4369,14 @@ int mlx5_devlink_port_fn_roce_get(struct devlink_port *port, bool *is_enabled,int mlx5_devlink_port_fn_roce_set (struct devlink_port *port,bool enable,struct netlink_ext_ack *extack) { +struct mlx5_eswitch *esw =mlx5_devlink_eswitch_nocheck_get (port->devlink);int query_out_sz =MLX5_ST_SZ_BYTES (query_hca_cap_out); -struct mlx5_eswitch *esw;struct mlx5_vport *vport;void *query_ctx;void *hca_caps;u16 vport_num;int err; - esw =mlx5_devlink_eswitch_get (port->devlink); -if (IS_ERR (esw)) -return PTR_ERR (esw); - vport =mlx5_devlink_port_fn_get_vport (port, esw);if (IS_ERR (vport)) {NL_SET_ERR_MSG_MOD (extack,"Invalid port" );
Signature · 1 line
2.41.0
PATCH 12/15 net/mlx5: Check vhca_resource_manager capability in each op and add extack msg
In reply to Saeed MahameedFrom: Jiri Pirko <[email protected]>
Since the follow-up patch is going to remove mlx5_devlink_port_fn_get_vport() entirely, move the vhca_resource_manager capability checking to individual ops. Add proper extack message on the way.
--- .../mellanox/mlx5/core/eswitch_offloads.c | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +20 -3
@@ -4258,9 +4258,6 @@ mlx5_devlink_port_fn_get_vport(struct devlink_port *port, struct mlx5_eswitch *e {u16 vport_num; -if (!MLX5_CAP_GEN (esw->dev, vhca_resource_manager)) -return ERR_PTR (-EOPNOTSUPP ); - vport_num =mlx5_esw_devlink_port_index_to_vport_num (port->index);return mlx5_eswitch_get_vport (esw, vport_num); }
@@ -4276,6 +4273,11 @@ int mlx5_devlink_port_fn_migratable_get(struct devlink_port *port, bool *is_enabreturn -EOPNOTSUPP ; } +if (!MLX5_CAP_GEN (esw->dev, vhca_resource_manager)) { +NL_SET_ERR_MSG_MOD (extack,"Device doesn't support VHCA management" ); +return -EOPNOTSUPP ; + } + vport =mlx5_devlink_port_fn_get_vport (port, esw);if (IS_ERR (vport)) {NL_SET_ERR_MSG_MOD (extack,"Invalid port" );
@@ -4303,6 +4305,11 @@ int mlx5_devlink_port_fn_migratable_set(struct devlink_port *port, bool enable,return -EOPNOTSUPP ; } +if (!MLX5_CAP_GEN (esw->dev, vhca_resource_manager)) { +NL_SET_ERR_MSG_MOD (extack,"Device doesn't support VHCA management" ); +return -EOPNOTSUPP ; + } + vport =mlx5_devlink_port_fn_get_vport (port, esw);if (IS_ERR (vport)) {NL_SET_ERR_MSG_MOD (extack,"Invalid port" );
@@ -4354,6 +4361,11 @@ int mlx5_devlink_port_fn_roce_get(struct devlink_port *port, bool *is_enabled,struct mlx5_eswitch *esw =mlx5_devlink_eswitch_nocheck_get (port->devlink);struct mlx5_vport *vport; +if (!MLX5_CAP_GEN (esw->dev, vhca_resource_manager)) { +NL_SET_ERR_MSG_MOD (extack,"Device doesn't support VHCA management" ); +return -EOPNOTSUPP ; + } + vport =mlx5_devlink_port_fn_get_vport (port, esw);if (IS_ERR (vport)) {NL_SET_ERR_MSG_MOD (extack,"Invalid port" );
@@ -4377,6 +4389,11 @@ int mlx5_devlink_port_fn_roce_set(struct devlink_port *port, bool enable,u16 vport_num;int err; +if (!MLX5_CAP_GEN (esw->dev, vhca_resource_manager)) { +NL_SET_ERR_MSG_MOD (extack,"Device doesn't support VHCA management" ); +return -EOPNOTSUPP ; + } + vport =mlx5_devlink_port_fn_get_vport (port, esw);if (IS_ERR (vport)) {NL_SET_ERR_MSG_MOD (extack,"Invalid port" );
Signature · 1 line
2.41.0
PATCH 13/15 net/mlx5: Store vport in struct mlx5_devlink_port and use it in port ops
In reply to Saeed MahameedFrom: Jiri Pirko <[email protected]>
Instead of using internal devlink_port->index to perform vport lookup in every devlink port op, store the vport pointer to the container struct mlx5_devlink_port and use it directly in port ops.
--- .../mellanox/mlx5/core/esw/devlink_port.c | 2 + .../net/ethernet/mellanox/mlx5/core/eswitch.h | 19 ++++++ .../mellanox/mlx5/core/eswitch_offloads.c | 61 +++---------------- 3 files changed, 29 insertions(+), 53 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c +2 -0
@@ -71,6 +71,7 @@ int mlx5_esw_offloads_pf_vf_devlink_port_init(struct mlx5_eswitch *esw, &dl_port->dl_port); vport->dl_port = dl_port; +mlx5_devlink_port_init (dl_port, vport);return 0 ; }
@@ -115,6 +116,7 @@ int mlx5_esw_offloads_sf_devlink_port_init(struct mlx5_eswitch *esw, struct mlx5mlx5_esw_offloads_sf_devlink_port_attrs_set (esw, &dl_port->dl_port, controller, sfnum); vport->dl_port = dl_port; +mlx5_devlink_port_init (dl_port, vport);return 0 ; }
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +19 -0
@@ -172,10 +172,29 @@ enum mlx5_eswitch_vport_event { MLX5_VPORT_PROMISC_CHANGE = BIT(3), }; +struct mlx5_vport ; +struct mlx5_devlink_port {struct devlink_port dl_port; +struct mlx5_vport *vport; }; +static inline void mlx5_devlink_port_init (struct mlx5_devlink_port *dl_port, +struct mlx5_vport *vport) +{ + dl_port->vport = vport; +} + +static inline struct mlx5_devlink_port *mlx5_devlink_port_get (struct devlink_port *dl_port) +{ + return container_of(dl_port, struct mlx5_devlink_port, dl_port); +} + +static inline struct mlx5_vport *mlx5_devlink_port_vport_get (struct devlink_port *dl_port) +{ +return mlx5_devlink_port_get (dl_port)->vport; +} +struct mlx5_vport {struct mlx5_core_dev *dev;struct hlist_head uc_list[MLX5_L2_ADDR_HASH_SIZE ];
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +8 -53
126 lines not on this page · raw message
Signature · 1 line
2.41.0
PATCH 14/15 net/mlx5e: Support IPsec upper protocol selector field offload for RX
In reply to Saeed MahameedFrom: Emeel Hakim <[email protected]>
Support RX policy/state upper protocol selector field offload, to enable selecting RX traffic for IPsec operation based on l4 protocol UDP with specific source/destination port.
--- .../net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 10 ++++------ .../ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c | 2 ++ 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c +4 -6
@@ -440,9 +440,8 @@ static int mlx5e_xfrm_validate_state(struct mlx5_core_dev *mdev,return -EINVAL ; } -if (x->sel.proto !=IPPROTO_IP && - (x->sel.proto !=IPPROTO_UDP || x->xso.dir !=XFRM_DEV_OFFLOAD_OUT )) { -NL_SET_ERR_MSG_MOD (extack,"Device does not support upper protocol other than UDP, and only Tx direction" ); +if (x->sel.proto !=IPPROTO_IP && x->sel.proto !=IPPROTO_UDP ) { +NL_SET_ERR_MSG_MOD (extack,"Device does not support upper protocol other than UDP" );return -EINVAL ; }
@@ -983,9 +982,8 @@ static int mlx5e_xfrm_validate_policy(struct mlx5_core_dev *mdev,return -EINVAL ; } -if (sel->proto !=IPPROTO_IP && - (sel->proto !=IPPROTO_UDP || x->xdo.dir !=XFRM_DEV_OFFLOAD_OUT )) { -NL_SET_ERR_MSG_MOD (extack,"Device does not support upper protocol other than UDP, and only Tx direction" ); +if (x->selector.proto !=IPPROTO_IP && x->selector.proto !=IPPROTO_UDP ) { +NL_SET_ERR_MSG_MOD (extack,"Device does not support upper protocol other than UDP" );return -EINVAL ; }
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c +2 -0
@@ -1243,6 +1243,7 @@ static int rx_add_rule(struct mlx5e_ipsec_sa_entry *sa_entry)setup_fte_spi (spec, attrs->spi);setup_fte_esp (spec);setup_fte_no_frags (spec); +setup_fte_upper_proto_match (spec, &attrs->upspec);if (rx != ipsec->rx_esw) err = setup_modify_header(ipsec, attrs->type,
@@ -1519,6 +1520,7 @@ static int rx_add_policy(struct mlx5e_ipsec_pol_entry *pol_entry)setup_fte_addr6 (spec, attrs->saddr.a6, attrs->daddr.a6);setup_fte_no_frags (spec); +setup_fte_upper_proto_match (spec, &attrs->upspec);switch (attrs->action) {case XFRM_POLICY_ALLOW :
Signature · 1 line
2.41.0
PATCH 15/15 net/mlx5e: Support IPsec upper TCP protocol selector
In reply to Saeed MahameedFrom: Leon Romanovsky <[email protected]>
Support TCP as protocol selector for policy and state in IPsec packet offload mode.
Example of state configuration is as follows:
ip xfrm state add src 192.168.25.3 dst 192.168.25.1 \
proto esp spi 1001 reqid 10001 aead 'rfc4106(gcm(aes))' \ 0x54a7588d36873b031e4bd46301be5a86b3a53879 128 mode transport \ offload packet dev re0 dir in sel src 192.168.25.3 dst 192.168.25.1 \ proto tcp dport 9003
--- .../mellanox/mlx5/core/en_accel/ipsec.c | 11 +++-- .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 43 +++++++++++++------ 2 files changed, 38 insertions(+), 16 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c +7 -4
@@ -440,8 +440,9 @@ static int mlx5e_xfrm_validate_state(struct mlx5_core_dev *mdev,return -EINVAL ; } -if (x->sel.proto !=IPPROTO_IP && x->sel.proto !=IPPROTO_UDP ) { -NL_SET_ERR_MSG_MOD (extack,"Device does not support upper protocol other than UDP" ); +if (x->sel.proto !=IPPROTO_IP && x->sel.proto !=IPPROTO_UDP && + x->sel.proto !=IPPROTO_TCP ) { +NL_SET_ERR_MSG_MOD (extack,"Device does not support upper protocol other than TCP/UDP" );return -EINVAL ; }
@@ -982,8 +983,10 @@ static int mlx5e_xfrm_validate_policy(struct mlx5_core_dev *mdev,return -EINVAL ; } -if (x->selector.proto !=IPPROTO_IP && x->selector.proto !=IPPROTO_UDP ) { -NL_SET_ERR_MSG_MOD (extack,"Device does not support upper protocol other than UDP" ); +if (x->selector.proto !=IPPROTO_IP && + x->selector.proto !=IPPROTO_UDP && + x->selector.proto !=IPPROTO_TCP ) { +NL_SET_ERR_MSG_MOD (extack,"Device does not support upper protocol other than TCP/UDP" );return -EINVAL ; }
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c +31 -12
54 lines not on this page · raw message
Signature · 1 line
2.41.0
Quoted 7 lines · On Tue, 22 Aug 2023 22:09:57 -0700 Saeed Mahameed wrote:
1) Patches #1..#13 From Jiri:
The goal of this patchset is to make the SF code cleaner.
Benefit from previously introduced
devlink_portstruct containerization to avoid unnecessary lookups in devlink port ops.
Quoted 7 lines
Also, benefit from the devlink locking changes and avoid unnecessary reference counting.
2) Patches #14,#15:
Add ability to configure proto both UDP and TCP selectors in RX and TX directions.