app/testpmd: fix use of indirect action after port close

[dpdk.git] / drivers / net / sfc / sfc_flow.h

diff --git a/drivers/net/sfc/sfc_flow.h b/drivers/net/sfc/sfc_flow.h
index d3bdbd5..1287534 100644 (file)
--- a/drivers/net/sfc/sfc_flow.h
+++ b/drivers/net/sfc/sfc_flow.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright(c) 2019-2020 Xilinx, Inc.
+ * Copyright(c) 2019-2021 Xilinx, Inc.
  * Copyright(c) 2017-2019 Solarflare Communications Inc.
  *
  * This software was jointly developed between OKTET Labs (under contract
@@ -15,6 +15,8 @@
 
 #include "efx.h"
 
+#include "sfc_flow_rss.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -26,14 +28,9 @@ extern "C" {
  */
 #define SF_FLOW_SPEC_NB_FILTERS_MAX 8
 
-/* RSS configuration storage */
-struct sfc_flow_rss {
-       unsigned int    rxq_hw_index_min;
-       unsigned int    rxq_hw_index_max;
-       unsigned int    rss_hash_types;
-       uint8_t         rss_key[EFX_RSS_KEY_SIZE];
-       unsigned int    rss_tbl[EFX_RSS_TBL_SIZE];
-};
+/* Used to guard action masks */
+#define SFC_BUILD_SET_OVERFLOW(_action, _set) \
+       RTE_BUILD_BUG_ON((_action) >= sizeof(_set) * CHAR_BIT)
 
 /* Flow engines supported by the implementation */
 enum sfc_flow_spec_type {
@@ -51,18 +48,33 @@ struct sfc_flow_spec_filter {
        efx_filter_spec_t filters[SF_FLOW_SPEC_NB_FILTERS_MAX];
        /* number of complete specifications */
        unsigned int count;
-       /* RSS toggle */
-       boolean_t rss;
-       /* RSS hash toggle */
-       boolean_t rss_hash_required;
-       /* RSS configuration */
-       struct sfc_flow_rss rss_conf;
+       /* RSS context (or NULL) */
+       struct sfc_flow_rss_ctx *rss_ctx;
+};
+
+/* Indicates the role of a given flow in tunnel offload */
+enum sfc_ft_rule_type {
+       /* The flow has nothing to do with tunnel offload */
+       SFC_FT_RULE_NONE = 0,
+       /* The flow is a TUNNEL rule, to match on an outer header */
+       SFC_FT_RULE_TUNNEL,
+       /*
+        * The flow is a SWITCH rule, to discard the outer header
+        * and dispatch the resulting packets to a vSwitch tenant
+        */
+       SFC_FT_RULE_SWITCH,
 };
 
 /* MAE-specific flow specification */
 struct sfc_flow_spec_mae {
+       /* FLow Tunnel (FT) rule type (or NONE) */
+       enum sfc_ft_rule_type           ft_rule_type;
+       /* Flow Tunnel (FT) context (or NULL) */
+       struct sfc_ft_ctx               *ft_ctx;
        /* Desired priority level */
        unsigned int                    priority;
+       /* Outer rule registry entry */
+       struct sfc_mae_outer_rule       *outer_rule;
        /* EFX match specification */
        efx_mae_match_spec_t            *match_spec;
        /* Action set registry entry */
@@ -130,13 +142,17 @@ typedef int (sfc_flow_item_parse)(const struct rte_flow_item *item,
 
 struct sfc_flow_item {
        enum rte_flow_item_type type;           /* Type of item */
+       const char *name;                       /* Item name */
        enum sfc_flow_item_layers layer;        /* Layer of item */
        enum sfc_flow_item_layers prev_layer;   /* Previous layer of item */
        enum sfc_flow_parse_ctx_type ctx_type;  /* Parse context type */
        sfc_flow_item_parse *parse;             /* Parsing function */
 };
 
-int sfc_flow_parse_pattern(const struct sfc_flow_item *flow_items,
+struct sfc_adapter;
+
+int sfc_flow_parse_pattern(struct sfc_adapter *sa,
+                          const struct sfc_flow_item *flow_items,
                           unsigned int nb_flow_items,
                           const struct rte_flow_item pattern[],
                           struct sfc_flow_parse_ctx *parse_ctx,
@@ -150,8 +166,6 @@ int sfc_flow_parse_init(const struct rte_flow_item *item,
                        unsigned int size,
                        struct rte_flow_error *error);
 
-struct sfc_adapter;
-
 void sfc_flow_init(struct sfc_adapter *sa);
 void sfc_flow_fini(struct sfc_adapter *sa);
 int sfc_flow_start(struct sfc_adapter *sa);
@@ -175,6 +189,12 @@ typedef int (sfc_flow_insert_cb_t)(struct sfc_adapter *sa,
 typedef int (sfc_flow_remove_cb_t)(struct sfc_adapter *sa,
                                   struct rte_flow *flow);
 
+typedef int (sfc_flow_query_cb_t)(struct rte_eth_dev *dev,
+                                 struct rte_flow *flow,
+                                 const struct rte_flow_action *action,
+                                 void *data,
+                                 struct rte_flow_error *error);
+
 #ifdef __cplusplus
 }
 #endif