net/mlx5e: E-Switch, Maintain vhca_id to vport_num mapping

Following patches in the series need to be able to map VF netdev to vport.
Since it is trivial to obtain vhca_id from netdev, maintain mapping from
vhca_id to vport_num inside eswitch offloads using xarray. Provide function
mlx5_eswitch_vhca_id_to_vport() to be used by TC code in following patches
to obtain the mapping.

Signed-off-by: Vlad Buslov <vladbu@nvidia.com>
Signed-off-by: Dmytro Linkin <dlinkin@nvidia.com>
Reviewed-by: Roi Dayan <roid@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index 820305b..aba1783 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -1300,6 +1300,13 @@ int mlx5_esw_vport_enable(struct mlx5_eswitch *esw, u16 vport_num,
            (!vport_num && mlx5_core_is_ecpf(esw->dev)))
                vport->info.trusted = true;
 
+       if (!mlx5_esw_is_manager_vport(esw, vport->vport) &&
+           MLX5_CAP_GEN(esw->dev, vhca_resource_manager)) {
+               ret = mlx5_esw_vport_vhca_id_set(esw, vport_num);
+               if (ret)
+                       goto err_vhca_mapping;
+       }
+
        esw_vport_change_handle_locked(vport);
 
        esw->enabled_vports++;
@@ -1307,6 +1314,11 @@ int mlx5_esw_vport_enable(struct mlx5_eswitch *esw, u16 vport_num,
 done:
        mutex_unlock(&esw->state_lock);
        return ret;
+
+err_vhca_mapping:
+       esw_vport_cleanup(esw, vport);
+       mutex_unlock(&esw->state_lock);
+       return ret;
 }
 
 void mlx5_esw_vport_disable(struct mlx5_eswitch *esw, u16 vport_num)
@@ -1325,6 +1337,11 @@ void mlx5_esw_vport_disable(struct mlx5_eswitch *esw, u16 vport_num)
 
        /* Disable events from this vport */
        arm_vport_context_events_cmd(esw->dev, vport->vport, 0);
+
+       if (!mlx5_esw_is_manager_vport(esw, vport->vport) &&
+           MLX5_CAP_GEN(esw->dev, vhca_resource_manager))
+               mlx5_esw_vport_vhca_id_clear(esw, vport_num);
+
        /* We don't assume VFs will cleanup after themselves.
         * Calling vport change handler while vport is disabled will cleanup
         * the vport resources.
@@ -1815,6 +1832,7 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev)
        mlx5e_mod_hdr_tbl_init(&esw->offloads.mod_hdr);
        atomic64_set(&esw->offloads.num_flows, 0);
        ida_init(&esw->offloads.vport_metadata_ida);
+       xa_init_flags(&esw->offloads.vhca_map, XA_FLAGS_ALLOC);
        mutex_init(&esw->state_lock);
        mutex_init(&esw->mode_lock);
 
@@ -1854,6 +1872,8 @@ void mlx5_eswitch_cleanup(struct mlx5_eswitch *esw)
        esw_offloads_cleanup_reps(esw);
        mutex_destroy(&esw->mode_lock);
        mutex_destroy(&esw->state_lock);
+       WARN_ON(!xa_empty(&esw->offloads.vhca_map));
+       xa_destroy(&esw->offloads.vhca_map);
        ida_destroy(&esw->offloads.vport_metadata_ida);
        mlx5e_mod_hdr_tbl_destroy(&esw->offloads.mod_hdr);
        mutex_destroy(&esw->offloads.encap_tbl_lock);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
index 479d2ac..1a045e9 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
@@ -36,6 +36,7 @@
 #include <linux/if_ether.h>
 #include <linux/if_link.h>
 #include <linux/atomic.h>
+#include <linux/xarray.h>
 #include <net/devlink.h>
 #include <linux/mlx5/device.h>
 #include <linux/mlx5/eswitch.h>
@@ -212,6 +213,7 @@ struct mlx5_esw_offload {
        struct mod_hdr_tbl mod_hdr;
        DECLARE_HASHTABLE(termtbl_tbl, 8);
        struct mutex termtbl_mutex; /* protects termtbl hash */
+       struct xarray vhca_map;
        const struct mlx5_eswitch_rep_ops *rep_ops[NUM_REP_TYPES];
        u8 inline_mode;
        atomic64_t num_flows;
@@ -734,6 +736,10 @@ int mlx5_esw_offloads_sf_vport_enable(struct mlx5_eswitch *esw, struct devlink_p
                                      u16 vport_num, u32 sfnum);
 void mlx5_esw_offloads_sf_vport_disable(struct mlx5_eswitch *esw, u16 vport_num);
 
+int mlx5_esw_vport_vhca_id_set(struct mlx5_eswitch *esw, u16 vport_num);
+void mlx5_esw_vport_vhca_id_clear(struct mlx5_eswitch *esw, u16 vport_num);
+int mlx5_eswitch_vhca_id_to_vport(struct mlx5_eswitch *esw, u16 vhca_id, u16 *vport_num);
+
 /**
  * mlx5_esw_event_info - Indicates eswitch mode changed/changing.
  *

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index 416ede2..3085bdd 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -2872,3 +2872,82 @@ void mlx5_esw_offloads_sf_vport_disable(struct mlx5_eswitch *esw, u16 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);
+       void *query_ctx;
+       void *hca_caps;
+       int err;
+
+       *vhca_id = 0;
+       if (mlx5_esw_is_manager_vport(esw, vport_num) ||
+           !MLX5_CAP_GEN(esw->dev, vhca_resource_manager))
+               return -EPERM;
+
+       query_ctx = kzalloc(query_out_sz, GFP_KERNEL);
+       if (!query_ctx)
+               return -ENOMEM;
+
+       err = mlx5_vport_get_other_func_cap(esw->dev, vport_num, query_ctx);
+       if (err)
+               goto out_free;
+
+       hca_caps = MLX5_ADDR_OF(query_hca_cap_out, query_ctx, capability);
+       *vhca_id = MLX5_GET(cmd_hca_cap, hca_caps, vhca_id);
+
+out_free:
+       kfree(query_ctx);
+       return err;
+}
+
+int mlx5_esw_vport_vhca_id_set(struct mlx5_eswitch *esw, u16 vport_num)
+{
+       u16 *old_entry, *vhca_map_entry, vhca_id;
+       int err;
+
+       err = mlx5_esw_query_vport_vhca_id(esw, vport_num, &vhca_id);
+       if (err) {
+               esw_warn(esw->dev, "Getting vhca_id for vport failed (vport=%u,err=%d)\n",
+                        vport_num, err);
+               return err;
+       }
+
+       vhca_map_entry = kmalloc(sizeof(*vhca_map_entry), GFP_KERNEL);
+       if (!vhca_map_entry)
+               return -ENOMEM;
+
+       *vhca_map_entry = vport_num;
+       old_entry = xa_store(&esw->offloads.vhca_map, vhca_id, vhca_map_entry, GFP_KERNEL);
+       if (xa_is_err(old_entry)) {
+               kfree(vhca_map_entry);
+               return xa_err(old_entry);
+       }
+       kfree(old_entry);
+       return 0;
+}
+
+void mlx5_esw_vport_vhca_id_clear(struct mlx5_eswitch *esw, u16 vport_num)
+{
+       u16 *vhca_map_entry, vhca_id;
+       int err;
+
+       err = mlx5_esw_query_vport_vhca_id(esw, vport_num, &vhca_id);
+       if (err)
+               esw_warn(esw->dev, "Getting vhca_id for vport failed (vport=%hu,err=%d)\n",
+                        vport_num, err);
+
+       vhca_map_entry = xa_erase(&esw->offloads.vhca_map, vhca_id);
+       kfree(vhca_map_entry);
+}
+
+int mlx5_eswitch_vhca_id_to_vport(struct mlx5_eswitch *esw, u16 vhca_id, u16 *vport_num)
+{
+       u16 *res = xa_load(&esw->offloads.vhca_map, vhca_id);
+
+       if (!res)
+               return -ENOENT;
+
+       *vport_num = *res;
+       return 0;
+}

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
index 3754ef9..efe403c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
@@ -270,5 +270,7 @@ void mlx5_mdev_uninit(struct mlx5_core_dev *dev);
 void mlx5_unload_one(struct mlx5_core_dev *dev, bool cleanup);
 int mlx5_load_one(struct mlx5_core_dev *dev, bool boot);
 
+int mlx5_vport_get_other_func_cap(struct mlx5_core_dev *dev, u16 function_id, void *out);
+
 void mlx5_events_work_enqueue(struct mlx5_core_dev *dev, struct work_struct *work);
 #endif /* __MLX5_CORE_H__ */

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vport.c b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
index ba78e06..e05c5c0 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/vport.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
@@ -1164,3 +1164,15 @@ u16 mlx5_eswitch_get_total_vports(const struct mlx5_core_dev *dev)
        return MLX5_SPECIAL_VPORTS(dev) + mlx5_core_max_vfs(dev) + mlx5_sf_max_functions(dev);
 }
 EXPORT_SYMBOL_GPL(mlx5_eswitch_get_total_vports);
+
+int mlx5_vport_get_other_func_cap(struct mlx5_core_dev *dev, u16 function_id, void *out)
+{
+       u16 opmod = (MLX5_CAP_GENERAL << 1) | (HCA_CAP_OPMOD_GET_MAX & 0x01);
+       u8 in[MLX5_ST_SZ_BYTES(query_hca_cap_in)] = {};
+
+       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, function_id);
+       MLX5_SET(query_hca_cap_in, in, other_function, true);
+       return mlx5_cmd_exec_inout(dev, query_hca_cap, in, out);
+}