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 B18E2470E5 for ; Thu, 25 Dec 2025 10:23:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9DCDB40B9C; Thu, 25 Dec 2025 10:22:54 +0100 (CET) Received: from CH1PR05CU001.outbound.protection.outlook.com (mail-northcentralusazon11010065.outbound.protection.outlook.com [52.101.193.65]) by mails.dpdk.org (Postfix) with ESMTP id AAD3340DCB for ; Thu, 25 Dec 2025 10:22:52 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vwhoyXo9MAE/LmpDkJzwMd9T20Gb/5JeIa6Xt8LgRO4siX45q4TM6RrAB547MwOSUILiZ9O0vPGsMhKLpRqDv8sb3JbasoWVaQ052ZY/EOq/JI8htvCFRIZMt9hqIe92T7tUZe/DlHBJUjjMw04bwLAzGAv8axEWb3xUStdSO7U+XomQiyPoz3CdH0tMlfPYvBvyuHRZmOEot1jY2lIycKB31gd4CITf8nGOywzxPe+Gl410gfwjTnbaW6Z8rIoZwizuEmJXKxkXrg9ijSppoHIN5zniPOv5QmtbtGuQ5/bwXtcDYdVB36e0zPWEJm9dXXQpbqU70ujDviAIgP32Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SbsGTZl6A9pfKkQ8HKk9+os2B15PQg6/Yfl2/HqKdkE=; b=rUgDxFSPyTlF0fBwGCfsYjY896O+IuwNgiCgw11OQoSVsHITvnteRLOnulNcSUZDDBZgWC9txOisXqyWhPb6ZR+6r4knuGlcyjA7H9gv+mC8YTed8gFiIsyDoXmCSvkTwm1fKmSPJW0qadI4hSTqdsT+qE/SqOLC2Qh3wwQbBUBZYLkF8VazTCcB/nGn6pCJtoKDRiSCBVXht8rSAzkmLY4fsMSk2aAHqxcHgRs2Fbsemy5Pg0mSsy08JHWaxDvVFP9xdfhp1vUBi1egqtduLjk2GejkLSHOsqluzwJlAoouA3HT/Ih2PgYWFRuTTSb5aVgvrU7OULoU4pIQftl9Tw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=trustnetic.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SbsGTZl6A9pfKkQ8HKk9+os2B15PQg6/Yfl2/HqKdkE=; b=fAI6yQVy2I/3t1zYltbXnerZEPKUbiWtd+X5IgAhEKrMaUIj09oRq0qfJkRu61wJbSwdaKWRXkKHdYfPMNQz038gkzeH2RCfmGzKeHASI5De/HMx9wZTVZwVDaZ12pPR4CFhXRGwOaZLLpXAWTO0h6k66kJlZKNlBR1d4Y/sTpRB0ljuK3qrtXbvHhHnz9KyUYfYcJVLJTrU4QNNpH0idfhZArdXOhgZF6ebFUMOYsvFv28r1hhxHoOu7VLOXakI9Xz3p0pRCKo5et/1SkYfjtGCZcQt6ENOIQAx4NarEKCkB8OUhv+ihUJbiCV2QgO5G3WnOkWEp3kBLWqwmWbO/A== Received: from CH0P221CA0016.NAMP221.PROD.OUTLOOK.COM (2603:10b6:610:11c::18) by PH7PR12MB7817.namprd12.prod.outlook.com (2603:10b6:510:279::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.11; Thu, 25 Dec 2025 09:22:48 +0000 Received: from CH2PEPF00000141.namprd02.prod.outlook.com (2603:10b6:610:11c:cafe::d0) by CH0P221CA0016.outlook.office365.com (2603:10b6:610:11c::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9456.11 via Frontend Transport; Thu, 25 Dec 2025 09:22:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CH2PEPF00000141.mail.protection.outlook.com (10.167.244.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.9 via Frontend Transport; Thu, 25 Dec 2025 09:22:47 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 01:22:34 -0800 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 01:22:33 -0800 Received: from nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20 via Frontend Transport; Thu, 25 Dec 2025 01:22:32 -0800 From: Shani Peretz To: Jiawen Wu CC: dpdk stable Subject: patch 'net/txgbe: remove unsupported flow action mark' has been queued to stable release 23.11.6 Date: Thu, 25 Dec 2025 11:18:03 +0200 Message-ID: <20251225091938.345892-42-shperetz@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251225091938.345892-1-shperetz@nvidia.com> References: <20251221145746.763179-93-shperetz@nvidia.com> <20251225091938.345892-1-shperetz@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PEPF00000141:EE_|PH7PR12MB7817:EE_ X-MS-Office365-Filtering-Correlation-Id: 0fbea087-bcc9-4f37-96a2-08de43972b55 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|376014|36860700013|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?pDs7GDFgp1Sj6jdXCH/F9fh467d/fsqCyiQyHeU/u78ns9JXWRstqahsowEv?= =?us-ascii?Q?j6hqLDIuofvPQHy0Slt0ZEjtEBYWDqBraOrF/lOR28/sscoq/o9AETMJy0UW?= =?us-ascii?Q?iGVROhIBaMvCTFYRvRBXonM+WdCOr4jvzsHwwNRlk4TRQXvzWDpJzETk+bOl?= =?us-ascii?Q?b6zshntophMCgktdOGhK7uKOuBX2pMr75ineEc8O3cgm5s4tzdS7Ek02E4Bo?= =?us-ascii?Q?m8F7Nin6+nCSy5WYdqGJRSKeBdykzwDJXxUFAoSeolIqCGbzdbpLEhHKdaRi?= =?us-ascii?Q?o42e164QcIBpwDNddRyK27BtrLLumhxx5zdD88auzSqwI8YCpVwOoAutnsxD?= =?us-ascii?Q?CkR/lcCPYQmo8D/Il6aH+mlAHMMWLCgHTys+ucbjllOdpqZDKch5kSz2vsFv?= =?us-ascii?Q?vjbmQU0TXJ5Pm+yrploFYsw7I4wv55mYs5oigBPEkq3m1tIg6VLv/pGhZOr6?= =?us-ascii?Q?5qoZRUhde97cHeVFMt8m6+oJzoD2sMkw7Ilmb7oVjtowqqsLaTue8hY823J3?= =?us-ascii?Q?1FvYe+YNZ5R9WcLSjisG7C6XuBXJnJbcYv9Ayc2kf/lNZvxUryKPHBInfzcp?= =?us-ascii?Q?PBkzGK3ECYHruzsSIDvT/rb5pDJTXibqj8jnwdPIyIC0bM5WqyjBHAkDD9V/?= =?us-ascii?Q?jOrLcFnaB3DrQnEkApaWeAX6CWUhp29hINB1oxYd4eiUEzz/lcOKm4MuUK4b?= =?us-ascii?Q?oX9AH4GVXTSQrfEEaiVJh9hIBwx9+8rdjA4yYqx59VThOhaMzQxTqnIreZ8W?= =?us-ascii?Q?7ztlfsy+oEmM5FNeyG29oVTOeHbmL0iuWFOHQoNU6BROXvtCc2Own75SavYV?= =?us-ascii?Q?6ZUHbCNyJJZf2BlhAdu/9wzymzuN5cu6VwY2dsfdcsAmnARsnS4xqvVcmsy8?= =?us-ascii?Q?PQaBms4J1AR2nIAnjRL07Fz/0PN2zgefPpVl77Fl+pTUh3dw4EBlry8Tnyxw?= =?us-ascii?Q?LqqKc3pcjEVdriCMAMtR5CadYjxHfl6N2ri9hvKHnys0trehWmoYSitTeBy6?= =?us-ascii?Q?udrUnZZU4xpL4U4irtn/T6cbpy/CW8THWb5+IISJs4p9SxaiA6509VlqFzV7?= =?us-ascii?Q?rlqPsBSpJ0fPP8bl/HHKP+TDlceqP3DpXzwxXLeS5xobOqgTNQuKppzLLWgz?= =?us-ascii?Q?b/Grvax3pdvy9OHbeAaJraQi4Ibq8Sc45z+3bfJn4bRHtpQB1uYzM+g3Kn45?= =?us-ascii?Q?Guf78/ztb0QFyd1WK3VEqp02pjU/Pbqzj0E3jw0fAlgdfQy1d1YeyS8dgVFn?= =?us-ascii?Q?j4ilrOmc/9P4kUoMTqeJun7VysAurHwP8mrx2JFkKTdpY9cKJeqGQh++bzrZ?= =?us-ascii?Q?8vVFCs0u6k78ksxskXv1iJXd+I5SDOweIIyG+kMaBUJci4IK6ZY+z+PBcKFG?= =?us-ascii?Q?Px9y3iNxexLfQauZi8pORx4Z7fZFQgBvyZn6lkULxoo7b9CdMZDhoFI6RF97?= =?us-ascii?Q?bOzKA05pyWW+YVj9b6A1JpyF+mEgHybcy0NSRUKHiiVwXbSAcsN+0hCAW7J5?= =?us-ascii?Q?mOZL0FydN1YlsPw8ccfQIcnO+1SwYGRVUoXprOqoOiWXWnkm/tZEYFRJsRx1?= =?us-ascii?Q?KJicEcNHIIfLTwKR6IDjoBZGksA2darxFUSIf8tt?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(82310400026)(376014)(36860700013)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Dec 2025 09:22:47.7730 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0fbea087-bcc9-4f37-96a2-08de43972b55 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CH2PEPF00000141.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7817 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 23.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/30/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/shanipr/dpdk-stable This queued commit can be viewed at: https://github.com/shanipr/dpdk-stable/commit/76fcd4d084993b841388dbd2a6bd0a3fe3beef95 Thanks. Shani --- >From 76fcd4d084993b841388dbd2a6bd0a3fe3beef95 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Mon, 27 Oct 2025 11:15:42 +0800 Subject: [PATCH] net/txgbe: remove unsupported flow action mark [ upstream commit 7224536b051457ce2a9cfd6e433da9d4a7bc97ac ] Flow action "mark" is not supported, just remove it. Fixes: b973ee26747a ("net/txgbe: parse flow director filter") Signed-off-by: Jiawen Wu --- doc/guides/nics/features/txgbe.ini | 1 - drivers/net/txgbe/txgbe_flow.c | 23 ++--------------------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/doc/guides/nics/features/txgbe.ini b/doc/guides/nics/features/txgbe.ini index be0af3dfad..eda96189d9 100644 --- a/doc/guides/nics/features/txgbe.ini +++ b/doc/guides/nics/features/txgbe.ini @@ -70,7 +70,6 @@ vxlan = Y [rte_flow actions] drop = Y -mark = Y pf = Y queue = Y rss = Y diff --git a/drivers/net/txgbe/txgbe_flow.c b/drivers/net/txgbe/txgbe_flow.c index 160439863a..585882265f 100644 --- a/drivers/net/txgbe/txgbe_flow.c +++ b/drivers/net/txgbe/txgbe_flow.c @@ -1337,7 +1337,6 @@ txgbe_parse_fdir_act_attr(const struct rte_flow_attr *attr, { const struct rte_flow_action *act; const struct rte_flow_action_queue *act_q; - const struct rte_flow_action_mark *mark; /* parse attr */ /* must be input direction */ @@ -1402,10 +1401,9 @@ txgbe_parse_fdir_act_attr(const struct rte_flow_attr *attr, rule->fdirflags = TXGBE_FDIRPICMD_DROP; } - /* check if the next not void item is MARK */ + /* nothing else supported */ act = next_no_void_action(actions, act); - if (act->type != RTE_FLOW_ACTION_TYPE_MARK && - act->type != RTE_FLOW_ACTION_TYPE_END) { + if (act->type != RTE_FLOW_ACTION_TYPE_END) { memset(rule, 0, sizeof(struct txgbe_fdir_rule)); rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, @@ -1415,21 +1413,6 @@ txgbe_parse_fdir_act_attr(const struct rte_flow_attr *attr, rule->soft_id = 0; - if (act->type == RTE_FLOW_ACTION_TYPE_MARK) { - mark = (const struct rte_flow_action_mark *)act->conf; - rule->soft_id = mark->id; - act = next_no_void_action(actions, act); - } - - /* check if the next not void item is END */ - if (act->type != RTE_FLOW_ACTION_TYPE_END) { - memset(rule, 0, sizeof(struct txgbe_fdir_rule)); - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ACTION, - act, "Not supported action."); - return -rte_errno; - } - return 0; } @@ -1541,8 +1524,6 @@ txgbe_fdir_parse_flow_type(struct txgbe_atr_input *input, u8 ptid, bool tun) * The next not void item must be END. * ACTION: * The first not void action should be QUEUE or DROP. - * The second not void optional action should be MARK, - * mark_id is a uint32_t number. * The next not void action should be END. * UDP/TCP/SCTP pattern example: * ITEM Spec Mask -- 2.43.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-12-25 11:16:38.412552477 +0200 +++ 0042-net-txgbe-remove-unsupported-flow-action-mark.patch 2025-12-25 11:16:35.666920000 +0200 @@ -1 +1 @@ -From 7224536b051457ce2a9cfd6e433da9d4a7bc97ac Mon Sep 17 00:00:00 2001 +From 76fcd4d084993b841388dbd2a6bd0a3fe3beef95 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7224536b051457ce2a9cfd6e433da9d4a7bc97ac ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index ef9f0cfa0a..a9f043a04f 100644 +index be0af3dfad..eda96189d9 100644 @@ -21 +22 @@ -@@ -72,7 +72,6 @@ vxlan = Y +@@ -70,7 +70,6 @@ vxlan = Y @@ -30 +31 @@ -index 5647165d52..a97588e57a 100644 +index 160439863a..585882265f 100644 @@ -33 +34 @@ -@@ -1358,7 +1358,6 @@ txgbe_parse_fdir_act_attr(const struct rte_flow_attr *attr, +@@ -1337,7 +1337,6 @@ txgbe_parse_fdir_act_attr(const struct rte_flow_attr *attr, @@ -41 +42 @@ -@@ -1423,10 +1422,9 @@ txgbe_parse_fdir_act_attr(const struct rte_flow_attr *attr, +@@ -1402,10 +1401,9 @@ txgbe_parse_fdir_act_attr(const struct rte_flow_attr *attr, @@ -54 +55 @@ -@@ -1436,21 +1434,6 @@ txgbe_parse_fdir_act_attr(const struct rte_flow_attr *attr, +@@ -1415,21 +1413,6 @@ txgbe_parse_fdir_act_attr(const struct rte_flow_attr *attr, @@ -76 +77 @@ -@@ -1562,8 +1545,6 @@ txgbe_fdir_parse_flow_type(struct txgbe_atr_input *input, u8 ptid, bool tun) +@@ -1541,8 +1524,6 @@ txgbe_fdir_parse_flow_type(struct txgbe_atr_input *input, u8 ptid, bool tun)