X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fsfc%2Fsfc_mae.c;h=7be77054abc0782dfdf199b0956a373f7c6dbe3b;hb=44db08d53be366d69bb7d16bffc3e55ba2d7398a;hp=32b88f92e09ff4c4309e52ce8b2a94a4c08600a0;hpb=98d26ef7b839e43b0cdbdee216c7caca6b76f8f8;p=dpdk.git diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c index 32b88f92e0..7be77054ab 100644 --- a/drivers/net/sfc/sfc_mae.c +++ b/drivers/net/sfc/sfc_mae.c @@ -9,13 +9,17 @@ #include +#include #include +#include #include "efx.h" #include "sfc.h" +#include "sfc_mae_counter.h" #include "sfc_log.h" #include "sfc_switch.h" +#include "sfc_service.h" static int sfc_mae_assign_entity_mport(struct sfc_adapter *sa, @@ -27,6 +31,152 @@ sfc_mae_assign_entity_mport(struct sfc_adapter *sa, mportp); } +static int +sfc_mae_counter_registry_init(struct sfc_mae_counter_registry *registry, + uint32_t nb_counters_max) +{ + return sfc_mae_counters_init(®istry->counters, nb_counters_max); +} + +static void +sfc_mae_counter_registry_fini(struct sfc_mae_counter_registry *registry) +{ + sfc_mae_counters_fini(®istry->counters); +} + +static int +sfc_mae_internal_rule_find_empty_slot(struct sfc_adapter *sa, + struct sfc_mae_rule **rule) +{ + struct sfc_mae *mae = &sa->mae; + struct sfc_mae_internal_rules *internal_rules = &mae->internal_rules; + unsigned int entry; + int rc; + + for (entry = 0; entry < SFC_MAE_NB_RULES_MAX; entry++) { + if (internal_rules->rules[entry].spec == NULL) + break; + } + + if (entry == SFC_MAE_NB_RULES_MAX) { + rc = ENOSPC; + sfc_err(sa, "failed too many rules (%u rules used)", entry); + goto fail_too_many_rules; + } + + *rule = &internal_rules->rules[entry]; + + return 0; + +fail_too_many_rules: + return rc; +} + +int +sfc_mae_rule_add_mport_match_deliver(struct sfc_adapter *sa, + const efx_mport_sel_t *mport_match, + const efx_mport_sel_t *mport_deliver, + int prio, struct sfc_mae_rule **rulep) +{ + struct sfc_mae *mae = &sa->mae; + struct sfc_mae_rule *rule; + int rc; + + sfc_log_init(sa, "entry"); + + if (prio > 0 && (unsigned int)prio >= mae->nb_action_rule_prios_max) { + rc = EINVAL; + sfc_err(sa, "failed: invalid priority %d (max %u)", prio, + mae->nb_action_rule_prios_max); + goto fail_invalid_prio; + } + if (prio < 0) + prio = mae->nb_action_rule_prios_max - 1; + + rc = sfc_mae_internal_rule_find_empty_slot(sa, &rule); + if (rc != 0) + goto fail_find_empty_slot; + + sfc_log_init(sa, "init MAE match spec"); + rc = efx_mae_match_spec_init(sa->nic, EFX_MAE_RULE_ACTION, + (uint32_t)prio, &rule->spec); + if (rc != 0) { + sfc_err(sa, "failed to init MAE match spec"); + goto fail_match_init; + } + + rc = efx_mae_match_spec_mport_set(rule->spec, mport_match, NULL); + if (rc != 0) { + sfc_err(sa, "failed to get MAE match mport selector"); + goto fail_mport_set; + } + + rc = efx_mae_action_set_spec_init(sa->nic, &rule->actions); + if (rc != 0) { + sfc_err(sa, "failed to init MAE action set"); + goto fail_action_init; + } + + rc = efx_mae_action_set_populate_deliver(rule->actions, + mport_deliver); + if (rc != 0) { + sfc_err(sa, "failed to populate deliver action"); + goto fail_populate_deliver; + } + + rc = efx_mae_action_set_alloc(sa->nic, rule->actions, + &rule->action_set); + if (rc != 0) { + sfc_err(sa, "failed to allocate action set"); + goto fail_action_set_alloc; + } + + rc = efx_mae_action_rule_insert(sa->nic, rule->spec, NULL, + &rule->action_set, + &rule->rule_id); + if (rc != 0) { + sfc_err(sa, "failed to insert action rule"); + goto fail_rule_insert; + } + + *rulep = rule; + + sfc_log_init(sa, "done"); + + return 0; + +fail_rule_insert: + efx_mae_action_set_free(sa->nic, &rule->action_set); + +fail_action_set_alloc: +fail_populate_deliver: + efx_mae_action_set_spec_fini(sa->nic, rule->actions); + +fail_action_init: +fail_mport_set: + efx_mae_match_spec_fini(sa->nic, rule->spec); + +fail_match_init: +fail_find_empty_slot: +fail_invalid_prio: + sfc_log_init(sa, "failed: %s", rte_strerror(rc)); + return rc; +} + +void +sfc_mae_rule_del(struct sfc_adapter *sa, struct sfc_mae_rule *rule) +{ + if (rule == NULL || rule->spec == NULL) + return; + + efx_mae_action_rule_remove(sa->nic, &rule->rule_id); + efx_mae_action_set_free(sa->nic, &rule->action_set); + efx_mae_action_set_spec_fini(sa->nic, rule->actions); + efx_mae_match_spec_fini(sa->nic, rule->spec); + + rule->spec = NULL; +} + int sfc_mae_attach(struct sfc_adapter *sa) { @@ -35,6 +185,7 @@ sfc_mae_attach(struct sfc_adapter *sa) const efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic); efx_mport_sel_t entity_mport; struct sfc_mae *mae = &sa->mae; + struct sfc_mae_bounce_eh *bounce_eh = &mae->bounce_eh; efx_mae_limits_t limits; int rc; @@ -55,6 +206,15 @@ sfc_mae_attach(struct sfc_adapter *sa) if (rc != 0) goto fail_mae_get_limits; + sfc_log_init(sa, "init MAE counter registry"); + rc = sfc_mae_counter_registry_init(&mae->counter_registry, + limits.eml_max_n_counters); + if (rc != 0) { + sfc_err(sa, "failed to init MAE counters registry for %u entries: %s", + limits.eml_max_n_counters, rte_strerror(rc)); + goto fail_counter_registry_init; + } + sfc_log_init(sa, "assign entity MPORT"); rc = sfc_mae_assign_entity_mport(sa, &entity_mport); if (rc != 0) @@ -80,20 +240,32 @@ sfc_mae_attach(struct sfc_adapter *sa) if (rc != 0) goto fail_mae_assign_switch_port; + sfc_log_init(sa, "allocate encap. header bounce buffer"); + bounce_eh->buf_size = limits.eml_encap_header_size_limit; + bounce_eh->buf = rte_malloc("sfc_mae_bounce_eh", + bounce_eh->buf_size, 0); + if (bounce_eh->buf == NULL) + goto fail_mae_alloc_bounce_eh; + mae->status = SFC_MAE_STATUS_SUPPORTED; mae->nb_outer_rule_prios_max = limits.eml_max_n_outer_prios; mae->nb_action_rule_prios_max = limits.eml_max_n_action_prios; mae->encap_types_supported = limits.eml_encap_types_supported; TAILQ_INIT(&mae->outer_rules); + TAILQ_INIT(&mae->encap_headers); TAILQ_INIT(&mae->action_sets); sfc_log_init(sa, "done"); return 0; +fail_mae_alloc_bounce_eh: fail_mae_assign_switch_port: fail_mae_assign_switch_domain: fail_mae_assign_entity_mport: + sfc_mae_counter_registry_fini(&mae->counter_registry); + +fail_counter_registry_init: fail_mae_get_limits: efx_mae_fini(sa->nic); @@ -117,6 +289,9 @@ sfc_mae_detach(struct sfc_adapter *sa) if (status_prev != SFC_MAE_STATUS_SUPPORTED) return; + rte_free(mae->bounce_eh.buf); + sfc_mae_counter_registry_fini(&mae->counter_registry); + efx_mae_fini(sa->nic); sfc_log_init(sa, "done"); @@ -135,6 +310,7 @@ sfc_mae_outer_rule_attach(struct sfc_adapter *sa, TAILQ_FOREACH(rule, &mae->outer_rules, entries) { if (efx_mae_match_specs_equal(rule->match_spec, match_spec) && rule->encap_type == encap_type) { + sfc_dbg(sa, "attaching to outer_rule=%p", rule); ++(rule->refcnt); return rule; } @@ -168,6 +344,8 @@ sfc_mae_outer_rule_add(struct sfc_adapter *sa, *rulep = rule; + sfc_dbg(sa, "added outer_rule=%p", rule); + return 0; } @@ -185,13 +363,18 @@ sfc_mae_outer_rule_del(struct sfc_adapter *sa, if (rule->refcnt != 0) return; - SFC_ASSERT(rule->fw_rsrc.rule_id.id == EFX_MAE_RSRC_ID_INVALID); - SFC_ASSERT(rule->fw_rsrc.refcnt == 0); + if (rule->fw_rsrc.rule_id.id != EFX_MAE_RSRC_ID_INVALID || + rule->fw_rsrc.refcnt != 0) { + sfc_err(sa, "deleting outer_rule=%p abandons its FW resource: OR_ID=0x%08x, refcnt=%u", + rule, rule->fw_rsrc.rule_id.id, rule->fw_rsrc.refcnt); + } efx_mae_match_spec_fini(sa->nic, rule->match_spec); TAILQ_REMOVE(&mae->outer_rules, rule, entries); rte_free(rule); + + sfc_dbg(sa, "deleted outer_rule=%p", rule); } static int @@ -211,8 +394,11 @@ sfc_mae_outer_rule_enable(struct sfc_adapter *sa, rc = efx_mae_outer_rule_insert(sa->nic, rule->match_spec, rule->encap_type, &fw_rsrc->rule_id); - if (rc != 0) + if (rc != 0) { + sfc_err(sa, "failed to enable outer_rule=%p: %s", + rule, strerror(rc)); return rc; + } } rc = efx_mae_match_spec_outer_rule_id_set(match_spec_action, @@ -221,16 +407,25 @@ sfc_mae_outer_rule_enable(struct sfc_adapter *sa, if (fw_rsrc->refcnt == 0) { (void)efx_mae_outer_rule_remove(sa->nic, &fw_rsrc->rule_id); + fw_rsrc->rule_id.id = EFX_MAE_RSRC_ID_INVALID; } + + sfc_err(sa, "can't match on outer rule ID: %s", strerror(rc)); + return rc; } + if (fw_rsrc->refcnt == 0) { + sfc_dbg(sa, "enabled outer_rule=%p: OR_ID=0x%08x", + rule, fw_rsrc->rule_id.id); + } + ++(fw_rsrc->refcnt); return 0; } -static int +static void sfc_mae_outer_rule_disable(struct sfc_adapter *sa, struct sfc_mae_outer_rule *rule) { @@ -238,24 +433,279 @@ sfc_mae_outer_rule_disable(struct sfc_adapter *sa, int rc; SFC_ASSERT(sfc_adapter_is_locked(sa)); - SFC_ASSERT(fw_rsrc->rule_id.id != EFX_MAE_RSRC_ID_INVALID); - SFC_ASSERT(fw_rsrc->refcnt != 0); + + if (fw_rsrc->rule_id.id == EFX_MAE_RSRC_ID_INVALID || + fw_rsrc->refcnt == 0) { + sfc_err(sa, "failed to disable outer_rule=%p: already disabled; OR_ID=0x%08x, refcnt=%u", + rule, fw_rsrc->rule_id.id, fw_rsrc->refcnt); + return; + } if (fw_rsrc->refcnt == 1) { rc = efx_mae_outer_rule_remove(sa->nic, &fw_rsrc->rule_id); - if (rc != 0) + if (rc == 0) { + sfc_dbg(sa, "disabled outer_rule=%p with OR_ID=0x%08x", + rule, fw_rsrc->rule_id.id); + } else { + sfc_err(sa, "failed to disable outer_rule=%p with OR_ID=0x%08x: %s", + rule, fw_rsrc->rule_id.id, strerror(rc)); + } + fw_rsrc->rule_id.id = EFX_MAE_RSRC_ID_INVALID; + } + + --(fw_rsrc->refcnt); +} + +static struct sfc_mae_encap_header * +sfc_mae_encap_header_attach(struct sfc_adapter *sa, + const struct sfc_mae_bounce_eh *bounce_eh) +{ + struct sfc_mae_encap_header *encap_header; + struct sfc_mae *mae = &sa->mae; + + SFC_ASSERT(sfc_adapter_is_locked(sa)); + + TAILQ_FOREACH(encap_header, &mae->encap_headers, entries) { + if (encap_header->size == bounce_eh->size && + memcmp(encap_header->buf, bounce_eh->buf, + bounce_eh->size) == 0) { + sfc_dbg(sa, "attaching to encap_header=%p", + encap_header); + ++(encap_header->refcnt); + return encap_header; + } + } + + return NULL; +} + +static int +sfc_mae_encap_header_add(struct sfc_adapter *sa, + const struct sfc_mae_bounce_eh *bounce_eh, + struct sfc_mae_encap_header **encap_headerp) +{ + struct sfc_mae_encap_header *encap_header; + struct sfc_mae *mae = &sa->mae; + + SFC_ASSERT(sfc_adapter_is_locked(sa)); + + encap_header = rte_zmalloc("sfc_mae_encap_header", + sizeof(*encap_header), 0); + if (encap_header == NULL) + return ENOMEM; + + encap_header->size = bounce_eh->size; + + encap_header->buf = rte_malloc("sfc_mae_encap_header_buf", + encap_header->size, 0); + if (encap_header->buf == NULL) { + rte_free(encap_header); + return ENOMEM; + } + + rte_memcpy(encap_header->buf, bounce_eh->buf, bounce_eh->size); + + encap_header->refcnt = 1; + encap_header->type = bounce_eh->type; + encap_header->fw_rsrc.eh_id.id = EFX_MAE_RSRC_ID_INVALID; + + TAILQ_INSERT_TAIL(&mae->encap_headers, encap_header, entries); + + *encap_headerp = encap_header; + + sfc_dbg(sa, "added encap_header=%p", encap_header); + + return 0; +} + +static void +sfc_mae_encap_header_del(struct sfc_adapter *sa, + struct sfc_mae_encap_header *encap_header) +{ + struct sfc_mae *mae = &sa->mae; + + if (encap_header == NULL) + return; + + SFC_ASSERT(sfc_adapter_is_locked(sa)); + SFC_ASSERT(encap_header->refcnt != 0); + + --(encap_header->refcnt); + + if (encap_header->refcnt != 0) + return; + + if (encap_header->fw_rsrc.eh_id.id != EFX_MAE_RSRC_ID_INVALID || + encap_header->fw_rsrc.refcnt != 0) { + sfc_err(sa, "deleting encap_header=%p abandons its FW resource: EH_ID=0x%08x, refcnt=%u", + encap_header, encap_header->fw_rsrc.eh_id.id, + encap_header->fw_rsrc.refcnt); + } + + TAILQ_REMOVE(&mae->encap_headers, encap_header, entries); + rte_free(encap_header->buf); + rte_free(encap_header); + + sfc_dbg(sa, "deleted encap_header=%p", encap_header); +} + +static int +sfc_mae_encap_header_enable(struct sfc_adapter *sa, + struct sfc_mae_encap_header *encap_header, + efx_mae_actions_t *action_set_spec) +{ + struct sfc_mae_fw_rsrc *fw_rsrc; + int rc; + + if (encap_header == NULL) + return 0; + + SFC_ASSERT(sfc_adapter_is_locked(sa)); + + fw_rsrc = &encap_header->fw_rsrc; + + if (fw_rsrc->refcnt == 0) { + SFC_ASSERT(fw_rsrc->eh_id.id == EFX_MAE_RSRC_ID_INVALID); + SFC_ASSERT(encap_header->buf != NULL); + SFC_ASSERT(encap_header->size != 0); + + rc = efx_mae_encap_header_alloc(sa->nic, encap_header->type, + encap_header->buf, + encap_header->size, + &fw_rsrc->eh_id); + if (rc != 0) { + sfc_err(sa, "failed to enable encap_header=%p: %s", + encap_header, strerror(rc)); return rc; + } + } - fw_rsrc->rule_id.id = EFX_MAE_RSRC_ID_INVALID; + rc = efx_mae_action_set_fill_in_eh_id(action_set_spec, + &fw_rsrc->eh_id); + if (rc != 0) { + if (fw_rsrc->refcnt == 0) { + (void)efx_mae_encap_header_free(sa->nic, + &fw_rsrc->eh_id); + fw_rsrc->eh_id.id = EFX_MAE_RSRC_ID_INVALID; + } + + sfc_err(sa, "can't fill in encap. header ID: %s", strerror(rc)); + + return rc; + } + + if (fw_rsrc->refcnt == 0) { + sfc_dbg(sa, "enabled encap_header=%p: EH_ID=0x%08x", + encap_header, fw_rsrc->eh_id.id); + } + + ++(fw_rsrc->refcnt); + + return 0; +} + +static void +sfc_mae_encap_header_disable(struct sfc_adapter *sa, + struct sfc_mae_encap_header *encap_header) +{ + struct sfc_mae_fw_rsrc *fw_rsrc; + int rc; + + if (encap_header == NULL) + return; + + SFC_ASSERT(sfc_adapter_is_locked(sa)); + + fw_rsrc = &encap_header->fw_rsrc; + + if (fw_rsrc->eh_id.id == EFX_MAE_RSRC_ID_INVALID || + fw_rsrc->refcnt == 0) { + sfc_err(sa, "failed to disable encap_header=%p: already disabled; EH_ID=0x%08x, refcnt=%u", + encap_header, fw_rsrc->eh_id.id, fw_rsrc->refcnt); + return; + } + + if (fw_rsrc->refcnt == 1) { + rc = efx_mae_encap_header_free(sa->nic, &fw_rsrc->eh_id); + if (rc == 0) { + sfc_dbg(sa, "disabled encap_header=%p with EH_ID=0x%08x", + encap_header, fw_rsrc->eh_id.id); + } else { + sfc_err(sa, "failed to disable encap_header=%p with EH_ID=0x%08x: %s", + encap_header, fw_rsrc->eh_id.id, strerror(rc)); + } + fw_rsrc->eh_id.id = EFX_MAE_RSRC_ID_INVALID; } --(fw_rsrc->refcnt); +} + +static int +sfc_mae_counters_enable(struct sfc_adapter *sa, + struct sfc_mae_counter_id *counters, + unsigned int n_counters, + efx_mae_actions_t *action_set_spec) +{ + int rc; + + sfc_log_init(sa, "entry"); + + if (n_counters == 0) { + sfc_log_init(sa, "no counters - skip"); + return 0; + } + + SFC_ASSERT(sfc_adapter_is_locked(sa)); + SFC_ASSERT(n_counters == 1); + + rc = sfc_mae_counter_enable(sa, &counters[0]); + if (rc != 0) { + sfc_err(sa, "failed to enable MAE counter %u: %s", + counters[0].mae_id.id, rte_strerror(rc)); + goto fail_counter_add; + } + + rc = efx_mae_action_set_fill_in_counter_id(action_set_spec, + &counters[0].mae_id); + if (rc != 0) { + sfc_err(sa, "failed to fill in MAE counter %u in action set: %s", + counters[0].mae_id.id, rte_strerror(rc)); + goto fail_fill_in_id; + } return 0; + +fail_fill_in_id: + (void)sfc_mae_counter_disable(sa, &counters[0]); + +fail_counter_add: + sfc_log_init(sa, "failed: %s", rte_strerror(rc)); + return rc; +} + +static int +sfc_mae_counters_disable(struct sfc_adapter *sa, + struct sfc_mae_counter_id *counters, + unsigned int n_counters) +{ + if (n_counters == 0) + return 0; + + SFC_ASSERT(sfc_adapter_is_locked(sa)); + SFC_ASSERT(n_counters == 1); + + if (counters[0].mae_id.id == EFX_MAE_RSRC_ID_INVALID) { + sfc_err(sa, "failed to disable: already disabled"); + return EALREADY; + } + + return sfc_mae_counter_disable(sa, &counters[0]); } static struct sfc_mae_action_set * sfc_mae_action_set_attach(struct sfc_adapter *sa, + const struct sfc_mae_encap_header *encap_header, + unsigned int n_count, const efx_mae_actions_t *spec) { struct sfc_mae_action_set *action_set; @@ -264,7 +714,14 @@ sfc_mae_action_set_attach(struct sfc_adapter *sa, SFC_ASSERT(sfc_adapter_is_locked(sa)); TAILQ_FOREACH(action_set, &mae->action_sets, entries) { - if (efx_mae_action_set_specs_equal(action_set->spec, spec)) { + /* + * Shared counters are not supported, hence action sets with + * COUNT are not attachable. + */ + if (action_set->encap_header == encap_header && + n_count == 0 && + efx_mae_action_set_specs_equal(action_set->spec, spec)) { + sfc_dbg(sa, "attaching to action_set=%p", action_set); ++(action_set->refcnt); return action_set; } @@ -275,20 +732,56 @@ sfc_mae_action_set_attach(struct sfc_adapter *sa, static int sfc_mae_action_set_add(struct sfc_adapter *sa, + const struct rte_flow_action actions[], efx_mae_actions_t *spec, + struct sfc_mae_encap_header *encap_header, + unsigned int n_counters, struct sfc_mae_action_set **action_setp) { struct sfc_mae_action_set *action_set; struct sfc_mae *mae = &sa->mae; + unsigned int i; SFC_ASSERT(sfc_adapter_is_locked(sa)); action_set = rte_zmalloc("sfc_mae_action_set", sizeof(*action_set), 0); - if (action_set == NULL) + if (action_set == NULL) { + sfc_err(sa, "failed to alloc action set"); return ENOMEM; + } + + if (n_counters > 0) { + const struct rte_flow_action *action; + + action_set->counters = rte_malloc("sfc_mae_counter_ids", + sizeof(action_set->counters[0]) * n_counters, 0); + if (action_set->counters == NULL) { + rte_free(action_set); + sfc_err(sa, "failed to alloc counters"); + return ENOMEM; + } + + for (action = actions, i = 0; + action->type != RTE_FLOW_ACTION_TYPE_END && i < n_counters; + ++action) { + const struct rte_flow_action_count *conf; + + if (action->type != RTE_FLOW_ACTION_TYPE_COUNT) + continue; + + conf = action->conf; + + action_set->counters[i].mae_id.id = + EFX_MAE_RSRC_ID_INVALID; + action_set->counters[i].rte_id = conf->id; + i++; + } + action_set->n_counters = n_counters; + } action_set->refcnt = 1; action_set->spec = spec; + action_set->encap_header = encap_header; action_set->fw_rsrc.aset_id.id = EFX_MAE_RSRC_ID_INVALID; @@ -296,6 +789,8 @@ sfc_mae_action_set_add(struct sfc_adapter *sa, *action_setp = action_set; + sfc_dbg(sa, "added action_set=%p", action_set); + return 0; } @@ -313,18 +808,33 @@ sfc_mae_action_set_del(struct sfc_adapter *sa, if (action_set->refcnt != 0) return; - SFC_ASSERT(action_set->fw_rsrc.aset_id.id == EFX_MAE_RSRC_ID_INVALID); - SFC_ASSERT(action_set->fw_rsrc.refcnt == 0); + if (action_set->fw_rsrc.aset_id.id != EFX_MAE_RSRC_ID_INVALID || + action_set->fw_rsrc.refcnt != 0) { + sfc_err(sa, "deleting action_set=%p abandons its FW resource: AS_ID=0x%08x, refcnt=%u", + action_set, action_set->fw_rsrc.aset_id.id, + action_set->fw_rsrc.refcnt); + } efx_mae_action_set_spec_fini(sa->nic, action_set->spec); + sfc_mae_encap_header_del(sa, action_set->encap_header); + if (action_set->n_counters > 0) { + SFC_ASSERT(action_set->n_counters == 1); + SFC_ASSERT(action_set->counters[0].mae_id.id == + EFX_MAE_RSRC_ID_INVALID); + rte_free(action_set->counters); + } TAILQ_REMOVE(&mae->action_sets, action_set, entries); rte_free(action_set); + + sfc_dbg(sa, "deleted action_set=%p", action_set); } static int sfc_mae_action_set_enable(struct sfc_adapter *sa, struct sfc_mae_action_set *action_set) { + struct sfc_mae_encap_header *encap_header = action_set->encap_header; + struct sfc_mae_counter_id *counters = action_set->counters; struct sfc_mae_fw_rsrc *fw_rsrc = &action_set->fw_rsrc; int rc; @@ -334,10 +844,36 @@ sfc_mae_action_set_enable(struct sfc_adapter *sa, SFC_ASSERT(fw_rsrc->aset_id.id == EFX_MAE_RSRC_ID_INVALID); SFC_ASSERT(action_set->spec != NULL); + rc = sfc_mae_encap_header_enable(sa, encap_header, + action_set->spec); + if (rc != 0) + return rc; + + rc = sfc_mae_counters_enable(sa, counters, + action_set->n_counters, + action_set->spec); + if (rc != 0) { + sfc_err(sa, "failed to enable %u MAE counters: %s", + action_set->n_counters, rte_strerror(rc)); + + sfc_mae_encap_header_disable(sa, encap_header); + return rc; + } + rc = efx_mae_action_set_alloc(sa->nic, action_set->spec, &fw_rsrc->aset_id); - if (rc != 0) + if (rc != 0) { + sfc_err(sa, "failed to enable action_set=%p: %s", + action_set, strerror(rc)); + + (void)sfc_mae_counters_disable(sa, counters, + action_set->n_counters); + sfc_mae_encap_header_disable(sa, encap_header); return rc; + } + + sfc_dbg(sa, "enabled action_set=%p: AS_ID=0x%08x", + action_set, fw_rsrc->aset_id.id); } ++(fw_rsrc->refcnt); @@ -345,7 +881,7 @@ sfc_mae_action_set_enable(struct sfc_adapter *sa, return 0; } -static int +static void sfc_mae_action_set_disable(struct sfc_adapter *sa, struct sfc_mae_action_set *action_set) { @@ -353,20 +889,36 @@ sfc_mae_action_set_disable(struct sfc_adapter *sa, int rc; SFC_ASSERT(sfc_adapter_is_locked(sa)); - SFC_ASSERT(fw_rsrc->aset_id.id != EFX_MAE_RSRC_ID_INVALID); - SFC_ASSERT(fw_rsrc->refcnt != 0); + + if (fw_rsrc->aset_id.id == EFX_MAE_RSRC_ID_INVALID || + fw_rsrc->refcnt == 0) { + sfc_err(sa, "failed to disable action_set=%p: already disabled; AS_ID=0x%08x, refcnt=%u", + action_set, fw_rsrc->aset_id.id, fw_rsrc->refcnt); + return; + } if (fw_rsrc->refcnt == 1) { rc = efx_mae_action_set_free(sa->nic, &fw_rsrc->aset_id); - if (rc != 0) - return rc; + if (rc == 0) { + sfc_dbg(sa, "disabled action_set=%p with AS_ID=0x%08x", + action_set, fw_rsrc->aset_id.id); + } else { + sfc_err(sa, "failed to disable action_set=%p with AS_ID=0x%08x: %s", + action_set, fw_rsrc->aset_id.id, strerror(rc)); + } + fw_rsrc->aset_id.id = EFX_MAE_RSRC_ID_INVALID; + + rc = sfc_mae_counters_disable(sa, action_set->counters, + action_set->n_counters); + if (rc != 0) { + sfc_err(sa, "failed to disable %u MAE counters: %s", + action_set->n_counters, rte_strerror(rc)); + } - fw_rsrc->aset_id.id = EFX_MAE_RSRC_ID_INVALID; + sfc_mae_encap_header_disable(sa, action_set->encap_header); } --(fw_rsrc->refcnt); - - return 0; } void @@ -465,6 +1017,7 @@ sfc_mae_rule_process_pattern_data(struct sfc_mae_parse_ctx *ctx, RTE_BE16(RTE_ETHER_TYPE_QINQ2), RTE_BE16(RTE_ETHER_TYPE_QINQ3), }; + bool enforce_tag_presence[SFC_MAE_MATCH_VLAN_MAX_NTAGS] = {0}; unsigned int nb_supported_tpids = RTE_DIM(supported_tpids); unsigned int ethertype_idx; const uint8_t *valuep; @@ -488,22 +1041,43 @@ sfc_mae_rule_process_pattern_data(struct sfc_mae_parse_ctx *ctx, 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; + /* + * This loop can have only two iterations. On the second one, + * drop outer tag presence enforcement bit because the inner + * tag presence automatically assumes that for the outer tag. + */ + enforce_tag_presence[0] = B_FALSE; + + if (tpid_m == RTE_BE16(0)) { + if (pdata->tci_masks[ethertype_idx] == RTE_BE16(0)) + enforce_tag_presence[ethertype_idx] = B_TRUE; + + /* No match on this field, and no value check. */ + nb_supported_tpids = 1; + continue; + } + /* 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; } @@ -513,14 +1087,19 @@ sfc_mae_rule_process_pattern_data(struct sfc_mae_parse_ctx *ctx, 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; } @@ -540,15 +1119,37 @@ sfc_mae_rule_process_pattern_data(struct sfc_mae_parse_ctx *ctx, 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; } } + if (enforce_tag_presence[0] || pdata->has_ovlan_mask) { + rc = efx_mae_match_spec_bit_set(ctx->match_spec, + fremap[EFX_MAE_FIELD_HAS_OVLAN], + enforce_tag_presence[0] || + pdata->has_ovlan_value); + if (rc != 0) + goto fail; + } + + if (enforce_tag_presence[1] || pdata->has_ivlan_mask) { + rc = efx_mae_match_spec_bit_set(ctx->match_spec, + fremap[EFX_MAE_FIELD_HAS_IVLAN], + enforce_tag_presence[1] || + pdata->has_ivlan_value); + if (rc != 0) + goto fail; + } + valuep = (const uint8_t *)&pdata->l3_next_proto_value; maskp = (const uint8_t *)&pdata->l3_next_proto_mask; rc = efx_mae_match_spec_field_set(ctx->match_spec, @@ -891,6 +1492,7 @@ sfc_mae_rule_parse_item_eth(const struct rte_flow_item *item, sfc_mae_item_build_supp_mask(flocs_eth, RTE_DIM(flocs_eth), &supp_mask, sizeof(supp_mask)); + supp_mask.has_vlan = 1; rc = sfc_flow_parse_init(item, (const void **)&spec, (const void **)&mask, @@ -909,14 +1511,23 @@ sfc_mae_rule_parse_item_eth(const struct rte_flow_item *item, item_spec = (const struct rte_flow_item_eth *)spec; item_mask = (const struct rte_flow_item_eth *)mask; + /* + * Remember various match criteria in the parsing context. + * sfc_mae_rule_process_pattern_data() will consider them + * altogether when the rest of the items have been parsed. + */ ethertypes[0].value = item_spec->type; ethertypes[0].mask = item_mask->type; + if (item_mask->has_vlan) { + pdata->has_ovlan_mask = B_TRUE; + if (item_spec->has_vlan) + pdata->has_ovlan_value = B_TRUE; + } } else { /* - * The specification is empty. This is wrong in the case - * when there are more network patterns in line. Other - * than that, any Ethernet can match. All of that is - * checked at the end of parsing. + * The specification is empty. The overall pattern + * validity will be enforced at the end of parsing. + * See sfc_mae_rule_process_pattern_data(). */ return 0; } @@ -966,6 +1577,16 @@ sfc_mae_rule_parse_item_vlan(const struct rte_flow_item *item, { struct sfc_mae_parse_ctx *ctx_mae = ctx->mae; struct sfc_mae_pattern_data *pdata = &ctx_mae->pattern_data; + boolean_t *has_vlan_mp_by_nb_tags[SFC_MAE_MATCH_VLAN_MAX_NTAGS] = { + &pdata->has_ovlan_mask, + &pdata->has_ivlan_mask, + }; + boolean_t *has_vlan_vp_by_nb_tags[SFC_MAE_MATCH_VLAN_MAX_NTAGS] = { + &pdata->has_ovlan_value, + &pdata->has_ivlan_value, + }; + boolean_t *cur_tag_presence_bit_mp; + boolean_t *cur_tag_presence_bit_vp; const struct sfc_mae_field_locator *flocs; struct rte_flow_item_vlan supp_mask; const uint8_t *spec = NULL; @@ -981,14 +1602,27 @@ sfc_mae_rule_parse_item_vlan(const struct rte_flow_item *item, "Can't match that many VLAN tags"); } + cur_tag_presence_bit_mp = has_vlan_mp_by_nb_tags[pdata->nb_vlan_tags]; + cur_tag_presence_bit_vp = has_vlan_vp_by_nb_tags[pdata->nb_vlan_tags]; + + if (*cur_tag_presence_bit_mp == B_TRUE && + *cur_tag_presence_bit_vp == B_FALSE) { + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, item, + "The previous item enforces no (more) VLAN, " + "so the current item (VLAN) must not exist"); + } + nb_flocs = RTE_DIM(flocs_vlan) / SFC_MAE_MATCH_VLAN_MAX_NTAGS; flocs = flocs_vlan + pdata->nb_vlan_tags * nb_flocs; - /* If parsing fails, this can remain incremented. */ - ++pdata->nb_vlan_tags; - sfc_mae_item_build_supp_mask(flocs, nb_flocs, &supp_mask, sizeof(supp_mask)); + /* + * This only means that the field is supported by the driver and libefx. + * Support on NIC level will be checked when all items have been parsed. + */ + supp_mask.has_more_vlan = 1; rc = sfc_flow_parse_init(item, (const void **)&spec, (const void **)&mask, @@ -999,26 +1633,44 @@ sfc_mae_rule_parse_item_vlan(const struct rte_flow_item *item, return rc; if (spec != NULL) { - struct sfc_mae_ethertype *ethertypes = pdata->ethertypes; + struct sfc_mae_ethertype *et = pdata->ethertypes; const struct rte_flow_item_vlan *item_spec; const struct rte_flow_item_vlan *item_mask; item_spec = (const struct rte_flow_item_vlan *)spec; item_mask = (const struct rte_flow_item_vlan *)mask; - ethertypes[pdata->nb_vlan_tags].value = item_spec->inner_type; - ethertypes[pdata->nb_vlan_tags].mask = item_mask->inner_type; - } else { /* - * The specification is empty. This is wrong in the case - * when there are more network patterns in line. Other - * than that, any Ethernet can match. All of that is - * checked at the end of parsing. + * Remember various match criteria in the parsing context. + * sfc_mae_rule_process_pattern_data() will consider them + * altogether when the rest of the items have been parsed. */ - return 0; + et[pdata->nb_vlan_tags + 1].value = item_spec->inner_type; + et[pdata->nb_vlan_tags + 1].mask = item_mask->inner_type; + pdata->tci_masks[pdata->nb_vlan_tags] = item_mask->tci; + if (item_mask->has_more_vlan) { + if (pdata->nb_vlan_tags == + SFC_MAE_MATCH_VLAN_MAX_NTAGS) { + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ITEM, item, + "Can't use 'has_more_vlan' in " + "the second item VLAN"); + } + pdata->has_ivlan_mask = B_TRUE; + if (item_spec->has_more_vlan) + pdata->has_ivlan_value = B_TRUE; + } + + /* Convert TCI to MAE representation right now. */ + rc = sfc_mae_parse_item(flocs, nb_flocs, spec, mask, + ctx_mae, error); + if (rc != 0) + return rc; } - return sfc_mae_parse_item(flocs, nb_flocs, spec, mask, ctx_mae, error); + ++(pdata->nb_vlan_tags); + + return 0; } static const struct sfc_mae_field_locator flocs_ipv4[] = { @@ -1349,6 +2001,8 @@ static const efx_mae_field_id_t field_ids_no_remap[] = { FIELD_ID_NO_REMAP(L4_SPORT_BE), FIELD_ID_NO_REMAP(L4_DPORT_BE), FIELD_ID_NO_REMAP(TCP_FLAGS_BE), + FIELD_ID_NO_REMAP(HAS_OVLAN), + FIELD_ID_NO_REMAP(HAS_IVLAN), #undef FIELD_ID_NO_REMAP }; @@ -1379,6 +2033,8 @@ static const efx_mae_field_id_t field_ids_remap_to_encap[] = { FIELD_ID_REMAP_TO_ENCAP(DST_IP6_BE), FIELD_ID_REMAP_TO_ENCAP(L4_SPORT_BE), FIELD_ID_REMAP_TO_ENCAP(L4_DPORT_BE), + FIELD_ID_REMAP_TO_ENCAP(HAS_OVLAN), + FIELD_ID_REMAP_TO_ENCAP(HAS_IVLAN), #undef FIELD_ID_REMAP_TO_ENCAP }; @@ -1462,6 +2118,7 @@ sfc_mae_rule_parse_item_tunnel(const struct rte_flow_item *item, 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. @@ -1473,6 +2130,7 @@ static const struct sfc_flow_item sfc_flow_items[] = { }, { .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. @@ -1484,6 +2142,7 @@ static const struct sfc_flow_item sfc_flow_items[] = { }, { .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. @@ -1495,6 +2154,7 @@ static const struct sfc_flow_item sfc_flow_items[] = { }, { .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. @@ -1506,6 +2166,7 @@ static const struct sfc_flow_item sfc_flow_items[] = { }, { .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, @@ -1513,6 +2174,7 @@ static const struct sfc_flow_item sfc_flow_items[] = { }, { .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, @@ -1520,6 +2182,7 @@ static const struct sfc_flow_item sfc_flow_items[] = { }, { .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, @@ -1527,6 +2190,7 @@ static const struct sfc_flow_item sfc_flow_items[] = { }, { .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, @@ -1534,6 +2198,7 @@ static const struct sfc_flow_item sfc_flow_items[] = { }, { .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, @@ -1541,6 +2206,7 @@ static const struct sfc_flow_item sfc_flow_items[] = { }, { .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, @@ -1548,6 +2214,7 @@ static const struct sfc_flow_item sfc_flow_items[] = { }, { .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, @@ -1555,6 +2222,7 @@ static const struct sfc_flow_item sfc_flow_items[] = { }, { .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, @@ -1562,6 +2230,7 @@ static const struct sfc_flow_item sfc_flow_items[] = { }, { .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, @@ -1575,12 +2244,12 @@ sfc_mae_rule_process_outer(struct sfc_adapter *sa, struct sfc_mae_outer_rule **rulep, struct rte_flow_error *error) { - struct sfc_mae_outer_rule *rule; + efx_mae_rule_id_t invalid_rule_id = { .id = EFX_MAE_RSRC_ID_INVALID }; int rc; if (ctx->encap_type == EFX_TUNNEL_PROTOCOL_NONE) { *rulep = NULL; - return 0; + goto no_or_id; } SFC_ASSERT(ctx->match_spec_outer != NULL); @@ -1608,21 +2277,27 @@ sfc_mae_rule_process_outer(struct sfc_adapter *sa, /* The spec has now been tracked by the outer rule entry. */ ctx->match_spec_outer = NULL; +no_or_id: /* - * Depending on whether we reuse an existing outer rule or create a - * new one (see above), outer rule ID is either a valid value or - * EFX_MAE_RSRC_ID_INVALID. Set it in the action rule match - * specification (and the full mask, too) in order to have correct - * class comparisons of the new rule with existing ones. - * Also, action rule match specification will be validated shortly, - * and having the full mask set for outer rule ID indicates that we - * will use this field, and support for this field has to be checked. + * In MAE, lookup sequence comprises outer parse, outer rule lookup, + * inner parse (when some outer rule is hit) and action rule lookup. + * If the currently processed flow does not come with an outer rule, + * its action rule must be available only for packets which miss in + * outer rule table. Set OR_ID match field to 0xffffffff/0xffffffff + * in the action rule specification; this ensures correct behaviour. + * + * If, on the other hand, this flow does have an outer rule, its ID + * may be unknown at the moment (not yet allocated), but OR_ID mask + * has to be set to 0xffffffff anyway for correct class comparisons. + * When the outer rule has been allocated, this match field will be + * overridden by sfc_mae_outer_rule_enable() to use the right value. */ - rule = *rulep; rc = efx_mae_match_spec_outer_rule_id_set(ctx->match_spec_action, - &rule->fw_rsrc.rule_id); + &invalid_rule_id); if (rc != 0) { - sfc_mae_outer_rule_del(sa, *rulep); + if (*rulep != NULL) + sfc_mae_outer_rule_del(sa, *rulep); + *rulep = NULL; return rte_flow_error_set(error, rc, @@ -1764,7 +2439,7 @@ sfc_mae_rule_parse_pattern(struct sfc_adapter *sa, 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; @@ -1817,130 +2492,487 @@ fail_init_match_spec_action: * action or an action of different bundle type follows. */ -enum sfc_mae_actions_bundle_type { - SFC_MAE_ACTIONS_BUNDLE_EMPTY = 0, - SFC_MAE_ACTIONS_BUNDLE_VLAN_PUSH, -}; +enum sfc_mae_actions_bundle_type { + SFC_MAE_ACTIONS_BUNDLE_EMPTY = 0, + SFC_MAE_ACTIONS_BUNDLE_VLAN_PUSH, +}; + +struct sfc_mae_actions_bundle { + enum sfc_mae_actions_bundle_type type; + + /* Indicates actions already tracked by the current bundle */ + uint64_t actions_mask; + + /* Parameters used by SFC_MAE_ACTIONS_BUNDLE_VLAN_PUSH */ + rte_be16_t vlan_push_tpid; + rte_be16_t vlan_push_tci; +}; + +/* + * Combine configuration of RTE flow actions tracked by the bundle into a + * single action and submit the result to MAE action set specification. + * Do nothing in the case of dummy action bundle. + */ +static int +sfc_mae_actions_bundle_submit(const struct sfc_mae_actions_bundle *bundle, + efx_mae_actions_t *spec) +{ + int rc = 0; + + switch (bundle->type) { + case SFC_MAE_ACTIONS_BUNDLE_EMPTY: + break; + case SFC_MAE_ACTIONS_BUNDLE_VLAN_PUSH: + rc = efx_mae_action_set_populate_vlan_push( + spec, bundle->vlan_push_tpid, bundle->vlan_push_tci); + break; + default: + SFC_ASSERT(B_FALSE); + break; + } + + return rc; +} + +/* + * Given the type of the next RTE flow action in the line, decide + * whether a new bundle is about to start, and, if this is the case, + * submit and reset the current bundle. + */ +static int +sfc_mae_actions_bundle_sync(const struct rte_flow_action *action, + struct sfc_mae_actions_bundle *bundle, + efx_mae_actions_t *spec, + struct rte_flow_error *error) +{ + enum sfc_mae_actions_bundle_type bundle_type_new; + int rc; + + switch (action->type) { + case RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN: + case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID: + case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP: + bundle_type_new = SFC_MAE_ACTIONS_BUNDLE_VLAN_PUSH; + break; + default: + /* + * Self-sufficient actions, including END, are handled in this + * case. No checks for unsupported actions are needed here + * because parsing doesn't occur at this point. + */ + bundle_type_new = SFC_MAE_ACTIONS_BUNDLE_EMPTY; + break; + } + + if (bundle_type_new != bundle->type || + (bundle->actions_mask & (1ULL << action->type)) != 0) { + rc = sfc_mae_actions_bundle_submit(bundle, spec); + if (rc != 0) + goto fail_submit; + + memset(bundle, 0, sizeof(*bundle)); + } + + bundle->type = bundle_type_new; + + return 0; + +fail_submit: + return rte_flow_error_set(error, rc, + RTE_FLOW_ERROR_TYPE_ACTION, NULL, + "Failed to request the (group of) action(s)"); +} + +static void +sfc_mae_rule_parse_action_of_push_vlan( + const struct rte_flow_action_of_push_vlan *conf, + struct sfc_mae_actions_bundle *bundle) +{ + bundle->vlan_push_tpid = conf->ethertype; +} + +static void +sfc_mae_rule_parse_action_of_set_vlan_vid( + const struct rte_flow_action_of_set_vlan_vid *conf, + struct sfc_mae_actions_bundle *bundle) +{ + bundle->vlan_push_tci |= (conf->vlan_vid & + rte_cpu_to_be_16(RTE_LEN2MASK(12, uint16_t))); +} + +static void +sfc_mae_rule_parse_action_of_set_vlan_pcp( + const struct rte_flow_action_of_set_vlan_pcp *conf, + struct sfc_mae_actions_bundle *bundle) +{ + uint16_t vlan_tci_pcp = (uint16_t)(conf->vlan_pcp & + RTE_LEN2MASK(3, uint8_t)) << 13; + + bundle->vlan_push_tci |= rte_cpu_to_be_16(vlan_tci_pcp); +} + +struct sfc_mae_parsed_item { + const struct rte_flow_item *item; + size_t proto_header_ofst; + size_t proto_header_size; +}; + +/* + * For each 16-bit word of the given header, override + * bits enforced by the corresponding 16-bit mask. + */ +static void +sfc_mae_header_force_item_masks(uint8_t *header_buf, + const struct sfc_mae_parsed_item *parsed_items, + unsigned int nb_parsed_items) +{ + unsigned int item_idx; + + for (item_idx = 0; item_idx < nb_parsed_items; ++item_idx) { + const struct sfc_mae_parsed_item *parsed_item; + const struct rte_flow_item *item; + size_t proto_header_size; + size_t ofst; + + parsed_item = &parsed_items[item_idx]; + proto_header_size = parsed_item->proto_header_size; + item = parsed_item->item; + + for (ofst = 0; ofst < proto_header_size; + ofst += sizeof(rte_be16_t)) { + rte_be16_t *wp = RTE_PTR_ADD(header_buf, ofst); + const rte_be16_t *w_maskp; + const rte_be16_t *w_specp; + + w_maskp = RTE_PTR_ADD(item->mask, ofst); + w_specp = RTE_PTR_ADD(item->spec, ofst); + + *wp &= ~(*w_maskp); + *wp |= (*w_specp & *w_maskp); + } + + header_buf += proto_header_size; + } +} + +#define SFC_IPV4_TTL_DEF 0x40 +#define SFC_IPV6_VTC_FLOW_DEF 0x60000000 +#define SFC_IPV6_HOP_LIMITS_DEF 0xff +#define SFC_VXLAN_FLAGS_DEF 0x08000000 + +static int +sfc_mae_rule_parse_action_vxlan_encap( + struct sfc_mae *mae, + const struct rte_flow_action_vxlan_encap *conf, + efx_mae_actions_t *spec, + struct rte_flow_error *error) +{ + struct sfc_mae_bounce_eh *bounce_eh = &mae->bounce_eh; + struct rte_flow_item *pattern = conf->definition; + uint8_t *buf = bounce_eh->buf; + + /* This array will keep track of non-VOID pattern items. */ + struct sfc_mae_parsed_item parsed_items[1 /* Ethernet */ + + 2 /* VLAN tags */ + + 1 /* IPv4 or IPv6 */ + + 1 /* UDP */ + + 1 /* VXLAN */]; + unsigned int nb_parsed_items = 0; + + size_t eth_ethertype_ofst = offsetof(struct rte_ether_hdr, ether_type); + uint8_t dummy_buf[RTE_MAX(sizeof(struct rte_ipv4_hdr), + sizeof(struct rte_ipv6_hdr))]; + struct rte_ipv4_hdr *ipv4 = (void *)dummy_buf; + struct rte_ipv6_hdr *ipv6 = (void *)dummy_buf; + struct rte_vxlan_hdr *vxlan = NULL; + struct rte_udp_hdr *udp = NULL; + unsigned int nb_vlan_tags = 0; + 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, + RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL, + "The encap. header definition is NULL"); + } + + bounce_eh->type = EFX_TUNNEL_PROTOCOL_VXLAN; + bounce_eh->size = 0; + + /* + * Process pattern items and remember non-VOID ones. + * Defer applying masks until after the complete header + * has been built from the pattern items. + */ + exp_items = RTE_BIT64(RTE_FLOW_ITEM_TYPE_ETH); + + for (; pattern->type != RTE_FLOW_ITEM_TYPE_END; ++pattern) { + struct sfc_mae_parsed_item *parsed_item; + const uint64_t exp_items_extra_vlan[] = { + RTE_BIT64(RTE_FLOW_ITEM_TYPE_VLAN), 0 + }; + size_t proto_header_size; + rte_be16_t *ethertypep; + uint8_t *next_protop; + uint8_t *buf_cur; + + if (pattern->spec == NULL) { + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL, + "NULL item spec in the encap. header"); + } + + if (pattern->mask == NULL) { + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL, + "NULL item mask in the encap. header"); + } + + if (pattern->last != NULL) { + /* This is not a match pattern, so disallow range. */ + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL, + "Range item in the encap. header"); + } + + if (pattern->type == RTE_FLOW_ITEM_TYPE_VOID) { + /* Handle VOID separately, for clarity. */ + continue; + } + + if ((exp_items & RTE_BIT64(pattern->type)) == 0) { + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL, + "Unexpected item in the encap. header"); + } + + parsed_item = &parsed_items[nb_parsed_items]; + buf_cur = buf + bounce_eh->size; + + switch (pattern->type) { + case RTE_FLOW_ITEM_TYPE_ETH: + SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ITEM_TYPE_ETH, + exp_items); + RTE_BUILD_BUG_ON(offsetof(struct rte_flow_item_eth, + hdr) != 0); + + proto_header_size = sizeof(struct rte_ether_hdr); + + ethertype_ofst = eth_ethertype_ofst; + + exp_items = RTE_BIT64(RTE_FLOW_ITEM_TYPE_VLAN) | + RTE_BIT64(RTE_FLOW_ITEM_TYPE_IPV4) | + RTE_BIT64(RTE_FLOW_ITEM_TYPE_IPV6); + break; + case RTE_FLOW_ITEM_TYPE_VLAN: + SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ITEM_TYPE_VLAN, + exp_items); + RTE_BUILD_BUG_ON(offsetof(struct rte_flow_item_vlan, + hdr) != 0); + + proto_header_size = sizeof(struct rte_vlan_hdr); + + ethertypep = RTE_PTR_ADD(buf, eth_ethertype_ofst); + *ethertypep = RTE_BE16(RTE_ETHER_TYPE_QINQ); + + ethertypep = RTE_PTR_ADD(buf, ethertype_ofst); + *ethertypep = RTE_BE16(RTE_ETHER_TYPE_VLAN); + + ethertype_ofst = + bounce_eh->size + + offsetof(struct rte_vlan_hdr, eth_proto); + + exp_items = RTE_BIT64(RTE_FLOW_ITEM_TYPE_IPV4) | + RTE_BIT64(RTE_FLOW_ITEM_TYPE_IPV6); + exp_items |= exp_items_extra_vlan[nb_vlan_tags]; + + ++nb_vlan_tags; + break; + case RTE_FLOW_ITEM_TYPE_IPV4: + SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ITEM_TYPE_IPV4, + exp_items); + RTE_BUILD_BUG_ON(offsetof(struct rte_flow_item_ipv4, + hdr) != 0); + + proto_header_size = sizeof(struct rte_ipv4_hdr); + + ethertypep = RTE_PTR_ADD(buf, ethertype_ofst); + *ethertypep = RTE_BE16(RTE_ETHER_TYPE_IPV4); + + next_proto_ofst = + bounce_eh->size + + offsetof(struct rte_ipv4_hdr, next_proto_id); + + ipv4 = (struct rte_ipv4_hdr *)buf_cur; + + exp_items = RTE_BIT64(RTE_FLOW_ITEM_TYPE_UDP); + break; + case RTE_FLOW_ITEM_TYPE_IPV6: + SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ITEM_TYPE_IPV6, + exp_items); + RTE_BUILD_BUG_ON(offsetof(struct rte_flow_item_ipv6, + hdr) != 0); + + proto_header_size = sizeof(struct rte_ipv6_hdr); + + ethertypep = RTE_PTR_ADD(buf, ethertype_ofst); + *ethertypep = RTE_BE16(RTE_ETHER_TYPE_IPV6); + + next_proto_ofst = bounce_eh->size + + offsetof(struct rte_ipv6_hdr, proto); + + ipv6 = (struct rte_ipv6_hdr *)buf_cur; + + exp_items = RTE_BIT64(RTE_FLOW_ITEM_TYPE_UDP); + break; + case RTE_FLOW_ITEM_TYPE_UDP: + SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ITEM_TYPE_UDP, + exp_items); + RTE_BUILD_BUG_ON(offsetof(struct rte_flow_item_udp, + hdr) != 0); + + proto_header_size = sizeof(struct rte_udp_hdr); + + next_protop = RTE_PTR_ADD(buf, next_proto_ofst); + *next_protop = IPPROTO_UDP; + + udp = (struct rte_udp_hdr *)buf_cur; + + exp_items = RTE_BIT64(RTE_FLOW_ITEM_TYPE_VXLAN); + break; + case RTE_FLOW_ITEM_TYPE_VXLAN: + SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ITEM_TYPE_VXLAN, + exp_items); + RTE_BUILD_BUG_ON(offsetof(struct rte_flow_item_vxlan, + hdr) != 0); + + proto_header_size = sizeof(struct rte_vxlan_hdr); + + vxlan = (struct rte_vxlan_hdr *)buf_cur; + + udp->dst_port = RTE_BE16(RTE_VXLAN_DEFAULT_PORT); + udp->dgram_len = RTE_BE16(sizeof(*udp) + + sizeof(*vxlan)); + udp->dgram_cksum = 0; + + exp_items = 0; + break; + default: + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL, + "Unknown item in the encap. header"); + } + + if (bounce_eh->size + proto_header_size > bounce_eh->buf_size) { + return rte_flow_error_set(error, E2BIG, + RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL, + "The encap. header is too big"); + } + + if ((proto_header_size & 1) != 0) { + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL, + "Odd layer size in the encap. header"); + } + + rte_memcpy(buf_cur, pattern->spec, proto_header_size); + bounce_eh->size += proto_header_size; + + parsed_item->item = pattern; + parsed_item->proto_header_size = proto_header_size; + ++nb_parsed_items; + } + + if (exp_items != 0) { + /* Parsing item VXLAN would have reset exp_items to 0. */ + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL, + "No item VXLAN in the encap. header"); + } + + /* One of the pointers (ipv4, ipv6) refers to a dummy area. */ + ipv4->version_ihl = RTE_IPV4_VHL_DEF; + ipv4->time_to_live = SFC_IPV4_TTL_DEF; + ipv4->total_length = RTE_BE16(sizeof(*ipv4) + sizeof(*udp) + + sizeof(*vxlan)); + /* The HW cannot compute this checksum. */ + ipv4->hdr_checksum = 0; + ipv4->hdr_checksum = rte_ipv4_cksum(ipv4); -struct sfc_mae_actions_bundle { - enum sfc_mae_actions_bundle_type type; + ipv6->vtc_flow = RTE_BE32(SFC_IPV6_VTC_FLOW_DEF); + ipv6->hop_limits = SFC_IPV6_HOP_LIMITS_DEF; + ipv6->payload_len = udp->dgram_len; - /* Indicates actions already tracked by the current bundle */ - uint64_t actions_mask; + vxlan->vx_flags = RTE_BE32(SFC_VXLAN_FLAGS_DEF); - /* Parameters used by SFC_MAE_ACTIONS_BUNDLE_VLAN_PUSH */ - rte_be16_t vlan_push_tpid; - rte_be16_t vlan_push_tci; -}; + /* Take care of the masks. */ + sfc_mae_header_force_item_masks(buf, parsed_items, nb_parsed_items); + + 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; +} -/* - * Combine configuration of RTE flow actions tracked by the bundle into a - * single action and submit the result to MAE action set specification. - * Do nothing in the case of dummy action bundle. - */ static int -sfc_mae_actions_bundle_submit(const struct sfc_mae_actions_bundle *bundle, - efx_mae_actions_t *spec) +sfc_mae_rule_parse_action_mark(struct sfc_adapter *sa, + const struct rte_flow_action_mark *conf, + efx_mae_actions_t *spec) { - int rc = 0; + int rc; - switch (bundle->type) { - case SFC_MAE_ACTIONS_BUNDLE_EMPTY: - break; - case SFC_MAE_ACTIONS_BUNDLE_VLAN_PUSH: - rc = efx_mae_action_set_populate_vlan_push( - spec, bundle->vlan_push_tpid, bundle->vlan_push_tci); - break; - default: - SFC_ASSERT(B_FALSE); - break; - } + 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; } -/* - * Given the type of the next RTE flow action in the line, decide - * whether a new bundle is about to start, and, if this is the case, - * submit and reset the current bundle. - */ static int -sfc_mae_actions_bundle_sync(const struct rte_flow_action *action, - struct sfc_mae_actions_bundle *bundle, - efx_mae_actions_t *spec, - struct rte_flow_error *error) +sfc_mae_rule_parse_action_count(struct sfc_adapter *sa, + const struct rte_flow_action_count *conf, + efx_mae_actions_t *spec) { - enum sfc_mae_actions_bundle_type bundle_type_new; int rc; - switch (action->type) { - case RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN: - case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID: - case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP: - bundle_type_new = SFC_MAE_ACTIONS_BUNDLE_VLAN_PUSH; - break; - default: - /* - * Self-sufficient actions, including END, are handled in this - * case. No checks for unsupported actions are needed here - * because parsing doesn't occur at this point. - */ - bundle_type_new = SFC_MAE_ACTIONS_BUNDLE_EMPTY; - break; + if (conf->shared) { + rc = ENOTSUP; + goto fail_counter_shared; } - if (bundle_type_new != bundle->type || - (bundle->actions_mask & (1ULL << action->type)) != 0) { - rc = sfc_mae_actions_bundle_submit(bundle, spec); - if (rc != 0) - goto fail_submit; + if ((sa->counter_rxq.state & SFC_COUNTER_RXQ_INITIALIZED) == 0) { + sfc_err(sa, + "counter queue is not configured for COUNT action"); + rc = EINVAL; + goto fail_counter_queue_uninit; + } - memset(bundle, 0, sizeof(*bundle)); + if (sfc_get_service_lcore(SOCKET_ID_ANY) == RTE_MAX_LCORE) { + rc = EINVAL; + goto fail_no_service_core; } - bundle->type = bundle_type_new; + rc = efx_mae_action_set_populate_count(spec); + if (rc != 0) { + sfc_err(sa, + "failed to populate counters in MAE action set: %s", + rte_strerror(rc)); + goto fail_populate_count; + } return 0; -fail_submit: - return rte_flow_error_set(error, rc, - RTE_FLOW_ERROR_TYPE_ACTION, NULL, - "Failed to request the (group of) action(s)"); -} - -static void -sfc_mae_rule_parse_action_of_push_vlan( - const struct rte_flow_action_of_push_vlan *conf, - struct sfc_mae_actions_bundle *bundle) -{ - bundle->vlan_push_tpid = conf->ethertype; -} - -static void -sfc_mae_rule_parse_action_of_set_vlan_vid( - const struct rte_flow_action_of_set_vlan_vid *conf, - struct sfc_mae_actions_bundle *bundle) -{ - bundle->vlan_push_tci |= (conf->vlan_vid & - rte_cpu_to_be_16(RTE_LEN2MASK(12, uint16_t))); -} - -static void -sfc_mae_rule_parse_action_of_set_vlan_pcp( - const struct rte_flow_action_of_set_vlan_pcp *conf, - struct sfc_mae_actions_bundle *bundle) -{ - uint16_t vlan_tci_pcp = (uint16_t)(conf->vlan_pcp & - RTE_LEN2MASK(3, uint8_t)) << 13; - - bundle->vlan_push_tci |= rte_cpu_to_be_16(vlan_tci_pcp); -} +fail_populate_count: +fail_no_service_core: +fail_counter_queue_uninit: +fail_counter_shared: -static int -sfc_mae_rule_parse_action_mark(const struct rte_flow_action_mark *conf, - efx_mae_actions_t *spec) -{ - return efx_mae_action_set_populate_mark(spec, conf->id); + return rc; } static int @@ -1958,10 +2990,19 @@ sfc_mae_rule_parse_action_phy_port(struct sfc_adapter *sa, 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 @@ -1982,10 +3023,20 @@ sfc_mae_rule_parse_action_pf_vf(struct sfc_adapter *sa, 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 @@ -1999,26 +3050,65 @@ sfc_mae_rule_parse_action_port_id(struct sfc_adapter *sa, uint16_t port_id; int rc; + if (conf->id > UINT16_MAX) + return EOVERFLOW; + port_id = (conf->original != 0) ? sas->port_id : conf->id; 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; + } - 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 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, + const struct sfc_mae_outer_rule *outer_rule, struct sfc_mae_actions_bundle *bundle, efx_mae_actions_t *spec, struct rte_flow_error *error) { + bool custom_error = B_FALSE; int rc = 0; switch (action->type) { + case RTE_FLOW_ACTION_TYPE_VXLAN_DECAP: + SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_VXLAN_DECAP, + bundle->actions_mask); + if (outer_rule == NULL || + outer_rule->encap_type != EFX_TUNNEL_PROTOCOL_VXLAN) + rc = EINVAL; + else + rc = efx_mae_action_set_populate_decap(spec); + break; case RTE_FLOW_ACTION_TYPE_OF_POP_VLAN: SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_OF_POP_VLAN, bundle->actions_mask); @@ -2039,6 +3129,19 @@ sfc_mae_rule_parse_action(struct sfc_adapter *sa, bundle->actions_mask); sfc_mae_rule_parse_action_of_set_vlan_pcp(action->conf, bundle); break; + case RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP: + SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP, + bundle->actions_mask); + rc = sfc_mae_rule_parse_action_vxlan_encap(&sa->mae, + action->conf, + spec, error); + custom_error = B_TRUE; + break; + case RTE_FLOW_ACTION_TYPE_COUNT: + SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_COUNT, + bundle->actions_mask); + rc = sfc_mae_rule_parse_action_count(sa, action->conf, spec); + break; case RTE_FLOW_ACTION_TYPE_FLAG: SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_FLAG, bundle->actions_mask); @@ -2047,7 +3150,7 @@ sfc_mae_rule_parse_action(struct sfc_adapter *sa, 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, @@ -2080,27 +3183,63 @@ sfc_mae_rule_parse_action(struct sfc_adapter *sa, "Unsupported action"); } - if (rc != 0) { + 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"); - } else { - bundle->actions_mask |= (1ULL << action->type); } return rc; } +static void +sfc_mae_bounce_eh_invalidate(struct sfc_mae_bounce_eh *bounce_eh) +{ + bounce_eh->type = EFX_TUNNEL_PROTOCOL_NONE; +} + +static int +sfc_mae_process_encap_header(struct sfc_adapter *sa, + const struct sfc_mae_bounce_eh *bounce_eh, + struct sfc_mae_encap_header **encap_headerp) +{ + if (bounce_eh->type == EFX_TUNNEL_PROTOCOL_NONE) { + encap_headerp = NULL; + return 0; + } + + *encap_headerp = sfc_mae_encap_header_attach(sa, bounce_eh); + if (*encap_headerp != NULL) + return 0; + + return sfc_mae_encap_header_add(sa, bounce_eh, encap_headerp); +} + int sfc_mae_rule_parse_actions(struct sfc_adapter *sa, const struct rte_flow_action actions[], - struct sfc_mae_action_set **action_setp, + struct sfc_flow_spec_mae *spec_mae, struct rte_flow_error *error) { + struct sfc_mae_encap_header *encap_header = NULL; struct sfc_mae_actions_bundle bundle = {0}; const struct rte_flow_action *action; + struct sfc_mae *mae = &sa->mae; efx_mae_actions_t *spec; + unsigned int n_count; int rc; + rte_errno = 0; + if (actions == NULL) { return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION_NUM, NULL, @@ -2111,14 +3250,17 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa, if (rc != 0) goto fail_action_set_spec_init; + /* Cleanup after previous encap. header bounce buffer usage. */ + sfc_mae_bounce_eh_invalidate(&mae->bounce_eh); + for (action = actions; action->type != RTE_FLOW_ACTION_TYPE_END; ++action) { rc = sfc_mae_actions_bundle_sync(action, &bundle, spec, error); if (rc != 0) goto fail_rule_parse_action; - rc = sfc_mae_rule_parse_action(sa, action, &bundle, spec, - error); + rc = sfc_mae_rule_parse_action(sa, action, spec_mae->outer_rule, + &bundle, spec, error); if (rc != 0) goto fail_rule_parse_action; } @@ -2127,24 +3269,42 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa, if (rc != 0) goto fail_rule_parse_action; - *action_setp = sfc_mae_action_set_attach(sa, spec); - if (*action_setp != NULL) { + rc = sfc_mae_process_encap_header(sa, &mae->bounce_eh, &encap_header); + if (rc != 0) + goto fail_process_encap_header; + + n_count = efx_mae_action_set_get_nb_count(spec); + if (n_count > 1) { + rc = ENOTSUP; + sfc_err(sa, "too many count actions requested: %u", n_count); + goto fail_nb_count; + } + + spec_mae->action_set = sfc_mae_action_set_attach(sa, encap_header, + n_count, spec); + if (spec_mae->action_set != NULL) { + sfc_mae_encap_header_del(sa, encap_header); efx_mae_action_set_spec_fini(sa->nic, spec); return 0; } - rc = sfc_mae_action_set_add(sa, spec, action_setp); + rc = sfc_mae_action_set_add(sa, actions, spec, encap_header, n_count, + &spec_mae->action_set); if (rc != 0) goto fail_action_set_add; return 0; fail_action_set_add: +fail_nb_count: + sfc_mae_encap_header_del(sa, encap_header); + +fail_process_encap_header: fail_rule_parse_action: efx_mae_action_set_spec_fini(sa->nic, spec); fail_action_set_spec_init: - if (rc > 0) { + if (rc > 0 && rte_errno == 0) { rc = rte_flow_error_set(error, rc, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "Failed to process the action"); @@ -2254,7 +3414,7 @@ sfc_mae_flow_verify(struct sfc_adapter *sa, SFC_ASSERT(sfc_adapter_is_locked(sa)); - if (sa->state != SFC_ADAPTER_STARTED) + if (sa->state != SFC_ETHDEV_STARTED) return EAGAIN; if (outer_rule != NULL) { @@ -2291,20 +3451,33 @@ sfc_mae_flow_insert(struct sfc_adapter *sa, if (rc != 0) goto fail_action_set_enable; + if (action_set->n_counters > 0) { + rc = sfc_mae_counter_start(sa); + if (rc != 0) { + sfc_err(sa, "failed to start MAE counters support: %s", + rte_strerror(rc)); + goto fail_mae_counter_start; + } + } + rc = efx_mae_action_rule_insert(sa->nic, spec_mae->match_spec, NULL, &fw_rsrc->aset_id, &spec_mae->rule_id); if (rc != 0) goto fail_action_rule_insert; + sfc_dbg(sa, "enabled flow=%p: AR_ID=0x%08x", + flow, spec_mae->rule_id.id); + return 0; fail_action_rule_insert: - (void)sfc_mae_action_set_disable(sa, action_set); +fail_mae_counter_start: + sfc_mae_action_set_disable(sa, action_set); fail_action_set_enable: if (outer_rule != NULL) - (void)sfc_mae_outer_rule_disable(sa, outer_rule); + sfc_mae_outer_rule_disable(sa, outer_rule); fail_outer_rule_enable: return rc; @@ -2324,19 +3497,160 @@ sfc_mae_flow_remove(struct sfc_adapter *sa, SFC_ASSERT(action_set != NULL); rc = efx_mae_action_rule_remove(sa->nic, &spec_mae->rule_id); - if (rc != 0) - return rc; - + if (rc != 0) { + sfc_err(sa, "failed to disable flow=%p with AR_ID=0x%08x: %s", + flow, spec_mae->rule_id.id, strerror(rc)); + } + sfc_dbg(sa, "disabled flow=%p with AR_ID=0x%08x", + flow, spec_mae->rule_id.id); spec_mae->rule_id.id = EFX_MAE_RSRC_ID_INVALID; - rc = sfc_mae_action_set_disable(sa, action_set); + sfc_mae_action_set_disable(sa, action_set); + + if (outer_rule != NULL) + sfc_mae_outer_rule_disable(sa, outer_rule); + + 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"); + } +} + +int +sfc_mae_switchdev_init(struct sfc_adapter *sa) +{ + const efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic); + struct sfc_mae *mae = &sa->mae; + efx_mport_sel_t pf; + efx_mport_sel_t phy; + int rc; + + sfc_log_init(sa, "entry"); + + if (!sa->switchdev) { + sfc_log_init(sa, "switchdev is not enabled - skip"); + return 0; + } + + if (mae->status != SFC_MAE_STATUS_SUPPORTED) { + rc = ENOTSUP; + sfc_err(sa, "failed to init switchdev - no MAE support"); + goto fail_no_mae; + } + + rc = efx_mae_mport_by_pcie_function(encp->enc_pf, EFX_PCI_VF_INVALID, + &pf); if (rc != 0) { - sfc_err(sa, "failed to disable the action set (rc = %d)", rc); - /* Despite the error, proceed with outer rule removal. */ + sfc_err(sa, "failed get PF mport"); + goto fail_pf_get; } - if (outer_rule != NULL) - return sfc_mae_outer_rule_disable(sa, outer_rule); + rc = efx_mae_mport_by_phy_port(encp->enc_assigned_port, &phy); + if (rc != 0) { + sfc_err(sa, "failed get PHY mport"); + goto fail_phy_get; + } + + rc = sfc_mae_rule_add_mport_match_deliver(sa, &pf, &phy, + SFC_MAE_RULE_PRIO_LOWEST, + &mae->switchdev_rule_pf_to_ext); + if (rc != 0) { + sfc_err(sa, "failed add MAE rule to forward from PF to PHY"); + goto fail_pf_add; + } + + rc = sfc_mae_rule_add_mport_match_deliver(sa, &phy, &pf, + SFC_MAE_RULE_PRIO_LOWEST, + &mae->switchdev_rule_ext_to_pf); + if (rc != 0) { + sfc_err(sa, "failed add MAE rule to forward from PHY to PF"); + goto fail_phy_add; + } + + sfc_log_init(sa, "done"); return 0; + +fail_phy_add: + sfc_mae_rule_del(sa, mae->switchdev_rule_pf_to_ext); + +fail_pf_add: +fail_phy_get: +fail_pf_get: +fail_no_mae: + sfc_log_init(sa, "failed: %s", rte_strerror(rc)); + return rc; +} + +void +sfc_mae_switchdev_fini(struct sfc_adapter *sa) +{ + struct sfc_mae *mae = &sa->mae; + + if (!sa->switchdev) + return; + + sfc_mae_rule_del(sa, mae->switchdev_rule_pf_to_ext); + sfc_mae_rule_del(sa, mae->switchdev_rule_ext_to_pf); }