/* 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
#include <rte_byteorder.h>
#include <rte_tailq.h>
#include <rte_common.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
#include <rte_ether.h>
#include <rte_flow.h>
#include <rte_flow_driver.h>
#include "sfc_flow.h"
#include "sfc_log.h"
#include "sfc_dp_rx.h"
+#include "sfc_mae_counter.h"
struct sfc_flow_ops_by_spec {
sfc_flow_parse_cb_t *parse;
+ sfc_flow_verify_cb_t *verify;
sfc_flow_cleanup_cb_t *cleanup;
sfc_flow_insert_cb_t *insert;
sfc_flow_remove_cb_t *remove;
static const struct sfc_flow_ops_by_spec sfc_flow_ops_filter = {
.parse = sfc_flow_parse_rte_to_filter,
+ .verify = NULL,
.cleanup = NULL,
.insert = sfc_flow_filter_insert,
.remove = sfc_flow_filter_remove,
static const struct sfc_flow_ops_by_spec sfc_flow_ops_mae = {
.parse = sfc_flow_parse_rte_to_mae,
+ .verify = sfc_mae_flow_verify,
.cleanup = sfc_mae_flow_cleanup,
- .insert = NULL,
- .remove = NULL,
+ .insert = sfc_mae_flow_insert,
+ .remove = sfc_mae_flow_remove,
};
static const struct sfc_flow_ops_by_spec *
static sfc_flow_item_parse sfc_flow_parse_vxlan;
static sfc_flow_item_parse sfc_flow_parse_geneve;
static sfc_flow_item_parse sfc_flow_parse_nvgre;
+static sfc_flow_item_parse sfc_flow_parse_pppoex;
typedef int (sfc_flow_spec_set_vals)(struct sfc_flow_spec *spec,
unsigned int filters_count_for_one_val,
return rc;
}
+/**
+ * Convert PPPoEx item to EFX filter specification.
+ *
+ * @param item[in]
+ * Item specification.
+ * Matching on PPPoEx fields is not supported.
+ * This item can only be used to set or validate the EtherType filter.
+ * Only zero masks are allowed.
+ * Ranging is not supported.
+ * @param efx_spec[in, out]
+ * EFX filter specification to update.
+ * @param[out] error
+ * Perform verbose error reporting if not NULL.
+ */
+static int
+sfc_flow_parse_pppoex(const struct rte_flow_item *item,
+ struct sfc_flow_parse_ctx *parse_ctx,
+ struct rte_flow_error *error)
+{
+ efx_filter_spec_t *efx_spec = parse_ctx->filter;
+ const struct rte_flow_item_pppoe *spec = NULL;
+ const struct rte_flow_item_pppoe *mask = NULL;
+ const struct rte_flow_item_pppoe supp_mask = {};
+ const struct rte_flow_item_pppoe def_mask = {};
+ uint16_t ether_type;
+ int rc;
+
+ rc = sfc_flow_parse_init(item,
+ (const void **)&spec,
+ (const void **)&mask,
+ &supp_mask,
+ &def_mask,
+ sizeof(struct rte_flow_item_pppoe),
+ error);
+ if (rc != 0)
+ return rc;
+
+ if (item->type == RTE_FLOW_ITEM_TYPE_PPPOED)
+ ether_type = RTE_ETHER_TYPE_PPPOE_DISCOVERY;
+ else
+ ether_type = RTE_ETHER_TYPE_PPPOE_SESSION;
+
+ if ((efx_spec->efs_match_flags & EFX_FILTER_MATCH_ETHER_TYPE) != 0) {
+ if (efx_spec->efs_ether_type != ether_type) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM, item,
+ "Invalid EtherType for a PPPoE flow item");
+ return -rte_errno;
+ }
+ } else {
+ efx_spec->efs_match_flags |= EFX_FILTER_MATCH_ETHER_TYPE;
+ efx_spec->efs_ether_type = ether_type;
+ }
+
+ return 0;
+}
+
static const struct sfc_flow_item sfc_flow_items[] = {
{
.type = RTE_FLOW_ITEM_TYPE_VOID,
.ctx_type = SFC_FLOW_PARSE_CTX_FILTER,
.parse = sfc_flow_parse_vlan,
},
+ {
+ .type = RTE_FLOW_ITEM_TYPE_PPPOED,
+ .prev_layer = SFC_FLOW_ITEM_L2,
+ .layer = SFC_FLOW_ITEM_L2,
+ .ctx_type = SFC_FLOW_PARSE_CTX_FILTER,
+ .parse = sfc_flow_parse_pppoex,
+ },
+ {
+ .type = RTE_FLOW_ITEM_TYPE_PPPOES,
+ .prev_layer = SFC_FLOW_ITEM_L2,
+ .layer = SFC_FLOW_ITEM_L2,
+ .ctx_type = SFC_FLOW_PARSE_CTX_FILTER,
+ .parse = sfc_flow_parse_pppoex,
+ },
{
.type = RTE_FLOW_ITEM_TYPE_IPV4,
.prev_layer = SFC_FLOW_ITEM_L2,
spec->type = SFC_FLOW_SPEC_MAE;
spec_mae->priority = attr->priority;
spec_mae->match_spec = NULL;
+ spec_mae->action_set = NULL;
+ spec_mae->rule_id.id = EFX_MAE_RSRC_ID_INVALID;
}
return 0;
break;
default:
- if (is_ifrm) {
+ if (parse_ctx->type == SFC_FLOW_PARSE_CTX_FILTER &&
+ is_ifrm) {
rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ITEM,
pattern,
struct sfc_rxq *rxq;
struct sfc_rxq_info *rxq_info;
- if (queue->index >= sfc_sa2shared(sa)->rxq_count)
+ if (queue->index >= sfc_sa2shared(sa)->ethdev_rxq_count)
return -EINVAL;
- rxq = &sa->rxq_ctrl[queue->index];
+ rxq = sfc_rxq_ctrl_by_ethdev_qid(sa, queue->index);
spec_filter->template.efs_dmaq_id = (uint16_t)rxq->hw_index;
rxq_info = &sfc_sa2shared(sa)->rxq_info[queue->index];
{
struct sfc_adapter_shared * const sas = sfc_sa2shared(sa);
struct sfc_rss *rss = &sas->rss;
- unsigned int rxq_sw_index;
+ sfc_ethdev_qid_t ethdev_qid;
struct sfc_rxq *rxq;
unsigned int rxq_hw_index_min;
unsigned int rxq_hw_index_max;
if (action_rss->queue_num == 0)
return -EINVAL;
- rxq_sw_index = sfc_sa2shared(sa)->rxq_count - 1;
- rxq = &sa->rxq_ctrl[rxq_sw_index];
+ ethdev_qid = sfc_sa2shared(sa)->ethdev_rxq_count - 1;
+ rxq = sfc_rxq_ctrl_by_ethdev_qid(sa, ethdev_qid);
rxq_hw_index_min = rxq->hw_index;
rxq_hw_index_max = 0;
for (i = 0; i < action_rss->queue_num; ++i) {
- rxq_sw_index = action_rss->queue[i];
+ ethdev_qid = action_rss->queue[i];
- if (rxq_sw_index >= sfc_sa2shared(sa)->rxq_count)
+ if ((unsigned int)ethdev_qid >=
+ sfc_sa2shared(sa)->ethdev_rxq_count)
return -EINVAL;
- rxq = &sa->rxq_ctrl[rxq_sw_index];
+ rxq = sfc_rxq_ctrl_by_ethdev_qid(sa, ethdev_qid);
if (rxq->hw_index < rxq_hw_index_min)
rxq_hw_index_min = rxq->hw_index;
for (i = 0; i < RTE_DIM(sfc_rss_conf->rss_tbl); ++i) {
unsigned int nb_queues = action_rss->queue_num;
- unsigned int rxq_sw_index = action_rss->queue[i % nb_queues];
- struct sfc_rxq *rxq = &sa->rxq_ctrl[rxq_sw_index];
+ struct sfc_rxq *rxq;
+ ethdev_qid = action_rss->queue[i % nb_queues];
+ rxq = sfc_rxq_ctrl_by_ethdev_qid(sa, ethdev_qid);
sfc_rss_conf->rss_tbl[i] = rxq->hw_index - rxq_hw_index_min;
}
return -rte_errno;
}
-#define SFC_BUILD_SET_OVERFLOW(_action, _set) \
- RTE_BUILD_BUG_ON(_action >= sizeof(_set) * CHAR_BIT)
-
for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {
switch (actions->type) {
case RTE_FLOW_ACTION_TYPE_VOID:
actions_set |= (1UL << actions->type);
}
-#undef SFC_BUILD_SET_OVERFLOW
/* When fate is unknown, drop traffic. */
if ((actions_set & fate_actions_mask) == 0) {
static int
sfc_flow_parse_rte_to_mae(struct rte_eth_dev *dev,
const struct rte_flow_item pattern[],
- __rte_unused const struct rte_flow_action actions[],
+ const struct rte_flow_action actions[],
struct rte_flow *flow,
struct rte_flow_error *error)
{
if (rc != 0)
return rc;
+ rc = sfc_mae_rule_parse_actions(sa, actions, spec_mae, error);
+ if (rc != 0)
+ return rc;
+
return 0;
}
return rc;
}
+static int
+sfc_flow_verify(struct sfc_adapter *sa, struct rte_flow *flow,
+ struct rte_flow_error *error)
+{
+ const struct sfc_flow_ops_by_spec *ops;
+ int rc = 0;
+
+ ops = sfc_flow_get_ops_by_spec(flow);
+ if (ops == NULL) {
+ rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
+ "No backend to handle this flow");
+ return -rte_errno;
+ }
+
+ if (ops->verify != NULL) {
+ SFC_ASSERT(sfc_adapter_is_locked(sa));
+ rc = ops->verify(sa, flow);
+ }
+
+ if (rc != 0) {
+ rte_flow_error_set(error, rc,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
+ "Failed to verify flow validity with FW");
+ return -rte_errno;
+ }
+
+ return 0;
+}
+
static int
sfc_flow_validate(struct rte_eth_dev *dev,
const struct rte_flow_attr *attr,
if (flow == NULL)
return -rte_errno;
+ sfc_adapter_lock(sa);
+
rc = sfc_flow_parse(dev, attr, pattern, actions, flow, error);
+ if (rc == 0)
+ rc = sfc_flow_verify(sa, flow, error);
sfc_flow_free(sa, flow);
+ sfc_adapter_unlock(sa);
+
return rc;
}
if (flow == NULL)
goto fail_no_mem;
+ sfc_adapter_lock(sa);
+
rc = sfc_flow_parse(dev, attr, pattern, actions, flow, error);
if (rc != 0)
goto fail_bad_value;
- sfc_adapter_lock(sa);
-
TAILQ_INSERT_TAIL(&sa->flow_list, flow, entries);
if (sa->state == SFC_ADAPTER_STARTED) {
efx_rx_scale_context_free(sa->nic, rss->dummy_rss_context);
rss->dummy_rss_context = EFX_RSS_CONTEXT_DEFAULT;
}
+
+ /*
+ * MAE counter service is not stopped on flow rule remove to avoid
+ * extra work. Make sure that it is stopped here.
+ */
+ sfc_mae_counter_stop(sa);
}
int
git.droids-corp.org / dpdk.git / blobdiff