net/mlx4: restore inner VXLAN RSS support

Inner VXLAN RSS was supported and performed by default prior to the entire
mlx4 refactoring that occurred in DPDK 17.11, however so far the new Verbs
RSS API did not provide means to enable it. This will be addressed in
Linux 4.15 and in RDMA core.

Thanks to RSS capabilities, the PMD can now probe for its support and
enable it again by default.

Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>

diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
index 025b88766dcdcc1bc37148239930afc443fabad8..8c20eea416df3717188b190cca502f33ab251a6e 100644 (file)
--- a/drivers/net/mlx4/mlx4.c
+++ b/drivers/net/mlx4/mlx4.c
@@ -582,14 +582,15 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                priv->hw_rss_sup = device_attr_ex.rss_caps.rx_hash_fields_mask;
                if (!priv->hw_rss_sup) {
                        WARN("no RSS capabilities reported; disabling support"
-                            " for UDP RSS");
+                            " for UDP RSS and inner VXLAN RSS");
                        /* Fake support for all possible RSS hash fields. */
                        priv->hw_rss_sup = ~UINT64_C(0);
                        priv->hw_rss_sup = mlx4_conv_rss_hf(priv, -1);
                        /* Filter out known unsupported fields. */
                        priv->hw_rss_sup &=
                                ~(uint64_t)(IBV_RX_HASH_SRC_PORT_UDP |
-                                           IBV_RX_HASH_DST_PORT_UDP);
+                                           IBV_RX_HASH_DST_PORT_UDP |
+                                           IBV_RX_HASH_INNER);
                }
                DEBUG("supported RSS hash fields mask: %016" PRIx64,
                      priv->hw_rss_sup);

diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h
index e5ab934c1327f3997c86acf9d5cfd886fd08ba59..99dc3357a9adfa2d071b3376ac8e83209a263f44 100644 (file)
--- a/drivers/net/mlx4/mlx4.h
+++ b/drivers/net/mlx4/mlx4.h
@@ -53,6 +53,11 @@
 #include <rte_mempool.h>
 #include <rte_spinlock.h>
 
+#ifndef IBV_RX_HASH_INNER
+/** This is not necessarily defined by supported RDMA core versions. */
+#define IBV_RX_HASH_INNER (1ull << 31)
+#endif /* IBV_RX_HASH_INNER */
+
 /** Maximum number of simultaneous MAC addresses. This value is arbitrary. */
 #define MLX4_MAX_MAC_ADDRESSES 128
 

diff --git a/drivers/net/mlx4/mlx4_flow.c b/drivers/net/mlx4/mlx4_flow.c
index a41d99dd8d8404b49e430890fb2f290daf218280..69025da426e502d19a22386c0161561a4b1ce435 100644 (file)
--- a/drivers/net/mlx4/mlx4_flow.c
+++ b/drivers/net/mlx4/mlx4_flow.c
@@ -158,8 +158,11 @@ mlx4_conv_rss_hf(struct priv *priv, uint64_t rss_hf)
                        conv |= out[i];
                }
        if ((conv & priv->hw_rss_sup) == conv) {
-               if (rss_hf == (uint64_t)-1)
+               if (rss_hf == (uint64_t)-1) {
+                       /* Include inner RSS by default if supported. */
+                       conv |= priv->hw_rss_sup & IBV_RX_HASH_INNER;
                        return conv;
+               }
                if (!(rss_hf & ~seen))
                        return conv;
        }