net/sfc: make processing of flow rule actions more uniform

[dpdk.git] / drivers / net / sfc / sfc_flow.c

diff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c
index 55226f1..2b5b831 100644 (file)
--- a/drivers/net/sfc/sfc_flow.c
+++ b/drivers/net/sfc/sfc_flow.c
@@ -120,7 +120,6 @@ sfc_flow_parse_init(const struct rte_flow_item *item,
        const uint8_t *spec;
        const uint8_t *mask;
        const uint8_t *last;
-       uint8_t match;
        uint8_t supp;
        unsigned int i;
 
@@ -181,12 +180,11 @@ sfc_flow_parse_init(const struct rte_flow_item *item,
                return -rte_errno;
        }
 
-       /* Check that mask and spec not asks for more match than supp_mask */
+       /* Check that mask does not ask for more match than supp_mask */
        for (i = 0; i < size; i++) {
-               match = spec[i] | mask[i];
                supp = ((const uint8_t *)supp_mask)[i];
 
-               if ((match | supp) != supp) {
+               if (~supp & mask[i]) {
                        rte_flow_error_set(error, ENOTSUP,
                                           RTE_FLOW_ERROR_TYPE_ITEM, item,
                                           "Item's field is not supported");
@@ -1297,6 +1295,17 @@ sfc_flow_parse_rss(struct sfc_adapter *sa,
        if (action_rss->level)
                return -EINVAL;
 
+       /*
+        * Dummy RSS action with only one queue and no specific settings
+        * for hash types and key does not require dedicated RSS context
+        * and may be simplified to single queue action.
+        */
+       if (action_rss->queue_num == 1 && action_rss->types == 0 &&
+           action_rss->key_len == 0) {
+               flow->spec.template.efs_dmaq_id = rxq_hw_index_min;
+               return 0;
+       }
+
        if (action_rss->types) {
                int rc;
 
@@ -1498,7 +1507,10 @@ sfc_flow_parse_actions(struct sfc_adapter *sa,
                       struct rte_flow_error *error)
 {
        int rc;
-       boolean_t is_specified = B_FALSE;
+       uint32_t actions_set = 0;
+       const uint32_t fate_actions_mask = (1UL << RTE_FLOW_ACTION_TYPE_QUEUE) |
+                                          (1UL << RTE_FLOW_ACTION_TYPE_RSS) |
+                                          (1UL << RTE_FLOW_ACTION_TYPE_DROP);
 
        if (actions == NULL) {
                rte_flow_error_set(error, EINVAL,
@@ -1507,21 +1519,22 @@ sfc_flow_parse_actions(struct sfc_adapter *sa,
                return -rte_errno;
        }
 
+#define SFC_BUILD_SET_OVERFLOW(_action, _set) \
+       RTE_BUILD_BUG_ON(_action >= sizeof(_set) * CHAR_BIT)
+
        for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {
-               /* 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:
+                       SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_VOID,
+                                              actions_set);
+                       break;
+
                case RTE_FLOW_ACTION_TYPE_QUEUE:
+                       SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_QUEUE,
+                                              actions_set);
+                       if ((actions_set & fate_actions_mask) != 0)
+                               goto fail_fate_actions;
+
                        rc = sfc_flow_parse_queue(sa, actions->conf, flow);
                        if (rc != 0) {
                                rte_flow_error_set(error, EINVAL,
@@ -1529,11 +1542,14 @@ sfc_flow_parse_actions(struct sfc_adapter *sa,
                                        "Bad QUEUE action");
                                return -rte_errno;
                        }
-
-                       is_specified = B_TRUE;
                        break;
 
                case RTE_FLOW_ACTION_TYPE_RSS:
+                       SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_RSS,
+                                              actions_set);
+                       if ((actions_set & fate_actions_mask) != 0)
+                               goto fail_fate_actions;
+
                        rc = sfc_flow_parse_rss(sa, actions->conf, flow);
                        if (rc != 0) {
                                rte_flow_error_set(error, rc,
@@ -1541,15 +1557,16 @@ sfc_flow_parse_actions(struct sfc_adapter *sa,
                                        "Bad RSS action");
                                return -rte_errno;
                        }
-
-                       is_specified = B_TRUE;
                        break;
 
                case RTE_FLOW_ACTION_TYPE_DROP:
+                       SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_DROP,
+                                              actions_set);
+                       if ((actions_set & fate_actions_mask) != 0)
+                               goto fail_fate_actions;
+
                        flow->spec.template.efs_dmaq_id =
                                EFX_FILTER_SPEC_RX_DMAQ_ID_DROP;
-
-                       is_specified = B_TRUE;
                        break;
 
                default:
@@ -1558,15 +1575,24 @@ sfc_flow_parse_actions(struct sfc_adapter *sa,
                                           "Action is not supported");
                        return -rte_errno;
                }
+
+               actions_set |= (1UL << actions->type);
        }
+#undef SFC_BUILD_SET_OVERFLOW
 
        /* When fate is unknown, drop traffic. */
-       if (!is_specified) {
+       if ((actions_set & fate_actions_mask) == 0) {
                flow->spec.template.efs_dmaq_id =
                        EFX_FILTER_SPEC_RX_DMAQ_ID_DROP;
        }
 
        return 0;
+
+fail_fate_actions:
+       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;
 }
 
 /**