[PATCH 19.11] net/mlx5: fix LRO validation in Rx setup

[PATCH 19.11] net/mlx5: fix LRO validation in Rx setup

[Michael Baum]

[ upstream commit a213b8682117711c8e92475c5bbb321a3d8428dd ]

The mlx5_rx_queue_setup() get LRO offload from user.

When LRO is configured, the LRO flag in rxq_data is set to 1.

This patch adds validation to make sure the LRO is supported.

Fixes: 17ed314 ("net/mlx5: allow LRO per Rx queue")

Signed-off-by: Michael Baum <michaelba@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
---
 drivers/net/mlx5/mlx5_rxq.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index bb4f11bccb..7a0a7e6ac9 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -502,8 +502,18 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
 	struct mlx5_rxq_data *rxq = (*priv->rxqs)[idx];
 	struct mlx5_rxq_ctrl *rxq_ctrl =
 		container_of(rxq, struct mlx5_rxq_ctrl, rxq);
+	uint64_t offloads = conf->offloads |
+			    dev->data->dev_conf.rxmode.offloads;
 	int res;
 
+	if ((offloads & DEV_RX_OFFLOAD_TCP_LRO) &&
+	    !priv->config.lro.supported) {
+		DRV_LOG(ERR,
+			"Port %u queue %u LRO is configured but not supported.",
+			dev->data->port_id, idx);
+		rte_errno = EINVAL;
+		return -rte_errno;
+	}
 	res = mlx5_rx_queue_pre_setup(dev, idx, &desc);
 	if (res)
 		return res;
-- 
2.25.1

Re: [PATCH 19.11] net/mlx5: fix LRO validation in Rx setup

[Christian Ehrhardt]

On Sun, Jul 10, 2022 at 9:04 AM Michael Baum <michaelba@nvidia.com> wrote:
>
> [ upstream commit a213b8682117711c8e92475c5bbb321a3d8428dd ]

Thanks, applied

> The mlx5_rx_queue_setup() get LRO offload from user.
>
> When LRO is configured, the LRO flag in rxq_data is set to 1.
>
> This patch adds validation to make sure the LRO is supported.
>
> Fixes: 17ed314 ("net/mlx5: allow LRO per Rx queue")
>
> Signed-off-by: Michael Baum <michaelba@nvidia.com>
> Acked-by: Matan Azrad <matan@nvidia.com>
> ---
>  drivers/net/mlx5/mlx5_rxq.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>
> diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
> index bb4f11bccb..7a0a7e6ac9 100644
> --- a/drivers/net/mlx5/mlx5_rxq.c
> +++ b/drivers/net/mlx5/mlx5_rxq.c
> @@ -502,8 +502,18 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
>         struct mlx5_rxq_data *rxq = (*priv->rxqs)[idx];
>         struct mlx5_rxq_ctrl *rxq_ctrl =
>                 container_of(rxq, struct mlx5_rxq_ctrl, rxq);
> +       uint64_t offloads = conf->offloads |
> +                           dev->data->dev_conf.rxmode.offloads;
>         int res;
>
> +       if ((offloads & DEV_RX_OFFLOAD_TCP_LRO) &&
> +           !priv->config.lro.supported) {
> +               DRV_LOG(ERR,
> +                       "Port %u queue %u LRO is configured but not supported.",
> +                       dev->data->port_id, idx);
> +               rte_errno = EINVAL;
> +               return -rte_errno;
> +       }
>         res = mlx5_rx_queue_pre_setup(dev, idx, &desc);
>         if (res)
>                 return res;
> --
> 2.25.1
>


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