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 6D82846B72 for ; Mon, 14 Jul 2025 17:13:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 68D6E4042C; Mon, 14 Jul 2025 17:13:02 +0200 (CEST) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id B7A4C400D5 for ; Mon, 14 Jul 2025 17:13:01 +0200 (CEST) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-455e6fb8057so31364415e9.3 for ; Mon, 14 Jul 2025 08:13:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752505981; x=1753110781; 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=l8jU1Jn67zyiy3RNLGpYrZJeDR8IxapdBawrOFpsajY=; b=dYcYST9zf+hnDbcjryZUQcLDfXbAD2XQy30Un0kP7rxCV/FCR0bBFYKE1NZLkznQ04 oY2xV9JQD3hSbh4VcLVOVik2Yfloxmwf+ekA1T+Mp2uqQi1QmAFbzo4QSDXGgUZAbgtF kW/NB5TxMtBzValUAlBL2GdGIAOw06kJXlmRjKdPAFOV0YTiHAbn8hXgeY5iQOpPx7qc /WGEsU1owoHcasHxGSpKWuvpIa8LeYLg+sSq8tGrdcvKnsRJuVPwX/r5AvVqjmo8KBww uvoO6ZqgEzZT81B2lhS6518L2KHvR5AZG4540jETp8UeIabcSv+Guq7EolnPaZLUbDWn YvTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752505981; x=1753110781; 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=l8jU1Jn67zyiy3RNLGpYrZJeDR8IxapdBawrOFpsajY=; b=aYK1DBc3U3hfNBVVOAORBQDFw76CfIAY3KPbAk6DxxUp5pL/MxaZr2xh5FDPhNXioj cJYQ8FOcsFbhNC6DsRuEsmyap1gQrGmDnsZmHAF77/mtEa3zUY3pKyv3RV6x83s6raJO rtKKNkCG/OCMj9TDHcn4vFQmjA0cCuKm5MUpByERgXPqnPfiur8YqqkA2GAlhZfUBzKr vzD++/AIW77mc3OWVZpvcFoV0XuS1JqKnw0MNgJi/GT5v05XlcWW4hCMVyqR44iGqLkm ejc7SpG6Ox22M4cI0fvTSdBzUdURHJSAM0Yr9oJf5REyp68KBKwnstY+ZaVH4yjap58p qN7w== X-Forwarded-Encrypted: i=1; AJvYcCXeBbm2smVy3ve4dbyNDY6T3zPGj9eDLehMLd0pmRmDvXtDiwZS0PfGDx0Ju29Ifflm923j2pk=@dpdk.org X-Gm-Message-State: AOJu0Yy0iMb8w4eQ9mdovZ20BtNuOBQArn9jK+oNP3xeNEKp5d2Q/BCt 4jB1nYKMBoukABCJ26uGtyeoQAJmFuhEVFt9z6mE50ysf3+KAt5XnVevzTU27QKH X-Gm-Gg: ASbGncsMUjdVTbNNiA5FJfKMVkOuaVUbIcHzQDNkAgs+W524uPXokP9KHkjQSD3a4lh PfCl5lLzX63BoztuoKlz4r5qsolWKC9M4iL62Il2sN4qCX66p2mFMcOGvbyry9VqkgZo8qdBY8Z 5RT1eytTGh0gMSnJGN1BLJ11sqVTVZMMzGfasm8gu4adPdcO7JCslt3KzuqNCpFznQmd5JgVHuA ssz868mfBNY9yvvd1DQ8WZo55IuF/qifjMmMy8DrbgcTyMvxO3ORj3WMmd8ag8wFr1wOKavOcPV y6qXuczCoLlQ2YbXF9xy4nPn44OW0+gOLF58EGR2RPOYYdLCMXdocjoK+N5nHll1LUl302W9K2h yx11+puUWRsPaJHoHRAs8xb1Rxxlk X-Google-Smtp-Source: AGHT+IGGdW4Sdy3E//Q9F/z7jWm/PcQ9GaCl9AwAQhuz/an4UFzkzcFBgbcJplW3XJuBXewjYqH8cA== X-Received: by 2002:a05:6000:2388:b0:3a6:d95c:5db with SMTP id ffacd0b85a97d-3b5f2dd4bb2mr10683434f8f.26.1752505981141; Mon, 14 Jul 2025 08:13:01 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:a923:75e5:f97f:ef33]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3b5e8dc1fd7sm12489278f8f.26.2025.07.14.08.13.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jul 2025 08:13:00 -0700 (PDT) From: luca.boccassi@gmail.com To: Dariusz Sosnowski Cc: Bing Zhao , dpdk stable Subject: patch 'net/mlx5: fix masked indirect age action validation' has been queued to stable release 22.11.9 Date: Mon, 14 Jul 2025 16:11:13 +0100 Message-ID: <20250714151121.219866-18-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250714151121.219866-1-luca.boccassi@gmail.com> References: <20250630122556.1133654-23-luca.boccassi@gmail.com> <20250714151121.219866-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 07/16/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/d8701243cb9e7e49a8ef75e3ea2e8d3cae10827e Thanks. Luca Boccassi --- >From d8701243cb9e7e49a8ef75e3ea2e8d3cae10827e Mon Sep 17 00:00:00 2001 From: Dariusz Sosnowski Date: Tue, 1 Jul 2025 12:32:53 +0200 Subject: [PATCH] net/mlx5: fix masked indirect age action validation [ upstream commit 6ed1ce029d6bd89a47968cd92d99cdf7ece8ac96 ] Masked indirect age flow action is not supported in actions templates. Up to this patch, this case was checked only through debug assertion. As a side effect, in a build without assertions, this lead to a segfault on the attempt to create a table using actions template with masked indirect age action. To prevent the segfault, this patch adds relevant validation to actions template creation and removes the debug assertion which now becomes redundant. Fixes: 04a4de756e14 ("net/mlx5: support flow age action with HWS") Signed-off-by: Dariusz Sosnowski Acked-by: Bing Zhao --- drivers/net/mlx5/mlx5_flow_hw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index ec44151302..a2cd9b8b5c 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -794,10 +794,6 @@ flow_hw_shared_action_translate(struct rte_eth_dev *dev, return -1; } break; - case MLX5_INDIRECT_ACTION_TYPE_AGE: - /* Not supported, prevent by validate function. */ - MLX5_ASSERT(0); - break; case MLX5_INDIRECT_ACTION_TYPE_CT: if (flow_hw_ct_compile(dev, MLX5_HW_INV_QUEUE, idx, &acts->rule_acts[action_dst])) { @@ -3705,6 +3701,10 @@ flow_hw_validate_action_indirect(struct rte_eth_dev *dev, *action_flags |= MLX5_FLOW_ACTION_INDIRECT_COUNT; break; case RTE_FLOW_ACTION_TYPE_AGE: + if (action->conf && mask->conf) + return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, + action, + "Fixed indirect age action is not supported"); ret = flow_hw_validate_action_age(dev, action, *action_flags, *fixed_cnt, error); if (ret < 0) -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-14 16:09:41.367740217 +0100 +++ 0018-net-mlx5-fix-masked-indirect-age-action-validation.patch 2025-07-14 16:09:40.720449163 +0100 @@ -1 +1 @@ -From 6ed1ce029d6bd89a47968cd92d99cdf7ece8ac96 Mon Sep 17 00:00:00 2001 +From d8701243cb9e7e49a8ef75e3ea2e8d3cae10827e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6ed1ce029d6bd89a47968cd92d99cdf7ece8ac96 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 4ecc2bacfc..6dc16f80d3 100644 +index ec44151302..a2cd9b8b5c 100644 @@ -29 +30 @@ -@@ -1351,10 +1351,6 @@ flow_hw_shared_action_translate(struct rte_eth_dev *dev, +@@ -794,10 +794,6 @@ flow_hw_shared_action_translate(struct rte_eth_dev *dev, @@ -40 +41 @@ -@@ -6405,6 +6401,10 @@ flow_hw_validate_action_indirect(struct rte_eth_dev *dev, +@@ -3705,6 +3701,10 @@ flow_hw_validate_action_indirect(struct rte_eth_dev *dev,