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 88A4C48AEF for ; Wed, 12 Nov 2025 17:54:39 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8293C402A0; Wed, 12 Nov 2025 17:54:39 +0100 (CET) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mails.dpdk.org (Postfix) with ESMTP id ACB01402A0 for ; Wed, 12 Nov 2025 17:54:38 +0100 (CET) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-477549b3082so8665115e9.0 for ; Wed, 12 Nov 2025 08:54:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762966478; x=1763571278; 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=yGBcaFNZIRGtUQQnjI0ajDDUnuGuMUVymUmiERUKIcI=; b=aFCz11tUuA9vI7PvCEjDIMVJl7omku9FJ/fxUAl966dhDQknCqglMH76wvtQBTzxRk JNXzvBQmm0jQ47/kCUMC7Fizzs5Ktklp8UZ/rOA/hyg6kdRAEuCGXL6I9U0I8KFnkySX x+Mh5N7ZgqRXOmgyxuMSVhxk9jNWLiyTZV7SsfjqHdT2VqUY3lIFYPig40bT2V7olJp6 7unIcBZkgcMBeoqmWG3I4xGweoOu5kqwKYI0P8/sVlfkagbY7HjK0wAUmqB2lh8enpEr 9EZi+6ikKdG5My0rkE+ZAmMDba5yHWKzY3UIFKeoxyOyusTzDUUHYuWt8Y0SN9HI7UQz mcIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762966478; x=1763571278; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=yGBcaFNZIRGtUQQnjI0ajDDUnuGuMUVymUmiERUKIcI=; b=lfLznHv+OMu4PC4zOpYLNWc3hFR/TCyy3sXAiNRdrtuLzVEDFOVHOm7HBI9IIf1AQK G0wUc18LE50UGaLNmKn5O+kZiqCfILzt6wNePkvsTEQF1zTsG4Fr079cwRA+jAUGnnp0 wxyVipq+R0/yhMmAXjH/VzpfgdmsOHJ40bMpKdx0PwrVVv5AChBNkmL2fH+c0g5OTVLp DoTWfsiB9i677l5RngqGIevdyoP8hrfHEd7OUBNYbR55P6FJZicb+e93Zybx0b4eY3pi BALqpOUSESRcHQTfcEvsAzCZveCf6olngdEldudP3jV6YuXcy3PJAjWnHFysCGEAQfqx xSqQ== X-Gm-Message-State: AOJu0YxbF247J3XaTL2TWV6QgPIP9Sj+n2dCxzKfJqeRLoVQSE/uEZin Lqp8IZPIRAIxShofzzDqdUDJ/v12w7Kb4tmBDzoVZPHVpDteaZnHr/mJFO/i4A== X-Gm-Gg: ASbGncvbagaoccDqdwXm7dtiBpm5+ChmJpEKu/IsQEpmITjwVwfg+No1Brbc+YxfBe9 IMSxkaJdIg3YVnLNHAf1STA7jAPcuYSuB/hOKvZfD6Uf9UMtOOkDb9eIPNyF5Thu8lctIbbBFzi emQqGPc2OXkfGUIzGNuoNABjprJPZvvWXtAY9+xwcnbAHAj7KT4j3pimaSBVY17LfeD5GcD3zBe /Z9rmTzJxN80TzyL4D9UHQ48pRsNsBZTTcWGjA2Kcnb4rqqQ2G6Xa5LyFvyxm1wlYMpPCH8m572 XOUSi4YucXw6RGzdU1CRTQYpES+lW7873UEUvRJu1w4MsbZTpfQe3+LxhBrDsMgwIWkgBf2OcqJ Y2rqNVoJHk76Duhb16+V6yjFgTkQqO7kswzGSkLiPeICdgm5/Q1bodAlODVrRtCkHIatJKcWO+Y P3gl9mXA== X-Google-Smtp-Source: AGHT+IE4p+EDMsYp23JGPGgAPnddcrwFr0VZ7Grrv/ahd3s6yWHq9EncENoy7bei1Iuc93uyIbWRKw== X-Received: by 2002:a05:600c:1f0d:b0:45d:f83b:96aa with SMTP id 5b1f17b1804b1-47787045016mr30418805e9.7.1762966478200; Wed, 12 Nov 2025 08:54:38 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:a397:14bc:5982:5745]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-47787e953e3sm44065015e9.14.2025.11.12.08.54.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Nov 2025 08:54:37 -0800 (PST) From: luca.boccassi@gmail.com To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/txgbe: remove unsupported flow action mark' has been queued to stable release 22.11.11 Date: Wed, 12 Nov 2025 16:52:43 +0000 Message-ID: <20251112165308.1618107-29-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251112165308.1618107-1-luca.boccassi@gmail.com> References: <20251027162001.3710450-79-luca.boccassi@gmail.com> <20251112165308.1618107-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.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/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/de2218fdbe114ab09dd4003e2ad2da2c64147fc8 Thanks. Luca Boccassi --- >From de2218fdbe114ab09dd4003e2ad2da2c64147fc8 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 ef9f0cfa0a..a9f043a04f 100644 --- a/doc/guides/nics/features/txgbe.ini +++ b/doc/guides/nics/features/txgbe.ini @@ -72,7 +72,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 074bbe6aab..a227944458 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.47.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-11-12 16:20:42.051101522 +0000 +++ 0029-net-txgbe-remove-unsupported-flow-action-mark.patch 2025-11-12 16:20:40.927716946 +0000 @@ -1 +1 @@ -From 7224536b051457ce2a9cfd6e433da9d4a7bc97ac Mon Sep 17 00:00:00 2001 +From de2218fdbe114ab09dd4003e2ad2da2c64147fc8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7224536b051457ce2a9cfd6e433da9d4a7bc97ac ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -30 +31 @@ -index 5647165d52..a97588e57a 100644 +index 074bbe6aab..a227944458 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)