net/bnxt: add Truflow flush-timer to alloc table scope

[dpdk.git] / drivers / net / mlx5 / mlx5_flow.h

diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index 6edd1cf..2a1f596 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -332,6 +332,23 @@ enum mlx5_feature_name {
 #define MLX5_ENCAPSULATION_DECISION_SIZE (sizeof(struct rte_flow_item_eth) + \
                                          sizeof(struct rte_flow_item_ipv4))
 
+/* Software header modify action numbers of a flow. */
+#define MLX5_ACT_NUM_MDF_IPV4          1
+#define MLX5_ACT_NUM_MDF_IPV6          4
+#define MLX5_ACT_NUM_MDF_MAC           2
+#define MLX5_ACT_NUM_MDF_VID           1
+#define MLX5_ACT_NUM_MDF_PORT          2
+#define MLX5_ACT_NUM_MDF_TTL           1
+#define MLX5_ACT_NUM_DEC_TTL           MLX5_ACT_NUM_MDF_TTL
+#define MLX5_ACT_NUM_MDF_TCPSEQ                1
+#define MLX5_ACT_NUM_MDF_TCPACK                1
+#define MLX5_ACT_NUM_SET_REG           1
+#define MLX5_ACT_NUM_SET_TAG           1
+#define MLX5_ACT_NUM_CPY_MREG          MLX5_ACT_NUM_SET_TAG
+#define MLX5_ACT_NUM_SET_MARK          MLX5_ACT_NUM_SET_TAG
+#define MLX5_ACT_NUM_SET_META          MLX5_ACT_NUM_SET_TAG
+#define MLX5_ACT_NUM_SET_DSCP          1
+
 enum mlx5_flow_drv_type {
        MLX5_FLOW_TYPE_MIN,
        MLX5_FLOW_TYPE_DV,
@@ -709,12 +726,41 @@ struct mlx5_flow_meter {
        uint32_t idx; /* Index to meter object. */
        uint32_t meter_id;
        /**< Meter id. */
-       struct rte_mtr_params params;
-       /**< Meter rule parameters. */
        struct mlx5_flow_meter_profile *profile;
        /**< Meter profile parameters. */
-       struct rte_flow_attr attr;
-       /**< Flow attributes. */
+
+       /** Policer actions (per meter output color). */
+       enum rte_mtr_policer_action action[RTE_COLORS];
+
+       /** Set of stats counters to be enabled.
+        * @see enum rte_mtr_stats_type
+        */
+       uint64_t stats_mask;
+
+       /**< Rule applies to ingress traffic. */
+       uint32_t ingress:1;
+
+       /**< Rule applies to egress traffic. */
+       uint32_t egress:1;
+       /**
+        * Instead of simply matching the properties of traffic as it would
+        * appear on a given DPDK port ID, enabling this attribute transfers
+        * a flow rule to the lowest possible level of any device endpoints
+        * found in the pattern.
+        *
+        * When supported, this effectively enables an application to
+        * re-route traffic not necessarily intended for it (e.g. coming
+        * from or addressed to different physical ports, VFs or
+        * applications) at the device level.
+        *
+        * It complements the behavior of some pattern items such as
+        * RTE_FLOW_ITEM_TYPE_PHY_PORT and is meaningless without them.
+        *
+        * When transferring flow rules, ingress and egress attributes keep
+        * their original meaning, as if processing traffic emitted or
+        * received by the application.
+        */
+       uint32_t transfer:1;
        struct mlx5_meter_domains_infos *mfts;
        /**< Flow table created for this meter. */
        struct mlx5_flow_policer_stats policer_stats;
@@ -783,6 +829,7 @@ typedef int (*mlx5_flow_validate_t)(struct rte_eth_dev *dev,
                                    const struct rte_flow_item items[],
                                    const struct rte_flow_action actions[],
                                    bool external,
+                                   int hairpin,
                                    struct rte_flow_error *error);
 typedef struct mlx5_flow *(*mlx5_flow_prepare_t)
        (struct rte_eth_dev *dev, const struct rte_flow_attr *attr,