common/cnxk: add lower bound check for SSO resources

[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 4c224bb..eb13365 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -186,6 +186,9 @@ enum mlx5_feature_name {
 #define MLX5_FLOW_ITEM_INNER_FLEX (UINT64_C(1) << 38)
 #define MLX5_FLOW_ITEM_FLEX_TUNNEL (UINT64_C(1) << 39)
 
+/* ESP item */
+#define MLX5_FLOW_ITEM_ESP (UINT64_C(1) << 40)
+
 /* Outer Masks. */
 #define MLX5_FLOW_LAYER_OUTER_L3 \
        (MLX5_FLOW_LAYER_OUTER_L3_IPV4 | MLX5_FLOW_LAYER_OUTER_L3_IPV6)
@@ -427,7 +430,7 @@ enum mlx5_feature_name {
 #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_PORT          1
 #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
@@ -700,7 +703,6 @@ struct mlx5_flow_handle {
        uint32_t split_flow_id:27; /**< Sub flow unique match flow id. */
        uint32_t is_meter_flow_id:1; /**< Indicate if flow_id is for meter. */
        uint32_t fate_action:3; /**< Fate action type. */
-       uint32_t flex_item; /**< referenced Flex Item bitmask. */
        union {
                uint32_t rix_hrxq; /**< Hash Rx queue object index. */
                uint32_t rix_jump; /**< Index to the jump action resource. */
@@ -716,6 +718,7 @@ struct mlx5_flow_handle {
 #if defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_INFINIBAND_VERBS_H)
        struct mlx5_flow_handle_dv dvh;
 #endif
+       uint8_t flex_item; /**< referenced Flex Item bitmask. */
 } __rte_packed;
 
 /*
@@ -1040,6 +1043,14 @@ struct mlx5_action_construct_data {
        uint16_t action_src; /* rte_flow_action src offset. */
        uint16_t action_dst; /* mlx5dr_rule_action dst offset. */
        union {
+               struct {
+                       /* encap src(item) offset. */
+                       uint16_t src;
+                       /* encap dst data offset. */
+                       uint16_t dst;
+                       /* encap data len. */
+                       uint16_t len;
+               } encap;
                struct {
                        uint64_t types; /* RSS hash types. */
                        uint32_t level; /* RSS level. */
@@ -1076,6 +1087,13 @@ struct mlx5_hw_jump_action {
        struct mlx5dr_action *hws_action;
 };
 
+/* Encap decap action struct. */
+struct mlx5_hw_encap_decap_action {
+       struct mlx5dr_action *action; /* Action object. */
+       size_t data_size; /* Action metadata size. */
+       uint8_t data[]; /* Action data. */
+};
+
 /* The maximum actions support in the flow. */
 #define MLX5_HW_MAX_ACTS 16
 
@@ -1085,6 +1103,9 @@ struct mlx5_hw_actions {
        LIST_HEAD(act_list, mlx5_action_construct_data) act_list;
        struct mlx5_hw_jump_action *jump; /* Jump action. */
        struct mlx5_hrxq *tir; /* TIR action. */
+       /* Encap/Decap action. */
+       struct mlx5_hw_encap_decap_action *encap_decap;
+       uint16_t encap_decap_pos; /* Encap/Decap action position. */
        uint32_t acts_num:4; /* Total action number. */
        uint32_t mark:1; /* Indicate the mark action. */
        /* Translated DR action array from action template. */
@@ -1167,6 +1188,16 @@ struct rte_flow_template_table {
        (MLX5_RSS_HASH_IPV6 | IBV_RX_HASH_SRC_PORT_TCP)
 #define MLX5_RSS_HASH_IPV6_TCP_DST_ONLY \
        (MLX5_RSS_HASH_IPV6 | IBV_RX_HASH_DST_PORT_TCP)
+
+#ifndef HAVE_IBV_RX_HASH_IPSEC_SPI
+#define IBV_RX_HASH_IPSEC_SPI (1U << 8)
+#endif
+
+#define MLX5_RSS_HASH_ESP_SPI IBV_RX_HASH_IPSEC_SPI
+#define MLX5_RSS_HASH_IPV4_ESP (MLX5_RSS_HASH_IPV4 | \
+                               MLX5_RSS_HASH_ESP_SPI)
+#define MLX5_RSS_HASH_IPV6_ESP (MLX5_RSS_HASH_IPV6 | \
+                               MLX5_RSS_HASH_ESP_SPI)
 #define MLX5_RSS_HASH_NONE 0ULL
 
 
@@ -1182,9 +1213,12 @@ static const uint64_t mlx5_rss_hash_fields[] = {
        MLX5_RSS_HASH_IPV4,
        MLX5_RSS_HASH_IPV4_TCP,
        MLX5_RSS_HASH_IPV4_UDP,
+       MLX5_RSS_HASH_IPV4_ESP,
        MLX5_RSS_HASH_IPV6,
        MLX5_RSS_HASH_IPV6_TCP,
        MLX5_RSS_HASH_IPV6_UDP,
+       MLX5_RSS_HASH_IPV6_ESP,
+       MLX5_RSS_HASH_ESP_SPI,
        MLX5_RSS_HASH_NONE,
 };
 
@@ -1765,6 +1799,12 @@ int mlx5_flow_validate_item_gre_key(const struct rte_flow_item *item,
                                    uint64_t item_flags,
                                    const struct rte_flow_item *gre_item,
                                    struct rte_flow_error *error);
+int mlx5_flow_validate_item_gre_option(struct rte_eth_dev *dev,
+                                      const struct rte_flow_item *item,
+                                      uint64_t item_flags,
+                                      const struct rte_flow_attr *attr,
+                                      const struct rte_flow_item *gre_item,
+                                      struct rte_flow_error *error);
 int mlx5_flow_validate_item_ipv4(const struct rte_flow_item *item,
                                 uint64_t item_flags,
                                 uint64_t last_item,
@@ -2027,4 +2067,7 @@ int flow_dv_action_query(struct rte_eth_dev *dev,
                         const struct rte_flow_action_handle *handle,
                         void *data,
                         struct rte_flow_error *error);
+size_t flow_dv_get_item_hdr_len(const enum rte_flow_item_type item_type);
+int flow_dv_convert_encap_data(const struct rte_flow_item *items, uint8_t *buf,
+                          size_t *size, struct rte_flow_error *error);
 #endif /* RTE_PMD_MLX5_FLOW_H_ */