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 2B99A46BAE for ; Fri, 18 Jul 2025 21:36:38 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 263D840611; Fri, 18 Jul 2025 21:36:38 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id D582340E2E for ; Fri, 18 Jul 2025 21:36:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867396; 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=TApfVAWNZ3ost4Wa0l/MI+pqwD7E8VATZakp7f+2DNI=; b=fgxRV9lJbd5CTguM+wc4vvhLTybZ+KB82QVl/rw023jn6TKKYeauhMkOn2/l8WEC20e+jw yc3H7PZbuyaroDyQVoyWPrPMrMSWatCWFz8tvbn5X2ooPO/+jcKwrUvrsMePz8+ddtrmIO YweU08jCO0/hk7xD1VEi3y3ABjtd+DM= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-558-yF59Hn6yP5iNB5a5Jc94aQ-1; Fri, 18 Jul 2025 15:36:33 -0400 X-MC-Unique: yF59Hn6yP5iNB5a5Jc94aQ-1 X-Mimecast-MFC-AGG-ID: yF59Hn6yP5iNB5a5Jc94aQ_1752867392 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3EED5180048E; Fri, 18 Jul 2025 19:36:32 +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 AAA2818003FC; Fri, 18 Jul 2025 19:36:30 +0000 (UTC) From: Kevin Traynor To: Gregory Etelson Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix access to auxiliary flow data' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:30:38 +0100 Message-ID: <20250718193247.1008129-104-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: IUKCHtdmFqec0Yn3ASx2KkTi-Xtt5SiQ0-6v27LkIag_1752867392 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/dfaef2bbf027ae77412ea60834d66ad4a13d051b Thanks. Kevin --- >From dfaef2bbf027ae77412ea60834d66ad4a13d051b Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Wed, 25 Jun 2025 12:43:39 +0300 Subject: [PATCH] net/mlx5: fix access to auxiliary flow data [ upstream commit 92a5b06c150ec5c28d7fb734d1ea1e7d5b4cb26f ] The MLX5 PMD keeps non-essential flow data in an auxiliary structure to reduce flow L1 cache usage. The auxiliary data location differs in template and non-template flows. The PMD tried to fetch flow template table from a non-template flow object and accessed stale memory address. This change separates the `mlx5_flow_hw_aux()` implementation for async template and sync non-template flows. Fixes: 27d171b88031 ("net/mlx5: abstract flow action and enable reconfigure") Signed-off-by: Gregory Etelson Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_hw.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index f60b7b0cc0..6781bad9b7 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -130,10 +130,14 @@ mlx5_flow_hw_aux(uint16_t port_id, struct rte_flow_hw *flow) struct rte_flow_template_table *table = flow->table; - if (rte_flow_template_table_resizable(port_id, &table->cfg.attr)) { - size_t offset = sizeof(struct rte_flow_hw) + mlx5dr_rule_get_handle_size(); + if (!flow->nt_rule) { + if (rte_flow_template_table_resizable(port_id, &table->cfg.attr)) { + size_t offset = sizeof(struct rte_flow_hw) + mlx5dr_rule_get_handle_size(); - return RTE_PTR_ADD(flow, offset); + return RTE_PTR_ADD(flow, offset); + } else { + return &table->flow_aux[flow->idx - 1]; + } } else { - return ((flow->nt_rule) ? flow->nt2hws->flow_aux : &table->flow_aux[flow->idx - 1]); + return flow->nt2hws->flow_aux; } } -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:14.603789381 +0100 +++ 0104-net-mlx5-fix-access-to-auxiliary-flow-data.patch 2025-07-18 20:29:11.026907625 +0100 @@ -1 +1 @@ -From 92a5b06c150ec5c28d7fb734d1ea1e7d5b4cb26f Mon Sep 17 00:00:00 2001 +From dfaef2bbf027ae77412ea60834d66ad4a13d051b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 92a5b06c150ec5c28d7fb734d1ea1e7d5b4cb26f ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index f7f85effba..a211b8ac52 100644 +index f60b7b0cc0..6781bad9b7 100644