X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fsfc%2Fsfc_flow.h;h=09105953ff36d71760f6ba76b37ffbc5f98cbe2d;hb=1be514fbcea9e8964296b46c91dbb56715503ae7;hp=2b287dd1803ca3ff32d251e592d6714c9281d755;hpb=adbf7f0e27f8205149cdfcae702a1056520aaa7e;p=dpdk.git diff --git a/drivers/net/sfc/sfc_flow.h b/drivers/net/sfc/sfc_flow.h index 2b287dd180..09105953ff 100644 --- a/drivers/net/sfc/sfc_flow.h +++ b/drivers/net/sfc/sfc_flow.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause * - * Copyright (c) 2017-2018 Solarflare Communications Inc. - * All rights reserved. + * Copyright(c) 2019-2020 Xilinx, Inc. + * Copyright(c) 2017-2019 Solarflare Communications Inc. * * This software was jointly developed between OKTET Labs (under contract * for Solarflare) and Solarflare Communications, Inc. @@ -24,9 +24,12 @@ extern "C" { * which can be produced from a template by means of multiplication, if * missing match flags are needed to be taken into account */ -#define SF_FLOW_SPEC_NB_FILTERS_MAX 4 +#define SF_FLOW_SPEC_NB_FILTERS_MAX 8 + +/* Used to guard action masks */ +#define SFC_BUILD_SET_OVERFLOW(_action, _set) \ + RTE_BUILD_BUG_ON((_action) >= sizeof(_set) * CHAR_BIT) -#if EFSYS_OPT_RX_SCALE /* RSS configuration storage */ struct sfc_flow_rss { unsigned int rxq_hw_index_min; @@ -35,25 +38,62 @@ struct sfc_flow_rss { uint8_t rss_key[EFX_RSS_KEY_SIZE]; unsigned int rss_tbl[EFX_RSS_TBL_SIZE]; }; -#endif /* EFSYS_OPT_RX_SCALE */ -/* Filter specification storage */ -struct sfc_flow_spec { +/* Flow engines supported by the implementation */ +enum sfc_flow_spec_type { + SFC_FLOW_SPEC_FILTER = 0, + SFC_FLOW_SPEC_MAE, + + SFC_FLOW_SPEC_NTYPES +}; + +/* VNIC-specific flow specification */ +struct sfc_flow_spec_filter { /* partial specification from flow rule */ efx_filter_spec_t template; /* fully elaborated hardware filters specifications */ 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; +}; + +/* MAE-specific flow specification */ +struct sfc_flow_spec_mae { + /* 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 */ + struct sfc_mae_action_set *action_set; + /* Firmware-allocated rule ID */ + efx_mae_rule_id_t rule_id; +}; + +/* Flow specification */ +struct sfc_flow_spec { + /* Flow specification type (engine-based) */ + enum sfc_flow_spec_type type; + + RTE_STD_C11 + union { + /* Filter-based (VNIC level flows) specification */ + struct sfc_flow_spec_filter filter; + /* MAE-based (lower-level HW switch flows) specification */ + struct sfc_flow_spec_mae mae; + }; }; /* PMD-specific definition of the opaque type from rte_flow.h */ struct rte_flow { - struct sfc_flow_spec spec; /* flow spec for hardware filter(s) */ -#if EFSYS_OPT_RX_SCALE - boolean_t rss; /* RSS toggle */ - struct sfc_flow_rss rss_conf; /* RSS configuration */ -#endif /* EFSYS_OPT_RX_SCALE */ + struct sfc_flow_spec spec; /* flow specification */ TAILQ_ENTRY(rte_flow) entries; /* flow list entries */ }; @@ -61,6 +101,61 @@ TAILQ_HEAD(sfc_flow_list, rte_flow); extern const struct rte_flow_ops sfc_flow_ops; +enum sfc_flow_item_layers { + SFC_FLOW_ITEM_ANY_LAYER, + SFC_FLOW_ITEM_START_LAYER, + SFC_FLOW_ITEM_L2, + SFC_FLOW_ITEM_L3, + SFC_FLOW_ITEM_L4, +}; + +/* Flow parse context types */ +enum sfc_flow_parse_ctx_type { + SFC_FLOW_PARSE_CTX_FILTER = 0, + SFC_FLOW_PARSE_CTX_MAE, + + SFC_FLOW_PARSE_CTX_NTYPES +}; + +/* Flow parse context */ +struct sfc_flow_parse_ctx { + enum sfc_flow_parse_ctx_type type; + + RTE_STD_C11 + union { + /* Context pointer valid for filter-based (VNIC) flows */ + efx_filter_spec_t *filter; + /* Context pointer valid for MAE-based flows */ + struct sfc_mae_parse_ctx *mae; + }; +}; + +typedef int (sfc_flow_item_parse)(const struct rte_flow_item *item, + struct sfc_flow_parse_ctx *parse_ctx, + struct rte_flow_error *error); + +struct sfc_flow_item { + enum rte_flow_item_type type; /* Type of item */ + 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, + unsigned int nb_flow_items, + const struct rte_flow_item pattern[], + struct sfc_flow_parse_ctx *parse_ctx, + struct rte_flow_error *error); + +int sfc_flow_parse_init(const struct rte_flow_item *item, + const void **spec_ptr, + const void **mask_ptr, + const void *supp_mask, + const void *def_mask, + unsigned int size, + struct rte_flow_error *error); + struct sfc_adapter; void sfc_flow_init(struct sfc_adapter *sa); @@ -68,6 +163,24 @@ void sfc_flow_fini(struct sfc_adapter *sa); int sfc_flow_start(struct sfc_adapter *sa); void sfc_flow_stop(struct sfc_adapter *sa); +typedef int (sfc_flow_parse_cb_t)(struct rte_eth_dev *dev, + const struct rte_flow_item items[], + const struct rte_flow_action actions[], + struct rte_flow *flow, + struct rte_flow_error *error); + +typedef int (sfc_flow_verify_cb_t)(struct sfc_adapter *sa, + struct rte_flow *flow); + +typedef void (sfc_flow_cleanup_cb_t)(struct sfc_adapter *sa, + struct rte_flow *flow); + +typedef int (sfc_flow_insert_cb_t)(struct sfc_adapter *sa, + struct rte_flow *flow); + +typedef int (sfc_flow_remove_cb_t)(struct sfc_adapter *sa, + struct rte_flow *flow); + #ifdef __cplusplus } #endif