net/mlx5: make metadata copy flow list thread safe

[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 931d96d..899c84b 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -384,6 +384,13 @@ enum mlx5_flow_fate_type {
        MLX5_FLOW_FATE_MAX,
 };
 
+/* Hash list callback context */
+struct mlx5_flow_cb_ctx {
+       struct rte_eth_dev *dev;
+       struct rte_flow_error *error;
+       void *data;
+};
+
 /* Matcher PRM representation */
 struct mlx5_flow_dv_match_params {
        size_t size;
@@ -460,10 +467,8 @@ struct mlx5_flow_dv_tag_resource {
 /* Modify resource structure */
 struct mlx5_flow_dv_modify_hdr_resource {
        struct mlx5_hlist_entry entry;
-       /* Pointer to next element. */
-       uint32_t refcnt; /**< Reference counter. */
-       void *action;
-       /**< Modify header action object. */
+       void *action; /**< Modify header action object. */
+       /* Key area for hash list matching: */
        uint8_t ft_type; /**< Flow table type, Rx or Tx. */
        uint32_t actions_num; /**< Number of modification actions. */
        uint64_t flags; /**< Flags for RDMA API. */
@@ -484,8 +489,6 @@ union mlx5_flow_modify_hdr_key {
 
 /* Jump action resource structure. */
 struct mlx5_flow_dv_jump_tbl_resource {
-       uint32_t refcnt; /**< Reference counter. */
-       uint8_t ft_type; /**< Flow table type, Rx or Tx. */
        void *action; /**< Pointer to the rdma core action. */
 };
 
@@ -519,12 +522,17 @@ struct mlx5_flow_mreg_copy_resource {
        struct mlx5_hlist_entry hlist_ent;
        LIST_ENTRY(mlx5_flow_mreg_copy_resource) next;
        /* List entry for device flows. */
-       uint32_t refcnt; /* Reference counter. */
-       uint32_t appcnt; /* Apply/Remove counter. */
        uint32_t idx;
        uint32_t rix_flow; /* Built flow for copy. */
 };
 
+/* Table tunnel parameter. */
+struct mlx5_flow_tbl_tunnel_prm {
+       const struct mlx5_flow_tunnel *tunnel;
+       uint32_t group_id;
+       bool external;
+};
+
 /* Table data structure of the hash organization. */
 struct mlx5_flow_tbl_data_entry {
        struct mlx5_hlist_entry entry;
@@ -540,6 +548,7 @@ struct mlx5_flow_tbl_data_entry {
        const struct mlx5_flow_tunnel *tunnel;
        uint32_t group_id;
        bool external;
+       bool tunnel_offload; /* Tunnel offlod table or not. */
 };
 
 /* Sub rdma-core actions list. */
@@ -845,6 +854,8 @@ struct mlx5_flow_meter {
        struct mlx5_flow_meter_profile *profile;
        /**< Meter profile parameters. */
 
+       rte_spinlock_t sl; /**< Meter action spinlock. */
+
        /** Policer actions (per meter output color). */
        enum rte_mtr_policer_action action[RTE_COLORS];
 
@@ -922,8 +933,6 @@ struct mlx5_fdir_flow {
        uint32_t rix_flow; /* Index to flow. */
 };
 
-#define HAIRPIN_FLOW_ID_BITS 28
-
 #define MLX5_MAX_TUNNELS 256
 #define MLX5_TNL_MISS_RULE_PRIORITY 3
 #define MLX5_TNL_MISS_FDB_JUMP_GRP  0x1234faac
@@ -953,8 +962,6 @@ struct mlx5_flow_tunnel {
 /** PMD tunnel related context */
 struct mlx5_flow_tunnel_hub {
        LIST_HEAD(, mlx5_flow_tunnel) tunnels;
-       struct mlx5_flow_id_pool *tunnel_ids;
-       struct mlx5_flow_id_pool *table_ids;
        struct mlx5_hlist *groups;              /** non tunnel groups */
 };
 
@@ -1039,14 +1046,11 @@ struct rte_flow {
        uint32_t drv_type:2; /**< Driver type. */
        uint32_t fdir:1; /**< Identifier of associated FDIR if any. */
        uint32_t tunnel:1;
-       uint32_t hairpin_flow_id:HAIRPIN_FLOW_ID_BITS;
-       /**< The flow id used for hairpin. */
-       uint32_t copy_applied:1; /**< The MARK copy Flow os applied. */
+       uint32_t meter:16; /**< Holds flow meter id. */
        uint32_t rix_mreg_copy;
        /**< Index to metadata register copy table resource. */
        uint32_t counter; /**< Holds flow counter. */
        uint32_t tunnel_id;  /**< Tunnel id */
-       uint16_t meter; /**< Holds flow meter id. */
 } __rte_packed;
 
 /*
@@ -1217,11 +1221,6 @@ struct mlx5_flow_driver_ops {
 /* mlx5_flow.c */
 
 struct mlx5_flow_workspace *mlx5_flow_get_thread_workspace(void);
-struct mlx5_flow_id_pool *mlx5_flow_id_pool_alloc(uint32_t max_id);
-void mlx5_flow_id_pool_release(struct mlx5_flow_id_pool *pool);
-uint32_t mlx5_flow_id_get(struct mlx5_flow_id_pool *pool, uint32_t *id);
-uint32_t mlx5_flow_id_release(struct mlx5_flow_id_pool *pool,
-                             uint32_t id);
 __extension__
 struct flow_grp_info {
        uint64_t external:1;
@@ -1411,4 +1410,33 @@ struct rte_flow_shared_action *mlx5_flow_get_shared_rss(struct rte_flow *flow);
 int mlx5_shared_action_flush(struct rte_eth_dev *dev);
 void mlx5_release_tunnel_hub(struct mlx5_dev_ctx_shared *sh, uint16_t port_id);
 int mlx5_alloc_tunnel_hub(struct mlx5_dev_ctx_shared *sh);
+
+/* Hash list callbacks for flow tables: */
+struct mlx5_hlist_entry *flow_dv_tbl_create_cb(struct mlx5_hlist *list,
+                                              uint64_t key, void *entry_ctx);
+void flow_dv_tbl_remove_cb(struct mlx5_hlist *list,
+                          struct mlx5_hlist_entry *entry);
+struct mlx5_flow_tbl_resource *flow_dv_tbl_resource_get(struct rte_eth_dev *dev,
+               uint32_t table_id, uint8_t egress, uint8_t transfer,
+               bool external, const struct mlx5_flow_tunnel *tunnel,
+               uint32_t group_id, uint8_t dummy, struct rte_flow_error *error);
+
+struct mlx5_hlist_entry *flow_dv_tag_create_cb(struct mlx5_hlist *list,
+                                              uint64_t key, void *cb_ctx);
+void flow_dv_tag_remove_cb(struct mlx5_hlist *list,
+                          struct mlx5_hlist_entry *entry);
+
+int flow_dv_modify_match_cb(struct mlx5_hlist *list,
+                           struct mlx5_hlist_entry *entry,
+                           uint64_t key, void *cb_ctx);
+struct mlx5_hlist_entry *flow_dv_modify_create_cb(struct mlx5_hlist *list,
+                                                 uint64_t key, void *ctx);
+void flow_dv_modify_remove_cb(struct mlx5_hlist *list,
+                             struct mlx5_hlist_entry *entry);
+
+struct mlx5_hlist_entry *flow_dv_mreg_create_cb(struct mlx5_hlist *list,
+                                               uint64_t key, void *ctx);
+void flow_dv_mreg_remove_cb(struct mlx5_hlist *list,
+                           struct mlx5_hlist_entry *entry);
+
 #endif /* RTE_PMD_MLX5_FLOW_H_ */