net/mlx5: optimize flow meter handle type

While flow attaches the meter handle, the meter id can be the unique tag
for the flow to get the meter handle. It's no need for flow to save the
pointer of the meter handle.

Save the meter id instead of pointer helps reduce the size for rte flow
structure.

As the supported maximum meter rule is 4K, uint16_t type is selected for
the meter id.

Signed-off-by: Suanming Mou <suanmingm@mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>

diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index e78de859d494231b0fcc260d631aa4607dd7eca1..bf0345a8d6ed05fc55816147aff2aa290e6b05a0 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -757,7 +757,7 @@ struct rte_flow {
        uint32_t counter; /**< Holds flow counter. */
        struct mlx5_flow_mreg_copy_resource *mreg_copy;
        /**< pointer to metadata register copy table resource. */
-       struct mlx5_flow_meter *meter; /**< Holds flow meter. */
+       uint16_t meter; /**< Holds flow meter id. */
        uint32_t dev_handles;
        /**< Device flow handles that are part of the flow. */
        struct mlx5_fdir *fdir; /**< Pointer to associated FDIR if any. */

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index a8e92f263bae0313a8ee86d38399ac49cb1aeb68..23b69ba933a09e0ae963157c630c4355214a254a 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -7430,6 +7430,7 @@ __flow_dv_translate(struct rte_eth_dev *dev,
                struct mlx5_flow_dv_port_id_action_resource port_id_resource;
                int action_type = actions->type;
                const struct rte_flow_action *found_action = NULL;
+               struct mlx5_flow_meter *fm = NULL;
 
                switch (action_type) {
                case RTE_FLOW_ACTION_TYPE_VOID:
@@ -7806,20 +7807,30 @@ cnt_err:
                case RTE_FLOW_ACTION_TYPE_METER:
                        mtr = actions->conf;
                        if (!flow->meter) {
-                               flow->meter = mlx5_flow_meter_attach(priv,
-                                                       mtr->mtr_id, attr,
-                                                       error);
-                               if (!flow->meter)
+                               fm = mlx5_flow_meter_attach(priv, mtr->mtr_id,
+                                                           attr, error);
+                               if (!fm)
                                        return rte_flow_error_set(error,
                                                rte_errno,
                                                RTE_FLOW_ERROR_TYPE_ACTION,
                                                NULL,
                                                "meter not found "
                                                "or invalid parameters");
+                               flow->meter = fm->meter_id;
                        }
                        /* Set the meter action. */
+                       if (!fm) {
+                               fm = mlx5_flow_meter_find(priv, flow->meter);
+                               if (!fm)
+                                       return rte_flow_error_set(error,
+                                               rte_errno,
+                                               RTE_FLOW_ERROR_TYPE_ACTION,
+                                               NULL,
+                                               "meter not found "
+                                               "or invalid parameters");
+                       }
                        dev_flow->dv.actions[actions_n++] =
-                               flow->meter->mfts->meter_action;
+                               fm->mfts->meter_action;
                        action_flags |= MLX5_FLOW_ACTION_METER;
                        break;
                case RTE_FLOW_ACTION_TYPE_SET_IPV4_DSCP:
@@ -8524,8 +8535,12 @@ __flow_dv_destroy(struct rte_eth_dev *dev, struct rte_flow *flow)
                flow->counter = 0;
        }
        if (flow->meter) {
-               mlx5_flow_meter_detach(flow->meter);
-               flow->meter = NULL;
+               struct mlx5_flow_meter *fm;
+
+               fm  = mlx5_flow_meter_find(priv, flow->meter);
+               if (fm)
+                       mlx5_flow_meter_detach(fm);
+               flow->meter = 0;
        }
        while (flow->dev_handles) {
                uint32_t tmp_idx = flow->dev_handles;