ethdev: add device flag to bypass auto-filled queue xstats

[dpdk.git] / drivers / net / mlx5 / mlx5_rss.c

diff --git a/drivers/net/mlx5/mlx5_rss.c b/drivers/net/mlx5/mlx5_rss.c
index 5ac6501..845cebe 100644 (file)
--- a/drivers/net/mlx5/mlx5_rss.c
+++ b/drivers/net/mlx5/mlx5_rss.c
@@ -1,29 +1,20 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright 2015 6WIND S.A.
- * Copyright 2015 Mellanox.
+ * Copyright 2015 Mellanox Technologies, Ltd
  */
 
 #include <stddef.h>
 #include <stdint.h>
 #include <errno.h>
 #include <string.h>
-#include <assert.h>
-
-/* Verbs header. */
-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */
-#ifdef PEDANTIC
-#pragma GCC diagnostic ignored "-Wpedantic"
-#endif
-#include <infiniband/verbs.h>
-#ifdef PEDANTIC
-#pragma GCC diagnostic error "-Wpedantic"
-#endif
 
 #include <rte_malloc.h>
 #include <rte_ethdev_driver.h>
 
-#include "mlx5.h"
+#include <mlx5_malloc.h>
+
 #include "mlx5_defs.h"
+#include "mlx5.h"
 #include "mlx5_rxtx.h"
 
 /**
@@ -41,15 +32,27 @@ int
 mlx5_rss_hash_update(struct rte_eth_dev *dev,
                     struct rte_eth_rss_conf *rss_conf)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
+       unsigned int i;
+       unsigned int idx;
 
        if (rss_conf->rss_hf & MLX5_RSS_HF_MASK) {
                rte_errno = EINVAL;
                return -rte_errno;
        }
        if (rss_conf->rss_key && rss_conf->rss_key_len) {
-               priv->rss_conf.rss_key = rte_realloc(priv->rss_conf.rss_key,
-                                                    rss_conf->rss_key_len, 0);
+               if (rss_conf->rss_key_len != MLX5_RSS_HASH_KEY_LEN) {
+                       DRV_LOG(ERR,
+                               "port %u RSS key len must be %s Bytes long",
+                               dev->data->port_id,
+                               RTE_STR(MLX5_RSS_HASH_KEY_LEN));
+                       rte_errno = EINVAL;
+                       return -rte_errno;
+               }
+               priv->rss_conf.rss_key = mlx5_realloc(priv->rss_conf.rss_key,
+                                                     MLX5_MEM_RTE,
+                                                     rss_conf->rss_key_len,
+                                                     0, SOCKET_ID_ANY);
                if (!priv->rss_conf.rss_key) {
                        rte_errno = ENOMEM;
                        return -rte_errno;
@@ -59,6 +62,14 @@ mlx5_rss_hash_update(struct rte_eth_dev *dev,
                priv->rss_conf.rss_key_len = rss_conf->rss_key_len;
        }
        priv->rss_conf.rss_hf = rss_conf->rss_hf;
+       /* Enable the RSS hash in all Rx queues. */
+       for (i = 0, idx = 0; idx != priv->rxqs_n; ++i) {
+               if (!(*priv->rxqs)[i])
+                       continue;
+               (*priv->rxqs)[i]->rss_hash = !!rss_conf->rss_hf &&
+                       !!(dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS);
+               ++idx;
+       }
        return 0;
 }
 
@@ -77,7 +88,7 @@ int
 mlx5_rss_hash_conf_get(struct rte_eth_dev *dev,
                       struct rte_eth_rss_conf *rss_conf)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
 
        if (!rss_conf) {
                rte_errno = EINVAL;
@@ -107,15 +118,16 @@ mlx5_rss_hash_conf_get(struct rte_eth_dev *dev,
 int
 mlx5_rss_reta_index_resize(struct rte_eth_dev *dev, unsigned int reta_size)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
        void *mem;
        unsigned int old_size = priv->reta_idx_n;
 
        if (priv->reta_idx_n == reta_size)
                return 0;
 
-       mem = rte_realloc(priv->reta_idx,
-                         reta_size * sizeof((*priv->reta_idx)[0]), 0);
+       mem = mlx5_realloc(priv->reta_idx, MLX5_MEM_RTE,
+                          reta_size * sizeof((*priv->reta_idx)[0]), 0,
+                          SOCKET_ID_ANY);
        if (!mem) {
                rte_errno = ENOMEM;
                return -rte_errno;
@@ -147,7 +159,7 @@ mlx5_dev_rss_reta_query(struct rte_eth_dev *dev,
                        struct rte_eth_rss_reta_entry64 *reta_conf,
                        uint16_t reta_size)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
        unsigned int idx;
        unsigned int i;
 
@@ -183,7 +195,7 @@ mlx5_dev_rss_reta_update(struct rte_eth_dev *dev,
                         uint16_t reta_size)
 {
        int ret;
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
        unsigned int idx;
        unsigned int i;
        unsigned int pos;
@@ -200,9 +212,12 @@ mlx5_dev_rss_reta_update(struct rte_eth_dev *dev,
                pos = i % RTE_RETA_GROUP_SIZE;
                if (((reta_conf[idx].mask >> i) & 0x1) == 0)
                        continue;
-               assert(reta_conf[idx].reta[pos] < priv->rxqs_n);
+               MLX5_ASSERT(reta_conf[idx].reta[pos] < priv->rxqs_n);
                (*priv->reta_idx)[i] = reta_conf[idx].reta[pos];
        }
+
+       priv->skip_default_rss_reta = 1;
+
        if (dev->data->dev_started) {
                mlx5_dev_stop(dev);
                return mlx5_dev_start(dev);