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 2624C43BA7 for ; Tue, 5 Mar 2024 16:35:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 17A9C42670; Tue, 5 Mar 2024 16:35:07 +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 2E71742686 for ; Tue, 5 Mar 2024 16:35:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652905; 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=619rprtIlHRbtrwbSTtvcdPUW+aQc53G0G4i3WXeIYM=; b=Q+I97zaTCfVss+Opn/lPaXkf8NHW6dreCeKVK/WCiNluOYO5rYe4je6de4zF6jwVoUGfcH KUzb5oxpdqgn/weSXmtvyyxH5blaHYgDMv5lU1+Op6fybnKCn8IMPGTrlSSgPBANcGOGUU Zt2ZtVcjUOntLrhSnveEMsu5g3F38zI= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-693-rxIVKf34NU2qJSMA2HWESw-1; Tue, 05 Mar 2024 10:35:02 -0500 X-MC-Unique: rxIVKf34NU2qJSMA2HWESw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8727E8007B0; Tue, 5 Mar 2024 15:35:01 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B457200AE7F; Tue, 5 Mar 2024 15:34:59 +0000 (UTC) From: Kevin Traynor To: Kaiwen Deng Cc: Qi Zhang , dpdk stable Subject: patch 'net/i40e: remove redundant judgment in flow parsing' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:33:36 +0000 Message-ID: <20240305153449.263666-3-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 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 21.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/11/24. 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/3c1d8f321d84a9a2595884ffaadf80b008f636c3 Thanks. Kevin --- >From 3c1d8f321d84a9a2595884ffaadf80b008f636c3 Mon Sep 17 00:00:00 2001 From: Kaiwen Deng Date: Fri, 24 Nov 2023 15:01:03 +0800 Subject: [PATCH] net/i40e: remove redundant judgment in flow parsing [ upstream commit e930f8622e05e410a475c6b57dd7edd73b2e1705 ] if (eth_spec && eth_mask && next_type == RTE_FLOW_ITEM_TYPE_END) { ... if (next_type == RTE_FLOW_ITEM_TYPE_VLAN || ...) { ... } ... } Clearly, that condition in the inner "if" is always "false". This commit will remove the redundant judgment. Fixes: 7d83c152a207 ("net/i40e: parse flow director filter") Signed-off-by: Kaiwen Deng Acked-by: Qi Zhang --- drivers/net/i40e/i40e_flow.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index b4cdefafa5..5c7f445018 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -2466,6 +2466,5 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, ether_type = rte_be_to_cpu_16(eth_spec->type); - if (next_type == RTE_FLOW_ITEM_TYPE_VLAN || - ether_type == RTE_ETHER_TYPE_IPV4 || + if (ether_type == RTE_ETHER_TYPE_IPV4 || ether_type == RTE_ETHER_TYPE_IPV6 || ether_type == i40e_get_outer_vlan(dev)) { -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:54.821576440 +0000 +++ 0003-net-i40e-remove-redundant-judgment-in-flow-parsing.patch 2024-03-05 14:08:54.594520617 +0000 @@ -1 +1 @@ -From e930f8622e05e410a475c6b57dd7edd73b2e1705 Mon Sep 17 00:00:00 2001 +From 3c1d8f321d84a9a2595884ffaadf80b008f636c3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e930f8622e05e410a475c6b57dd7edd73b2e1705 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -29 +30 @@ -index 877e49151e..92165c8422 100644 +index b4cdefafa5..5c7f445018 100644 @@ -32,2 +33,2 @@ -@@ -1709,6 +1709,5 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, - ether_type = rte_be_to_cpu_16(eth_spec->hdr.ether_type); +@@ -2466,6 +2466,5 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, + ether_type = rte_be_to_cpu_16(eth_spec->type);