net/mlx5: Use devlink port pointer to get the pointer of container SF struct

[ Upstream commit 9caeb1475c3e852bcfa6332227c6bb2feaa8eb23 ]

Benefit from the fact that struct devlink_port is eventually embedded
in struct mlx5_sf and use container_of() macro to get it instead of the
xarray lookup in every devlink port op.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Shay Drory <shayd@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Stable-dep-of: 26e42ec7712d ("net/mlx5: Nack sync reset when SFs are present")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c b/drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c
index 1dd01701df20eee085c1a16df736f252eb58be95..4711dcfe8ba83dfcd2d4d4a70a9d0bb33ff3ea8b 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c
@@ -20,6 +20,13 @@ struct mlx5_sf {
        u16 hw_state;
 };
 
+static void *mlx5_sf_by_dl_port(struct devlink_port *dl_port)
+{
+       struct mlx5_devlink_port *mlx5_dl_port = mlx5_devlink_port_get(dl_port);
+
+       return container_of(mlx5_dl_port, struct mlx5_sf, dl_port);
+}
+
 struct mlx5_sf_table {
        struct mlx5_core_dev *dev; /* To refer from notifier context. */
        struct xarray port_indices; /* port index based lookup. */
@@ -30,12 +37,6 @@ struct mlx5_sf_table {
        struct notifier_block vhca_nb;
 };
 
-static struct mlx5_sf *
-mlx5_sf_lookup_by_index(struct mlx5_sf_table *table, unsigned int port_index)
-{
-       return xa_load(&table->port_indices, port_index);
-}
-
 static struct mlx5_sf *
 mlx5_sf_lookup_by_function_id(struct mlx5_sf_table *table, unsigned int fn_id)
 {
@@ -171,26 +172,19 @@ int mlx5_devlink_sf_port_fn_state_get(struct devlink_port *dl_port,
                                      struct netlink_ext_ack *extack)
 {
        struct mlx5_core_dev *dev = devlink_priv(dl_port->devlink);
+       struct mlx5_sf *sf = mlx5_sf_by_dl_port(dl_port);
        struct mlx5_sf_table *table;
-       struct mlx5_sf *sf;
-       int err = 0;
 
        table = mlx5_sf_table_try_get(dev);
        if (!table)
                return -EOPNOTSUPP;
 
-       sf = mlx5_sf_lookup_by_index(table, dl_port->index);
-       if (!sf) {
-               err = -EOPNOTSUPP;
-               goto sf_err;
-       }
        mutex_lock(&table->sf_state_lock);
        *state = mlx5_sf_to_devlink_state(sf->hw_state);
        *opstate = mlx5_sf_to_devlink_opstate(sf->hw_state);
        mutex_unlock(&table->sf_state_lock);
-sf_err:
        mlx5_sf_table_put(table);
-       return err;
+       return 0;
 }
 
 static int mlx5_sf_activate(struct mlx5_core_dev *dev, struct mlx5_sf *sf,
@@ -256,8 +250,8 @@ int mlx5_devlink_sf_port_fn_state_set(struct devlink_port *dl_port,
                                      struct netlink_ext_ack *extack)
 {
        struct mlx5_core_dev *dev = devlink_priv(dl_port->devlink);
+       struct mlx5_sf *sf = mlx5_sf_by_dl_port(dl_port);
        struct mlx5_sf_table *table;
-       struct mlx5_sf *sf;
        int err;
 
        table = mlx5_sf_table_try_get(dev);
@@ -266,14 +260,7 @@ int mlx5_devlink_sf_port_fn_state_set(struct devlink_port *dl_port,
                                   "Port state set is only supported in eswitch switchdev mode or SF ports are disabled.");
                return -EOPNOTSUPP;
        }
-       sf = mlx5_sf_lookup_by_index(table, dl_port->index);
-       if (!sf) {
-               err = -ENODEV;
-               goto out;
-       }
-
        err = mlx5_sf_state_set(dev, table, sf, state, extack);
-out:
        mlx5_sf_table_put(table);
        return err;
 }
@@ -384,10 +371,9 @@ int mlx5_devlink_sf_port_del(struct devlink *devlink,
                             struct netlink_ext_ack *extack)
 {
        struct mlx5_core_dev *dev = devlink_priv(devlink);
+       struct mlx5_sf *sf = mlx5_sf_by_dl_port(dl_port);
        struct mlx5_eswitch *esw = dev->priv.eswitch;
        struct mlx5_sf_table *table;
-       struct mlx5_sf *sf;
-       int err = 0;
 
        table = mlx5_sf_table_try_get(dev);
        if (!table) {
@@ -395,20 +381,14 @@ int mlx5_devlink_sf_port_del(struct devlink *devlink,
                                   "Port del is only supported in eswitch switchdev mode or SF ports are disabled.");
                return -EOPNOTSUPP;
        }
-       sf = mlx5_sf_lookup_by_index(table, dl_port->index);
-       if (!sf) {
-               err = -ENODEV;
-               goto sf_err;
-       }
 
        mlx5_eswitch_unload_sf_vport(esw, sf->hw_fn_id);
 
        mutex_lock(&table->sf_state_lock);
        mlx5_sf_dealloc(table, sf);
        mutex_unlock(&table->sf_state_lock);
-sf_err:
        mlx5_sf_table_put(table);
-       return err;
+       return 0;
 }
 
 static bool mlx5_sf_state_update_check(const struct mlx5_sf *sf, u8 new_state)