net/mlx5e: Adjustments in the TC offload code towards reuse for SRIOV

[linux-2.6-block.git] / drivers / net / ethernet / mellanox / mlx5 / core / en_tc.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 704c3d30493e8218a13a1a1c0ebb4eac7885f9c0..57b76f759ee800d436174af716a566f47e9f53f9 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -49,9 +49,9 @@ struct mlx5e_tc_flow {
 #define MLX5E_TC_TABLE_NUM_ENTRIES 1024
 #define MLX5E_TC_TABLE_NUM_GROUPS 4
 
-static struct mlx5_flow_rule *mlx5e_tc_add_flow(struct mlx5e_priv *priv,
-                                               u32 *match_c, u32 *match_v,
-                                               u32 action, u32 flow_tag)
+static struct mlx5_flow_rule *mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv,
+                                                   struct mlx5_flow_spec *spec,
+                                                   u32 action, u32 flow_tag)
 {
        struct mlx5_core_dev *dev = priv->mdev;
        struct mlx5_flow_destination dest = { 0 };
@@ -62,7 +62,7 @@ static struct mlx5_flow_rule *mlx5e_tc_add_flow(struct mlx5e_priv *priv,
        if (action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST) {
                dest.type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE;
                dest.ft = priv->fs.vlan.ft.t;
-       } else {
+       } else if (action & MLX5_FLOW_CONTEXT_ACTION_COUNT) {
                counter = mlx5_fc_create(dev, true);
                if (IS_ERR(counter))
                        return ERR_CAST(counter);
@@ -88,8 +88,8 @@ static struct mlx5_flow_rule *mlx5e_tc_add_flow(struct mlx5e_priv *priv,
                table_created = true;
        }
 
-       rule = mlx5_add_flow_rule(priv->fs.tc.t, MLX5_MATCH_OUTER_HEADERS,
-                                 match_c, match_v,
+       spec->match_criteria_enable = MLX5_MATCH_OUTER_HEADERS;
+       rule = mlx5_add_flow_rule(priv->fs.tc.t, spec,
                                  action, flow_tag,
                                  &dest);
 
@@ -120,18 +120,19 @@ static void mlx5e_tc_del_flow(struct mlx5e_priv *priv,
 
        mlx5_fc_destroy(priv->mdev, counter);
 
-       if (!mlx5e_tc_num_filters(priv)) {
+       if (!mlx5e_tc_num_filters(priv) && (priv->fs.tc.t)) {
                mlx5_destroy_flow_table(priv->fs.tc.t);
                priv->fs.tc.t = NULL;
        }
 }
 
-static int parse_cls_flower(struct mlx5e_priv *priv,
-                           u32 *match_c, u32 *match_v,
+static int parse_cls_flower(struct mlx5e_priv *priv, struct mlx5_flow_spec *spec,
                            struct tc_cls_flower_offload *f)
 {
-       void *headers_c = MLX5_ADDR_OF(fte_match_param, match_c, outer_headers);
-       void *headers_v = MLX5_ADDR_OF(fte_match_param, match_v, outer_headers);
+       void *headers_c = MLX5_ADDR_OF(fte_match_param, spec->match_criteria,
+                                      outer_headers);
+       void *headers_v = MLX5_ADDR_OF(fte_match_param, spec->match_value,
+                                      outer_headers);
        u16 addr_type = 0;
        u8 ip_proto = 0;
 
@@ -294,8 +295,8 @@ static int parse_cls_flower(struct mlx5e_priv *priv,
        return 0;
 }
 
-static int parse_tc_actions(struct mlx5e_priv *priv, struct tcf_exts *exts,
-                           u32 *action, u32 *flow_tag)
+static int parse_tc_nic_actions(struct mlx5e_priv *priv, struct tcf_exts *exts,
+                               u32 *action, u32 *flow_tag)
 {
        const struct tc_action *a;
 
@@ -342,12 +343,11 @@ int mlx5e_configure_flower(struct mlx5e_priv *priv, __be16 protocol,
                           struct tc_cls_flower_offload *f)
 {
        struct mlx5e_tc_table *tc = &priv->fs.tc;
-       u32 *match_c;
-       u32 *match_v;
        int err = 0;
        u32 flow_tag;
        u32 action;
        struct mlx5e_tc_flow *flow;
+       struct mlx5_flow_spec *spec;
        struct mlx5_flow_rule *old = NULL;
 
        flow = rhashtable_lookup_fast(&tc->ht, &f->cookie,
@@ -357,49 +357,46 @@ int mlx5e_configure_flower(struct mlx5e_priv *priv, __be16 protocol,
        else
                flow = kzalloc(sizeof(*flow), GFP_KERNEL);
 
-       match_c = kzalloc(MLX5_ST_SZ_BYTES(fte_match_param), GFP_KERNEL);
-       match_v = kzalloc(MLX5_ST_SZ_BYTES(fte_match_param), GFP_KERNEL);
-       if (!match_c || !match_v || !flow) {
+       spec = mlx5_vzalloc(sizeof(*spec));
+       if (!spec || !flow) {
                err = -ENOMEM;
                goto err_free;
        }
 
        flow->cookie = f->cookie;
 
-       err = parse_cls_flower(priv, match_c, match_v, f);
+       err = parse_cls_flower(priv, spec, f);
        if (err < 0)
                goto err_free;
 
-       err = parse_tc_actions(priv, f->exts, &action, &flow_tag);
+       err = parse_tc_nic_actions(priv, f->exts, &action, &flow_tag);
        if (err < 0)
                goto err_free;
 
-       err = rhashtable_insert_fast(&tc->ht, &flow->node,
-                                    tc->ht_params);
-       if (err)
-               goto err_free;
-
-       flow->rule = mlx5e_tc_add_flow(priv, match_c, match_v, action,
-                                      flow_tag);
+       flow->rule = mlx5e_tc_add_nic_flow(priv, spec, action, flow_tag);
        if (IS_ERR(flow->rule)) {
                err = PTR_ERR(flow->rule);
-               goto err_hash_del;
+               goto err_free;
        }
 
+       err = rhashtable_insert_fast(&tc->ht, &flow->node,
+                                    tc->ht_params);
+       if (err)
+               goto err_del_rule;
+
        if (old)
                mlx5e_tc_del_flow(priv, old);
 
        goto out;
 
-err_hash_del:
-       rhashtable_remove_fast(&tc->ht, &flow->node, tc->ht_params);
+err_del_rule:
+       mlx5_del_flow_rule(flow->rule);
 
 err_free:
        if (!old)
                kfree(flow);
 out:
-       kfree(match_c);
-       kfree(match_v);
+       kvfree(spec);
        return err;
 }