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 2328D489EF for ; Mon, 27 Oct 2025 17:21:23 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1D9E040663; Mon, 27 Oct 2025 17:21:23 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id DEE3940655 for ; Mon, 27 Oct 2025 17:21:20 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4770c2cd96fso14057585e9.3 for ; Mon, 27 Oct 2025 09:21:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761582080; x=1762186880; 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=AxYlVUnk99uOvMaQvSCH6zZT/ByCC3a8MUXf5s7NJt4=; b=MSSTtMHP3I+c0kWPuga2QiuVbRh5b++BPgqt2xoAWjHvMr+VdYh7ahm5HKUmrjyLFX 4HKuWFZodZcdoHjPENi6qJGqYXTQ7JoAeUTU/OVSNmCKlSrk96n2K04KwC7qCym6BfP9 zO/qab9TZPXYzoO7apS3geCgDCTXDkFlwxH9IUhEiga/ieWNCvFvSGgzV9xl2TG1TJQZ 6dYm+/CWWF0Toy7gCu7SMPZhtD2DH+pSQn6zLqxrXKeKX2DXBC2x9jwWIXYjH0FuIn1G C4gFLWMWQRizHvjh6WXzhNVZ6AN7Z1J0L/V0wQBvHBkG6L90tC/0VBVSncTTRSTGckJ7 sY2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761582080; x=1762186880; 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=AxYlVUnk99uOvMaQvSCH6zZT/ByCC3a8MUXf5s7NJt4=; b=ErazX+WPEjasdXSyU77Sd0OHCd9bKywcnkCcFyaVtBLQvIk6J1z311zpGkBXGs775u Lg8VXmWbOF2zXmi0C6CPOolzQfQycgrNcs+C1EyYTUAzNWTsSGNPfHZH56hduG1WS/2s oFL/a996NvoAb1q3n3jiZJQNv28fDJh0/1S12H6Lro2dgn4stRqX9jguRIuxCsA/LD7p LfJT+oUFLFgrgfgYjwT7z/wZstCd+9A9gbNIljeNlTF4JfQIBdADlZZhmz3Z47Y6FlPQ DDGXDBBKfeRX6Vn/t1hFkFOtBCtVjX/ToD8CWwAZfjfgbRMZC8ePfMaKcZFwwlOOh/dz 1VAQ== X-Forwarded-Encrypted: i=1; AJvYcCVnjhw/M41+hHPhCyndmCUmIwG2KS6fhMW+pNJuT8zCZLDFPNrwDKADJJOkGHTyLXYdwQoTGBM=@dpdk.org X-Gm-Message-State: AOJu0YxE8zGcY9RWEPsXzjXe02XBf69746OXPT/J8RxKBhuFuTl9I875 KQtwiq2DMvpTtidQpxdeLM1Lu3ifKe/D2YXhn+I+HZ71eYVtB3ocGyUx X-Gm-Gg: ASbGncvDZf4gcAtntHS3+oiT7bW+GYktqEBaTrs5DImO8R5Hfw9hVSBvsG1IMRAzCua OtFkoPYRFdKdFwBFQyC7v7xqXrV3HmSLBojGmhrzcMeevCEpcN+pidqq5Zw3w53oNiNgUeLPhlZ SFl4avMHIvk1rhwXi6dBP7/osAaXG0LhbVTzeqt/C9+kRyM3NOg9BRKdRKfcao+xYDf3r0dtrly f7VWmcoD4+DEwU0+m1bPjVtPaJu8Sh/WSll6Se7FnmZU272i7rYPuVnBu7gmAWX54TtCbQx6A7q AM+KbqjFpLQZDU16H6JKfM+XAIFUfnLeN0m6sQufgecLZoyAwbJaMoaE4/0aacKq/Gj+LG9dFZj fiPa9B2+v2yfQdhtC6g9mZr7gXOLK0qfKt5/yXqPjgjkKWtUdSUdQimf5sr4aQoKL2wwuVtSt2H ZQLTF2Ew== X-Google-Smtp-Source: AGHT+IHazDMR0Ns20DjkgDMstEl2UZZIRtu/H7RDYbobG0o8GfUbXlftMhp4fXmrCfsQ3HglCfC/ZA== X-Received: by 2002:a05:600c:8411:b0:471:7a:791a with SMTP id 5b1f17b1804b1-47717df6c67mr2276935e9.7.1761582080389; Mon, 27 Oct 2025 09:21:20 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:6fc5:c3bc:147e:832c]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-475dd4924e2sm145336075e9.8.2025.10.27.09.21.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Oct 2025 09:21:19 -0700 (PDT) From: luca.boccassi@gmail.com To: Shaiq Wani Cc: Jeff Shaw , Anatoly Burakov , Bruce Richardson , dpdk stable Subject: patch 'net/ice/base: fix adding special words' has been queued to stable release 22.11.11 Date: Mon, 27 Oct 2025 16:19:03 +0000 Message-ID: <20251027162001.3710450-25-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251027162001.3710450-1-luca.boccassi@gmail.com> References: <20251027162001.3710450-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 10/29/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/7d2b27c099024bb4ba0299149fe47fbe6cfa8fa1 Thanks. Luca Boccassi --- >From 7d2b27c099024bb4ba0299149fe47fbe6cfa8fa1 Mon Sep 17 00:00:00 2001 From: Shaiq Wani Date: Tue, 2 Sep 2025 18:26:52 +0100 Subject: [PATCH] net/ice/base: fix adding special words [ upstream commit e563992fba809bcae90b4734f555e354024ec564 ] The function ice_add_special_words() is meant to add special words (such as traffic direction) to the rule. The function that interprets/translates these additional words is ice_get_sw_fv_list(). However, the ice_get_sw_fv_list() is called *before* ice_add_special_words(), so the "special" words weren't added at that point yet, hence they're not translated. This results in the driver ignoring whatever special words that were added. The fix is to call ice_get_sw_fv_list() *after* ice_add_special_words(). Fixes: ed3066a3b1b0 ("net/ice/base: refactor DDP code") Signed-off-by: Jeff Shaw Signed-off-by: Shaiq Wani Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/ice/base/ice_switch.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c index 89270a477d..0ab3abe276 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -7868,10 +7868,6 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, */ ice_get_compat_fv_bitmap(hw, rinfo, fv_bitmap); - status = ice_get_fv(hw, lkup_exts, fv_bitmap, &rm->fv_list); - if (status) - goto err_unroll; - /* Create any special protocol/offset pairs, such as looking at tunnel * bits by extracting metadata */ @@ -7879,6 +7875,10 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, if (status) goto err_free_lkup_exts; + status = ice_get_fv(hw, lkup_exts, fv_bitmap, &rm->fv_list); + if (status) + goto err_unroll; + /* Group match words into recipes using preferred recipe grouping * criteria. */ -- 2.47.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-10-27 15:54:35.797525145 +0000 +++ 0025-net-ice-base-fix-adding-special-words.patch 2025-10-27 15:54:34.795949549 +0000 @@ -1 +1 @@ -From e563992fba809bcae90b4734f555e354024ec564 Mon Sep 17 00:00:00 2001 +From 7d2b27c099024bb4ba0299149fe47fbe6cfa8fa1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e563992fba809bcae90b4734f555e354024ec564 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ - drivers/net/intel/ice/base/ice_switch.c | 8 ++++---- + drivers/net/ice/base/ice_switch.c | 8 ++++---- @@ -27,5 +28,5 @@ -diff --git a/drivers/net/intel/ice/base/ice_switch.c b/drivers/net/intel/ice/base/ice_switch.c -index 54cc2e1c07..f16bec044c 100644 ---- a/drivers/net/intel/ice/base/ice_switch.c -+++ b/drivers/net/intel/ice/base/ice_switch.c -@@ -8287,10 +8287,6 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, +diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c +index 89270a477d..0ab3abe276 100644 +--- a/drivers/net/ice/base/ice_switch.c ++++ b/drivers/net/ice/base/ice_switch.c +@@ -7868,10 +7868,6 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, @@ -35 +36 @@ -- status = ice_get_sw_fv_list(hw, lkup_exts, fv_bitmap, &rm->fv_list); +- status = ice_get_fv(hw, lkup_exts, fv_bitmap, &rm->fv_list); @@ -42 +43 @@ -@@ -8298,6 +8294,10 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, +@@ -7879,6 +7875,10 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, @@ -46 +47 @@ -+ status = ice_get_sw_fv_list(hw, lkup_exts, fv_bitmap, &rm->fv_list); ++ status = ice_get_fv(hw, lkup_exts, fv_bitmap, &rm->fv_list);