X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fmlx5%2Fmlx5_rss.c;h=e2b478b75ce7e2a2e14606558dd5c65f8d2cd632;hb=7158e46cb94be6f6071ccdabfc1fa48256955906;hp=9e12b51fee50e3f28e98d83385c302fb53c13b8f;hpb=ffc905f3b856b96c6d8d864dba4052104fae4064;p=dpdk.git diff --git a/drivers/net/mlx5/mlx5_rss.c b/drivers/net/mlx5/mlx5_rss.c index 9e12b51fee..e2b478b75c 100644 --- a/drivers/net/mlx5/mlx5_rss.c +++ b/drivers/net/mlx5/mlx5_rss.c @@ -1,58 +1,22 @@ -/*- - * BSD LICENSE - * - * Copyright 2015 6WIND S.A. - * Copyright 2015 Mellanox. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of 6WIND S.A. nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2015 6WIND S.A. + * Copyright 2015 Mellanox Technologies, Ltd */ #include #include #include #include -#include - -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#include -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif #include -#include +#include + +#include -#include "mlx5.h" #include "mlx5_defs.h" +#include "mlx5.h" #include "mlx5_rxtx.h" +#include "mlx5_rx.h" /** * DPDK callback to update the RSS hash configuration. @@ -63,35 +27,53 @@ * RSS configuration data. * * @return - * 0 on success, negative errno value on failure. + * 0 on success, a negative errno value otherwise and rte_errno is set. */ int mlx5_rss_hash_update(struct rte_eth_dev *dev, struct rte_eth_rss_conf *rss_conf) { - struct priv *priv = dev->data->dev_private; - int ret = 0; + struct mlx5_priv *priv = dev->data->dev_private; + unsigned int i; + unsigned int idx; - priv_lock(priv); if (rss_conf->rss_hf & MLX5_RSS_HF_MASK) { - ret = -EINVAL; - goto out; + 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) { - ret = -ENOMEM; - goto out; + rte_errno = ENOMEM; + return -rte_errno; } memcpy(priv->rss_conf.rss_key, rss_conf->rss_key, rss_conf->rss_key_len); priv->rss_conf.rss_key_len = rss_conf->rss_key_len; } priv->rss_conf.rss_hf = rss_conf->rss_hf; -out: - priv_unlock(priv); - return ret; + /* Enable the RSS hash in all Rx queues. */ + for (i = 0, idx = 0; idx != priv->rxqs_n; ++i) { + struct mlx5_rxq_priv *rxq = mlx5_rxq_get(dev, i); + + if (rxq == NULL || rxq->ctrl == NULL) + continue; + rxq->ctrl->rxq.rss_hash = !!rss_conf->rss_hf && + !!(dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS); + ++idx; + } + return 0; } /** @@ -103,17 +85,18 @@ out: * RSS configuration data. * * @return - * 0 on success, negative errno value on failure. + * 0 on success, a negative errno value otherwise and rte_errno is set. */ 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) - return -EINVAL; - priv_lock(priv); + if (!rss_conf) { + rte_errno = EINVAL; + return -rte_errno; + } if (rss_conf->rss_key && (rss_conf->rss_key_len >= priv->rss_conf.rss_key_len)) { memcpy(rss_conf->rss_key, priv->rss_conf.rss_key, @@ -121,37 +104,39 @@ mlx5_rss_hash_conf_get(struct rte_eth_dev *dev, } rss_conf->rss_key_len = priv->rss_conf.rss_key_len; rss_conf->rss_hf = priv->rss_conf.rss_hf; - priv_unlock(priv); return 0; } /** * Allocate/reallocate RETA index table. * - * @param priv - * Pointer to private structure. + * @param dev + * Pointer to Ethernet device. * @praram reta_size * The size of the array to allocate. * * @return - * 0 on success, errno value on failure. + * 0 on success, a negative errno value otherwise and rte_errno is set. */ int -priv_rss_reta_index_resize(struct priv *priv, unsigned int reta_size) +mlx5_rss_reta_index_resize(struct rte_eth_dev *dev, unsigned int reta_size) { + 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); - if (!mem) - return ENOMEM; + 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; + } priv->reta_idx = mem; priv->reta_idx_n = reta_size; - if (old_size < reta_size) memset(&(*priv->reta_idx)[old_size], 0, (reta_size - old_size) * @@ -159,78 +144,6 @@ priv_rss_reta_index_resize(struct priv *priv, unsigned int reta_size) return 0; } -/** - * Query RETA table. - * - * @param priv - * Pointer to private structure. - * @param[in, out] reta_conf - * Pointer to the first RETA configuration structure. - * @param reta_size - * Number of entries. - * - * @return - * 0 on success, errno value on failure. - */ -static int -priv_dev_rss_reta_query(struct priv *priv, - struct rte_eth_rss_reta_entry64 *reta_conf, - unsigned int reta_size) -{ - unsigned int idx; - unsigned int i; - - if (!reta_size || reta_size > priv->reta_idx_n) - return EINVAL; - /* Fill each entry of the table even if its bit is not set. */ - for (idx = 0, i = 0; (i != reta_size); ++i) { - idx = i / RTE_RETA_GROUP_SIZE; - reta_conf[idx].reta[i % RTE_RETA_GROUP_SIZE] = - (*priv->reta_idx)[i]; - } - return 0; -} - -/** - * Update RETA table. - * - * @param priv - * Pointer to private structure. - * @param[in] reta_conf - * Pointer to the first RETA configuration structure. - * @param reta_size - * Number of entries. - * - * @return - * 0 on success, errno value on failure. - */ -static int -priv_dev_rss_reta_update(struct priv *priv, - struct rte_eth_rss_reta_entry64 *reta_conf, - unsigned int reta_size) -{ - unsigned int idx; - unsigned int i; - unsigned int pos; - int ret; - - if (!reta_size) - return EINVAL; - ret = priv_rss_reta_index_resize(priv, reta_size); - if (ret) - return ret; - - for (idx = 0, i = 0; (i != reta_size); ++i) { - idx = i / RTE_RETA_GROUP_SIZE; - pos = i % RTE_RETA_GROUP_SIZE; - if (((reta_conf[idx].mask >> i) & 0x1) == 0) - continue; - assert(reta_conf[idx].reta[pos] < priv->rxqs_n); - (*priv->reta_idx)[i] = reta_conf[idx].reta[pos]; - } - return 0; -} - /** * DPDK callback to get the RETA indirection table. * @@ -242,20 +155,28 @@ priv_dev_rss_reta_update(struct priv *priv, * Size of the RETA table. * * @return - * 0 on success, negative errno value on failure. + * 0 on success, a negative errno value otherwise and rte_errno is set. */ int mlx5_dev_rss_reta_query(struct rte_eth_dev *dev, struct rte_eth_rss_reta_entry64 *reta_conf, 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; - priv_lock(priv); - ret = priv_dev_rss_reta_query(priv, reta_conf, reta_size); - priv_unlock(priv); - return -ret; + if (!reta_size || reta_size > priv->reta_idx_n) { + rte_errno = EINVAL; + return -rte_errno; + } + /* Fill each entry of the table even if its bit is not set. */ + for (idx = 0, i = 0; (i != reta_size); ++i) { + idx = i / RTE_ETH_RETA_GROUP_SIZE; + reta_conf[idx].reta[i % RTE_ETH_RETA_GROUP_SIZE] = + (*priv->reta_idx)[i]; + } + return 0; } /** @@ -269,7 +190,7 @@ mlx5_dev_rss_reta_query(struct rte_eth_dev *dev, * Size of the RETA table. * * @return - * 0 on success, negative errno value on failure. + * 0 on success, a negative errno value otherwise and rte_errno is set. */ int mlx5_dev_rss_reta_update(struct rte_eth_dev *dev, @@ -277,14 +198,26 @@ 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; - priv_lock(priv); - ret = priv_dev_rss_reta_update(priv, reta_conf, reta_size); - priv_unlock(priv); - if (dev->data->dev_started) { - mlx5_dev_stop(dev); - mlx5_dev_start(dev); + if (!reta_size) { + rte_errno = EINVAL; + return -rte_errno; + } + ret = mlx5_rss_reta_index_resize(dev, reta_size); + if (ret) + return ret; + for (idx = 0, i = 0; (i != reta_size); ++i) { + idx = i / RTE_ETH_RETA_GROUP_SIZE; + pos = i % RTE_ETH_RETA_GROUP_SIZE; + if (((reta_conf[idx].mask >> pos) & 0x1) == 0) + continue; + MLX5_ASSERT(reta_conf[idx].reta[pos] < priv->rxqs_n); + (*priv->reta_idx)[i] = reta_conf[idx].reta[pos]; } - return -ret; + priv->skip_default_rss_reta = 1; + return mlx5_traffic_restart(dev); }