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 00685468E4 for ; Thu, 12 Jun 2025 23:10:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EDE2E42E58; Thu, 12 Jun 2025 23:10:04 +0200 (CEST) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mails.dpdk.org (Postfix) with ESMTP id 87C2942E0C for ; Thu, 12 Jun 2025 23:10:03 +0200 (CEST) Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-3a4e742dc97so1726275f8f.0 for ; Thu, 12 Jun 2025 14:10:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749762603; x=1750367403; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=247Wr3mkNRJ5ZKS3TQvDFsz99BLDYlgzkjSgjvRG2wo=; b=IhXLc0hoqZVATJ/+24VBc2OGSon7HNVL8t014U8q+BDo8EwkYny3WeSwFK3BgE0Bmn KcM08cjN7Ad2PXYVTUOgZAiTnNB31+m7traxicfsExcuxKd3ZE0/tNzIaiVupSpKph2K /2Ho1Sy4tmQwuqGPngfHTW4jRSErb53Xy1gomUctnaji0MZ99kCR7KcfFFqd5wokc4EN 8iUpZGtbyIFseaUqDcdCOxOM6TIYvXo4+Udl1F+ZCooBcvSg7eTY43TXQLaowz7jaxLT U0xYcWwTVyDw1jrLK5jOT15YL7/+RUBtS7BszcL6zLaT7/jMPu/cmZawfw4uEq7CF8E4 bXhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749762603; x=1750367403; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=247Wr3mkNRJ5ZKS3TQvDFsz99BLDYlgzkjSgjvRG2wo=; b=T51/M3PuhTwvn91zbgqHkvqkfhvU23yAU+ch+rm92LGEiowuxewFzAGPPKIVOCdpIJ M6Iwh4Unfo1xp4+4zJFNA5QF4atT1aP7ZEalP+04UryNMl41ju4cG6R6cQ03vKRl3LQ5 XonKuH0KygDuigvtW9rPSYf62N38TQFL/eEX4E0FDTWJyrLGCNHkYZDSWkSaln1gVL5S 19i21jIIdkADI+SZaSWl1GI518TJhKxlcnNOe0U2gMZu4AZmL631EGS2Y8WV87J/PD/h GZLtmW9eQocgx8JlyC1wn8H3y9BiOGuA+HRVutz3eFzlbFGy0PwyNWul/NM/o3J0xWq9 gTrA== X-Forwarded-Encrypted: i=1; AJvYcCXNLo/oYcga9861Qrm+5hmmjglMfXiVj1y0Nz8mnejapqlZOK5IWFhJijz6BCiBjLj907WfNm8=@dpdk.org X-Gm-Message-State: AOJu0YwNW9WfXjlL+oXhe0FVO/nx6pWU5egQ/MhdfyOyyPcMtjUfez4n vSG8rmdF1xAF1H0xBkkHQ09/E7fTqeaDAtTNRhUCLpcGn9oAiRk+gHovwTKaV2UF X-Gm-Gg: ASbGncuFv1V0SPLxCbZzWbm7X3o2HU1erH4XVxYMl9fOZxZHaJMs+aSnjM66e/uzalE +/jv9x7kCSxmldpejQW7nDWwFWWPUlz+kK+ByqJOQwPrs8YAvfuf2VJyOD5F4Pb06/VBPjJVNOs LMspEwsUadnnuXgBOrG1WbT9x5b8qyt2UI0gvfmhi04Y6MINsPUwF0YEwEao5nQlWol0OZS9IyO Ocz96XZFRFVHDTgUC2DuYdrDPv3UTbIiRxaOH/E2XtiYpVRun2zrWRTf781wCDP+D6ha4IGwmHV x0fGdME5S9Fwkv/Z37uyk+kXvpX1IXb0PtcilCyhg5cRywntanKCzknUy2ywWCyFsUR+ X-Google-Smtp-Source: AGHT+IGhk4fnPLZACkV5BqBahL2dWu07xvgSAO7CvloUEyPIucseULgDiyyGK/1FtpH00voubkuDnQ== X-Received: by 2002:a05:6000:25c7:b0:3a5:5136:bd25 with SMTP id ffacd0b85a97d-3a56a2bb97dmr50817f8f.1.1749762603071; Thu, 12 Jun 2025 14:10:03 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:f2df:571a:ae4c:bef2]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4532dea1cc5sm33020545e9.16.2025.06.12.14.10.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 14:10:02 -0700 (PDT) From: luca.boccassi@gmail.com To: Dariusz Sosnowski Cc: Bing Zhao , dpdk stable Subject: patch 'net/mlx5: fix VLAN stripping on hairpin queue' has been queued to stable release 22.11.9 Date: Thu, 12 Jun 2025 22:07:02 +0100 Message-ID: <20250612210733.2506558-45-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250612210733.2506558-1-luca.boccassi@gmail.com> References: <20250612210733.2506558-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/e1c3914301a026f18af9180d39bda1f17efd39f6 Thanks. Luca Boccassi --- >From e1c3914301a026f18af9180d39bda1f17efd39f6 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 cca7b86649..b329e40891 100644 --- a/drivers/net/mlx5/mlx5_devx.c +++ b/drivers/net/mlx5/mlx5_devx.c @@ -48,6 +48,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 e7161b66fe..d0459024f1 100644 --- a/drivers/net/mlx5/mlx5_vlan.c +++ b/drivers/net/mlx5/mlx5_vlan.c @@ -108,7 +108,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.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-12 22:06:25.543003170 +0100 +++ 0045-net-mlx5-fix-VLAN-stripping-on-hairpin-queue.patch 2025-06-12 22:06:23.874044722 +0100 @@ -1 +1 @@ -From 468334f07a9298fb4ff05e6cdcbbde64b0da4aa2 Mon Sep 17 00:00:00 2001 +From e1c3914301a026f18af9180d39bda1f17efd39f6 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 cca7b86649..b329e40891 100644 @@ -28 +29 @@ -@@ -88,6 +88,8 @@ mlx5_rxq_obj_modify_rq_vlan_strip(struct mlx5_rxq_priv *rxq, int on) +@@ -48,6 +48,8 @@ mlx5_rxq_obj_modify_rq_vlan_strip(struct mlx5_rxq_priv *rxq, int on) @@ -38 +39 @@ -index 43a314a679..7c7ac78dfe 100644 +index e7161b66fe..d0459024f1 100644 @@ -41 +42 @@ -@@ -107,7 +107,7 @@ mlx5_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) +@@ -108,7 +108,7 @@ mlx5_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on)