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 A707F468E4 for ; Thu, 12 Jun 2025 23:08:39 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A202442E02; Thu, 12 Jun 2025 23:08:39 +0200 (CEST) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id BCF6F42E02 for ; Thu, 12 Jun 2025 23:08:37 +0200 (CEST) Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-3a525eee2e3so1209104f8f.2 for ; Thu, 12 Jun 2025 14:08:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749762517; x=1750367317; 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=SLvr4ENZEqqp+Xa/huK6CQsYBeUybORb1oFTMJqJAeY=; b=N9JR6kgt0rGAYWhz3kVv1gOeRSMJ34vRTbXfwRMotddOX8u9vT9tDgy83U7EEHaBU8 C7NptCCXbtTkQTSr0dXglhx7YE+uLRO6LPjsLhYfGqWl/YiLJ02MRrtQIYoDfDan8OH5 /3RUa06J81wEws64R1bKl8yHo57ul4V3I3Ag3fx/1IXRVCs26gaELBba7WHxNWZu272L gPsbnO4y+LBRT+5qCnTjev1S14oGZkyV5wt1N3+9c0nEOVx6U/H9agSXO5jt132TC/8X NMRgnLAtIMp8Kt5AJiOUIWkzpFg5C9Z3WScCQ/3AVLjUYKRzAj7VhZjMrezlWi7ws6GV /vOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749762517; x=1750367317; 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=SLvr4ENZEqqp+Xa/huK6CQsYBeUybORb1oFTMJqJAeY=; b=L0k1e2BV1afe0/3zNmHsmxeNB9GxTu+uR07BOYvvBFmSy38anKdiGywmWP5gY3wCvS l8L7aHLyKxP/1qQsLFtOFY1zWtmv3HB7gvwMbjxwLJwn2zAHewsUkkJiO9v2nqY57ZEH m6qG7viG1DeGxbz96frOeBgp+s+gKJvIYDpIEt+YpX5BSv4qyz3b1FS6Ztg7rC0Nhy2N xECYitCnGeIvgfS1JbCV3Oaf27NsIjsisbMO2j0B8rZb/HTM8ZXOyNtTly6U3Hew9uJy dF3VzLi1T+GsAFH4SxvTiU2oV/Zc9qyj0XOxTN4Qxy/I4WmPPQc92mJIrOllD6k2rjau nZVA== X-Forwarded-Encrypted: i=1; AJvYcCVAiCn7P6PkV18CMoTL51oIv2DR8IXEFAEXie81h2Dbb0wreE1YLNJKmowWbqmgP+NxChsg4CQ=@dpdk.org X-Gm-Message-State: AOJu0YxuCn6BwgM/oUgvGLNvKge3DHGAURUzYT1/qKyhtoP8bn+rChHT 7ZUgDVMTUGdvaCJjFlZYjmjWtJxhomcQw9B6mqkjPYisccScWDJqUPA94TNouRS4 X-Gm-Gg: ASbGnct73FcqutX7BpiyQB6y4clKegDBQbee2z282dtHejZ5BOR0EivEzpjfYF6ott5 PgoTp81DNo2WdVMVsXg7CRcmx6HOWgp7LYjr6wnjbQw5WSEyH6LOJLJnRL2D0A727pxfm/1O6aS qi7vi4/GpKOOE6o8yzsaD2KgNH7N87Q5HdGfAmqFtck0yDL9QPotETfNd6Wr3esGrf1XRL63d97 L6GPgm0sAm530/THW8EA+rIsuvrqEE8p9xC+hbh5wLHPjWviu9L9LbRBalaklLn2qMNXU7SBRO1 HJNvh/+6vP7xye4LbLaQkki3ZHkhenGiYZYMI0K8IS9V39GRkzmgsGa9doeK16Ekkrnh X-Google-Smtp-Source: AGHT+IHAyQQu4QTe9l/B2DP8JnI6qbDTP7SeIplo9WRQTw4UJr+N7FAYAL/rq2t2kFTzUMABd48tzQ== X-Received: by 2002:a05:6000:240e:b0:3a5:39be:c926 with SMTP id ffacd0b85a97d-3a56876b11cmr545158f8f.32.1749762517165; Thu, 12 Jun 2025 14:08:37 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:f2df:571a:ae4c:bef2]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a568a60d0fsm393934f8f.22.2025.06.12.14.08.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 14:08:36 -0700 (PDT) From: luca.boccassi@gmail.com To: Dariusz Sosnowski Cc: Bing Zhao , dpdk stable Subject: patch 'net/mlx5: fix header modify action on group 0' has been queued to stable release 22.11.9 Date: Thu, 12 Jun 2025 22:06:36 +0100 Message-ID: <20250612210733.2506558-19-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/0f7cba98cac32c3592272d5d493398df38cfa538 Thanks. Luca Boccassi --- >From 0f7cba98cac32c3592272d5d493398df38cfa538 Mon Sep 17 00:00:00 2001 From: Dariusz Sosnowski Date: Fri, 25 Apr 2025 21:32:57 +0200 Subject: [PATCH] net/mlx5: fix header modify action on group 0 [ upstream commit f1ebb26d0d9388b6df65d493b06ce3b55adfb893 ] HW modify header commands generated for multiple modify field flow actions, which modify/access the same packet fields do not have to be separated by NOPs when used on group 0. This is because: - On group > 0, HW uses Modify Header Pattern objects which require NOP explicitly. - On group 0, modify field action is implemented using Modify Header Context object managed by FW. FW inserts requires NOPs internally. mlx5 PMD inserted NOP always, which caused flow/table creation failures on group 0 flow rules. This patch addresses that. Fixes: 0f4aa72b99da ("net/mlx5: support flow modify field with HWS") Signed-off-by: Dariusz Sosnowski Acked-by: Bing Zhao --- drivers/net/mlx5/mlx5_flow_hw.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 0f36700143..7040dd863d 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -856,7 +856,8 @@ flow_hw_action_modify_field_is_shared(const struct rte_flow_action *action, static __rte_always_inline bool flow_hw_should_insert_nop(const struct mlx5_hw_modify_header_action *mhdr, - const struct mlx5_modification_cmd *cmd) + const struct mlx5_modification_cmd *cmd, + const struct rte_flow_attr *attr) { struct mlx5_modification_cmd last_cmd = { { 0 } }; struct mlx5_modification_cmd new_cmd = { { 0 } }; @@ -864,6 +865,15 @@ flow_hw_should_insert_nop(const struct mlx5_hw_modify_header_action *mhdr, unsigned int last_type; bool should_insert = false; + /* + * Modify header action list does not require NOPs in root table, + * because different type of underlying object is used: + * - in root table - MODIFY_HEADER_CONTEXT (does not require NOPs), + * - in non-root - either inline modify action or based on Modify Header Pattern + * (which requires NOPs). + */ + if (attr->group == 0) + return false; if (cmds_num == 0) return false; last_cmd = *(&mhdr->mhdr_cmds[cmds_num - 1]); @@ -939,7 +949,8 @@ flow_hw_mhdr_cmd_append(struct mlx5_hw_modify_header_action *mhdr, static __rte_always_inline int flow_hw_converted_mhdr_cmds_append(struct mlx5_hw_modify_header_action *mhdr, - struct mlx5_flow_dv_modify_hdr_resource *resource) + struct mlx5_flow_dv_modify_hdr_resource *resource, + const struct rte_flow_attr *attr) { uint32_t idx; int ret; @@ -947,7 +958,7 @@ flow_hw_converted_mhdr_cmds_append(struct mlx5_hw_modify_header_action *mhdr, for (idx = 0; idx < resource->actions_num; ++idx) { struct mlx5_modification_cmd *src = &resource->actions[idx]; - if (flow_hw_should_insert_nop(mhdr, src)) { + if (flow_hw_should_insert_nop(mhdr, src, attr)) { ret = flow_hw_mhdr_cmd_nop_append(mhdr); if (ret) return ret; @@ -1057,14 +1068,14 @@ flow_hw_modify_field_compile(struct rte_eth_dev *dev, * This NOP command will not be a part of action's command range used to update commands * on rule creation. */ - if (flow_hw_should_insert_nop(mhdr, &resource->actions[0])) { + if (flow_hw_should_insert_nop(mhdr, &resource->actions[0], attr)) { ret = flow_hw_mhdr_cmd_nop_append(mhdr); if (ret) return rte_flow_error_set(error, ret, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "too many modify field operations specified"); } cmds_start = mhdr->mhdr_cmds_num; - ret = flow_hw_converted_mhdr_cmds_append(mhdr, resource); + ret = flow_hw_converted_mhdr_cmds_append(mhdr, resource, attr); if (ret) return rte_flow_error_set(error, ret, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "too many modify field operations specified"); -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-12 22:06:24.592330271 +0100 +++ 0019-net-mlx5-fix-header-modify-action-on-group-0.patch 2025-06-12 22:06:23.814043456 +0100 @@ -1 +1 @@ -From f1ebb26d0d9388b6df65d493b06ce3b55adfb893 Mon Sep 17 00:00:00 2001 +From 0f7cba98cac32c3592272d5d493398df38cfa538 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f1ebb26d0d9388b6df65d493b06ce3b55adfb893 ] + @@ -22 +23,0 @@ -Cc: stable@dpdk.org @@ -31 +32 @@ -index 2f7b769aec..cbe6bd3ef9 100644 +index 0f36700143..7040dd863d 100644 @@ -34 +35 @@ -@@ -1422,7 +1422,8 @@ flow_hw_action_modify_field_is_shared(const struct rte_flow_action *action, +@@ -856,7 +856,8 @@ flow_hw_action_modify_field_is_shared(const struct rte_flow_action *action, @@ -44 +45 @@ -@@ -1430,6 +1431,15 @@ flow_hw_should_insert_nop(const struct mlx5_hw_modify_header_action *mhdr, +@@ -864,6 +865,15 @@ flow_hw_should_insert_nop(const struct mlx5_hw_modify_header_action *mhdr, @@ -60 +61 @@ -@@ -1508,7 +1518,8 @@ flow_hw_mhdr_cmd_append(struct mlx5_hw_modify_header_action *mhdr, +@@ -939,7 +949,8 @@ flow_hw_mhdr_cmd_append(struct mlx5_hw_modify_header_action *mhdr, @@ -70 +71 @@ -@@ -1516,7 +1527,7 @@ flow_hw_converted_mhdr_cmds_append(struct mlx5_hw_modify_header_action *mhdr, +@@ -947,7 +958,7 @@ flow_hw_converted_mhdr_cmds_append(struct mlx5_hw_modify_header_action *mhdr, @@ -79 +80 @@ -@@ -1639,14 +1650,14 @@ flow_hw_modify_field_compile(struct rte_eth_dev *dev, +@@ -1057,14 +1068,14 @@ flow_hw_modify_field_compile(struct rte_eth_dev *dev,