net/mlx4: restore UDP RSS by probing capabilities

[dpdk.git] / drivers / net / mlx4 / mlx4_flow.c

diff --git a/drivers/net/mlx4/mlx4_flow.c b/drivers/net/mlx4/mlx4_flow.c
index 5c4bf8e..a41d99d 100644 (file)
--- a/drivers/net/mlx4/mlx4_flow.c
+++ b/drivers/net/mlx4/mlx4_flow.c
@@ -105,6 +105,11 @@ struct mlx4_drop {
 /**
  * Convert DPDK RSS hash fields to their Verbs equivalent.
  *
+ * This function returns the supported (default) set when @p rss_hf has
+ * special value (uint64_t)-1.
+ *
+ * @param priv
+ *   Pointer to private structure.
  * @param rss_hf
  *   Hash fields in DPDK format (see struct rte_eth_rss_conf).
  *
@@ -112,8 +117,8 @@ struct mlx4_drop {
  *   A valid Verbs RSS hash fields mask for mlx4 on success, (uint64_t)-1
  *   otherwise and rte_errno is set.
  */
-static uint64_t
-mlx4_conv_rss_hf(uint64_t rss_hf)
+uint64_t
+mlx4_conv_rss_hf(struct priv *priv, uint64_t rss_hf)
 {
        enum { IPV4, IPV6, TCP, UDP, };
        const uint64_t in[] = {
@@ -133,11 +138,9 @@ mlx4_conv_rss_hf(uint64_t rss_hf)
                [TCP] = (ETH_RSS_NONFRAG_IPV4_TCP |
                         ETH_RSS_NONFRAG_IPV6_TCP |
                         ETH_RSS_IPV6_TCP_EX),
-               /*
-                * UDP support is temporarily disabled due to an
-                * implementation issue in the kernel.
-                */
-               [UDP] = 0,
+               [UDP] = (ETH_RSS_NONFRAG_IPV4_UDP |
+                        ETH_RSS_NONFRAG_IPV6_UDP |
+                        ETH_RSS_IPV6_UDP_EX),
        };
        const uint64_t out[RTE_DIM(in)] = {
                [IPV4] = IBV_RX_HASH_SRC_IPV4 | IBV_RX_HASH_DST_IPV4,
@@ -154,8 +157,12 @@ mlx4_conv_rss_hf(uint64_t rss_hf)
                        seen |= rss_hf & in[i];
                        conv |= out[i];
                }
-       if (!(rss_hf & ~seen))
-               return conv;
+       if ((conv & priv->hw_rss_sup) == conv) {
+               if (rss_hf == (uint64_t)-1)
+                       return conv;
+               if (!(rss_hf & ~seen))
+                       return conv;
+       }
        rte_errno = ENOTSUP;
        return (uint64_t)-1;
 }
@@ -404,7 +411,7 @@ mlx4_flow_merge_udp(struct rte_flow *flow,
        struct ibv_flow_spec_tcp_udp *udp;
        const char *msg;
 
-       if (!mask ||
+       if (mask &&
            ((uint16_t)(mask->hdr.src_port + 1) > UINT16_C(1) ||
             (uint16_t)(mask->hdr.dst_port + 1) > UINT16_C(1))) {
                msg = "mlx4 does not support matching partial UDP fields";
@@ -464,7 +471,7 @@ mlx4_flow_merge_tcp(struct rte_flow *flow,
        struct ibv_flow_spec_tcp_udp *tcp;
        const char *msg;
 
-       if (!mask ||
+       if (mask &&
            ((uint16_t)(mask->hdr.src_port + 1) > UINT16_C(1) ||
             (uint16_t)(mask->hdr.dst_port + 1) > UINT16_C(1))) {
                msg = "mlx4 does not support matching partial TCP fields";
@@ -734,6 +741,11 @@ fill:
                        if (flow->rss)
                                break;
                        queue = action->conf;
+                       if (queue->index >= priv->dev->data->nb_rx_queues) {
+                               msg = "queue target index beyond number of"
+                                       " configured Rx queues";
+                               goto exit_action_not_supported;
+                       }
                        flow->rss = mlx4_rss_get
                                (priv, 0, mlx4_rss_hash_key_default, 1,
                                 &queue->index);
@@ -754,12 +766,18 @@ fill:
                                &(struct rte_eth_rss_conf){
                                        .rss_key = mlx4_rss_hash_key_default,
                                        .rss_key_len = MLX4_RSS_HASH_KEY_SIZE,
-                                       .rss_hf = (ETH_RSS_IPV4 |
-                                                  ETH_RSS_NONFRAG_IPV4_TCP |
-                                                  ETH_RSS_IPV6 |
-                                                  ETH_RSS_NONFRAG_IPV6_TCP),
+                                       .rss_hf = -1,
                                };
                        /* Sanity checks. */
+                       for (i = 0; i < rss->num; ++i)
+                               if (rss->queue[i] >=
+                                   priv->dev->data->nb_rx_queues)
+                                       break;
+                       if (i != rss->num) {
+                               msg = "queue index target beyond number of"
+                                       " configured Rx queues";
+                               goto exit_action_not_supported;
+                       }
                        if (!rte_is_power_of_2(rss->num)) {
                                msg = "for RSS, mlx4 requires the number of"
                                        " queues to be a power of two";
@@ -787,7 +805,8 @@ fill:
                                goto exit_action_not_supported;
                        }
                        flow->rss = mlx4_rss_get
-                               (priv, mlx4_conv_rss_hf(rss_conf->rss_hf),
+                               (priv,
+                                mlx4_conv_rss_hf(priv, rss_conf->rss_hf),
                                 rss_conf->rss_key, rss->num, rss->queue);
                        if (!flow->rss) {
                                msg = "either invalid parameters or not enough"
@@ -1290,6 +1309,9 @@ mlx4_flow_internal(struct priv *priv, struct rte_flow_error *error)
        unsigned int i;
        int err = 0;
 
+       /* Nothing to be done if there are no Rx queues. */
+       if (!queues)
+               goto error;
        /* Prepare default RSS configuration. */
        *rss_conf = (struct rte_flow_action_rss){
                .rss_conf = NULL, /* Rely on default fallback settings. */
@@ -1339,6 +1361,7 @@ next_vlan:
                        assert(flow->ibv_attr->type == IBV_FLOW_ATTR_NORMAL);
                        assert(flow->ibv_attr->num_of_specs == 1);
                        assert(eth->type == IBV_FLOW_SPEC_ETH);
+                       assert(flow->rss);
                        if (rule_vlan &&
                            (eth->val.vlan_tag != *rule_vlan ||
                             eth->mask.vlan_tag != RTE_BE16(0x0fff)))
@@ -1351,8 +1374,13 @@ next_vlan:
                                    eth->val.src_mac[j] != UINT8_C(0x00) ||
                                    eth->mask.src_mac[j] != UINT8_C(0x00))
                                        break;
-                       if (j == sizeof(mac->addr_bytes))
-                               break;
+                       if (j != sizeof(mac->addr_bytes))
+                               continue;
+                       if (flow->rss->queues != queues ||
+                           memcmp(flow->rss->queue_id, rss_conf->queue,
+                                  queues * sizeof(flow->rss->queue_id[0])))
+                               continue;
+                       break;
                }
                if (!flow || !flow->internal) {
                        /* Not found, create a new flow rule. */
@@ -1386,6 +1414,13 @@ next_vlan:
                                        break;
                        }
                }
+               if (flow && flow->internal) {
+                       assert(flow->rss);
+                       if (flow->rss->queues != queues ||
+                           memcmp(flow->rss->queue_id, rss_conf->queue,
+                                  queues * sizeof(flow->rss->queue_id[0])))
+                               flow = NULL;
+               }
                if (!flow || !flow->internal) {
                        /* Not found, create a new flow rule. */
                        if (priv->dev->data->promiscuous) {
@@ -1460,9 +1495,7 @@ mlx4_flow_sync(struct priv *priv, struct rte_flow_error *error)
                        return ret;
        }
        /* Toggle the remaining flow rules . */
-       for (flow = LIST_FIRST(&priv->flows);
-            flow;
-            flow = LIST_NEXT(flow, next)) {
+       LIST_FOREACH(flow, &priv->flows, next) {
                ret = mlx4_flow_toggle(priv, flow, priv->started, error);
                if (ret)
                        return ret;