ethdev: fix TPID handling in flow API
[dpdk.git] / drivers / net / sfc / sfc_flow.c
index 3f6b7b7..cd6a61b 100644 (file)
@@ -7,6 +7,7 @@
  * for Solarflare) and Solarflare Communications, Inc.
  */
 
+#include <rte_byteorder.h>
 #include <rte_tailq.h>
 #include <rte_common.h>
 #include <rte_ethdev_driver.h>
@@ -64,6 +65,34 @@ static sfc_flow_item_parse sfc_flow_parse_vxlan;
 static sfc_flow_item_parse sfc_flow_parse_geneve;
 static sfc_flow_item_parse sfc_flow_parse_nvgre;
 
+typedef int (sfc_flow_spec_set_vals)(struct sfc_flow_spec *spec,
+                                    unsigned int filters_count_for_one_val,
+                                    struct rte_flow_error *error);
+
+typedef boolean_t (sfc_flow_spec_check)(efx_filter_match_flags_t match,
+                                       efx_filter_spec_t *spec,
+                                       struct sfc_filter *filter);
+
+struct sfc_flow_copy_flag {
+       /* EFX filter specification match flag */
+       efx_filter_match_flags_t flag;
+       /* Number of values of corresponding field */
+       unsigned int vals_count;
+       /* Function to set values in specifications */
+       sfc_flow_spec_set_vals *set_vals;
+       /*
+        * Function to check that the specification is suitable
+        * for adding this match flag
+        */
+       sfc_flow_spec_check *spec_check;
+};
+
+static sfc_flow_spec_set_vals sfc_flow_set_unknown_dst_flags;
+static sfc_flow_spec_check sfc_flow_check_unknown_dst_flags;
+static sfc_flow_spec_set_vals sfc_flow_set_ethertypes;
+static sfc_flow_spec_set_vals sfc_flow_set_ifrm_unknown_dst_flags;
+static sfc_flow_spec_check sfc_flow_check_ifrm_unknown_dst_flags;
+
 static boolean_t
 sfc_flow_is_zero(const uint8_t *buf, unsigned int size)
 {
@@ -244,16 +273,9 @@ sfc_flow_parse_eth(const struct rte_flow_item *item,
        if (rc != 0)
                return rc;
 
-       /*
-        * If "spec" is not set, could be any Ethernet, but for the inner frame
-        * type of destination MAC must be set
-        */
-       if (spec == NULL) {
-               if (is_ifrm)
-                       goto fail_bad_ifrm_dst_mac;
-               else
-                       return 0;
-       }
+       /* If "spec" is not set, could be any Ethernet */
+       if (spec == NULL)
+               return 0;
 
        if (is_same_ether_addr(&mask->dst, &supp_mask.dst)) {
                efx_spec->efs_match_flags |= is_ifrm ?
@@ -273,8 +295,6 @@ sfc_flow_parse_eth(const struct rte_flow_item *item,
                                EFX_FILTER_MATCH_UNKNOWN_MCAST_DST;
        } else if (!is_zero_ether_addr(&mask->dst)) {
                goto fail_bad_mask;
-       } else if (is_ifrm) {
-               goto fail_bad_ifrm_dst_mac;
        }
 
        /*
@@ -308,13 +328,6 @@ fail_bad_mask:
                           RTE_FLOW_ERROR_TYPE_ITEM, item,
                           "Bad mask in the ETH pattern item");
        return -rte_errno;
-
-fail_bad_ifrm_dst_mac:
-       rte_flow_error_set(error, EINVAL,
-                          RTE_FLOW_ERROR_TYPE_ITEM, item,
-                          "Type of destination MAC address in inner frame "
-                          "must be set");
-       return -rte_errno;
 }
 
 /**
@@ -339,6 +352,7 @@ sfc_flow_parse_vlan(const struct rte_flow_item *item,
        const struct rte_flow_item_vlan *mask = NULL;
        const struct rte_flow_item_vlan supp_mask = {
                .tci = rte_cpu_to_be_16(ETH_VLAN_ID_MAX),
+               .inner_type = RTE_BE16(0xffff),
        };
 
        rc = sfc_flow_parse_init(item,
@@ -381,6 +395,22 @@ sfc_flow_parse_vlan(const struct rte_flow_item *item,
                return -rte_errno;
        }
 
+       if (efx_spec->efs_match_flags & EFX_FILTER_MATCH_ETHER_TYPE) {
+               rte_flow_error_set(error, EINVAL,
+                                  RTE_FLOW_ERROR_TYPE_ITEM, item,
+                                  "VLAN TPID matching is not supported");
+               return -rte_errno;
+       }
+       if (mask->inner_type == supp_mask.inner_type) {
+               efx_spec->efs_match_flags |= EFX_FILTER_MATCH_ETHER_TYPE;
+               efx_spec->efs_ether_type = rte_bswap16(spec->inner_type);
+       } else if (mask->inner_type) {
+               rte_flow_error_set(error, EINVAL,
+                                  RTE_FLOW_ERROR_TYPE_ITEM, item,
+                                  "Bad mask for VLAN inner_type");
+               return -rte_errno;
+       }
+
        return 0;
 }
 
@@ -782,14 +812,9 @@ sfc_flow_set_match_flags_for_encap_pkts(const struct rte_flow_item *item,
                }
        }
 
-       if (!(efx_spec->efs_match_flags & EFX_FILTER_MATCH_ETHER_TYPE)) {
-               rte_flow_error_set(error, EINVAL,
-                       RTE_FLOW_ERROR_TYPE_ITEM, item,
-                       "Outer frame EtherType in pattern with tunneling "
-                       "must be set");
-               return -rte_errno;
-       } else if (efx_spec->efs_ether_type != EFX_ETHER_TYPE_IPV4 &&
-                  efx_spec->efs_ether_type != EFX_ETHER_TYPE_IPV6) {
+       if (efx_spec->efs_match_flags & EFX_FILTER_MATCH_ETHER_TYPE &&
+           efx_spec->efs_ether_type != EFX_ETHER_TYPE_IPV4 &&
+           efx_spec->efs_ether_type != EFX_ETHER_TYPE_IPV6) {
                rte_flow_error_set(error, EINVAL,
                        RTE_FLOW_ERROR_TYPE_ITEM, item,
                        "Outer frame EtherType in pattern with tunneling "
@@ -1227,13 +1252,11 @@ sfc_flow_parse_rss(struct sfc_adapter *sa,
        struct sfc_rxq *rxq;
        unsigned int rxq_hw_index_min;
        unsigned int rxq_hw_index_max;
-       const struct rte_eth_rss_conf *rss_conf = rss->rss_conf;
-       uint64_t rss_hf;
-       uint8_t *rss_key = NULL;
+       const uint8_t *rss_key;
        struct sfc_flow_rss *sfc_rss_conf = &flow->rss_conf;
        unsigned int i;
 
-       if (rss->num == 0)
+       if (rss->queue_num == 0)
                return -EINVAL;
 
        rxq_sw_index = sa->rxq_count - 1;
@@ -1241,7 +1264,7 @@ sfc_flow_parse_rss(struct sfc_adapter *sa,
        rxq_hw_index_min = rxq->hw_index;
        rxq_hw_index_max = 0;
 
-       for (i = 0; i < rss->num; ++i) {
+       for (i = 0; i < rss->queue_num; ++i) {
                rxq_sw_index = rss->queue[i];
 
                if (rxq_sw_index >= sa->rxq_count)
@@ -1256,15 +1279,25 @@ sfc_flow_parse_rss(struct sfc_adapter *sa,
                        rxq_hw_index_max = rxq->hw_index;
        }
 
-       rss_hf = (rss_conf != NULL) ? rss_conf->rss_hf : SFC_RSS_OFFLOADS;
-       if ((rss_hf & ~SFC_RSS_OFFLOADS) != 0)
+       switch (rss->func) {
+       case RTE_ETH_HASH_FUNCTION_DEFAULT:
+       case RTE_ETH_HASH_FUNCTION_TOEPLITZ:
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       if (rss->level)
                return -EINVAL;
 
-       if (rss_conf != NULL) {
-               if (rss_conf->rss_key_len != sizeof(sa->rss_key))
+       if ((rss->types & ~SFC_RSS_OFFLOADS) != 0)
+               return -EINVAL;
+
+       if (rss->key_len) {
+               if (rss->key_len != sizeof(sa->rss_key))
                        return -EINVAL;
 
-               rss_key = rss_conf->rss_key;
+               rss_key = rss->key;
        } else {
                rss_key = sa->rss_key;
        }
@@ -1273,11 +1306,11 @@ sfc_flow_parse_rss(struct sfc_adapter *sa,
 
        sfc_rss_conf->rxq_hw_index_min = rxq_hw_index_min;
        sfc_rss_conf->rxq_hw_index_max = rxq_hw_index_max;
-       sfc_rss_conf->rss_hash_types = sfc_rte_to_efx_hash_type(rss_hf);
+       sfc_rss_conf->rss_hash_types = sfc_rte_to_efx_hash_type(rss->types);
        rte_memcpy(sfc_rss_conf->rss_key, rss_key, sizeof(sa->rss_key));
 
        for (i = 0; i < RTE_DIM(sfc_rss_conf->rss_tbl); ++i) {
-               unsigned int rxq_sw_index = rss->queue[i % rss->num];
+               unsigned int rxq_sw_index = rss->queue[i % rss->queue_num];
                struct sfc_rxq *rxq = sa->rxq_info[rxq_sw_index].rxq;
 
                sfc_rss_conf->rss_tbl[i] = rxq->hw_index - rxq_hw_index_min;
@@ -1460,10 +1493,19 @@ sfc_flow_parse_actions(struct sfc_adapter *sa,
        }
 
        for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {
+               /* This one may appear anywhere multiple times. */
+               if (actions->type == RTE_FLOW_ACTION_TYPE_VOID)
+                       continue;
+               /* Fate-deciding actions may appear exactly once. */
+               if (is_specified) {
+                       rte_flow_error_set
+                               (error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION,
+                                actions,
+                                "Cannot combine several fate-deciding actions,"
+                                "choose between QUEUE, RSS or DROP");
+                       return -rte_errno;
+               }
                switch (actions->type) {
-               case RTE_FLOW_ACTION_TYPE_VOID:
-                       break;
-
                case RTE_FLOW_ACTION_TYPE_QUEUE:
                        rc = sfc_flow_parse_queue(sa, actions->conf, flow);
                        if (rc != 0) {
@@ -1490,6 +1532,13 @@ sfc_flow_parse_actions(struct sfc_adapter *sa,
                        break;
 #endif /* EFSYS_OPT_RX_SCALE */
 
+               case RTE_FLOW_ACTION_TYPE_DROP:
+                       flow->spec.template.efs_dmaq_id =
+                               EFX_FILTER_SPEC_RX_DMAQ_ID_DROP;
+
+                       is_specified = B_TRUE;
+                       break;
+
                default:
                        rte_flow_error_set(error, ENOTSUP,
                                           RTE_FLOW_ERROR_TYPE_ACTION, actions,
@@ -1498,10 +1547,513 @@ sfc_flow_parse_actions(struct sfc_adapter *sa,
                }
        }
 
+       /* When fate is unknown, drop traffic. */
        if (!is_specified) {
+               flow->spec.template.efs_dmaq_id =
+                       EFX_FILTER_SPEC_RX_DMAQ_ID_DROP;
+       }
+
+       return 0;
+}
+
+/**
+ * Set the EFX_FILTER_MATCH_UNKNOWN_UCAST_DST
+ * and EFX_FILTER_MATCH_UNKNOWN_MCAST_DST match flags in the same
+ * specifications after copying.
+ *
+ * @param spec[in, out]
+ *   SFC flow specification to update.
+ * @param filters_count_for_one_val[in]
+ *   How many specifications should have the same match flag, what is the
+ *   number of specifications before copying.
+ * @param error[out]
+ *   Perform verbose error reporting if not NULL.
+ */
+static int
+sfc_flow_set_unknown_dst_flags(struct sfc_flow_spec *spec,
+                              unsigned int filters_count_for_one_val,
+                              struct rte_flow_error *error)
+{
+       unsigned int i;
+       static const efx_filter_match_flags_t vals[] = {
+               EFX_FILTER_MATCH_UNKNOWN_UCAST_DST,
+               EFX_FILTER_MATCH_UNKNOWN_MCAST_DST
+       };
+
+       if (filters_count_for_one_val * RTE_DIM(vals) != spec->count) {
+               rte_flow_error_set(error, EINVAL,
+                       RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
+                       "Number of specifications is incorrect while copying "
+                       "by unknown destination flags");
+               return -rte_errno;
+       }
+
+       for (i = 0; i < spec->count; i++) {
+               /* The check above ensures that divisor can't be zero here */
+               spec->filters[i].efs_match_flags |=
+                       vals[i / filters_count_for_one_val];
+       }
+
+       return 0;
+}
+
+/**
+ * Check that the following conditions are met:
+ * - the list of supported filters has a filter
+ *   with EFX_FILTER_MATCH_UNKNOWN_MCAST_DST flag instead of
+ *   EFX_FILTER_MATCH_UNKNOWN_UCAST_DST, since this filter will also
+ *   be inserted.
+ *
+ * @param match[in]
+ *   The match flags of filter.
+ * @param spec[in]
+ *   Specification to be supplemented.
+ * @param filter[in]
+ *   SFC filter with list of supported filters.
+ */
+static boolean_t
+sfc_flow_check_unknown_dst_flags(efx_filter_match_flags_t match,
+                                __rte_unused efx_filter_spec_t *spec,
+                                struct sfc_filter *filter)
+{
+       unsigned int i;
+       efx_filter_match_flags_t match_mcast_dst;
+
+       match_mcast_dst =
+               (match & ~EFX_FILTER_MATCH_UNKNOWN_UCAST_DST) |
+               EFX_FILTER_MATCH_UNKNOWN_MCAST_DST;
+       for (i = 0; i < filter->supported_match_num; i++) {
+               if (match_mcast_dst == filter->supported_match[i])
+                       return B_TRUE;
+       }
+
+       return B_FALSE;
+}
+
+/**
+ * Set the EFX_FILTER_MATCH_ETHER_TYPE match flag and EFX_ETHER_TYPE_IPV4 and
+ * EFX_ETHER_TYPE_IPV6 values of the corresponding field in the same
+ * specifications after copying.
+ *
+ * @param spec[in, out]
+ *   SFC flow specification to update.
+ * @param filters_count_for_one_val[in]
+ *   How many specifications should have the same EtherType value, what is the
+ *   number of specifications before copying.
+ * @param error[out]
+ *   Perform verbose error reporting if not NULL.
+ */
+static int
+sfc_flow_set_ethertypes(struct sfc_flow_spec *spec,
+                       unsigned int filters_count_for_one_val,
+                       struct rte_flow_error *error)
+{
+       unsigned int i;
+       static const uint16_t vals[] = {
+               EFX_ETHER_TYPE_IPV4, EFX_ETHER_TYPE_IPV6
+       };
+
+       if (filters_count_for_one_val * RTE_DIM(vals) != spec->count) {
+               rte_flow_error_set(error, EINVAL,
+                       RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
+                       "Number of specifications is incorrect "
+                       "while copying by Ethertype");
+               return -rte_errno;
+       }
+
+       for (i = 0; i < spec->count; i++) {
+               spec->filters[i].efs_match_flags |=
+                       EFX_FILTER_MATCH_ETHER_TYPE;
+
+               /*
+                * The check above ensures that
+                * filters_count_for_one_val is not 0
+                */
+               spec->filters[i].efs_ether_type =
+                       vals[i / filters_count_for_one_val];
+       }
+
+       return 0;
+}
+
+/**
+ * Set the EFX_FILTER_MATCH_IFRM_UNKNOWN_UCAST_DST and
+ * EFX_FILTER_MATCH_IFRM_UNKNOWN_MCAST_DST match flags in the same
+ * specifications after copying.
+ *
+ * @param spec[in, out]
+ *   SFC flow specification to update.
+ * @param filters_count_for_one_val[in]
+ *   How many specifications should have the same match flag, what is the
+ *   number of specifications before copying.
+ * @param error[out]
+ *   Perform verbose error reporting if not NULL.
+ */
+static int
+sfc_flow_set_ifrm_unknown_dst_flags(struct sfc_flow_spec *spec,
+                                   unsigned int filters_count_for_one_val,
+                                   struct rte_flow_error *error)
+{
+       unsigned int i;
+       static const efx_filter_match_flags_t vals[] = {
+               EFX_FILTER_MATCH_IFRM_UNKNOWN_UCAST_DST,
+               EFX_FILTER_MATCH_IFRM_UNKNOWN_MCAST_DST
+       };
+
+       if (filters_count_for_one_val * RTE_DIM(vals) != spec->count) {
+               rte_flow_error_set(error, EINVAL,
+                       RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
+                       "Number of specifications is incorrect while copying "
+                       "by inner frame unknown destination flags");
+               return -rte_errno;
+       }
+
+       for (i = 0; i < spec->count; i++) {
+               /* The check above ensures that divisor can't be zero here */
+               spec->filters[i].efs_match_flags |=
+                       vals[i / filters_count_for_one_val];
+       }
+
+       return 0;
+}
+
+/**
+ * Check that the following conditions are met:
+ * - the specification corresponds to a filter for encapsulated traffic
+ * - the list of supported filters has a filter
+ *   with EFX_FILTER_MATCH_IFRM_UNKNOWN_MCAST_DST flag instead of
+ *   EFX_FILTER_MATCH_IFRM_UNKNOWN_UCAST_DST, since this filter will also
+ *   be inserted.
+ *
+ * @param match[in]
+ *   The match flags of filter.
+ * @param spec[in]
+ *   Specification to be supplemented.
+ * @param filter[in]
+ *   SFC filter with list of supported filters.
+ */
+static boolean_t
+sfc_flow_check_ifrm_unknown_dst_flags(efx_filter_match_flags_t match,
+                                     efx_filter_spec_t *spec,
+                                     struct sfc_filter *filter)
+{
+       unsigned int i;
+       efx_tunnel_protocol_t encap_type = spec->efs_encap_type;
+       efx_filter_match_flags_t match_mcast_dst;
+
+       if (encap_type == EFX_TUNNEL_PROTOCOL_NONE)
+               return B_FALSE;
+
+       match_mcast_dst =
+               (match & ~EFX_FILTER_MATCH_IFRM_UNKNOWN_UCAST_DST) |
+               EFX_FILTER_MATCH_IFRM_UNKNOWN_MCAST_DST;
+       for (i = 0; i < filter->supported_match_num; i++) {
+               if (match_mcast_dst == filter->supported_match[i])
+                       return B_TRUE;
+       }
+
+       return B_FALSE;
+}
+
+/*
+ * Match flags that can be automatically added to filters.
+ * Selecting the last minimum when searching for the copy flag ensures that the
+ * EFX_FILTER_MATCH_UNKNOWN_UCAST_DST flag has a higher priority than
+ * EFX_FILTER_MATCH_ETHER_TYPE. This is because the filter
+ * EFX_FILTER_MATCH_UNKNOWN_UCAST_DST is at the end of the list of supported
+ * filters.
+ */
+static const struct sfc_flow_copy_flag sfc_flow_copy_flags[] = {
+       {
+               .flag = EFX_FILTER_MATCH_UNKNOWN_UCAST_DST,
+               .vals_count = 2,
+               .set_vals = sfc_flow_set_unknown_dst_flags,
+               .spec_check = sfc_flow_check_unknown_dst_flags,
+       },
+       {
+               .flag = EFX_FILTER_MATCH_ETHER_TYPE,
+               .vals_count = 2,
+               .set_vals = sfc_flow_set_ethertypes,
+               .spec_check = NULL,
+       },
+       {
+               .flag = EFX_FILTER_MATCH_IFRM_UNKNOWN_UCAST_DST,
+               .vals_count = 2,
+               .set_vals = sfc_flow_set_ifrm_unknown_dst_flags,
+               .spec_check = sfc_flow_check_ifrm_unknown_dst_flags,
+       },
+};
+
+/* Get item from array sfc_flow_copy_flags */
+static const struct sfc_flow_copy_flag *
+sfc_flow_get_copy_flag(efx_filter_match_flags_t flag)
+{
+       unsigned int i;
+
+       for (i = 0; i < RTE_DIM(sfc_flow_copy_flags); i++) {
+               if (sfc_flow_copy_flags[i].flag == flag)
+                       return &sfc_flow_copy_flags[i];
+       }
+
+       return NULL;
+}
+
+/**
+ * Make copies of the specifications, set match flag and values
+ * of the field that corresponds to it.
+ *
+ * @param spec[in, out]
+ *   SFC flow specification to update.
+ * @param flag[in]
+ *   The match flag to add.
+ * @param error[out]
+ *   Perform verbose error reporting if not NULL.
+ */
+static int
+sfc_flow_spec_add_match_flag(struct sfc_flow_spec *spec,
+                            efx_filter_match_flags_t flag,
+                            struct rte_flow_error *error)
+{
+       unsigned int i;
+       unsigned int new_filters_count;
+       unsigned int filters_count_for_one_val;
+       const struct sfc_flow_copy_flag *copy_flag;
+       int rc;
+
+       copy_flag = sfc_flow_get_copy_flag(flag);
+       if (copy_flag == NULL) {
+               rte_flow_error_set(error, ENOTSUP,
+                                  RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
+                                  "Unsupported spec field for copying");
+               return -rte_errno;
+       }
+
+       new_filters_count = spec->count * copy_flag->vals_count;
+       if (new_filters_count > SF_FLOW_SPEC_NB_FILTERS_MAX) {
                rte_flow_error_set(error, EINVAL,
-                                  RTE_FLOW_ERROR_TYPE_ACTION_NUM, actions,
-                                  "Action is unspecified");
+                       RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
+                       "Too much EFX specifications in the flow rule");
+               return -rte_errno;
+       }
+
+       /* Copy filters specifications */
+       for (i = spec->count; i < new_filters_count; i++)
+               spec->filters[i] = spec->filters[i - spec->count];
+
+       filters_count_for_one_val = spec->count;
+       spec->count = new_filters_count;
+
+       rc = copy_flag->set_vals(spec, filters_count_for_one_val, error);
+       if (rc != 0)
+               return rc;
+
+       return 0;
+}
+
+/**
+ * Check that the given set of match flags missing in the original filter spec
+ * could be covered by adding spec copies which specify the corresponding
+ * flags and packet field values to match.
+ *
+ * @param miss_flags[in]
+ *   Flags that are missing until the supported filter.
+ * @param spec[in]
+ *   Specification to be supplemented.
+ * @param filter[in]
+ *   SFC filter.
+ *
+ * @return
+ *   Number of specifications after copy or 0, if the flags can not be added.
+ */
+static unsigned int
+sfc_flow_check_missing_flags(efx_filter_match_flags_t miss_flags,
+                            efx_filter_spec_t *spec,
+                            struct sfc_filter *filter)
+{
+       unsigned int i;
+       efx_filter_match_flags_t copy_flags = 0;
+       efx_filter_match_flags_t flag;
+       efx_filter_match_flags_t match = spec->efs_match_flags | miss_flags;
+       sfc_flow_spec_check *check;
+       unsigned int multiplier = 1;
+
+       for (i = 0; i < RTE_DIM(sfc_flow_copy_flags); i++) {
+               flag = sfc_flow_copy_flags[i].flag;
+               check = sfc_flow_copy_flags[i].spec_check;
+               if ((flag & miss_flags) == flag) {
+                       if (check != NULL && (!check(match, spec, filter)))
+                               continue;
+
+                       copy_flags |= flag;
+                       multiplier *= sfc_flow_copy_flags[i].vals_count;
+               }
+       }
+
+       if (copy_flags == miss_flags)
+               return multiplier;
+
+       return 0;
+}
+
+/**
+ * Attempt to supplement the specification template to the minimally
+ * supported set of match flags. To do this, it is necessary to copy
+ * the specifications, filling them with the values of fields that
+ * correspond to the missing flags.
+ * The necessary and sufficient filter is built from the fewest number
+ * of copies which could be made to cover the minimally required set
+ * of flags.
+ *
+ * @param sa[in]
+ *   SFC adapter.
+ * @param spec[in, out]
+ *   SFC flow specification to update.
+ * @param error[out]
+ *   Perform verbose error reporting if not NULL.
+ */
+static int
+sfc_flow_spec_filters_complete(struct sfc_adapter *sa,
+                              struct sfc_flow_spec *spec,
+                              struct rte_flow_error *error)
+{
+       struct sfc_filter *filter = &sa->filter;
+       efx_filter_match_flags_t miss_flags;
+       efx_filter_match_flags_t min_miss_flags = 0;
+       efx_filter_match_flags_t match;
+       unsigned int min_multiplier = UINT_MAX;
+       unsigned int multiplier;
+       unsigned int i;
+       int rc;
+
+       match = spec->template.efs_match_flags;
+       for (i = 0; i < filter->supported_match_num; i++) {
+               if ((match & filter->supported_match[i]) == match) {
+                       miss_flags = filter->supported_match[i] & (~match);
+                       multiplier = sfc_flow_check_missing_flags(miss_flags,
+                               &spec->template, filter);
+                       if (multiplier > 0) {
+                               if (multiplier <= min_multiplier) {
+                                       min_multiplier = multiplier;
+                                       min_miss_flags = miss_flags;
+                               }
+                       }
+               }
+       }
+
+       if (min_multiplier == UINT_MAX) {
+               rte_flow_error_set(error, ENOTSUP,
+                                  RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
+                                  "Flow rule pattern is not supported");
+               return -rte_errno;
+       }
+
+       for (i = 0; i < RTE_DIM(sfc_flow_copy_flags); i++) {
+               efx_filter_match_flags_t flag = sfc_flow_copy_flags[i].flag;
+
+               if ((flag & min_miss_flags) == flag) {
+                       rc = sfc_flow_spec_add_match_flag(spec, flag, error);
+                       if (rc != 0)
+                               return rc;
+               }
+       }
+
+       return 0;
+}
+
+/**
+ * Check that set of match flags is referred to by a filter. Filter is
+ * described by match flags with the ability to add OUTER_VID and INNER_VID
+ * flags.
+ *
+ * @param match_flags[in]
+ *   Set of match flags.
+ * @param flags_pattern[in]
+ *   Pattern of filter match flags.
+ */
+static boolean_t
+sfc_flow_is_match_with_vids(efx_filter_match_flags_t match_flags,
+                           efx_filter_match_flags_t flags_pattern)
+{
+       if ((match_flags & flags_pattern) != flags_pattern)
+               return B_FALSE;
+
+       switch (match_flags & ~flags_pattern) {
+       case 0:
+       case EFX_FILTER_MATCH_OUTER_VID:
+       case EFX_FILTER_MATCH_OUTER_VID | EFX_FILTER_MATCH_INNER_VID:
+               return B_TRUE;
+       default:
+               return B_FALSE;
+       }
+}
+
+/**
+ * Check whether the spec maps to a hardware filter which is known to be
+ * ineffective despite being valid.
+ *
+ * @param spec[in]
+ *   SFC flow specification.
+ */
+static boolean_t
+sfc_flow_is_match_flags_exception(struct sfc_flow_spec *spec)
+{
+       unsigned int i;
+       uint16_t ether_type;
+       uint8_t ip_proto;
+       efx_filter_match_flags_t match_flags;
+
+       for (i = 0; i < spec->count; i++) {
+               match_flags = spec->filters[i].efs_match_flags;
+
+               if (sfc_flow_is_match_with_vids(match_flags,
+                                               EFX_FILTER_MATCH_ETHER_TYPE) ||
+                   sfc_flow_is_match_with_vids(match_flags,
+                                               EFX_FILTER_MATCH_ETHER_TYPE |
+                                               EFX_FILTER_MATCH_LOC_MAC)) {
+                       ether_type = spec->filters[i].efs_ether_type;
+                       if (ether_type == EFX_ETHER_TYPE_IPV4 ||
+                           ether_type == EFX_ETHER_TYPE_IPV6)
+                               return B_TRUE;
+               } else if (sfc_flow_is_match_with_vids(match_flags,
+                               EFX_FILTER_MATCH_ETHER_TYPE |
+                               EFX_FILTER_MATCH_IP_PROTO) ||
+                          sfc_flow_is_match_with_vids(match_flags,
+                               EFX_FILTER_MATCH_ETHER_TYPE |
+                               EFX_FILTER_MATCH_IP_PROTO |
+                               EFX_FILTER_MATCH_LOC_MAC)) {
+                       ip_proto = spec->filters[i].efs_ip_proto;
+                       if (ip_proto == EFX_IPPROTO_TCP ||
+                           ip_proto == EFX_IPPROTO_UDP)
+                               return B_TRUE;
+               }
+       }
+
+       return B_FALSE;
+}
+
+static int
+sfc_flow_validate_match_flags(struct sfc_adapter *sa,
+                             struct rte_flow *flow,
+                             struct rte_flow_error *error)
+{
+       efx_filter_spec_t *spec_tmpl = &flow->spec.template;
+       efx_filter_match_flags_t match_flags = spec_tmpl->efs_match_flags;
+       int rc;
+
+       /* Initialize the first filter spec with template */
+       flow->spec.filters[0] = *spec_tmpl;
+       flow->spec.count = 1;
+
+       if (!sfc_filter_is_match_supported(sa, match_flags)) {
+               rc = sfc_flow_spec_filters_complete(sa, &flow->spec, error);
+               if (rc != 0)
+                       return rc;
+       }
+
+       if (sfc_flow_is_match_flags_exception(&flow->spec)) {
+               rte_flow_error_set(error, ENOTSUP,
+                       RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
+                       "The flow rule pattern is unsupported");
                return -rte_errno;
        }
 
@@ -1517,8 +2069,6 @@ sfc_flow_parse(struct rte_eth_dev *dev,
               struct rte_flow_error *error)
 {
        struct sfc_adapter *sa = dev->data->dev_private;
-       efx_filter_match_flags_t match_flags =
-               flow->spec.template.efs_match_flags;
        int rc;
 
        rc = sfc_flow_parse_attr(attr, flow, error);
@@ -1533,19 +2083,11 @@ sfc_flow_parse(struct rte_eth_dev *dev,
        if (rc != 0)
                goto fail_bad_value;
 
-       if (!sfc_filter_is_match_supported(sa, match_flags)) {
-               rte_flow_error_set(error, ENOTSUP,
-                                  RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
-                                  "Flow rule pattern is not supported");
-               return -rte_errno;
-       }
+       rc = sfc_flow_validate_match_flags(sa, flow, error);
+       if (rc != 0)
+               goto fail_bad_value;
 
-       /*
-        * At this point, template specification simply becomes the first
-        * fully elaborated spec
-        */
-       flow->spec.filters[0] = flow->spec.template;
-       flow->spec.count = 1;
+       return 0;
 
 fail_bad_value:
        return rc;