[PATCH 19.11] ethdev: fix RSS update when RSS is disabled

[Christian Ehrhardt]

On Tue, Aug 2, 2022 at 1:30 PM Huisong Li <lihuisong at huawei.com> wrote:
>
> [ upstream commit 93e1ea6dfa99dea359b8d66123576a395c2c0acd ]

Thank you,
your patch was too late in regard to my original deadline and I was
then unavailable for a while.
In the meantime more patches came in and I do not want to waste any of
them just because they were late.

Your patch is applied to the WIP branch now, but currently testing of
-rc1 is going on which I do not want to disrupt.

If we need an -rc2 anyway or generally have the time to do an -rc2
without too much disruption it will be in 19.11.13, otherwise it is
already queued for 19.11.14

> The ETH_MQ_RX_RSS_FLAG flag is a switch to enable RSS. If the flag
> is not set in dev_configure, RSS will be not configured and enabled.
> However, RSS hash and reta can still be configured by ethdev ops to
> enable RSS if the flag isn't set. The behavior is inconsistent.
>
> Bugzilla ID: 1056
> Fixes: 99a2dd955fba ("lib: remove librte_ prefix from directory names")
>
> Signed-off-by: Huisong Li <lihuisong at huawei.com>
> Signed-off-by: Min Hu (Connor) <humin29 at huawei.com>
> Reviewed-by: Ferruh Yigit <ferruh.yigit at xilinx.com>
> ---
>  lib/librte_ethdev/rte_ethdev.c | 15 +++++++++++++++
>  1 file changed, 15 insertions(+)
>
> diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
> index 76699cc10f..eb82e12ea4 100644
> --- a/lib/librte_ethdev/rte_ethdev.c
> +++ b/lib/librte_ethdev/rte_ethdev.c
> @@ -3504,6 +3504,7 @@ rte_eth_dev_rss_reta_update(uint16_t port_id,
>                             struct rte_eth_rss_reta_entry64 *reta_conf,
>                             uint16_t reta_size)
>  {
> +       enum rte_eth_rx_mq_mode mq_mode;
>         struct rte_eth_dev *dev;
>         int ret;
>
> @@ -3521,6 +3522,12 @@ rte_eth_dev_rss_reta_update(uint16_t port_id,
>         if (ret < 0)
>                 return ret;
>
> +       mq_mode = dev->data->dev_conf.rxmode.mq_mode;
> +       if (!(mq_mode & ETH_MQ_RX_RSS_FLAG)) {
> +               RTE_ETHDEV_LOG(ERR, "Multi-queue RSS mode isn't enabled.\n");
> +               return -ENOTSUP;
> +       }
> +
>         RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->reta_update, -ENOTSUP);
>         return eth_err(port_id, (*dev->dev_ops->reta_update)(dev, reta_conf,
>                                                              reta_size));
> @@ -3553,6 +3560,7 @@ rte_eth_dev_rss_hash_update(uint16_t port_id,
>  {
>         struct rte_eth_dev *dev;
>         struct rte_eth_dev_info dev_info = { .flow_type_rss_offloads = 0, };
> +       enum rte_eth_rx_mq_mode mq_mode;
>         int ret;
>
>         RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
> @@ -3572,6 +3580,13 @@ rte_eth_dev_rss_hash_update(uint16_t port_id,
>                         dev_info.flow_type_rss_offloads);
>                 return -EINVAL;
>         }
> +
> +       mq_mode = dev->data->dev_conf.rxmode.mq_mode;
> +       if (!(mq_mode & ETH_MQ_RX_RSS_FLAG)) {
> +               RTE_ETHDEV_LOG(ERR, "Multi-queue RSS mode isn't enabled.\n");
> +               return -ENOTSUP;
> +       }
> +
>         RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rss_hash_update, -ENOTSUP);
>         return eth_err(port_id, (*dev->dev_ops->rss_hash_update)(dev,
>                                                                  rss_conf));
> --
> 2.22.0
>


-- 
Christian Ehrhardt
Senior Staff Engineer, Ubuntu Server
Canonical Ltd