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 36D0346211 for ; Thu, 13 Feb 2025 11:01:31 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2FCFB42ECC; Thu, 13 Feb 2025 11:01:31 +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 15C1042EDE for ; Thu, 13 Feb 2025 11:01:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440889; 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=5s4XVhEmtKAvCqeXfBIo1H5OUsHcLJZPAfRBCp4zBXw=; b=gbcDSrbx7RZvU3G6WqjAE9St8pL4yKGSlXVr9zKBeodUSXTKkdcWptLG0rgmDoEa56FhpG 4PBYJHzov+dk8y7d0yizitwmHIgkbbcu07r4DtYMSxU41pxXUod2Vk9jGYXCMZdGiVhmeV Tw9ktxbHOUCrIVWxYtUDmlwUVwVW2iA= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-533-gx1VTldlNyqcgO9E_SFx_g-1; Thu, 13 Feb 2025 05:01:26 -0500 X-MC-Unique: gx1VTldlNyqcgO9E_SFx_g-1 X-Mimecast-MFC-AGG-ID: gx1VTldlNyqcgO9E_SFx_g Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 62F7A18E6952; Thu, 13 Feb 2025 10:01:25 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C41AB1800267; Thu, 13 Feb 2025 10:01:23 +0000 (UTC) From: Kevin Traynor To: Vladimir Medvedkin Cc: Bruce Richardson , dpdk stable Subject: patch 'net/ice: fix flows handling' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:58:11 +0000 Message-ID: <20250213095933.362078-44-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: HeD05qKGUaE78HnwGm_5Pq7ERIF5RDpbh8xahL3bydg_1739440885 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/17/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/0ee5bed6e573af387888f90285310c339e75508f Thanks. Kevin --- >From 0ee5bed6e573af387888f90285310c339e75508f Mon Sep 17 00:00:00 2001 From: Vladimir Medvedkin Date: Thu, 30 Jan 2025 16:14:42 +0000 Subject: [PATCH] net/ice: fix flows handling [ upstream commit fabc9e1322e26b41ab74a8e35dcb477c702c3f6d ] Currently ICE PMD uses group attribute to select the appropriate HW engine to offload the flow. This behavior violates the rte_flow API, existing documentation/examples, and reveals hardware specific details. This patch eliminates the use of the group attribute and runs each engine parser in the order they work in the HW pipeline. Fixes: 9c5f0070fa3f ("net/ice: map group to pipeline stage") Signed-off-by: Vladimir Medvedkin Acked-by: Bruce Richardson --- drivers/net/ice/ice_generic_flow.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c index 50d760004f..5c34e0385f 100644 --- a/drivers/net/ice/ice_generic_flow.c +++ b/drivers/net/ice/ice_generic_flow.c @@ -21,4 +21,6 @@ #define ICE_FLOW_ENGINE_DISABLED(mask, type) ((mask) & BIT(type)) +#define ICE_FLOW_ENGINE_NB 3 + static struct ice_engine_list engine_list = TAILQ_HEAD_INITIALIZER(engine_list); @@ -2296,19 +2298,21 @@ ice_flow_process_filter(struct rte_eth_dev *dev, } - parser = get_flow_parser(attr->group); - if (parser == NULL) { - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ATTR, - NULL, "NULL attribute."); - return -rte_errno; - } + for (int i = 0; i < ICE_FLOW_ENGINE_NB; i++) { + parser = get_flow_parser(i); + if (parser == NULL) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ATTR, + NULL, "NULL attribute."); + return -rte_errno; + } - if (ice_parse_engine(ad, flow, parser, attr->priority, - pattern, actions, error)) { - *engine = parser->engine; - return 0; - } else { - return -rte_errno; + if (ice_parse_engine(ad, flow, parser, attr->priority, + pattern, actions, error)) { + *engine = parser->engine; + return 0; + } } + + return -rte_errno; } -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:39.283320235 +0000 +++ 0044-net-ice-fix-flows-handling.patch 2025-02-12 17:29:34.328945798 +0000 @@ -1 +1 @@ -From fabc9e1322e26b41ab74a8e35dcb477c702c3f6d Mon Sep 17 00:00:00 2001 +From 0ee5bed6e573af387888f90285310c339e75508f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fabc9e1322e26b41ab74a8e35dcb477c702c3f6d ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ - drivers/net/intel/ice/ice_generic_flow.c | 30 ++++++++++++++---------- + drivers/net/ice/ice_generic_flow.c | 30 +++++++++++++++++------------- @@ -22 +23 @@ -diff --git a/drivers/net/intel/ice/ice_generic_flow.c b/drivers/net/intel/ice/ice_generic_flow.c +diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c @@ -24,2 +25,2 @@ ---- a/drivers/net/intel/ice/ice_generic_flow.c -+++ b/drivers/net/intel/ice/ice_generic_flow.c +--- a/drivers/net/ice/ice_generic_flow.c ++++ b/drivers/net/ice/ice_generic_flow.c