From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3DB1346BAE for ; Fri, 18 Jul 2025 21:35:16 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 386D740E35; Fri, 18 Jul 2025 21:35:16 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 33DFF40611 for ; Fri, 18 Jul 2025 21:35:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RfGuBb9Cb6z1P5XOX1I40g+iQMLzEThW6CqrRvtYx1k=; b=eg9O5lXMwGbx2aXRwYW4r4aIYXFwicRVFcQI6AY2H3TSquEVyHfO+7J2+uccVDav7IpRnE jA6QpvRxwhv9E+f708AGtshhtxn5wjgxbJ4cWgqlD0ZVTjuFTJxIErmJGuuKePYsD0PJ/Q r8oJSa8oQcJtD3TJrK9SwXJ9Ch9tqgg= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-269-vsMsfDnYPUCmhMSerpSU9w-1; Fri, 18 Jul 2025 15:35:09 -0400 X-MC-Unique: vsMsfDnYPUCmhMSerpSU9w-1 X-Mimecast-MFC-AGG-ID: vsMsfDnYPUCmhMSerpSU9w_1752867308 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7948619560B4; Fri, 18 Jul 2025 19:35:08 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E49E518003FC; Fri, 18 Jul 2025 19:35:06 +0000 (UTC) From: Kevin Traynor To: Dariusz Sosnowski Cc: Bing Zhao , dpdk stable Subject: patch 'net/mlx5: fix VLAN stripping on hairpin queue' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:29:58 +0100 Message-ID: <20250718193247.1008129-64-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: p8ewxMF-7BoPUYWPkkyObEdUhOOV5sRnTzMdD_WfjVY_1752867308 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 24.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/23/25. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/82d26cdd09f8f0c24f6751f4395b006a798355ba Thanks. Kevin --- >From 82d26cdd09f8f0c24f6751f4395b006a798355ba Mon Sep 17 00:00:00 2001 From: Dariusz Sosnowski Date: Fri, 25 Apr 2025 21:49:13 +0200 Subject: [PATCH] net/mlx5: fix VLAN stripping on hairpin queue [ upstream commit 468334f07a9298fb4ff05e6cdcbbde64b0da4aa2 ] 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") Signed-off-by: Dariusz Sosnowski Acked-by: Bing Zhao --- 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 8ebe784000..b9d29ca7d5 100644 --- a/drivers/net/mlx5/mlx5_devx.c +++ b/drivers/net/mlx5/mlx5_devx.c @@ -89,4 +89,6 @@ mlx5_rxq_obj_modify_rq_vlan_strip(struct mlx5_rxq_priv *rxq, int on) 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 @@ -108,5 +108,5 @@ mlx5_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) 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) { -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:13.289635486 +0100 +++ 0064-net-mlx5-fix-VLAN-stripping-on-hairpin-queue.patch 2025-07-18 20:29:10.964907435 +0100 @@ -1 +1 @@ -From 468334f07a9298fb4ff05e6cdcbbde64b0da4aa2 Mon Sep 17 00:00:00 2001 +From 82d26cdd09f8f0c24f6751f4395b006a798355ba Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 468334f07a9298fb4ff05e6cdcbbde64b0da4aa2 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 9711746edb..6c79a634f9 100644 +index 8ebe784000..b9d29ca7d5 100644