net/sfc: support flow item IPv6 in transfer rules
[dpdk.git] / drivers / net / sfc / sfc_mae.c
index 5fbf627..2b0121c 100644 (file)
 
 #include "sfc.h"
 #include "sfc_log.h"
+#include "sfc_switch.h"
+
+static int
+sfc_mae_assign_entity_mport(struct sfc_adapter *sa,
+                           efx_mport_sel_t *mportp)
+{
+       const efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic);
+
+       return efx_mae_mport_by_pcie_function(encp->enc_pf, encp->enc_vf,
+                                             mportp);
+}
 
 int
 sfc_mae_attach(struct sfc_adapter *sa)
 {
+       struct sfc_adapter_shared * const sas = sfc_sa2shared(sa);
+       struct sfc_mae_switch_port_request switch_port_request = {0};
        const efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic);
+       efx_mport_sel_t entity_mport;
        struct sfc_mae *mae = &sa->mae;
        efx_mae_limits_t limits;
        int rc;
@@ -41,6 +55,31 @@ sfc_mae_attach(struct sfc_adapter *sa)
        if (rc != 0)
                goto fail_mae_get_limits;
 
+       sfc_log_init(sa, "assign entity MPORT");
+       rc = sfc_mae_assign_entity_mport(sa, &entity_mport);
+       if (rc != 0)
+               goto fail_mae_assign_entity_mport;
+
+       sfc_log_init(sa, "assign RTE switch domain");
+       rc = sfc_mae_assign_switch_domain(sa, &mae->switch_domain_id);
+       if (rc != 0)
+               goto fail_mae_assign_switch_domain;
+
+       sfc_log_init(sa, "assign RTE switch port");
+       switch_port_request.type = SFC_MAE_SWITCH_PORT_INDEPENDENT;
+       switch_port_request.entity_mportp = &entity_mport;
+       /*
+        * As of now, the driver does not support representors, so
+        * RTE ethdev MPORT simply matches that of the entity.
+        */
+       switch_port_request.ethdev_mportp = &entity_mport;
+       switch_port_request.ethdev_port_id = sas->port_id;
+       rc = sfc_mae_assign_switch_port(mae->switch_domain_id,
+                                       &switch_port_request,
+                                       &mae->switch_port_id);
+       if (rc != 0)
+               goto fail_mae_assign_switch_port;
+
        mae->status = SFC_MAE_STATUS_SUPPORTED;
        mae->nb_action_rule_prios_max = limits.eml_max_n_action_prios;
        TAILQ_INIT(&mae->action_sets);
@@ -49,6 +88,9 @@ sfc_mae_attach(struct sfc_adapter *sa)
 
        return 0;
 
+fail_mae_assign_switch_port:
+fail_mae_assign_switch_domain:
+fail_mae_assign_entity_mport:
 fail_mae_get_limits:
        efx_mae_fini(sa->nic);
 
@@ -218,6 +260,224 @@ sfc_mae_flow_cleanup(struct sfc_adapter *sa,
                efx_mae_match_spec_fini(sa->nic, spec_mae->match_spec);
 }
 
+static int
+sfc_mae_set_ethertypes(struct sfc_mae_parse_ctx *ctx)
+{
+       efx_mae_match_spec_t *efx_spec = ctx->match_spec_action;
+       struct sfc_mae_pattern_data *pdata = &ctx->pattern_data;
+       const efx_mae_field_id_t field_ids[] = {
+               EFX_MAE_FIELD_VLAN0_PROTO_BE,
+               EFX_MAE_FIELD_VLAN1_PROTO_BE,
+       };
+       const struct sfc_mae_ethertype *et;
+       unsigned int i;
+       int rc;
+
+       /*
+        * In accordance with RTE flow API convention, the innermost L2
+        * item's "type" ("inner_type") is a L3 EtherType. If there is
+        * no L3 item, it's 0x0000/0x0000.
+        */
+       et = &pdata->ethertypes[pdata->nb_vlan_tags];
+       rc = efx_mae_match_spec_field_set(efx_spec, EFX_MAE_FIELD_ETHER_TYPE_BE,
+                                         sizeof(et->value),
+                                         (const uint8_t *)&et->value,
+                                         sizeof(et->mask),
+                                         (const uint8_t *)&et->mask);
+       if (rc != 0)
+               return rc;
+
+       /*
+        * sfc_mae_rule_parse_item_vlan() has already made sure
+        * that pdata->nb_vlan_tags does not exceed this figure.
+        */
+       RTE_BUILD_BUG_ON(SFC_MAE_MATCH_VLAN_MAX_NTAGS != 2);
+
+       for (i = 0; i < pdata->nb_vlan_tags; ++i) {
+               et = &pdata->ethertypes[i];
+
+               rc = efx_mae_match_spec_field_set(efx_spec, field_ids[i],
+                                                 sizeof(et->value),
+                                                 (const uint8_t *)&et->value,
+                                                 sizeof(et->mask),
+                                                 (const uint8_t *)&et->mask);
+               if (rc != 0)
+                       return rc;
+       }
+
+       return 0;
+}
+
+static int
+sfc_mae_rule_process_pattern_data(struct sfc_mae_parse_ctx *ctx,
+                                 struct rte_flow_error *error)
+{
+       efx_mae_match_spec_t *efx_spec = ctx->match_spec_action;
+       struct sfc_mae_pattern_data *pdata = &ctx->pattern_data;
+       struct sfc_mae_ethertype *ethertypes = pdata->ethertypes;
+       const rte_be16_t supported_tpids[] = {
+               /* VLAN standard TPID (always the first element) */
+               RTE_BE16(RTE_ETHER_TYPE_VLAN),
+
+               /* Double-tagging TPIDs */
+               RTE_BE16(RTE_ETHER_TYPE_QINQ),
+               RTE_BE16(RTE_ETHER_TYPE_QINQ1),
+               RTE_BE16(RTE_ETHER_TYPE_QINQ2),
+               RTE_BE16(RTE_ETHER_TYPE_QINQ3),
+       };
+       unsigned int nb_supported_tpids = RTE_DIM(supported_tpids);
+       unsigned int ethertype_idx;
+       const uint8_t *valuep;
+       const uint8_t *maskp;
+       int rc;
+
+       if (pdata->innermost_ethertype_restriction.mask != 0 &&
+           pdata->nb_vlan_tags < SFC_MAE_MATCH_VLAN_MAX_NTAGS) {
+               /*
+                * If a single item VLAN is followed by a L3 item, value
+                * of "type" in item ETH can't be a double-tagging TPID.
+                */
+               nb_supported_tpids = 1;
+       }
+
+       /*
+        * sfc_mae_rule_parse_item_vlan() has already made sure
+        * that pdata->nb_vlan_tags does not exceed this figure.
+        */
+       RTE_BUILD_BUG_ON(SFC_MAE_MATCH_VLAN_MAX_NTAGS != 2);
+
+       for (ethertype_idx = 0;
+            ethertype_idx < pdata->nb_vlan_tags; ++ethertype_idx) {
+               unsigned int tpid_idx;
+
+               /* Exact match is supported only. */
+               if (ethertypes[ethertype_idx].mask != RTE_BE16(0xffff)) {
+                       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])
+                               break;
+               }
+
+               if (tpid_idx == nb_supported_tpids) {
+                       rc = EINVAL;
+                       goto fail;
+               }
+
+               nb_supported_tpids = 1;
+       }
+
+       if (pdata->innermost_ethertype_restriction.mask == RTE_BE16(0xffff)) {
+               struct sfc_mae_ethertype *et = &ethertypes[ethertype_idx];
+
+               if (et->mask == 0) {
+                       et->mask = RTE_BE16(0xffff);
+                       et->value =
+                           pdata->innermost_ethertype_restriction.value;
+               } else if (et->mask != RTE_BE16(0xffff) ||
+                          et->value !=
+                          pdata->innermost_ethertype_restriction.value) {
+                       rc = EINVAL;
+                       goto fail;
+               }
+       }
+
+       /*
+        * Now, when the number of VLAN tags is known, set fields
+        * ETHER_TYPE, VLAN0_PROTO and VLAN1_PROTO so that the first
+        * one is either a valid L3 EtherType (or 0x0000/0x0000),
+        * and the last two are valid TPIDs (or 0x0000/0x0000).
+        */
+       rc = sfc_mae_set_ethertypes(ctx);
+       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(efx_spec, EFX_MAE_FIELD_IP_PROTO,
+                                         sizeof(pdata->l3_next_proto_value),
+                                         valuep,
+                                         sizeof(pdata->l3_next_proto_mask),
+                                         maskp);
+       if (rc != 0)
+               goto fail;
+
+       return 0;
+
+fail:
+       return rte_flow_error_set(error, rc, RTE_FLOW_ERROR_TYPE_ITEM, NULL,
+                                 "Failed to process pattern data");
+}
+
+static int
+sfc_mae_rule_parse_item_port_id(const struct rte_flow_item *item,
+                               struct sfc_flow_parse_ctx *ctx,
+                               struct rte_flow_error *error)
+{
+       struct sfc_mae_parse_ctx *ctx_mae = ctx->mae;
+       const struct rte_flow_item_port_id supp_mask = {
+               .id = 0xffffffff,
+       };
+       const void *def_mask = &rte_flow_item_port_id_mask;
+       const struct rte_flow_item_port_id *spec = NULL;
+       const struct rte_flow_item_port_id *mask = NULL;
+       efx_mport_sel_t mport_sel;
+       int rc;
+
+       if (ctx_mae->match_mport_set) {
+               return rte_flow_error_set(error, ENOTSUP,
+                               RTE_FLOW_ERROR_TYPE_ITEM, item,
+                               "Can't handle multiple traffic source items");
+       }
+
+       rc = sfc_flow_parse_init(item,
+                                (const void **)&spec, (const void **)&mask,
+                                (const void *)&supp_mask, def_mask,
+                                sizeof(struct rte_flow_item_port_id), error);
+       if (rc != 0)
+               return rc;
+
+       if (mask->id != supp_mask.id) {
+               return rte_flow_error_set(error, EINVAL,
+                               RTE_FLOW_ERROR_TYPE_ITEM, item,
+                               "Bad mask in the PORT_ID pattern item");
+       }
+
+       /* If "spec" is not set, could be any port ID */
+       if (spec == NULL)
+               return 0;
+
+       if (spec->id > UINT16_MAX) {
+               return rte_flow_error_set(error, EOVERFLOW,
+                                         RTE_FLOW_ERROR_TYPE_ITEM, item,
+                                         "The port ID is too large");
+       }
+
+       rc = sfc_mae_switch_port_by_ethdev(ctx_mae->sa->mae.switch_domain_id,
+                                          spec->id, &mport_sel);
+       if (rc != 0) {
+               return rte_flow_error_set(error, rc,
+                               RTE_FLOW_ERROR_TYPE_ITEM, item,
+                               "Can't find RTE ethdev by the port ID");
+       }
+
+       rc = efx_mae_match_spec_mport_set(ctx_mae->match_spec_action,
+                                         &mport_sel, NULL);
+       if (rc != 0) {
+               return rte_flow_error_set(error, rc,
+                               RTE_FLOW_ERROR_TYPE_ITEM, item,
+                               "Failed to set MPORT for the port ID");
+       }
+
+       ctx_mae->match_mport_set = B_TRUE;
+
+       return 0;
+}
+
 static int
 sfc_mae_rule_parse_item_phy_port(const struct rte_flow_item *item,
                                 struct sfc_flow_parse_ctx *ctx,
@@ -276,6 +536,119 @@ sfc_mae_rule_parse_item_phy_port(const struct rte_flow_item *item,
        return 0;
 }
 
+static int
+sfc_mae_rule_parse_item_pf(const struct rte_flow_item *item,
+                          struct sfc_flow_parse_ctx *ctx,
+                          struct rte_flow_error *error)
+{
+       struct sfc_mae_parse_ctx *ctx_mae = ctx->mae;
+       const efx_nic_cfg_t *encp = efx_nic_cfg_get(ctx_mae->sa->nic);
+       efx_mport_sel_t mport_v;
+       int rc;
+
+       if (ctx_mae->match_mport_set) {
+               return rte_flow_error_set(error, ENOTSUP,
+                               RTE_FLOW_ERROR_TYPE_ITEM, item,
+                               "Can't handle multiple traffic source items");
+       }
+
+       rc = efx_mae_mport_by_pcie_function(encp->enc_pf, EFX_PCI_VF_INVALID,
+                                           &mport_v);
+       if (rc != 0) {
+               return rte_flow_error_set(error, rc,
+                               RTE_FLOW_ERROR_TYPE_ITEM, item,
+                               "Failed to convert the PF ID");
+       }
+
+       rc = efx_mae_match_spec_mport_set(ctx_mae->match_spec_action,
+                                         &mport_v, NULL);
+       if (rc != 0) {
+               return rte_flow_error_set(error, rc,
+                               RTE_FLOW_ERROR_TYPE_ITEM, item,
+                               "Failed to set MPORT for the PF");
+       }
+
+       ctx_mae->match_mport_set = B_TRUE;
+
+       return 0;
+}
+
+static int
+sfc_mae_rule_parse_item_vf(const struct rte_flow_item *item,
+                          struct sfc_flow_parse_ctx *ctx,
+                          struct rte_flow_error *error)
+{
+       struct sfc_mae_parse_ctx *ctx_mae = ctx->mae;
+       const efx_nic_cfg_t *encp = efx_nic_cfg_get(ctx_mae->sa->nic);
+       const struct rte_flow_item_vf supp_mask = {
+               .id = 0xffffffff,
+       };
+       const void *def_mask = &rte_flow_item_vf_mask;
+       const struct rte_flow_item_vf *spec = NULL;
+       const struct rte_flow_item_vf *mask = NULL;
+       efx_mport_sel_t mport_v;
+       int rc;
+
+       if (ctx_mae->match_mport_set) {
+               return rte_flow_error_set(error, ENOTSUP,
+                               RTE_FLOW_ERROR_TYPE_ITEM, item,
+                               "Can't handle multiple traffic source items");
+       }
+
+       rc = sfc_flow_parse_init(item,
+                                (const void **)&spec, (const void **)&mask,
+                                (const void *)&supp_mask, def_mask,
+                                sizeof(struct rte_flow_item_vf), error);
+       if (rc != 0)
+               return rc;
+
+       if (mask->id != supp_mask.id) {
+               return rte_flow_error_set(error, EINVAL,
+                               RTE_FLOW_ERROR_TYPE_ITEM, item,
+                               "Bad mask in the VF pattern item");
+       }
+
+       /*
+        * If "spec" is not set, the item requests any VF related to the
+        * PF of the current DPDK port (but not the PF itself).
+        * Reject this match criterion as unsupported.
+        */
+       if (spec == NULL) {
+               return rte_flow_error_set(error, EINVAL,
+                               RTE_FLOW_ERROR_TYPE_ITEM, item,
+                               "Bad spec in the VF pattern item");
+       }
+
+       rc = efx_mae_mport_by_pcie_function(encp->enc_pf, spec->id, &mport_v);
+       if (rc != 0) {
+               return rte_flow_error_set(error, rc,
+                               RTE_FLOW_ERROR_TYPE_ITEM, item,
+                               "Failed to convert the PF + VF IDs");
+       }
+
+       rc = efx_mae_match_spec_mport_set(ctx_mae->match_spec_action,
+                                         &mport_v, NULL);
+       if (rc != 0) {
+               return rte_flow_error_set(error, rc,
+                               RTE_FLOW_ERROR_TYPE_ITEM, item,
+                               "Failed to set MPORT for the PF + VF");
+       }
+
+       ctx_mae->match_mport_set = B_TRUE;
+
+       return 0;
+}
+
+/*
+ * Having this field ID in a field locator means that this
+ * locator cannot be used to actually set the field at the
+ * time when the corresponding item gets encountered. Such
+ * fields get stashed in the parsing context instead. This
+ * is required to resolve dependencies between the stashed
+ * fields. See sfc_mae_rule_process_pattern_data().
+ */
+#define SFC_MAE_FIELD_HANDLING_DEFERRED        EFX_MAE_FIELD_NIDS
+
 struct sfc_mae_field_locator {
        efx_mae_field_id_t              field_id;
        size_t                          size;
@@ -312,6 +685,9 @@ sfc_mae_parse_item(const struct sfc_mae_field_locator *field_locators,
        for (i = 0; i < nb_field_locators; ++i) {
                const struct sfc_mae_field_locator *fl = &field_locators[i];
 
+               if (fl->field_id == SFC_MAE_FIELD_HANDLING_DEFERRED)
+                       continue;
+
                rc = efx_mae_match_spec_field_set(efx_spec, fl->field_id,
                                                  fl->size, spec + fl->ofst,
                                                  fl->size, mask + fl->ofst);
@@ -329,7 +705,11 @@ sfc_mae_parse_item(const struct sfc_mae_field_locator *field_locators,
 
 static const struct sfc_mae_field_locator flocs_eth[] = {
        {
-               EFX_MAE_FIELD_ETHER_TYPE_BE,
+               /*
+                * This locator is used only for building supported fields mask.
+                * The field is handled by sfc_mae_rule_process_pattern_data().
+                */
+               SFC_MAE_FIELD_HANDLING_DEFERRED,
                RTE_SIZEOF_FIELD(struct rte_flow_item_eth, type),
                offsetof(struct rte_flow_item_eth, type),
        },
@@ -367,15 +747,316 @@ sfc_mae_rule_parse_item_eth(const struct rte_flow_item *item,
        if (rc != 0)
                return rc;
 
-       /* If "spec" is not set, could be any Ethernet */
-       if (spec == NULL)
+       if (spec != NULL) {
+               struct sfc_mae_pattern_data *pdata = &ctx_mae->pattern_data;
+               struct sfc_mae_ethertype *ethertypes = pdata->ethertypes;
+               const struct rte_flow_item_eth *item_spec;
+               const struct rte_flow_item_eth *item_mask;
+
+               item_spec = (const struct rte_flow_item_eth *)spec;
+               item_mask = (const struct rte_flow_item_eth *)mask;
+
+               ethertypes[0].value = item_spec->type;
+               ethertypes[0].mask = item_mask->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.
+                */
                return 0;
+       }
 
        return sfc_mae_parse_item(flocs_eth, RTE_DIM(flocs_eth), spec, mask,
                                  ctx_mae->match_spec_action, error);
 }
 
+static const struct sfc_mae_field_locator flocs_vlan[] = {
+       /* Outermost tag */
+       {
+               EFX_MAE_FIELD_VLAN0_TCI_BE,
+               RTE_SIZEOF_FIELD(struct rte_flow_item_vlan, tci),
+               offsetof(struct rte_flow_item_vlan, tci),
+       },
+       {
+               /*
+                * This locator is used only for building supported fields mask.
+                * The field is handled by sfc_mae_rule_process_pattern_data().
+                */
+               SFC_MAE_FIELD_HANDLING_DEFERRED,
+               RTE_SIZEOF_FIELD(struct rte_flow_item_vlan, inner_type),
+               offsetof(struct rte_flow_item_vlan, inner_type),
+       },
+
+       /* Innermost tag */
+       {
+               EFX_MAE_FIELD_VLAN1_TCI_BE,
+               RTE_SIZEOF_FIELD(struct rte_flow_item_vlan, tci),
+               offsetof(struct rte_flow_item_vlan, tci),
+       },
+       {
+               /*
+                * This locator is used only for building supported fields mask.
+                * The field is handled by sfc_mae_rule_process_pattern_data().
+                */
+               SFC_MAE_FIELD_HANDLING_DEFERRED,
+               RTE_SIZEOF_FIELD(struct rte_flow_item_vlan, inner_type),
+               offsetof(struct rte_flow_item_vlan, inner_type),
+       },
+};
+
+static int
+sfc_mae_rule_parse_item_vlan(const struct rte_flow_item *item,
+                            struct sfc_flow_parse_ctx *ctx,
+                            struct rte_flow_error *error)
+{
+       struct sfc_mae_parse_ctx *ctx_mae = ctx->mae;
+       struct sfc_mae_pattern_data *pdata = &ctx_mae->pattern_data;
+       const struct sfc_mae_field_locator *flocs;
+       struct rte_flow_item_vlan supp_mask;
+       const uint8_t *spec = NULL;
+       const uint8_t *mask = NULL;
+       unsigned int nb_flocs;
+       int rc;
+
+       RTE_BUILD_BUG_ON(SFC_MAE_MATCH_VLAN_MAX_NTAGS != 2);
+
+       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 match that many VLAN tags");
+       }
+
+       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));
+
+       rc = sfc_flow_parse_init(item,
+                                (const void **)&spec, (const void **)&mask,
+                                (const void *)&supp_mask,
+                                &rte_flow_item_vlan_mask,
+                                sizeof(struct rte_flow_item_vlan), error);
+       if (rc != 0)
+               return rc;
+
+       if (spec != NULL) {
+               struct sfc_mae_ethertype *ethertypes = 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.
+                */
+               return 0;
+       }
+
+       return sfc_mae_parse_item(flocs, nb_flocs, spec, mask,
+                                 ctx_mae->match_spec_action, error);
+}
+
+static const struct sfc_mae_field_locator flocs_ipv4[] = {
+       {
+               EFX_MAE_FIELD_SRC_IP4_BE,
+               RTE_SIZEOF_FIELD(struct rte_flow_item_ipv4, hdr.src_addr),
+               offsetof(struct rte_flow_item_ipv4, hdr.src_addr),
+       },
+       {
+               EFX_MAE_FIELD_DST_IP4_BE,
+               RTE_SIZEOF_FIELD(struct rte_flow_item_ipv4, hdr.dst_addr),
+               offsetof(struct rte_flow_item_ipv4, hdr.dst_addr),
+       },
+       {
+               /*
+                * This locator is used only for building supported fields mask.
+                * The field is handled by sfc_mae_rule_process_pattern_data().
+                */
+               SFC_MAE_FIELD_HANDLING_DEFERRED,
+               RTE_SIZEOF_FIELD(struct rte_flow_item_ipv4, hdr.next_proto_id),
+               offsetof(struct rte_flow_item_ipv4, hdr.next_proto_id),
+       },
+       {
+               EFX_MAE_FIELD_IP_TOS,
+               RTE_SIZEOF_FIELD(struct rte_flow_item_ipv4,
+                                hdr.type_of_service),
+               offsetof(struct rte_flow_item_ipv4, hdr.type_of_service),
+       },
+       {
+               EFX_MAE_FIELD_IP_TTL,
+               RTE_SIZEOF_FIELD(struct rte_flow_item_ipv4, hdr.time_to_live),
+               offsetof(struct rte_flow_item_ipv4, hdr.time_to_live),
+       },
+};
+
+static int
+sfc_mae_rule_parse_item_ipv4(const struct rte_flow_item *item,
+                            struct sfc_flow_parse_ctx *ctx,
+                            struct rte_flow_error *error)
+{
+       rte_be16_t ethertype_ipv4_be = RTE_BE16(RTE_ETHER_TYPE_IPV4);
+       struct sfc_mae_parse_ctx *ctx_mae = ctx->mae;
+       struct sfc_mae_pattern_data *pdata = &ctx_mae->pattern_data;
+       struct rte_flow_item_ipv4 supp_mask;
+       const uint8_t *spec = NULL;
+       const uint8_t *mask = NULL;
+       int rc;
+
+       sfc_mae_item_build_supp_mask(flocs_ipv4, RTE_DIM(flocs_ipv4),
+                                    &supp_mask, sizeof(supp_mask));
+
+       rc = sfc_flow_parse_init(item,
+                                (const void **)&spec, (const void **)&mask,
+                                (const void *)&supp_mask,
+                                &rte_flow_item_ipv4_mask,
+                                sizeof(struct rte_flow_item_ipv4), error);
+       if (rc != 0)
+               return rc;
+
+       pdata->innermost_ethertype_restriction.value = ethertype_ipv4_be;
+       pdata->innermost_ethertype_restriction.mask = RTE_BE16(0xffff);
+
+       if (spec != NULL) {
+               const struct rte_flow_item_ipv4 *item_spec;
+               const struct rte_flow_item_ipv4 *item_mask;
+
+               item_spec = (const struct rte_flow_item_ipv4 *)spec;
+               item_mask = (const struct rte_flow_item_ipv4 *)mask;
+
+               pdata->l3_next_proto_value = item_spec->hdr.next_proto_id;
+               pdata->l3_next_proto_mask = item_mask->hdr.next_proto_id;
+       } else {
+               return 0;
+       }
+
+       return sfc_mae_parse_item(flocs_ipv4, RTE_DIM(flocs_ipv4), spec, mask,
+                                 ctx_mae->match_spec_action, error);
+}
+
+static const struct sfc_mae_field_locator flocs_ipv6[] = {
+       {
+               EFX_MAE_FIELD_SRC_IP6_BE,
+               RTE_SIZEOF_FIELD(struct rte_flow_item_ipv6, hdr.src_addr),
+               offsetof(struct rte_flow_item_ipv6, hdr.src_addr),
+       },
+       {
+               EFX_MAE_FIELD_DST_IP6_BE,
+               RTE_SIZEOF_FIELD(struct rte_flow_item_ipv6, hdr.dst_addr),
+               offsetof(struct rte_flow_item_ipv6, hdr.dst_addr),
+       },
+       {
+               /*
+                * This locator is used only for building supported fields mask.
+                * The field is handled by sfc_mae_rule_process_pattern_data().
+                */
+               SFC_MAE_FIELD_HANDLING_DEFERRED,
+               RTE_SIZEOF_FIELD(struct rte_flow_item_ipv6, hdr.proto),
+               offsetof(struct rte_flow_item_ipv6, hdr.proto),
+       },
+       {
+               EFX_MAE_FIELD_IP_TTL,
+               RTE_SIZEOF_FIELD(struct rte_flow_item_ipv6, hdr.hop_limits),
+               offsetof(struct rte_flow_item_ipv6, hdr.hop_limits),
+       },
+};
+
+static int
+sfc_mae_rule_parse_item_ipv6(const struct rte_flow_item *item,
+                            struct sfc_flow_parse_ctx *ctx,
+                            struct rte_flow_error *error)
+{
+       rte_be16_t ethertype_ipv6_be = RTE_BE16(RTE_ETHER_TYPE_IPV6);
+       struct sfc_mae_parse_ctx *ctx_mae = ctx->mae;
+       struct sfc_mae_pattern_data *pdata = &ctx_mae->pattern_data;
+       struct rte_flow_item_ipv6 supp_mask;
+       const uint8_t *spec = NULL;
+       const uint8_t *mask = NULL;
+       rte_be32_t vtc_flow_be;
+       uint32_t vtc_flow;
+       uint8_t tc_value;
+       uint8_t tc_mask;
+       int rc;
+
+       sfc_mae_item_build_supp_mask(flocs_ipv6, RTE_DIM(flocs_ipv6),
+                                    &supp_mask, sizeof(supp_mask));
+
+       vtc_flow_be = RTE_BE32(RTE_IPV6_HDR_TC_MASK);
+       memcpy(&supp_mask, &vtc_flow_be, sizeof(vtc_flow_be));
+
+       rc = sfc_flow_parse_init(item,
+                                (const void **)&spec, (const void **)&mask,
+                                (const void *)&supp_mask,
+                                &rte_flow_item_ipv6_mask,
+                                sizeof(struct rte_flow_item_ipv6), error);
+       if (rc != 0)
+               return rc;
+
+       pdata->innermost_ethertype_restriction.value = ethertype_ipv6_be;
+       pdata->innermost_ethertype_restriction.mask = RTE_BE16(0xffff);
+
+       if (spec != NULL) {
+               const struct rte_flow_item_ipv6 *item_spec;
+               const struct rte_flow_item_ipv6 *item_mask;
+
+               item_spec = (const struct rte_flow_item_ipv6 *)spec;
+               item_mask = (const struct rte_flow_item_ipv6 *)mask;
+
+               pdata->l3_next_proto_value = item_spec->hdr.proto;
+               pdata->l3_next_proto_mask = item_mask->hdr.proto;
+       } else {
+               return 0;
+       }
+
+       rc = sfc_mae_parse_item(flocs_ipv6, RTE_DIM(flocs_ipv6), spec, mask,
+                               ctx_mae->match_spec_action, error);
+       if (rc != 0)
+               return rc;
+
+       memcpy(&vtc_flow_be, spec, sizeof(vtc_flow_be));
+       vtc_flow = rte_be_to_cpu_32(vtc_flow_be);
+       tc_value = (vtc_flow & RTE_IPV6_HDR_TC_MASK) >> RTE_IPV6_HDR_TC_SHIFT;
+
+       memcpy(&vtc_flow_be, mask, sizeof(vtc_flow_be));
+       vtc_flow = rte_be_to_cpu_32(vtc_flow_be);
+       tc_mask = (vtc_flow & RTE_IPV6_HDR_TC_MASK) >> RTE_IPV6_HDR_TC_SHIFT;
+
+       rc = efx_mae_match_spec_field_set(ctx_mae->match_spec_action,
+                                         EFX_MAE_FIELD_IP_TOS,
+                                         sizeof(tc_value), &tc_value,
+                                         sizeof(tc_mask), &tc_mask);
+       if (rc != 0) {
+               return rte_flow_error_set(error, rc, RTE_FLOW_ERROR_TYPE_ITEM,
+                               NULL, "Failed to process item fields");
+       }
+
+       return 0;
+}
+
 static const struct sfc_flow_item sfc_flow_items[] = {
+       {
+               .type = RTE_FLOW_ITEM_TYPE_PORT_ID,
+               /*
+                * In terms of RTE flow, this item is a META one,
+                * and its position in the pattern is don't care.
+                */
+               .prev_layer = SFC_FLOW_ITEM_ANY_LAYER,
+               .layer = SFC_FLOW_ITEM_ANY_LAYER,
+               .ctx_type = SFC_FLOW_PARSE_CTX_MAE,
+               .parse = sfc_mae_rule_parse_item_port_id,
+       },
        {
                .type = RTE_FLOW_ITEM_TYPE_PHY_PORT,
                /*
@@ -387,6 +1068,28 @@ static const struct sfc_flow_item sfc_flow_items[] = {
                .ctx_type = SFC_FLOW_PARSE_CTX_MAE,
                .parse = sfc_mae_rule_parse_item_phy_port,
        },
+       {
+               .type = RTE_FLOW_ITEM_TYPE_PF,
+               /*
+                * In terms of RTE flow, this item is a META one,
+                * and its position in the pattern is don't care.
+                */
+               .prev_layer = SFC_FLOW_ITEM_ANY_LAYER,
+               .layer = SFC_FLOW_ITEM_ANY_LAYER,
+               .ctx_type = SFC_FLOW_PARSE_CTX_MAE,
+               .parse = sfc_mae_rule_parse_item_pf,
+       },
+       {
+               .type = RTE_FLOW_ITEM_TYPE_VF,
+               /*
+                * In terms of RTE flow, this item is a META one,
+                * and its position in the pattern is don't care.
+                */
+               .prev_layer = SFC_FLOW_ITEM_ANY_LAYER,
+               .layer = SFC_FLOW_ITEM_ANY_LAYER,
+               .ctx_type = SFC_FLOW_PARSE_CTX_MAE,
+               .parse = sfc_mae_rule_parse_item_vf,
+       },
        {
                .type = RTE_FLOW_ITEM_TYPE_ETH,
                .prev_layer = SFC_FLOW_ITEM_START_LAYER,
@@ -394,6 +1097,27 @@ static const struct sfc_flow_item sfc_flow_items[] = {
                .ctx_type = SFC_FLOW_PARSE_CTX_MAE,
                .parse = sfc_mae_rule_parse_item_eth,
        },
+       {
+               .type = RTE_FLOW_ITEM_TYPE_VLAN,
+               .prev_layer = SFC_FLOW_ITEM_L2,
+               .layer = SFC_FLOW_ITEM_L2,
+               .ctx_type = SFC_FLOW_PARSE_CTX_MAE,
+               .parse = sfc_mae_rule_parse_item_vlan,
+       },
+       {
+               .type = RTE_FLOW_ITEM_TYPE_IPV4,
+               .prev_layer = SFC_FLOW_ITEM_L2,
+               .layer = SFC_FLOW_ITEM_L3,
+               .ctx_type = SFC_FLOW_PARSE_CTX_MAE,
+               .parse = sfc_mae_rule_parse_item_ipv4,
+       },
+       {
+               .type = RTE_FLOW_ITEM_TYPE_IPV6,
+               .prev_layer = SFC_FLOW_ITEM_L2,
+               .layer = SFC_FLOW_ITEM_L3,
+               .ctx_type = SFC_FLOW_PARSE_CTX_MAE,
+               .parse = sfc_mae_rule_parse_item_ipv6,
+       },
 };
 
 int
@@ -407,6 +1131,7 @@ sfc_mae_rule_parse_pattern(struct sfc_adapter *sa,
        int rc;
 
        memset(&ctx_mae, 0, sizeof(ctx_mae));
+       ctx_mae.sa = sa;
 
        rc = efx_mae_match_spec_init(sa->nic, EFX_MAE_RULE_ACTION,
                                     spec->priority,
@@ -426,6 +1151,10 @@ sfc_mae_rule_parse_pattern(struct sfc_adapter *sa,
        if (rc != 0)
                goto fail_parse_pattern;
 
+       rc = sfc_mae_rule_process_pattern_data(&ctx_mae, error);
+       if (rc != 0)
+               goto fail_process_pattern_data;
+
        if (!efx_mae_match_spec_is_valid(sa->nic, ctx_mae.match_spec_action)) {
                rc = rte_flow_error_set(error, ENOTSUP,
                                        RTE_FLOW_ERROR_TYPE_ITEM, NULL,
@@ -438,6 +1167,7 @@ sfc_mae_rule_parse_pattern(struct sfc_adapter *sa,
        return 0;
 
 fail_validate_match_spec_action:
+fail_process_pattern_data:
 fail_parse_pattern:
        efx_mae_match_spec_fini(sa->nic, ctx_mae.match_spec_action);
 
@@ -463,6 +1193,7 @@ fail_init_match_spec_action:
 
 enum sfc_mae_actions_bundle_type {
        SFC_MAE_ACTIONS_BUNDLE_EMPTY = 0,
+       SFC_MAE_ACTIONS_BUNDLE_VLAN_PUSH,
 };
 
 struct sfc_mae_actions_bundle {
@@ -470,6 +1201,10 @@ struct sfc_mae_actions_bundle {
 
        /* 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;
 };
 
 /*
@@ -479,13 +1214,17 @@ struct sfc_mae_actions_bundle {
  */
 static int
 sfc_mae_actions_bundle_submit(const struct sfc_mae_actions_bundle *bundle,
-                             __rte_unused efx_mae_actions_t *spec)
+                             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;
@@ -509,6 +1248,11 @@ sfc_mae_actions_bundle_sync(const struct rte_flow_action *action,
        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
@@ -538,6 +1282,41 @@ fail_submit:
                        "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);
+}
+
+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);
+}
+
 static int
 sfc_mae_rule_parse_action_phy_port(struct sfc_adapter *sa,
                                   const struct rte_flow_action_phy_port *conf,
@@ -559,6 +1338,51 @@ sfc_mae_rule_parse_action_phy_port(struct sfc_adapter *sa,
        return efx_mae_action_set_populate_deliver(spec, &mport);
 }
 
+static int
+sfc_mae_rule_parse_action_pf_vf(struct sfc_adapter *sa,
+                               const struct rte_flow_action_vf *vf_conf,
+                               efx_mae_actions_t *spec)
+{
+       const efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic);
+       efx_mport_sel_t mport;
+       uint32_t vf;
+       int rc;
+
+       if (vf_conf == NULL)
+               vf = EFX_PCI_VF_INVALID;
+       else if (vf_conf->original != 0)
+               vf = encp->enc_vf;
+       else
+               vf = vf_conf->id;
+
+       rc = efx_mae_mport_by_pcie_function(encp->enc_pf, vf, &mport);
+       if (rc != 0)
+               return rc;
+
+       return efx_mae_action_set_populate_deliver(spec, &mport);
+}
+
+static int
+sfc_mae_rule_parse_action_port_id(struct sfc_adapter *sa,
+                                 const struct rte_flow_action_port_id *conf,
+                                 efx_mae_actions_t *spec)
+{
+       struct sfc_adapter_shared * const sas = sfc_sa2shared(sa);
+       struct sfc_mae *mae = &sa->mae;
+       efx_mport_sel_t mport;
+       uint16_t port_id;
+       int rc;
+
+       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)
+               return rc;
+
+       return efx_mae_action_set_populate_deliver(spec, &mport);
+}
+
 static int
 sfc_mae_rule_parse_action(struct sfc_adapter *sa,
                          const struct rte_flow_action *action,
@@ -566,7 +1390,7 @@ sfc_mae_rule_parse_action(struct sfc_adapter *sa,
                          efx_mae_actions_t *spec,
                          struct rte_flow_error *error)
 {
-       int rc;
+       int rc = 0;
 
        switch (action->type) {
        case RTE_FLOW_ACTION_TYPE_OF_POP_VLAN:
@@ -574,11 +1398,56 @@ sfc_mae_rule_parse_action(struct sfc_adapter *sa,
                                       bundle->actions_mask);
                rc = efx_mae_action_set_populate_vlan_pop(spec);
                break;
+       case RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN:
+               SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN,
+                                      bundle->actions_mask);
+               sfc_mae_rule_parse_action_of_push_vlan(action->conf, bundle);
+               break;
+       case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID:
+               SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID,
+                                      bundle->actions_mask);
+               sfc_mae_rule_parse_action_of_set_vlan_vid(action->conf, bundle);
+               break;
+       case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP:
+               SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP,
+                                      bundle->actions_mask);
+               sfc_mae_rule_parse_action_of_set_vlan_pcp(action->conf, bundle);
+               break;
+       case RTE_FLOW_ACTION_TYPE_FLAG:
+               SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_FLAG,
+                                      bundle->actions_mask);
+               rc = efx_mae_action_set_populate_flag(spec);
+               break;
+       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);
+               break;
        case RTE_FLOW_ACTION_TYPE_PHY_PORT:
                SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_PHY_PORT,
                                       bundle->actions_mask);
                rc = sfc_mae_rule_parse_action_phy_port(sa, action->conf, spec);
                break;
+       case RTE_FLOW_ACTION_TYPE_PF:
+               SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_PF,
+                                      bundle->actions_mask);
+               rc = sfc_mae_rule_parse_action_pf_vf(sa, NULL, spec);
+               break;
+       case RTE_FLOW_ACTION_TYPE_VF:
+               SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_VF,
+                                      bundle->actions_mask);
+               rc = sfc_mae_rule_parse_action_pf_vf(sa, action->conf, spec);
+               break;
+       case RTE_FLOW_ACTION_TYPE_PORT_ID:
+               SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_PORT_ID,
+                                      bundle->actions_mask);
+               rc = sfc_mae_rule_parse_action_port_id(sa, action->conf, spec);
+               break;
+       case RTE_FLOW_ACTION_TYPE_DROP:
+               SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_DROP,
+                                      bundle->actions_mask);
+               rc = efx_mae_action_set_populate_drop(spec);
+               break;
        default:
                return rte_flow_error_set(error, ENOTSUP,
                                RTE_FLOW_ERROR_TYPE_ACTION, NULL,