for (ethertype_idx = 0;
ethertype_idx < pdata->nb_vlan_tags; ++ethertype_idx) {
+ rte_be16_t tpid_v = ethertypes[ethertype_idx].value;
+ rte_be16_t tpid_m = ethertypes[ethertype_idx].mask;
unsigned int tpid_idx;
/*
*/
enforce_tag_presence[0] = B_FALSE;
- if (ethertypes[ethertype_idx].mask == RTE_BE16(0)) {
+ if (tpid_m == RTE_BE16(0)) {
if (pdata->tci_masks[ethertype_idx] == RTE_BE16(0))
enforce_tag_presence[ethertype_idx] = B_TRUE;
}
/* Exact match is supported only. */
- if (ethertypes[ethertype_idx].mask != RTE_BE16(0xffff)) {
+ if (tpid_m != RTE_BE16(0xffff)) {
+ sfc_err(ctx->sa, "TPID mask must be 0x0 or 0xffff; got 0x%04x",
+ rte_be_to_cpu_16(tpid_m));
rc = EINVAL;
goto fail;
}
for (tpid_idx = pdata->nb_vlan_tags - ethertype_idx - 1;
tpid_idx < nb_supported_tpids; ++tpid_idx) {
- if (ethertypes[ethertype_idx].value ==
- supported_tpids[tpid_idx])
+ if (tpid_v == supported_tpids[tpid_idx])
break;
}
if (tpid_idx == nb_supported_tpids) {
+ sfc_err(ctx->sa, "TPID 0x%04x is unsupported",
+ rte_be_to_cpu_16(tpid_v));
rc = EINVAL;
goto fail;
}
if (pdata->innermost_ethertype_restriction.mask == RTE_BE16(0xffff)) {
struct sfc_mae_ethertype *et = ðertypes[ethertype_idx];
+ rte_be16_t enforced_et;
+
+ enforced_et = pdata->innermost_ethertype_restriction.value;
if (et->mask == 0) {
et->mask = RTE_BE16(0xffff);
- et->value =
- pdata->innermost_ethertype_restriction.value;
+ et->value = enforced_et;
} else if (et->mask != RTE_BE16(0xffff) ||
- et->value !=
- pdata->innermost_ethertype_restriction.value) {
+ et->value != enforced_et) {
+ sfc_err(ctx->sa, "L3 EtherType must be 0x0/0x0 or 0x%04x/0xffff; got 0x%04x/0x%04x",
+ rte_be_to_cpu_16(enforced_et),
+ rte_be_to_cpu_16(et->value),
+ rte_be_to_cpu_16(et->mask));
rc = EINVAL;
goto fail;
}
if (pdata->l3_next_proto_mask == 0) {
pdata->l3_next_proto_mask = 0xff;
pdata->l3_next_proto_value =
- pdata->l3_next_proto_restriction_value;
+ pdata->l3_next_proto_restriction_value;
} else if (pdata->l3_next_proto_mask != 0xff ||
pdata->l3_next_proto_value !=
pdata->l3_next_proto_restriction_value) {
+ sfc_err(ctx->sa, "L3 next protocol must be 0x0/0x0 or 0x%02x/0xff; got 0x%02x/0x%02x",
+ pdata->l3_next_proto_restriction_value,
+ pdata->l3_next_proto_value,
+ pdata->l3_next_proto_mask);
rc = EINVAL;
goto fail;
}
static const struct sfc_flow_item sfc_flow_items[] = {
{
.type = RTE_FLOW_ITEM_TYPE_PORT_ID,
+ .name = "PORT_ID",
/*
* In terms of RTE flow, this item is a META one,
* and its position in the pattern is don't care.
},
{
.type = RTE_FLOW_ITEM_TYPE_PHY_PORT,
+ .name = "PHY_PORT",
/*
* In terms of RTE flow, this item is a META one,
* and its position in the pattern is don't care.
},
{
.type = RTE_FLOW_ITEM_TYPE_PF,
+ .name = "PF",
/*
* In terms of RTE flow, this item is a META one,
* and its position in the pattern is don't care.
},
{
.type = RTE_FLOW_ITEM_TYPE_VF,
+ .name = "VF",
/*
* In terms of RTE flow, this item is a META one,
* and its position in the pattern is don't care.
},
{
.type = RTE_FLOW_ITEM_TYPE_ETH,
+ .name = "ETH",
.prev_layer = SFC_FLOW_ITEM_START_LAYER,
.layer = SFC_FLOW_ITEM_L2,
.ctx_type = SFC_FLOW_PARSE_CTX_MAE,
},
{
.type = RTE_FLOW_ITEM_TYPE_VLAN,
+ .name = "VLAN",
.prev_layer = SFC_FLOW_ITEM_L2,
.layer = SFC_FLOW_ITEM_L2,
.ctx_type = SFC_FLOW_PARSE_CTX_MAE,
},
{
.type = RTE_FLOW_ITEM_TYPE_IPV4,
+ .name = "IPV4",
.prev_layer = SFC_FLOW_ITEM_L2,
.layer = SFC_FLOW_ITEM_L3,
.ctx_type = SFC_FLOW_PARSE_CTX_MAE,
},
{
.type = RTE_FLOW_ITEM_TYPE_IPV6,
+ .name = "IPV6",
.prev_layer = SFC_FLOW_ITEM_L2,
.layer = SFC_FLOW_ITEM_L3,
.ctx_type = SFC_FLOW_PARSE_CTX_MAE,
},
{
.type = RTE_FLOW_ITEM_TYPE_TCP,
+ .name = "TCP",
.prev_layer = SFC_FLOW_ITEM_L3,
.layer = SFC_FLOW_ITEM_L4,
.ctx_type = SFC_FLOW_PARSE_CTX_MAE,
},
{
.type = RTE_FLOW_ITEM_TYPE_UDP,
+ .name = "UDP",
.prev_layer = SFC_FLOW_ITEM_L3,
.layer = SFC_FLOW_ITEM_L4,
.ctx_type = SFC_FLOW_PARSE_CTX_MAE,
},
{
.type = RTE_FLOW_ITEM_TYPE_VXLAN,
+ .name = "VXLAN",
.prev_layer = SFC_FLOW_ITEM_L4,
.layer = SFC_FLOW_ITEM_START_LAYER,
.ctx_type = SFC_FLOW_PARSE_CTX_MAE,
},
{
.type = RTE_FLOW_ITEM_TYPE_GENEVE,
+ .name = "GENEVE",
.prev_layer = SFC_FLOW_ITEM_L4,
.layer = SFC_FLOW_ITEM_START_LAYER,
.ctx_type = SFC_FLOW_PARSE_CTX_MAE,
},
{
.type = RTE_FLOW_ITEM_TYPE_NVGRE,
+ .name = "NVGRE",
.prev_layer = SFC_FLOW_ITEM_L3,
.layer = SFC_FLOW_ITEM_START_LAYER,
.ctx_type = SFC_FLOW_PARSE_CTX_MAE,
if (rc != 0)
goto fail_encap_parse_init;
- rc = sfc_flow_parse_pattern(sfc_flow_items, RTE_DIM(sfc_flow_items),
+ rc = sfc_flow_parse_pattern(sa, sfc_flow_items, RTE_DIM(sfc_flow_items),
pattern, &ctx, error);
if (rc != 0)
goto fail_parse_pattern;
size_t next_proto_ofst = 0;
size_t ethertype_ofst = 0;
uint64_t exp_items;
+ int rc;
if (pattern == NULL) {
return rte_flow_error_set(error, EINVAL,
/* Take care of the masks. */
sfc_mae_header_force_item_masks(buf, parsed_items, nb_parsed_items);
- return (spec != NULL) ? efx_mae_action_set_populate_encap(spec) : 0;
+ rc = efx_mae_action_set_populate_encap(spec);
+ if (rc != 0) {
+ rc = rte_flow_error_set(error, rc, RTE_FLOW_ERROR_TYPE_ACTION,
+ NULL, "failed to request action ENCAP");
+ }
+
+ return rc;
}
static int
-sfc_mae_rule_parse_action_mark(const struct rte_flow_action_mark *conf,
+sfc_mae_rule_parse_action_mark(struct sfc_adapter *sa,
+ const struct rte_flow_action_mark *conf,
efx_mae_actions_t *spec)
{
- return efx_mae_action_set_populate_mark(spec, conf->id);
+ int rc;
+
+ rc = efx_mae_action_set_populate_mark(spec, conf->id);
+ if (rc != 0)
+ sfc_err(sa, "failed to request action MARK: %s", strerror(rc));
+
+ return rc;
}
static int
phy_port = conf->index;
rc = efx_mae_mport_by_phy_port(phy_port, &mport);
- if (rc != 0)
+ if (rc != 0) {
+ sfc_err(sa, "failed to convert phys. port ID %u to m-port selector: %s",
+ phy_port, strerror(rc));
return rc;
+ }
+
+ rc = efx_mae_action_set_populate_deliver(spec, &mport);
+ if (rc != 0) {
+ sfc_err(sa, "failed to request action DELIVER with m-port selector 0x%08x: %s",
+ mport.sel, strerror(rc));
+ }
- return efx_mae_action_set_populate_deliver(spec, &mport);
+ return rc;
}
static int
vf = vf_conf->id;
rc = efx_mae_mport_by_pcie_function(encp->enc_pf, vf, &mport);
- if (rc != 0)
+ if (rc != 0) {
+ sfc_err(sa, "failed to convert PF %u VF %d to m-port: %s",
+ encp->enc_pf, (vf != EFX_PCI_VF_INVALID) ? (int)vf : -1,
+ strerror(rc));
return rc;
+ }
- return efx_mae_action_set_populate_deliver(spec, &mport);
+ rc = efx_mae_action_set_populate_deliver(spec, &mport);
+ if (rc != 0) {
+ sfc_err(sa, "failed to request action DELIVER with m-port selector 0x%08x: %s",
+ mport.sel, strerror(rc));
+ }
+
+ return rc;
}
static int
rc = sfc_mae_switch_port_by_ethdev(mae->switch_domain_id,
port_id, &mport);
- if (rc != 0)
+ if (rc != 0) {
+ sfc_err(sa, "failed to find MAE switch port SW entry for RTE ethdev port %u: %s",
+ port_id, strerror(rc));
return rc;
+ }
+
+ rc = efx_mae_action_set_populate_deliver(spec, &mport);
+ if (rc != 0) {
+ sfc_err(sa, "failed to request action DELIVER with m-port selector 0x%08x: %s",
+ mport.sel, strerror(rc));
+ }
- return efx_mae_action_set_populate_deliver(spec, &mport);
+ return rc;
}
+static const char * const action_names[] = {
+ [RTE_FLOW_ACTION_TYPE_VXLAN_DECAP] = "VXLAN_DECAP",
+ [RTE_FLOW_ACTION_TYPE_OF_POP_VLAN] = "OF_POP_VLAN",
+ [RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN] = "OF_PUSH_VLAN",
+ [RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID] = "OF_SET_VLAN_VID",
+ [RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP] = "OF_SET_VLAN_PCP",
+ [RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP] = "VXLAN_ENCAP",
+ [RTE_FLOW_ACTION_TYPE_FLAG] = "FLAG",
+ [RTE_FLOW_ACTION_TYPE_MARK] = "MARK",
+ [RTE_FLOW_ACTION_TYPE_PHY_PORT] = "PHY_PORT",
+ [RTE_FLOW_ACTION_TYPE_PF] = "PF",
+ [RTE_FLOW_ACTION_TYPE_VF] = "VF",
+ [RTE_FLOW_ACTION_TYPE_PORT_ID] = "PORT_ID",
+ [RTE_FLOW_ACTION_TYPE_DROP] = "DROP",
+};
+
static int
sfc_mae_rule_parse_action(struct sfc_adapter *sa,
const struct rte_flow_action *action,
case RTE_FLOW_ACTION_TYPE_MARK:
SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_MARK,
bundle->actions_mask);
- rc = sfc_mae_rule_parse_action_mark(action->conf, spec);
+ rc = sfc_mae_rule_parse_action_mark(sa, action->conf, spec);
break;
case RTE_FLOW_ACTION_TYPE_PHY_PORT:
SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_PHY_PORT,
if (rc == 0) {
bundle->actions_mask |= (1ULL << action->type);
} else if (!custom_error) {
+ if (action->type < RTE_DIM(action_names)) {
+ const char *action_name = action_names[action->type];
+
+ if (action_name != NULL) {
+ sfc_err(sa, "action %s was rejected: %s",
+ action_name, strerror(rc));
+ }
+ }
rc = rte_flow_error_set(error, rc, RTE_FLOW_ERROR_TYPE_ACTION,
NULL, "Failed to request the action");
}
return 0;
}
+
+static int
+sfc_mae_query_counter(struct sfc_adapter *sa,
+ struct sfc_flow_spec_mae *spec,
+ const struct rte_flow_action *action,
+ struct rte_flow_query_count *data,
+ struct rte_flow_error *error)
+{
+ struct sfc_mae_action_set *action_set = spec->action_set;
+ const struct rte_flow_action_count *conf = action->conf;
+ unsigned int i;
+ int rc;
+
+ if (action_set->n_counters == 0) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION, action,
+ "Queried flow rule does not have count actions");
+ }
+
+ for (i = 0; i < action_set->n_counters; i++) {
+ /*
+ * Get the first available counter of the flow rule if
+ * counter ID is not specified.
+ */
+ if (conf != NULL && action_set->counters[i].rte_id != conf->id)
+ continue;
+
+ rc = sfc_mae_counter_get(&sa->mae.counter_registry.counters,
+ &action_set->counters[i], data);
+ if (rc != 0) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION, action,
+ "Queried flow rule counter action is invalid");
+ }
+
+ return 0;
+ }
+
+ return rte_flow_error_set(error, ENOENT,
+ RTE_FLOW_ERROR_TYPE_ACTION, action,
+ "No such flow rule action count ID");
+}
+
+int
+sfc_mae_flow_query(struct rte_eth_dev *dev,
+ struct rte_flow *flow,
+ const struct rte_flow_action *action,
+ void *data,
+ 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_mae *spec_mae = &spec->mae;
+
+ switch (action->type) {
+ case RTE_FLOW_ACTION_TYPE_COUNT:
+ return sfc_mae_query_counter(sa, spec_mae, action,
+ data, error);
+ default:
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+ "Query for action of this type is not supported");
+ }
+}
git.droids-corp.org / dpdk.git / blobdiff