X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fsfc%2Fsfc_flow.c;h=c8e6fb8bce2284cb4f7cf257392d002a6c01c0ba;hb=df3a6666cbc3d27177359ae74066b35811dc0418;hp=cffcd9a4cb88c7f2c1eec30dba63cd72897b6eb2;hpb=5313b441d8aed6db416f470c8028082e69cbd3ff;p=dpdk.git diff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c index cffcd9a4cb..c8e6fb8bce 100644 --- a/drivers/net/sfc/sfc_flow.c +++ b/drivers/net/sfc/sfc_flow.c @@ -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. @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include @@ -25,9 +24,43 @@ #include "sfc_log.h" #include "sfc_dp_rx.h" +struct sfc_flow_ops_by_spec { + sfc_flow_parse_cb_t *parse; + sfc_flow_insert_cb_t *insert; + sfc_flow_remove_cb_t *remove; +}; + +static sfc_flow_parse_cb_t sfc_flow_parse_rte_to_filter; +static sfc_flow_insert_cb_t sfc_flow_filter_insert; +static sfc_flow_remove_cb_t sfc_flow_filter_remove; + +static const struct sfc_flow_ops_by_spec sfc_flow_ops_filter = { + .parse = sfc_flow_parse_rte_to_filter, + .insert = sfc_flow_filter_insert, + .remove = sfc_flow_filter_remove, +}; + +static const struct sfc_flow_ops_by_spec * +sfc_flow_get_ops_by_spec(struct rte_flow *flow) +{ + struct sfc_flow_spec *spec = &flow->spec; + const struct sfc_flow_ops_by_spec *ops = NULL; + + switch (spec->type) { + case SFC_FLOW_SPEC_FILTER: + ops = &sfc_flow_ops_filter; + break; + default: + SFC_ASSERT(false); + break; + } + + return ops; +} + /* - * At now flow API is implemented in such a manner that each - * flow rule is converted to one or more hardware filters. + * Currently, filter-based (VNIC) flow API is implemented in such a manner + * that each flow rule is converted to one or more hardware filters. * All elements of flow rule (attributes, pattern items, actions) * correspond to one or more fields in the efx_filter_spec_s structure * that is responsible for the hardware filter. @@ -36,25 +69,6 @@ * of such a field. */ -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, -}; - -typedef int (sfc_flow_item_parse)(const struct rte_flow_item *item, - efx_filter_spec_t *spec, - 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 */ - sfc_flow_item_parse *parse; /* Parsing function */ -}; - static sfc_flow_item_parse sfc_flow_parse_void; static sfc_flow_item_parse sfc_flow_parse_eth; static sfc_flow_item_parse sfc_flow_parse_vlan; @@ -111,7 +125,7 @@ sfc_flow_is_zero(const uint8_t *buf, unsigned int size) /* * Validate item and prepare structures spec and mask for parsing */ -static int +int sfc_flow_parse_init(const struct rte_flow_item *item, const void **spec_ptr, const void **mask_ptr, @@ -210,7 +224,7 @@ exit: static int sfc_flow_parse_void(__rte_unused const struct rte_flow_item *item, - __rte_unused efx_filter_spec_t *efx_spec, + __rte_unused struct sfc_flow_parse_ctx *parse_ctx, __rte_unused struct rte_flow_error *error) { return 0; @@ -232,10 +246,11 @@ sfc_flow_parse_void(__rte_unused const struct rte_flow_item *item, */ static int sfc_flow_parse_eth(const struct rte_flow_item *item, - efx_filter_spec_t *efx_spec, + struct sfc_flow_parse_ctx *parse_ctx, struct rte_flow_error *error) { int rc; + efx_filter_spec_t *efx_spec = parse_ctx->filter; const struct rte_flow_item_eth *spec = NULL; const struct rte_flow_item_eth *mask = NULL; const struct rte_flow_item_eth supp_mask = { @@ -278,7 +293,7 @@ sfc_flow_parse_eth(const struct rte_flow_item *item, if (spec == NULL) return 0; - if (is_same_ether_addr(&mask->dst, &supp_mask.dst)) { + if (rte_is_same_ether_addr(&mask->dst, &supp_mask.dst)) { efx_spec->efs_match_flags |= is_ifrm ? EFX_FILTER_MATCH_IFRM_LOC_MAC : EFX_FILTER_MATCH_LOC_MAC; @@ -286,7 +301,7 @@ sfc_flow_parse_eth(const struct rte_flow_item *item, EFX_MAC_ADDR_LEN); } else if (memcmp(mask->dst.addr_bytes, ig_mask, EFX_MAC_ADDR_LEN) == 0) { - if (is_unicast_ether_addr(&spec->dst)) + if (rte_is_unicast_ether_addr(&spec->dst)) efx_spec->efs_match_flags |= is_ifrm ? EFX_FILTER_MATCH_IFRM_UNKNOWN_UCAST_DST : EFX_FILTER_MATCH_UNKNOWN_UCAST_DST; @@ -294,7 +309,7 @@ sfc_flow_parse_eth(const struct rte_flow_item *item, efx_spec->efs_match_flags |= is_ifrm ? EFX_FILTER_MATCH_IFRM_UNKNOWN_MCAST_DST : EFX_FILTER_MATCH_UNKNOWN_MCAST_DST; - } else if (!is_zero_ether_addr(&mask->dst)) { + } else if (!rte_is_zero_ether_addr(&mask->dst)) { goto fail_bad_mask; } @@ -303,11 +318,11 @@ sfc_flow_parse_eth(const struct rte_flow_item *item, * ethertype masks are equal to zero in inner frame, * so these fields are filled in only for the outer frame */ - if (is_same_ether_addr(&mask->src, &supp_mask.src)) { + if (rte_is_same_ether_addr(&mask->src, &supp_mask.src)) { efx_spec->efs_match_flags |= EFX_FILTER_MATCH_REM_MAC; rte_memcpy(efx_spec->efs_rem_mac, spec->src.addr_bytes, EFX_MAC_ADDR_LEN); - } else if (!is_zero_ether_addr(&mask->src)) { + } else if (!rte_is_zero_ether_addr(&mask->src)) { goto fail_bad_mask; } @@ -344,11 +359,12 @@ fail_bad_mask: */ static int sfc_flow_parse_vlan(const struct rte_flow_item *item, - efx_filter_spec_t *efx_spec, + struct sfc_flow_parse_ctx *parse_ctx, struct rte_flow_error *error) { int rc; uint16_t vid; + efx_filter_spec_t *efx_spec = parse_ctx->filter; const struct rte_flow_item_vlan *spec = NULL; const struct rte_flow_item_vlan *mask = NULL; const struct rte_flow_item_vlan supp_mask = { @@ -430,10 +446,11 @@ sfc_flow_parse_vlan(const struct rte_flow_item *item, */ static int sfc_flow_parse_ipv4(const struct rte_flow_item *item, - efx_filter_spec_t *efx_spec, + struct sfc_flow_parse_ctx *parse_ctx, struct rte_flow_error *error) { int rc; + efx_filter_spec_t *efx_spec = parse_ctx->filter; const struct rte_flow_item_ipv4 *spec = NULL; const struct rte_flow_item_ipv4 *mask = NULL; const uint16_t ether_type_ipv4 = rte_cpu_to_le_16(EFX_ETHER_TYPE_IPV4); @@ -520,10 +537,11 @@ fail_bad_mask: */ static int sfc_flow_parse_ipv6(const struct rte_flow_item *item, - efx_filter_spec_t *efx_spec, + struct sfc_flow_parse_ctx *parse_ctx, struct rte_flow_error *error) { int rc; + efx_filter_spec_t *efx_spec = parse_ctx->filter; const struct rte_flow_item_ipv6 *spec = NULL; const struct rte_flow_item_ipv6 *mask = NULL; const uint16_t ether_type_ipv6 = rte_cpu_to_le_16(EFX_ETHER_TYPE_IPV6); @@ -628,10 +646,11 @@ fail_bad_mask: */ static int sfc_flow_parse_tcp(const struct rte_flow_item *item, - efx_filter_spec_t *efx_spec, + struct sfc_flow_parse_ctx *parse_ctx, struct rte_flow_error *error) { int rc; + efx_filter_spec_t *efx_spec = parse_ctx->filter; const struct rte_flow_item_tcp *spec = NULL; const struct rte_flow_item_tcp *mask = NULL; const struct rte_flow_item_tcp supp_mask = { @@ -709,10 +728,11 @@ fail_bad_mask: */ static int sfc_flow_parse_udp(const struct rte_flow_item *item, - efx_filter_spec_t *efx_spec, + struct sfc_flow_parse_ctx *parse_ctx, struct rte_flow_error *error) { int rc; + efx_filter_spec_t *efx_spec = parse_ctx->filter; const struct rte_flow_item_udp *spec = NULL; const struct rte_flow_item_udp *mask = NULL; const struct rte_flow_item_udp supp_mask = { @@ -867,10 +887,11 @@ sfc_flow_set_efx_spec_vni_or_vsid(efx_filter_spec_t *efx_spec, */ static int sfc_flow_parse_vxlan(const struct rte_flow_item *item, - efx_filter_spec_t *efx_spec, + struct sfc_flow_parse_ctx *parse_ctx, struct rte_flow_error *error) { int rc; + efx_filter_spec_t *efx_spec = parse_ctx->filter; const struct rte_flow_item_vxlan *spec = NULL; const struct rte_flow_item_vxlan *mask = NULL; const struct rte_flow_item_vxlan supp_mask = { @@ -919,10 +940,11 @@ sfc_flow_parse_vxlan(const struct rte_flow_item *item, */ static int sfc_flow_parse_geneve(const struct rte_flow_item *item, - efx_filter_spec_t *efx_spec, + struct sfc_flow_parse_ctx *parse_ctx, struct rte_flow_error *error) { int rc; + efx_filter_spec_t *efx_spec = parse_ctx->filter; const struct rte_flow_item_geneve *spec = NULL; const struct rte_flow_item_geneve *mask = NULL; const struct rte_flow_item_geneve supp_mask = { @@ -952,7 +974,7 @@ sfc_flow_parse_geneve(const struct rte_flow_item *item, return 0; if (mask->protocol == supp_mask.protocol) { - if (spec->protocol != rte_cpu_to_be_16(ETHER_TYPE_TEB)) { + if (spec->protocol != rte_cpu_to_be_16(RTE_ETHER_TYPE_TEB)) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, item, "GENEVE encap. protocol must be Ethernet " @@ -986,10 +1008,11 @@ sfc_flow_parse_geneve(const struct rte_flow_item *item, */ static int sfc_flow_parse_nvgre(const struct rte_flow_item *item, - efx_filter_spec_t *efx_spec, + struct sfc_flow_parse_ctx *parse_ctx, struct rte_flow_error *error) { int rc; + efx_filter_spec_t *efx_spec = parse_ctx->filter; const struct rte_flow_item_nvgre *spec = NULL; const struct rte_flow_item_nvgre *mask = NULL; const struct rte_flow_item_nvgre supp_mask = { @@ -1028,60 +1051,70 @@ static const struct sfc_flow_item sfc_flow_items[] = { .type = RTE_FLOW_ITEM_TYPE_VOID, .prev_layer = SFC_FLOW_ITEM_ANY_LAYER, .layer = SFC_FLOW_ITEM_ANY_LAYER, + .ctx_type = SFC_FLOW_PARSE_CTX_FILTER, .parse = sfc_flow_parse_void, }, { .type = RTE_FLOW_ITEM_TYPE_ETH, .prev_layer = SFC_FLOW_ITEM_START_LAYER, .layer = SFC_FLOW_ITEM_L2, + .ctx_type = SFC_FLOW_PARSE_CTX_FILTER, .parse = sfc_flow_parse_eth, }, { .type = RTE_FLOW_ITEM_TYPE_VLAN, .prev_layer = SFC_FLOW_ITEM_L2, .layer = SFC_FLOW_ITEM_L2, + .ctx_type = SFC_FLOW_PARSE_CTX_FILTER, .parse = sfc_flow_parse_vlan, }, { .type = RTE_FLOW_ITEM_TYPE_IPV4, .prev_layer = SFC_FLOW_ITEM_L2, .layer = SFC_FLOW_ITEM_L3, + .ctx_type = SFC_FLOW_PARSE_CTX_FILTER, .parse = sfc_flow_parse_ipv4, }, { .type = RTE_FLOW_ITEM_TYPE_IPV6, .prev_layer = SFC_FLOW_ITEM_L2, .layer = SFC_FLOW_ITEM_L3, + .ctx_type = SFC_FLOW_PARSE_CTX_FILTER, .parse = sfc_flow_parse_ipv6, }, { .type = RTE_FLOW_ITEM_TYPE_TCP, .prev_layer = SFC_FLOW_ITEM_L3, .layer = SFC_FLOW_ITEM_L4, + .ctx_type = SFC_FLOW_PARSE_CTX_FILTER, .parse = sfc_flow_parse_tcp, }, { .type = RTE_FLOW_ITEM_TYPE_UDP, .prev_layer = SFC_FLOW_ITEM_L3, .layer = SFC_FLOW_ITEM_L4, + .ctx_type = SFC_FLOW_PARSE_CTX_FILTER, .parse = sfc_flow_parse_udp, }, { .type = RTE_FLOW_ITEM_TYPE_VXLAN, .prev_layer = SFC_FLOW_ITEM_L4, .layer = SFC_FLOW_ITEM_START_LAYER, + .ctx_type = SFC_FLOW_PARSE_CTX_FILTER, .parse = sfc_flow_parse_vxlan, }, { .type = RTE_FLOW_ITEM_TYPE_GENEVE, .prev_layer = SFC_FLOW_ITEM_L4, .layer = SFC_FLOW_ITEM_START_LAYER, + .ctx_type = SFC_FLOW_PARSE_CTX_FILTER, .parse = sfc_flow_parse_geneve, }, { .type = RTE_FLOW_ITEM_TYPE_NVGRE, .prev_layer = SFC_FLOW_ITEM_L3, .layer = SFC_FLOW_ITEM_START_LAYER, + .ctx_type = SFC_FLOW_PARSE_CTX_FILTER, .parse = sfc_flow_parse_nvgre, }, }; @@ -1094,6 +1127,9 @@ sfc_flow_parse_attr(const struct rte_flow_attr *attr, struct rte_flow *flow, struct rte_flow_error *error) { + struct sfc_flow_spec *spec = &flow->spec; + struct sfc_flow_spec_filter *spec_filter = &spec->filter; + if (attr == NULL) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ATTR, NULL, @@ -1106,53 +1142,59 @@ sfc_flow_parse_attr(const struct rte_flow_attr *attr, "Groups are not supported"); return -rte_errno; } - if (attr->priority != 0) { - rte_flow_error_set(error, ENOTSUP, - RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY, attr, - "Priorities are not supported"); - return -rte_errno; - } if (attr->egress != 0) { rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ATTR_EGRESS, attr, "Egress is not supported"); return -rte_errno; } - if (attr->transfer != 0) { + if (attr->ingress == 0) { rte_flow_error_set(error, ENOTSUP, - RTE_FLOW_ERROR_TYPE_ATTR_TRANSFER, attr, - "Transfer is not supported"); + RTE_FLOW_ERROR_TYPE_ATTR_INGRESS, attr, + "Ingress is compulsory"); return -rte_errno; } - if (attr->ingress == 0) { + if (attr->transfer == 0) { + if (attr->priority != 0) { + rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY, + attr, "Priorities are unsupported"); + return -rte_errno; + } + spec->type = SFC_FLOW_SPEC_FILTER; + spec_filter->template.efs_flags |= EFX_FILTER_FLAG_RX; + spec_filter->template.efs_rss_context = EFX_RSS_CONTEXT_DEFAULT; + spec_filter->template.efs_priority = EFX_FILTER_PRI_MANUAL; + } else { rte_flow_error_set(error, ENOTSUP, - RTE_FLOW_ERROR_TYPE_ATTR_INGRESS, attr, - "Only ingress is supported"); + RTE_FLOW_ERROR_TYPE_ATTR_TRANSFER, attr, + "Transfer is not supported"); return -rte_errno; } - flow->spec.template.efs_flags |= EFX_FILTER_FLAG_RX; - flow->spec.template.efs_rss_context = EFX_RSS_CONTEXT_DEFAULT; - return 0; } /* Get item from array sfc_flow_items */ static const struct sfc_flow_item * -sfc_flow_get_item(enum rte_flow_item_type type) +sfc_flow_get_item(const struct sfc_flow_item *items, + unsigned int nb_items, + enum rte_flow_item_type type) { unsigned int i; - for (i = 0; i < RTE_DIM(sfc_flow_items); i++) - if (sfc_flow_items[i].type == type) - return &sfc_flow_items[i]; + for (i = 0; i < nb_items; i++) + if (items[i].type == type) + return &items[i]; return NULL; } -static int -sfc_flow_parse_pattern(const struct rte_flow_item pattern[], - struct rte_flow *flow, +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 rc; @@ -1168,7 +1210,8 @@ sfc_flow_parse_pattern(const struct rte_flow_item pattern[], } for (; pattern->type != RTE_FLOW_ITEM_TYPE_END; pattern++) { - item = sfc_flow_get_item(pattern->type); + item = sfc_flow_get_item(flow_items, nb_flow_items, + pattern->type); if (item == NULL) { rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM, pattern, @@ -1223,7 +1266,14 @@ sfc_flow_parse_pattern(const struct rte_flow_item pattern[], break; } - rc = item->parse(pattern, &flow->spec.template, error); + if (parse_ctx->type != item->ctx_type) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, pattern, + "Parse context type mismatch"); + return -rte_errno; + } + + rc = item->parse(pattern, parse_ctx, error); if (rc != 0) return rc; @@ -1239,13 +1289,15 @@ sfc_flow_parse_queue(struct sfc_adapter *sa, const struct rte_flow_action_queue *queue, struct rte_flow *flow) { + struct sfc_flow_spec *spec = &flow->spec; + struct sfc_flow_spec_filter *spec_filter = &spec->filter; struct sfc_rxq *rxq; if (queue->index >= sfc_sa2shared(sa)->rxq_count) return -EINVAL; rxq = &sa->rxq_ctrl[queue->index]; - flow->spec.template.efs_dmaq_id = (uint16_t)rxq->hw_index; + spec_filter->template.efs_dmaq_id = (uint16_t)rxq->hw_index; return 0; } @@ -1263,7 +1315,9 @@ sfc_flow_parse_rss(struct sfc_adapter *sa, unsigned int rxq_hw_index_max; efx_rx_hash_type_t efx_hash_types; const uint8_t *rss_key; - struct sfc_flow_rss *sfc_rss_conf = &flow->rss_conf; + struct sfc_flow_spec *spec = &flow->spec; + struct sfc_flow_spec_filter *spec_filter = &spec->filter; + struct sfc_flow_rss *sfc_rss_conf = &spec_filter->rss_conf; unsigned int i; if (action_rss->queue_num == 0) @@ -1307,7 +1361,7 @@ sfc_flow_parse_rss(struct sfc_adapter *sa, */ if (action_rss->queue_num == 1 && action_rss->types == 0 && action_rss->key_len == 0) { - flow->spec.template.efs_dmaq_id = rxq_hw_index_min; + spec_filter->template.efs_dmaq_id = rxq_hw_index_min; return 0; } @@ -1335,7 +1389,7 @@ sfc_flow_parse_rss(struct sfc_adapter *sa, rss_key = rss->key; } - flow->rss = B_TRUE; + spec_filter->rss = B_TRUE; sfc_rss_conf->rxq_hw_index_min = rxq_hw_index_min; sfc_rss_conf->rxq_hw_index_max = rxq_hw_index_max; @@ -1357,13 +1411,14 @@ static int sfc_flow_spec_flush(struct sfc_adapter *sa, struct sfc_flow_spec *spec, unsigned int filters_count) { + struct sfc_flow_spec_filter *spec_filter = &spec->filter; unsigned int i; int ret = 0; for (i = 0; i < filters_count; i++) { int rc; - rc = efx_filter_remove(sa->nic, &spec->filters[i]); + rc = efx_filter_remove(sa->nic, &spec_filter->filters[i]); if (ret == 0 && rc != 0) { sfc_err(sa, "failed to remove filter specification " "(rc = %d)", rc); @@ -1377,11 +1432,12 @@ sfc_flow_spec_flush(struct sfc_adapter *sa, struct sfc_flow_spec *spec, static int sfc_flow_spec_insert(struct sfc_adapter *sa, struct sfc_flow_spec *spec) { + struct sfc_flow_spec_filter *spec_filter = &spec->filter; unsigned int i; int rc = 0; - for (i = 0; i < spec->count; i++) { - rc = efx_filter_insert(sa->nic, &spec->filters[i]); + for (i = 0; i < spec_filter->count; i++) { + rc = efx_filter_insert(sa->nic, &spec_filter->filters[i]); if (rc != 0) { sfc_flow_spec_flush(sa, spec, i); break; @@ -1394,7 +1450,9 @@ sfc_flow_spec_insert(struct sfc_adapter *sa, struct sfc_flow_spec *spec) static int sfc_flow_spec_remove(struct sfc_adapter *sa, struct sfc_flow_spec *spec) { - return sfc_flow_spec_flush(sa, spec, spec->count); + struct sfc_flow_spec_filter *spec_filter = &spec->filter; + + return sfc_flow_spec_flush(sa, spec, spec_filter->count); } static int @@ -1403,12 +1461,13 @@ sfc_flow_filter_insert(struct sfc_adapter *sa, { struct sfc_adapter_shared * const sas = sfc_sa2shared(sa); struct sfc_rss *rss = &sas->rss; - struct sfc_flow_rss *flow_rss = &flow->rss_conf; + struct sfc_flow_spec_filter *spec_filter = &flow->spec.filter; + struct sfc_flow_rss *flow_rss = &spec_filter->rss_conf; uint32_t efs_rss_context = EFX_RSS_CONTEXT_DEFAULT; unsigned int i; int rc = 0; - if (flow->rss) { + if (spec_filter->rss) { unsigned int rss_spread = MIN(flow_rss->rxq_hw_index_max - flow_rss->rxq_hw_index_min + 1, EFX_MAXRSS); @@ -1438,8 +1497,8 @@ sfc_flow_filter_insert(struct sfc_adapter *sa, * RSS behaviour is consistent between them, set the same * RSS context value everywhere. */ - for (i = 0; i < flow->spec.count; i++) { - efx_filter_spec_t *spec = &flow->spec.filters[i]; + for (i = 0; i < spec_filter->count; i++) { + efx_filter_spec_t *spec = &spec_filter->filters[i]; spec->efs_rss_context = efs_rss_context; spec->efs_dmaq_id = flow_rss->rxq_hw_index_min; @@ -1451,7 +1510,7 @@ sfc_flow_filter_insert(struct sfc_adapter *sa, if (rc != 0) goto fail_filter_insert; - if (flow->rss) { + if (spec_filter->rss) { /* * Scale table is set after filter insertion because * the table entries are relative to the base RxQ ID @@ -1486,19 +1545,20 @@ static int sfc_flow_filter_remove(struct sfc_adapter *sa, struct rte_flow *flow) { + struct sfc_flow_spec_filter *spec_filter = &flow->spec.filter; int rc = 0; rc = sfc_flow_spec_remove(sa, &flow->spec); if (rc != 0) return rc; - if (flow->rss) { + if (spec_filter->rss) { /* * All specifications for a given flow rule have the same RSS * context, so that RSS context value is taken from the first * filter specification */ - efx_filter_spec_t *spec = &flow->spec.filters[0]; + efx_filter_spec_t *spec = &spec_filter->filters[0]; rc = efx_rx_scale_context_free(sa->nic, spec->efs_rss_context); } @@ -1511,13 +1571,15 @@ sfc_flow_parse_mark(struct sfc_adapter *sa, const struct rte_flow_action_mark *mark, struct rte_flow *flow) { + struct sfc_flow_spec *spec = &flow->spec; + struct sfc_flow_spec_filter *spec_filter = &spec->filter; const efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic); if (mark == NULL || mark->id > encp->enc_filter_action_mark_max) return EINVAL; - flow->spec.template.efs_flags |= EFX_FILTER_FLAG_ACTION_MARK; - flow->spec.template.efs_mark = mark->id; + spec_filter->template.efs_flags |= EFX_FILTER_FLAG_ACTION_MARK; + spec_filter->template.efs_mark = mark->id; return 0; } @@ -1529,6 +1591,8 @@ sfc_flow_parse_actions(struct sfc_adapter *sa, struct rte_flow_error *error) { int rc; + struct sfc_flow_spec *spec = &flow->spec; + struct sfc_flow_spec_filter *spec_filter = &spec->filter; const unsigned int dp_rx_features = sa->priv.dp_rx->features; uint32_t actions_set = 0; const uint32_t fate_actions_mask = (1UL << RTE_FLOW_ACTION_TYPE_QUEUE) | @@ -1590,7 +1654,7 @@ sfc_flow_parse_actions(struct sfc_adapter *sa, if ((actions_set & fate_actions_mask) != 0) goto fail_fate_actions; - flow->spec.template.efs_dmaq_id = + spec_filter->template.efs_dmaq_id = EFX_FILTER_SPEC_RX_DMAQ_ID_DROP; break; @@ -1607,7 +1671,7 @@ sfc_flow_parse_actions(struct sfc_adapter *sa, return -rte_errno; } - flow->spec.template.efs_flags |= + spec_filter->template.efs_flags |= EFX_FILTER_FLAG_ACTION_FLAG; break; @@ -1646,7 +1710,7 @@ sfc_flow_parse_actions(struct sfc_adapter *sa, /* When fate is unknown, drop traffic. */ if ((actions_set & fate_actions_mask) == 0) { - flow->spec.template.efs_dmaq_id = + spec_filter->template.efs_dmaq_id = EFX_FILTER_SPEC_RX_DMAQ_ID_DROP; } @@ -1683,12 +1747,13 @@ sfc_flow_set_unknown_dst_flags(struct sfc_flow_spec *spec, struct rte_flow_error *error) { unsigned int i; + struct sfc_flow_spec_filter *spec_filter = &spec->filter; static const efx_filter_match_flags_t vals[] = { EFX_FILTER_MATCH_UNKNOWN_UCAST_DST, EFX_FILTER_MATCH_UNKNOWN_MCAST_DST }; - if (filters_count_for_one_val * RTE_DIM(vals) != spec->count) { + if (filters_count_for_one_val * RTE_DIM(vals) != spec_filter->count) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "Number of specifications is incorrect while copying " @@ -1696,9 +1761,9 @@ sfc_flow_set_unknown_dst_flags(struct sfc_flow_spec *spec, return -rte_errno; } - for (i = 0; i < spec->count; i++) { + for (i = 0; i < spec_filter->count; i++) { /* The check above ensures that divisor can't be zero here */ - spec->filters[i].efs_match_flags |= + spec_filter->filters[i].efs_match_flags |= vals[i / filters_count_for_one_val]; } @@ -1757,11 +1822,12 @@ sfc_flow_set_ethertypes(struct sfc_flow_spec *spec, struct rte_flow_error *error) { unsigned int i; + struct sfc_flow_spec_filter *spec_filter = &spec->filter; static const uint16_t vals[] = { EFX_ETHER_TYPE_IPV4, EFX_ETHER_TYPE_IPV6 }; - if (filters_count_for_one_val * RTE_DIM(vals) != spec->count) { + if (filters_count_for_one_val * RTE_DIM(vals) != spec_filter->count) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "Number of specifications is incorrect " @@ -1769,15 +1835,15 @@ sfc_flow_set_ethertypes(struct sfc_flow_spec *spec, return -rte_errno; } - for (i = 0; i < spec->count; i++) { - spec->filters[i].efs_match_flags |= + for (i = 0; i < spec_filter->count; i++) { + spec_filter->filters[i].efs_match_flags |= EFX_FILTER_MATCH_ETHER_TYPE; /* * The check above ensures that * filters_count_for_one_val is not 0 */ - spec->filters[i].efs_ether_type = + spec_filter->filters[i].efs_ether_type = vals[i / filters_count_for_one_val]; } @@ -1801,9 +1867,10 @@ sfc_flow_set_outer_vid_flag(struct sfc_flow_spec *spec, unsigned int filters_count_for_one_val, struct rte_flow_error *error) { + struct sfc_flow_spec_filter *spec_filter = &spec->filter; unsigned int i; - if (filters_count_for_one_val != spec->count) { + if (filters_count_for_one_val != spec_filter->count) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "Number of specifications is incorrect " @@ -1811,11 +1878,11 @@ sfc_flow_set_outer_vid_flag(struct sfc_flow_spec *spec, return -rte_errno; } - for (i = 0; i < spec->count; i++) { - spec->filters[i].efs_match_flags |= + for (i = 0; i < spec_filter->count; i++) { + spec_filter->filters[i].efs_match_flags |= EFX_FILTER_MATCH_OUTER_VID; - spec->filters[i].efs_outer_vid = 0; + spec_filter->filters[i].efs_outer_vid = 0; } return 0; @@ -1840,12 +1907,13 @@ sfc_flow_set_ifrm_unknown_dst_flags(struct sfc_flow_spec *spec, struct rte_flow_error *error) { unsigned int i; + struct sfc_flow_spec_filter *spec_filter = &spec->filter; static const efx_filter_match_flags_t vals[] = { EFX_FILTER_MATCH_IFRM_UNKNOWN_UCAST_DST, EFX_FILTER_MATCH_IFRM_UNKNOWN_MCAST_DST }; - if (filters_count_for_one_val * RTE_DIM(vals) != spec->count) { + if (filters_count_for_one_val * RTE_DIM(vals) != spec_filter->count) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "Number of specifications is incorrect while copying " @@ -1853,9 +1921,9 @@ sfc_flow_set_ifrm_unknown_dst_flags(struct sfc_flow_spec *spec, return -rte_errno; } - for (i = 0; i < spec->count; i++) { + for (i = 0; i < spec_filter->count; i++) { /* The check above ensures that divisor can't be zero here */ - spec->filters[i].efs_match_flags |= + spec_filter->filters[i].efs_match_flags |= vals[i / filters_count_for_one_val]; } @@ -1999,6 +2067,7 @@ sfc_flow_spec_add_match_flag(struct sfc_flow_spec *spec, unsigned int new_filters_count; unsigned int filters_count_for_one_val; const struct sfc_flow_copy_flag *copy_flag; + struct sfc_flow_spec_filter *spec_filter = &spec->filter; int rc; copy_flag = sfc_flow_get_copy_flag(flag); @@ -2009,7 +2078,7 @@ sfc_flow_spec_add_match_flag(struct sfc_flow_spec *spec, return -rte_errno; } - new_filters_count = spec->count * copy_flag->vals_count; + new_filters_count = spec_filter->count * copy_flag->vals_count; if (new_filters_count > SF_FLOW_SPEC_NB_FILTERS_MAX) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, @@ -2018,11 +2087,13 @@ sfc_flow_spec_add_match_flag(struct sfc_flow_spec *spec, } /* Copy filters specifications */ - for (i = spec->count; i < new_filters_count; i++) - spec->filters[i] = spec->filters[i - spec->count]; + for (i = spec_filter->count; i < new_filters_count; i++) { + spec_filter->filters[i] = + spec_filter->filters[i - spec_filter->count]; + } - filters_count_for_one_val = spec->count; - spec->count = new_filters_count; + filters_count_for_one_val = spec_filter->count; + spec_filter->count = new_filters_count; rc = copy_flag->set_vals(spec, filters_count_for_one_val, error); if (rc != 0) @@ -2097,6 +2168,7 @@ sfc_flow_spec_filters_complete(struct sfc_adapter *sa, struct sfc_flow_spec *spec, struct rte_flow_error *error) { + struct sfc_flow_spec_filter *spec_filter = &spec->filter; struct sfc_filter *filter = &sa->filter; efx_filter_match_flags_t miss_flags; efx_filter_match_flags_t min_miss_flags = 0; @@ -2106,12 +2178,12 @@ sfc_flow_spec_filters_complete(struct sfc_adapter *sa, unsigned int i; int rc; - match = spec->template.efs_match_flags; + match = spec_filter->template.efs_match_flags; for (i = 0; i < filter->supported_match_num; i++) { if ((match & filter->supported_match[i]) == match) { miss_flags = filter->supported_match[i] & (~match); multiplier = sfc_flow_check_missing_flags(miss_flags, - &spec->template, filter); + &spec_filter->template, filter); if (multiplier > 0) { if (multiplier <= min_multiplier) { min_multiplier = multiplier; @@ -2185,16 +2257,17 @@ sfc_flow_is_match_flags_exception(struct sfc_filter *filter, uint16_t ether_type; uint8_t ip_proto; efx_filter_match_flags_t match_flags; + struct sfc_flow_spec_filter *spec_filter = &spec->filter; - for (i = 0; i < spec->count; i++) { - match_flags = spec->filters[i].efs_match_flags; + for (i = 0; i < spec_filter->count; i++) { + match_flags = spec_filter->filters[i].efs_match_flags; if (sfc_flow_is_match_with_vids(match_flags, EFX_FILTER_MATCH_ETHER_TYPE) || sfc_flow_is_match_with_vids(match_flags, EFX_FILTER_MATCH_ETHER_TYPE | EFX_FILTER_MATCH_LOC_MAC)) { - ether_type = spec->filters[i].efs_ether_type; + ether_type = spec_filter->filters[i].efs_ether_type; if (filter->supports_ip_proto_or_addr_filter && (ether_type == EFX_ETHER_TYPE_IPV4 || ether_type == EFX_ETHER_TYPE_IPV6)) @@ -2206,7 +2279,7 @@ sfc_flow_is_match_flags_exception(struct sfc_filter *filter, EFX_FILTER_MATCH_ETHER_TYPE | EFX_FILTER_MATCH_IP_PROTO | EFX_FILTER_MATCH_LOC_MAC)) { - ip_proto = spec->filters[i].efs_ip_proto; + ip_proto = spec_filter->filters[i].efs_ip_proto; if (filter->supports_rem_or_local_port_filter && (ip_proto == EFX_IPPROTO_TCP || ip_proto == EFX_IPPROTO_UDP)) @@ -2222,13 +2295,15 @@ sfc_flow_validate_match_flags(struct sfc_adapter *sa, struct rte_flow *flow, struct rte_flow_error *error) { - efx_filter_spec_t *spec_tmpl = &flow->spec.template; + struct sfc_flow_spec *spec = &flow->spec; + struct sfc_flow_spec_filter *spec_filter = &spec->filter; + efx_filter_spec_t *spec_tmpl = &spec_filter->template; efx_filter_match_flags_t match_flags = spec_tmpl->efs_match_flags; int rc; /* Initialize the first filter spec with template */ - flow->spec.filters[0] = *spec_tmpl; - flow->spec.count = 1; + spec_filter->filters[0] = *spec_tmpl; + spec_filter->count = 1; if (!sfc_filter_is_match_supported(sa, match_flags)) { rc = sfc_flow_spec_filters_complete(sa, &flow->spec, error); @@ -2247,21 +2322,23 @@ sfc_flow_validate_match_flags(struct sfc_adapter *sa, } static int -sfc_flow_parse(struct rte_eth_dev *dev, - const struct rte_flow_attr *attr, - const struct rte_flow_item pattern[], - const struct rte_flow_action actions[], - struct rte_flow *flow, - struct rte_flow_error *error) +sfc_flow_parse_rte_to_filter(struct rte_eth_dev *dev, + const struct rte_flow_item pattern[], + const struct rte_flow_action actions[], + struct rte_flow *flow, + struct rte_flow_error *error) { struct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev); + struct sfc_flow_spec *spec = &flow->spec; + struct sfc_flow_spec_filter *spec_filter = &spec->filter; + struct sfc_flow_parse_ctx ctx; int rc; - rc = sfc_flow_parse_attr(attr, flow, error); - if (rc != 0) - goto fail_bad_value; + ctx.type = SFC_FLOW_PARSE_CTX_FILTER; + ctx.filter = &spec_filter->template; - rc = sfc_flow_parse_pattern(pattern, flow, error); + rc = sfc_flow_parse_pattern(sfc_flow_items, RTE_DIM(sfc_flow_items), + pattern, &ctx, error); if (rc != 0) goto fail_bad_value; @@ -2279,6 +2356,101 @@ fail_bad_value: return rc; } +static int +sfc_flow_parse(struct rte_eth_dev *dev, + const struct rte_flow_attr *attr, + const struct rte_flow_item pattern[], + const struct rte_flow_action actions[], + struct rte_flow *flow, + struct rte_flow_error *error) +{ + const struct sfc_flow_ops_by_spec *ops; + int rc; + + rc = sfc_flow_parse_attr(attr, flow, error); + if (rc != 0) + return rc; + + ops = sfc_flow_get_ops_by_spec(flow); + if (ops == NULL || ops->parse == NULL) { + rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, + "No backend to handle this flow"); + return -rte_errno; + } + + return ops->parse(dev, pattern, actions, flow, error); +} + +static struct rte_flow * +sfc_flow_zmalloc(struct rte_flow_error *error) +{ + struct rte_flow *flow; + + flow = rte_zmalloc("sfc_rte_flow", sizeof(*flow), 0); + if (flow == NULL) { + rte_flow_error_set(error, ENOMEM, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, + "Failed to allocate memory"); + } + + return flow; +} + +static void +sfc_flow_free(__rte_unused struct sfc_adapter *sa, struct rte_flow *flow) +{ + rte_free(flow); +} + +static int +sfc_flow_insert(struct sfc_adapter *sa, struct rte_flow *flow, + struct rte_flow_error *error) +{ + const struct sfc_flow_ops_by_spec *ops; + int rc; + + ops = sfc_flow_get_ops_by_spec(flow); + if (ops == NULL || ops->insert == NULL) { + rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, + "No backend to handle this flow"); + return rte_errno; + } + + rc = ops->insert(sa, flow); + if (rc != 0) { + rte_flow_error_set(error, rc, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, "Failed to insert the flow rule"); + } + + return rc; +} + +static int +sfc_flow_remove(struct sfc_adapter *sa, struct rte_flow *flow, + struct rte_flow_error *error) +{ + const struct sfc_flow_ops_by_spec *ops; + int rc; + + ops = sfc_flow_get_ops_by_spec(flow); + if (ops == NULL || ops->remove == NULL) { + rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, + "No backend to handle this flow"); + return rte_errno; + } + + rc = ops->remove(sa, flow); + if (rc != 0) { + rte_flow_error_set(error, rc, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, "Failed to remove the flow rule"); + } + + return rc; +} + static int sfc_flow_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, @@ -2286,11 +2458,19 @@ sfc_flow_validate(struct rte_eth_dev *dev, const struct rte_flow_action actions[], struct rte_flow_error *error) { - struct rte_flow flow; + struct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev); + struct rte_flow *flow; + int rc; + + flow = sfc_flow_zmalloc(error); + if (flow == NULL) + return -rte_errno; + + rc = sfc_flow_parse(dev, attr, pattern, actions, flow, error); - memset(&flow, 0, sizeof(flow)); + sfc_flow_free(sa, flow); - return sfc_flow_parse(dev, attr, pattern, actions, &flow, error); + return rc; } static struct rte_flow * @@ -2304,70 +2484,39 @@ sfc_flow_create(struct rte_eth_dev *dev, struct rte_flow *flow = NULL; int rc; - flow = rte_zmalloc("sfc_rte_flow", sizeof(*flow), 0); - if (flow == NULL) { - rte_flow_error_set(error, ENOMEM, - RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, - "Failed to allocate memory"); + flow = sfc_flow_zmalloc(error); + if (flow == NULL) goto fail_no_mem; - } rc = sfc_flow_parse(dev, attr, pattern, actions, flow, error); if (rc != 0) goto fail_bad_value; - TAILQ_INSERT_TAIL(&sa->filter.flow_list, flow, entries); - sfc_adapter_lock(sa); + TAILQ_INSERT_TAIL(&sa->flow_list, flow, entries); + if (sa->state == SFC_ADAPTER_STARTED) { - rc = sfc_flow_filter_insert(sa, flow); - if (rc != 0) { - rte_flow_error_set(error, rc, - RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, - "Failed to insert filter"); - goto fail_filter_insert; - } + rc = sfc_flow_insert(sa, flow, error); + if (rc != 0) + goto fail_flow_insert; } sfc_adapter_unlock(sa); return flow; -fail_filter_insert: - TAILQ_REMOVE(&sa->filter.flow_list, flow, entries); +fail_flow_insert: + TAILQ_REMOVE(&sa->flow_list, flow, entries); fail_bad_value: - rte_free(flow); + sfc_flow_free(sa, flow); sfc_adapter_unlock(sa); fail_no_mem: return NULL; } -static int -sfc_flow_remove(struct sfc_adapter *sa, - struct rte_flow *flow, - struct rte_flow_error *error) -{ - int rc = 0; - - SFC_ASSERT(sfc_adapter_is_locked(sa)); - - if (sa->state == SFC_ADAPTER_STARTED) { - rc = sfc_flow_filter_remove(sa, flow); - if (rc != 0) - rte_flow_error_set(error, rc, - RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, - "Failed to destroy flow rule"); - } - - TAILQ_REMOVE(&sa->filter.flow_list, flow, entries); - rte_free(flow); - - return rc; -} - static int sfc_flow_destroy(struct rte_eth_dev *dev, struct rte_flow *flow, @@ -2379,7 +2528,7 @@ sfc_flow_destroy(struct rte_eth_dev *dev, sfc_adapter_lock(sa); - TAILQ_FOREACH(flow_ptr, &sa->filter.flow_list, entries) { + TAILQ_FOREACH(flow_ptr, &sa->flow_list, entries) { if (flow_ptr == flow) rc = 0; } @@ -2390,7 +2539,11 @@ sfc_flow_destroy(struct rte_eth_dev *dev, goto fail_bad_value; } - rc = sfc_flow_remove(sa, flow, error); + if (sa->state == SFC_ADAPTER_STARTED) + rc = sfc_flow_remove(sa, flow, error); + + TAILQ_REMOVE(&sa->flow_list, flow, entries); + sfc_flow_free(sa, flow); fail_bad_value: sfc_adapter_unlock(sa); @@ -2404,15 +2557,21 @@ sfc_flow_flush(struct rte_eth_dev *dev, { struct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev); struct rte_flow *flow; - int rc = 0; int ret = 0; sfc_adapter_lock(sa); - while ((flow = TAILQ_FIRST(&sa->filter.flow_list)) != NULL) { - rc = sfc_flow_remove(sa, flow, error); - if (rc != 0) - ret = rc; + while ((flow = TAILQ_FIRST(&sa->flow_list)) != NULL) { + if (sa->state == SFC_ADAPTER_STARTED) { + int rc; + + rc = sfc_flow_remove(sa, flow, error); + if (rc != 0) + ret = rc; + } + + TAILQ_REMOVE(&sa->flow_list, flow, entries); + sfc_flow_free(sa, flow); } sfc_adapter_unlock(sa); @@ -2455,7 +2614,7 @@ sfc_flow_init(struct sfc_adapter *sa) { SFC_ASSERT(sfc_adapter_is_locked(sa)); - TAILQ_INIT(&sa->filter.flow_list); + TAILQ_INIT(&sa->flow_list); } void @@ -2465,9 +2624,9 @@ sfc_flow_fini(struct sfc_adapter *sa) SFC_ASSERT(sfc_adapter_is_locked(sa)); - while ((flow = TAILQ_FIRST(&sa->filter.flow_list)) != NULL) { - TAILQ_REMOVE(&sa->filter.flow_list, flow, entries); - rte_free(flow); + while ((flow = TAILQ_FIRST(&sa->flow_list)) != NULL) { + TAILQ_REMOVE(&sa->flow_list, flow, entries); + sfc_flow_free(sa, flow); } } @@ -2478,8 +2637,8 @@ sfc_flow_stop(struct sfc_adapter *sa) SFC_ASSERT(sfc_adapter_is_locked(sa)); - TAILQ_FOREACH(flow, &sa->filter.flow_list, entries) - sfc_flow_filter_remove(sa, flow); + TAILQ_FOREACH(flow, &sa->flow_list, entries) + sfc_flow_remove(sa, flow, NULL); } int @@ -2492,8 +2651,8 @@ sfc_flow_start(struct sfc_adapter *sa) SFC_ASSERT(sfc_adapter_is_locked(sa)); - TAILQ_FOREACH(flow, &sa->filter.flow_list, entries) { - rc = sfc_flow_filter_insert(sa, flow); + TAILQ_FOREACH(flow, &sa->flow_list, entries) { + rc = sfc_flow_insert(sa, flow, NULL); if (rc != 0) goto fail_bad_flow; }