[PATCH 20.11 v2] net/mlx5: fix LRO validation in Rx setup
Xueming(Steven) Li
xuemingl at nvidia.com
Wed Jun 29 09:24:27 CEST 2022
Hey Michael,
Applied, thanks!
> -----Original Message-----
> From: Michael Baum <michaelba at nvidia.com>
> Sent: Tuesday, June 28, 2022 11:34 PM
> To: stable at dpdk.org
> Cc: Matan Azrad <matan at nvidia.com>; Slava Ovsiienko <viacheslavo at nvidia.com>; Xueming(Steven) Li <xuemingl at nvidia.com>
> Subject: [PATCH 20.11 v2] net/mlx5: fix LRO validation in Rx setup
>
> [ 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 at nvidia.com>
> Acked-by: Matan Azrad <matan at nvidia.com>
> ---
>
> v2: fix compilation issue.
>
> drivers/net/mlx5/mlx5_rxq.c | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index 4a263a5803..cb743a773c 100644
> --- a/drivers/net/mlx5/mlx5_rxq.c
> +++ b/drivers/net/mlx5/mlx5_rxq.c
> @@ -754,8 +754,18 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
> (struct rte_eth_rxseg_split *)conf->rx_seg;
> struct rte_eth_rxseg_split rx_single = {.mp = mp};
> uint16_t n_seg = conf->rx_nseg;
> + 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;
> + }
> if (mp) {
> /*
> * The parameters should be checked on rte_eth_dev layer.
> @@ -766,9 +776,6 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
> n_seg = 1;
> }
> if (n_seg > 1) {
> - uint64_t offloads = conf->offloads |
> - dev->data->dev_conf.rxmode.offloads;
> -
> /* The offloads should be checked on rte_eth_dev layer. */
> MLX5_ASSERT(offloads & DEV_RX_OFFLOAD_SCATTER);
> if (!(offloads & RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT)) {
> --
> 2.25.1
More information about the stable
mailing list