net/mlx5: E-Switch, Alloc and free unique metadata for match

Introduce infrastructure to create unique metadata for match
for vport without depending on vport_num. Vport uses its
default metadata for match in standalone configuration but
will share a different unique "bond_metadata" for match with
other vports in bond configuration.

Using ida to generate unique metadata for match for vports
in default and bond configurations.

Introduce APIs to generate, free metadata for match.
Introduce APIs to set vport's bond_metadata and replace its
ingress acl rules with bond_metatada.

Signed-off-by: Vu Pham <vuhuong@mellanox.com>
Reviewed-by: Parav Pandit <parav@mellanox.com>
Reviewed-by: Roi Dayan <roid@mellanox.com>
Reviewed-by: Mark Bloch <markb@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_ofld.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_ofld.c
index 1bae549f3fa73a18ef5d7c4061eb6e5ac2b84cdb..4e55d7225a265c2ec382c435aa59fd957eb6f853 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_ofld.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_ofld.c
@@ -291,3 +291,32 @@ void esw_acl_ingress_ofld_cleanup(struct mlx5_eswitch *esw,
        esw_acl_ingress_ofld_groups_destroy(vport);
        esw_acl_ingress_table_destroy(vport);
 }
+
+/* Caller must hold rtnl_lock */
+int mlx5_esw_acl_ingress_vport_bond_update(struct mlx5_eswitch *esw, u16 vport_num,
+                                          u32 metadata)
+{
+       struct mlx5_vport *vport = mlx5_eswitch_get_vport(esw, vport_num);
+       int err;
+
+       if (WARN_ON_ONCE(IS_ERR(vport))) {
+               esw_warn(esw->dev, "vport(%d) invalid!\n", vport_num);
+               err = PTR_ERR(vport);
+               goto out;
+       }
+
+       esw_acl_ingress_ofld_rules_destroy(esw, vport);
+
+       vport->metadata = metadata ? metadata : vport->default_metadata;
+
+       /* Recreate ingress acl rules with vport->metadata */
+       err = esw_acl_ingress_ofld_rules_create(esw, vport);
+       if (err)
+               goto out;
+
+       return 0;
+
+out:
+       vport->metadata = vport->default_metadata;
+       return err;
+}

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ofld.h b/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ofld.h
index 90ddc5d7da468d55f50f0536e2fa7c927b929d49..c57869b93d6062e0a709a2889e5fe06d361c4e17 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ofld.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ofld.h
@@ -23,5 +23,7 @@ static inline bool mlx5_esw_acl_egress_fwd2vport_supported(struct mlx5_eswitch *
 /* Eswitch acl ingress external APIs */
 int esw_acl_ingress_ofld_setup(struct mlx5_eswitch *esw, struct mlx5_vport *vport);
 void esw_acl_ingress_ofld_cleanup(struct mlx5_eswitch *esw, struct mlx5_vport *vport);
+int mlx5_esw_acl_ingress_vport_bond_update(struct mlx5_eswitch *esw, u16 vport_num,
+                                          u32 metadata);
 
 #endif /* __MLX5_ESWITCH_ACL_OFLD_H__ */

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index 20ab13ff230384100eef99887297374721fc0992..1116ab9bea6c579069f1e874997d965c7c7bc568 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -1730,6 +1730,7 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev)
        mutex_init(&esw->offloads.decap_tbl_lock);
        hash_init(esw->offloads.decap_tbl);
        atomic64_set(&esw->offloads.num_flows, 0);
+       ida_init(&esw->offloads.vport_metadata_ida);
        mutex_init(&esw->state_lock);
        mutex_init(&esw->mode_lock);
 
@@ -1768,6 +1769,7 @@ void mlx5_eswitch_cleanup(struct mlx5_eswitch *esw)
        esw_offloads_cleanup_reps(esw);
        mutex_destroy(&esw->mode_lock);
        mutex_destroy(&esw->state_lock);
+       ida_destroy(&esw->offloads.vport_metadata_ida);
        mutex_destroy(&esw->offloads.mod_hdr.lock);
        mutex_destroy(&esw->offloads.encap_tbl_lock);
        mutex_destroy(&esw->offloads.decap_tbl_lock);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
index 7b6b3686b666f4b9240521f0e578add5ff171410..a5175e98c0b348539896535d02492f5c27a6c67b 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
@@ -149,6 +149,8 @@ struct mlx5_vport {
 
        struct vport_ingress    ingress;
        struct vport_egress     egress;
+       u32                     default_metadata;
+       u32                     metadata;
 
        struct mlx5_vport_info  info;
 
@@ -224,6 +226,7 @@ struct mlx5_esw_offload {
        u8 inline_mode;
        atomic64_t num_flows;
        enum devlink_eswitch_encap_mode encap;
+       struct ida vport_metadata_ida;
 };
 
 /* E-Switch MC FDB table hash node */
@@ -292,6 +295,9 @@ int esw_offloads_enable(struct mlx5_eswitch *esw);
 void esw_offloads_cleanup_reps(struct mlx5_eswitch *esw);
 int esw_offloads_init_reps(struct mlx5_eswitch *esw);
 
+u32 mlx5_esw_match_metadata_alloc(struct mlx5_eswitch *esw);
+void mlx5_esw_match_metadata_free(struct mlx5_eswitch *esw, u32 metadata);
+
 int mlx5_esw_modify_vport_rate(struct mlx5_eswitch *esw, u16 vport_num,
                               u32 rate_mbps);
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index 11bc9cc1d5f0affd7106aacdf748537d346bfdb3..060354bb211adeaeb90c90caf9d64d3461dc8b7b 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -31,6 +31,7 @@
  */
 
 #include <linux/etherdevice.h>
+#include <linux/idr.h>
 #include <linux/mlx5/driver.h>
 #include <linux/mlx5/mlx5_ifc.h>
 #include <linux/mlx5/vport.h>
@@ -1877,15 +1878,69 @@ static bool esw_use_vport_metadata(const struct mlx5_eswitch *esw)
               esw_check_vport_match_metadata_supported(esw);
 }
 
+u32 mlx5_esw_match_metadata_alloc(struct mlx5_eswitch *esw)
+{
+       u32 num_vports = GENMASK(ESW_VPORT_BITS - 1, 0) - 1;
+       u32 vhca_id_mask = GENMASK(ESW_VHCA_ID_BITS - 1, 0);
+       u32 vhca_id = MLX5_CAP_GEN(esw->dev, vhca_id);
+       u32 start;
+       u32 end;
+       int id;
+
+       /* Make sure the vhca_id fits the ESW_VHCA_ID_BITS */
+       WARN_ON_ONCE(vhca_id >= BIT(ESW_VHCA_ID_BITS));
+
+       /* Trim vhca_id to ESW_VHCA_ID_BITS */
+       vhca_id &= vhca_id_mask;
+
+       start = (vhca_id << ESW_VPORT_BITS);
+       end = start + num_vports;
+       if (!vhca_id)
+               start += 1; /* zero is reserved/invalid metadata */
+       id = ida_alloc_range(&esw->offloads.vport_metadata_ida, start, end, GFP_KERNEL);
+
+       return (id < 0) ? 0 : id;
+}
+
+void mlx5_esw_match_metadata_free(struct mlx5_eswitch *esw, u32 metadata)
+{
+       ida_free(&esw->offloads.vport_metadata_ida, metadata);
+}
+
+static int esw_offloads_vport_metadata_setup(struct mlx5_eswitch *esw,
+                                            struct mlx5_vport *vport)
+{
+       if (vport->vport == MLX5_VPORT_UPLINK)
+               return 0;
+
+       vport->default_metadata = mlx5_esw_match_metadata_alloc(esw);
+       vport->metadata = vport->default_metadata;
+       return vport->metadata ? 0 : -ENOSPC;
+}
+
+static void esw_offloads_vport_metadata_cleanup(struct mlx5_eswitch *esw,
+                                               struct mlx5_vport *vport)
+{
+       if (vport->vport == MLX5_VPORT_UPLINK || !vport->default_metadata)
+               return;
+
+       WARN_ON(vport->metadata != vport->default_metadata);
+       mlx5_esw_match_metadata_free(esw, vport->default_metadata);
+}
+
 int
 esw_vport_create_offloads_acl_tables(struct mlx5_eswitch *esw,
                                     struct mlx5_vport *vport)
 {
        int err;
 
+       err = esw_offloads_vport_metadata_setup(esw, vport);
+       if (err)
+               goto metadata_err;
+
        err = esw_acl_ingress_ofld_setup(esw, vport);
        if (err)
-               return err;
+               goto ingress_err;
 
        if (mlx5_eswitch_is_vf_vport(esw, vport->vport)) {
                err = esw_acl_egress_ofld_setup(esw, vport);
@@ -1897,6 +1952,9 @@ esw_vport_create_offloads_acl_tables(struct mlx5_eswitch *esw,
 
 egress_err:
        esw_acl_ingress_ofld_cleanup(esw, vport);
+ingress_err:
+       esw_offloads_vport_metadata_cleanup(esw, vport);
+metadata_err:
        return err;
 }
 
@@ -1906,6 +1964,7 @@ esw_vport_destroy_offloads_acl_tables(struct mlx5_eswitch *esw,
 {
        esw_acl_egress_ofld_cleanup(vport);
        esw_acl_ingress_ofld_cleanup(esw, vport);
+       esw_offloads_vport_metadata_cleanup(esw, vport);
 }
 
 static int esw_create_uplink_offloads_acl_tables(struct mlx5_eswitch *esw)
@@ -2571,38 +2630,11 @@ EXPORT_SYMBOL(mlx5_eswitch_vport_match_metadata_enabled);
 u32 mlx5_eswitch_get_vport_metadata_for_match(struct mlx5_eswitch *esw,
                                              u16 vport_num)
 {
-       u32 vport_num_mask = GENMASK(ESW_VPORT_BITS - 1, 0);
-       u32 vhca_id_mask = GENMASK(ESW_VHCA_ID_BITS - 1, 0);
-       u32 vhca_id = MLX5_CAP_GEN(esw->dev, vhca_id);
-       u32 val;
+       struct mlx5_vport *vport = mlx5_eswitch_get_vport(esw, vport_num);
 
-       /* Make sure the vhca_id fits the ESW_VHCA_ID_BITS */
-       WARN_ON_ONCE(vhca_id >= BIT(ESW_VHCA_ID_BITS));
-
-       /* Trim vhca_id to ESW_VHCA_ID_BITS */
-       vhca_id &= vhca_id_mask;
-
-       /* Make sure pf and ecpf map to end of ESW_VPORT_BITS range so they
-        * don't overlap with VF numbers, and themselves, after trimming.
-        */
-       WARN_ON_ONCE((MLX5_VPORT_UPLINK & vport_num_mask) <
-                    vport_num_mask - 1);
-       WARN_ON_ONCE((MLX5_VPORT_ECPF & vport_num_mask) <
-                    vport_num_mask - 1);
-       WARN_ON_ONCE((MLX5_VPORT_UPLINK & vport_num_mask) ==
-                    (MLX5_VPORT_ECPF & vport_num_mask));
-
-       /* Make sure that the VF vport_num fits ESW_VPORT_BITS and don't
-        * overlap with pf and ecpf.
-        */
-       if (vport_num != MLX5_VPORT_UPLINK &&
-           vport_num != MLX5_VPORT_ECPF)
-               WARN_ON_ONCE(vport_num >= vport_num_mask - 1);
-
-       /* We can now trim vport_num to ESW_VPORT_BITS */
-       vport_num &= vport_num_mask;
+       if (WARN_ON_ONCE(IS_ERR(vport)))
+               return 0;
 
-       val = (vhca_id << ESW_VPORT_BITS) | vport_num;
-       return val << (32 - ESW_SOURCE_PORT_METADATA_BITS);
+       return vport->metadata << (32 - ESW_SOURCE_PORT_METADATA_BITS);
 }
 EXPORT_SYMBOL(mlx5_eswitch_get_vport_metadata_for_match);