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 33F4B48A44 for ; Fri, 31 Oct 2025 15:37:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2CC8A4066F; Fri, 31 Oct 2025 15:37:18 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 9D7FE40150 for ; Fri, 31 Oct 2025 15:37:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761921435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bIRoQzgsXmGIIw8xWRcjjjnsvORJHVKUXHddTmxZ9W0=; b=jEc3l7FnfOgJ81AU2S9zGFBbeSpoSims6aHQQg/I/ux+GSZbFrdGapMIf81OJvG7+c+A8m MVK6m8F6gHMGnzmKghk7H7apksBZ2YJcdLBhklqn/5nMGSmpukiIZ36gzfjDSl0XcGZWUG QUGm3ujI5i9vQxZ9eDHsHHWXvFaGIzk= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-261-oGrkyA2SOBy74TiUl0S_qQ-1; Fri, 31 Oct 2025 10:37:12 -0400 X-MC-Unique: oGrkyA2SOBy74TiUl0S_qQ-1 X-Mimecast-MFC-AGG-ID: oGrkyA2SOBy74TiUl0S_qQ_1761921431 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5A8851800D81; Fri, 31 Oct 2025 14:37:11 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.50]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 26F59180044F; Fri, 31 Oct 2025 14:37:08 +0000 (UTC) From: Kevin Traynor 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 24.11.4 Date: Fri, 31 Oct 2025 14:32:50 +0000 Message-ID: <20251031143421.324432-48-ktraynor@redhat.com> In-Reply-To: <20251031143421.324432-1-ktraynor@redhat.com> References: <20251031143421.324432-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: SipmP9M8FA3dKrYV-0CjFwNdgZfUPOQFhAM5QszsnjA_1761921431 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.11.4 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/05/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/f0513d9c9a93f1d8a33f42c5960b4763d9b92f90 Thanks. Kevin --- >From f0513d9c9a93f1d8a33f42c5960b4763d9b92f90 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 a3786961e6..65b97f6b11 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -8237,8 +8237,4 @@ 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_sw_fv_list(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 @@ -8248,4 +8244,8 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, goto err_free_lkup_exts; + status = ice_get_sw_fv_list(hw, lkup_exts, fv_bitmap, &rm->fv_list); + if (status) + goto err_unroll; + /* Group match words into recipes using preferred recipe grouping * criteria. -- 2.51.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-10-31 13:53:53.775678760 +0000 +++ 0048-net-ice-base-fix-adding-special-words.patch 2025-10-31 13:53:52.156523743 +0000 @@ -1 +1 @@ -From e563992fba809bcae90b4734f555e354024ec564 Mon Sep 17 00:00:00 2001 +From f0513d9c9a93f1d8a33f42c5960b4763d9b92f90 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 -@@ -8288,8 +8288,4 @@ 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 a3786961e6..65b97f6b11 100644 +--- a/drivers/net/ice/base/ice_switch.c ++++ b/drivers/net/ice/base/ice_switch.c +@@ -8237,8 +8237,4 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, @@ -40 +41 @@ -@@ -8299,4 +8295,8 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, +@@ -8248,4 +8244,8 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups,