diff mbox series

net/mlx5: fix VLAN stripping on hairpin queues

Message ID 20250425194913.70742-1-dsosnowski@nvidia.com (mailing list archive)
State Awaiting Upstream
Delegated to: Raslan Darawsheh
Headers
Series net/mlx5: fix VLAN stripping on hairpin queues |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/loongarch-compilation success Compilation OK
ci/loongarch-unit-testing success Unit Testing PASS
ci/Intel-compilation success Compilation OK
ci/github-robot: build success github build: passed
ci/aws-unit-testing success Unit Testing PASS
ci/iol-abi-testing success Testing PASS
ci/iol-unit-amd64-testing fail Testing issues
ci/iol-unit-arm64-testing success Testing PASS
ci/iol-compile-amd64-testing success Testing PASS
ci/iol-compile-arm64-testing success Testing PASS
ci/iol-mellanox-Functional success Functional Testing PASS RETEST #1
ci/iol-marvell-Functional success Functional Testing PASS RETEST #1
ci/iol-mellanox-Performance success Performance Testing PASS RETEST #1
ci/iol-broadcom-Performance success Performance Testing PASS RETEST #1
ci/iol-sample-apps-testing success Testing PASS RETEST #1
ci/iol-intel-Performance success Performance Testing PASS RETEST #1
ci/iol-intel-Functional success Functional Testing PASS RETEST #1
ci/intel-Testing success Testing PASS
ci/intel-Functional success Functional PASS

Commit Message

Dariusz Sosnowski April 25, 2025, 7:49 p.m. UTC 
Rx hairpin queues support VLAN stripping,
but if port was started and application attempted
to configure stripping on hairpin queue,
segfault was triggered because of NULL dereference.
Underlying function, which was updating the RQ was passing
wrong object handle for hairpin queues.
This patch fixes that.

Fixes: e79c9be91515 ("net/mlx5: support Rx hairpin queues")
Cc: stable@dpdk.org

Signed-off-by: Dariusz Sosnowski <dsosnowski@nvidia.com>
---
 drivers/net/mlx5/mlx5_devx.c | 2 ++
 drivers/net/mlx5/mlx5_vlan.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

Comments

Patrick Robb April 29, 2025, 9:30 p.m. UTC | #1 
Hi, it looks like your patch was affected by an infrastructure issue at the
DPDK Community Lab and has a false failure test result on DPDK patchwork.
Issuing a retest to correct this:

Recheck-request: iol-intel-Functional
Bing Zhao May 27, 2025, 4:09 p.m. UTC | #2 
Hi,

> -----Original Message-----
> From: Dariusz Sosnowski <dsosnowski@nvidia.com>
> Sent: Saturday, April 26, 2025 3:49 AM
> To: Slava Ovsiienko <viacheslavo@nvidia.com>; Bing Zhao
> <bingz@nvidia.com>; Ori Kam <orika@nvidia.com>; Suanming Mou
> <suanmingm@nvidia.com>; Matan Azrad <matan@nvidia.com>
> Cc: dev@dpdk.org; stable@dpdk.org
> Subject: [PATCH] net/mlx5: fix VLAN stripping on hairpin queues
> 
> Rx hairpin queues support VLAN stripping, but if port was started and
> application attempted to configure stripping on hairpin queue, segfault
> was triggered because of NULL dereference.
> Underlying function, which was updating the RQ was passing wrong object
> handle for hairpin queues.
> This patch fixes that.
> 
> Fixes: e79c9be91515 ("net/mlx5: support Rx hairpin queues")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Dariusz Sosnowski <dsosnowski@nvidia.com>
> ---
>  drivers/net/mlx5/mlx5_devx.c | 2 ++
>  drivers/net/mlx5/mlx5_vlan.c | 2 +-
>  2 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c
> index a12891a983..ed1826a612 100644
> --- a/drivers/net/mlx5/mlx5_devx.c
> +++ b/drivers/net/mlx5/mlx5_devx.c
> @@ -88,6 +88,8 @@ mlx5_rxq_obj_modify_rq_vlan_strip(struct mlx5_rxq_priv
> *rxq, int on)
>  	rq_attr.state = MLX5_RQC_STATE_RDY;
>  	rq_attr.vsd = (on ? 0 : 1);
>  	rq_attr.modify_bitmask = MLX5_MODIFY_RQ_IN_MODIFY_BITMASK_VSD;
> +	if (rxq->ctrl->is_hairpin)
> +		return mlx5_devx_cmd_modify_rq(rxq->ctrl->obj->rq, &rq_attr);
>  	return mlx5_devx_cmd_modify_rq(rxq->devx_rq.rq, &rq_attr);  }
> 
> diff --git a/drivers/net/mlx5/mlx5_vlan.c b/drivers/net/mlx5/mlx5_vlan.c
> index 43a314a679..7c7ac78dfe 100644
> --- a/drivers/net/mlx5/mlx5_vlan.c
> +++ b/drivers/net/mlx5/mlx5_vlan.c
> @@ -107,7 +107,7 @@ mlx5_vlan_strip_queue_set(struct rte_eth_dev *dev,
> uint16_t queue, int on)
>  			dev->data->port_id, queue);
>  		return;
>  	}
> -	DRV_LOG(DEBUG, "port %u set VLAN stripping offloads %d for
> port %uqueue %d",
> +	DRV_LOG(DEBUG, "port %u set VLAN stripping offloads %d for port %u
> +queue %d",
>  		dev->data->port_id, on, rxq_data->port_id, queue);
>  	if (rxq->ctrl->obj == NULL) {
>  		/* Update related bits in RX queue. */
> --
> 2.39.5

Acked-by: Bing Zhao <bingz@nvidia.com>

Thanks
Raslan Darawsheh June 2, 2025, 6:46 a.m. UTC | #3 
Hi,

On 25/04/2025 10:49 PM, Dariusz Sosnowski wrote:
> Rx hairpin queues support VLAN stripping,
> but if port was started and application attempted
> to configure stripping on hairpin queue,
> segfault was triggered because of NULL dereference.
> Underlying function, which was updating the RQ was passing
> wrong object handle for hairpin queues.
> This patch fixes that.
> 
> Fixes: e79c9be91515 ("net/mlx5: support Rx hairpin queues")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Dariusz Sosnowski <dsosnowski@nvidia.com>
> ---

Patch applied to next-net-mlx,
diff mbox series

Patch

diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c
index a12891a983..ed1826a612 100644
--- a/drivers/net/mlx5/mlx5_devx.c
+++ b/drivers/net/mlx5/mlx5_devx.c
@@ -88,6 +88,8 @@  mlx5_rxq_obj_modify_rq_vlan_strip(struct mlx5_rxq_priv *rxq, int on)
 	rq_attr.state = MLX5_RQC_STATE_RDY;
 	rq_attr.vsd = (on ? 0 : 1);
 	rq_attr.modify_bitmask = MLX5_MODIFY_RQ_IN_MODIFY_BITMASK_VSD;
+	if (rxq->ctrl->is_hairpin)
+		return mlx5_devx_cmd_modify_rq(rxq->ctrl->obj->rq, &rq_attr);
 	return mlx5_devx_cmd_modify_rq(rxq->devx_rq.rq, &rq_attr);
 }
 
diff --git a/drivers/net/mlx5/mlx5_vlan.c b/drivers/net/mlx5/mlx5_vlan.c
index 43a314a679..7c7ac78dfe 100644
--- a/drivers/net/mlx5/mlx5_vlan.c
+++ b/drivers/net/mlx5/mlx5_vlan.c
@@ -107,7 +107,7 @@  mlx5_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on)
 			dev->data->port_id, queue);
 		return;
 	}
-	DRV_LOG(DEBUG, "port %u set VLAN stripping offloads %d for port %uqueue %d",
+	DRV_LOG(DEBUG, "port %u set VLAN stripping offloads %d for port %u queue %d",
 		dev->data->port_id, on, rxq_data->port_id, queue);
 	if (rxq->ctrl->obj == NULL) {
 		/* Update related bits in RX queue. */