From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 53141A0613 for ; Wed, 28 Aug 2019 15:44:07 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 486EE1BF82; Wed, 28 Aug 2019 15:44:07 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 0C70C1BF82 for ; Wed, 28 Aug 2019 15:44:04 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7FD39102BB3E; Wed, 28 Aug 2019 13:44:03 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 71808194BE; Wed, 28 Aug 2019 13:44:02 +0000 (UTC) From: Kevin Traynor To: Xiaolong Ye Cc: Beilei Xing , dpdk stable Date: Wed, 28 Aug 2019 14:42:32 +0100 Message-Id: <20190828134234.20547-56-ktraynor@redhat.com> In-Reply-To: <20190828134234.20547-1-ktraynor@redhat.com> References: <20190828134234.20547-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.64]); Wed, 28 Aug 2019 13:44:03 +0000 (UTC) Subject: [dpdk-stable] patch 'net/i40e: fix ethernet flow rule' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/04/19. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/e163a6a648314ae4b9bffe239d163b761eed286a Thanks. Kevin Traynor --- >From e163a6a648314ae4b9bffe239d163b761eed286a Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Mon, 22 Jul 2019 20:06:37 +0800 Subject: [PATCH] net/i40e: fix ethernet flow rule [ upstream commit 3106ca84dc2de241382461d93d49d5a643145c70 ] i40e FDIR doesn't allow to create flow with empty spec and mask for ethertype pattern. Without this patch, below flow would be created successfully which is unexpected. > flow create 0 ingress pattern eth / end actions drop / end Fixes: 7d83c152a207 ("net/i40e: parse flow director filter") Signed-off-by: Xiaolong Ye Acked-by: Beilei Xing --- drivers/net/i40e/i40e_flow.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index 3c3b69b9f..1699578ff 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -2444,4 +2444,5 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, uint16_t frag_off; enum rte_flow_item_type item_type; + enum rte_flow_item_type next_type; enum rte_flow_item_type l3 = RTE_FLOW_ITEM_TYPE_END; enum rte_flow_item_type cus_proto = RTE_FLOW_ITEM_TYPE_END; @@ -2484,4 +2485,14 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, eth_spec = item->spec; eth_mask = item->mask; + next_type = (item + 1)->type; + + if (next_type == RTE_FLOW_ITEM_TYPE_END && + (!eth_spec || !eth_mask)) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + item, + "NULL eth spec/mask."); + return -rte_errno; + } if (eth_spec && eth_mask) { @@ -2496,6 +2507,4 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, } if (eth_spec && eth_mask && eth_mask->type) { - enum rte_flow_item_type next = (item + 1)->type; - if (eth_mask->type != RTE_BE16(0xffff)) { rte_flow_error_set(error, EINVAL, @@ -2508,5 +2517,5 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, ether_type = rte_be_to_cpu_16(eth_spec->type); - if (next == RTE_FLOW_ITEM_TYPE_VLAN || + if (next_type == RTE_FLOW_ITEM_TYPE_VLAN || ether_type == ETHER_TYPE_IPv4 || ether_type == ETHER_TYPE_IPv6 || -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-28 14:32:35.198333313 +0100 +++ 0057-net-i40e-fix-ethernet-flow-rule.patch 2019-08-28 14:32:31.736955242 +0100 @@ -1 +1 @@ -From 3106ca84dc2de241382461d93d49d5a643145c70 Mon Sep 17 00:00:00 2001 +From e163a6a648314ae4b9bffe239d163b761eed286a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3106ca84dc2de241382461d93d49d5a643145c70 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 48a6782a8..3c0af70c0 100644 +index 3c3b69b9f..1699578ff 100644 @@ -25 +26 @@ -@@ -2443,4 +2443,5 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, +@@ -2444,4 +2444,5 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, @@ -31 +32 @@ -@@ -2483,4 +2484,14 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, +@@ -2484,4 +2485,14 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, @@ -46 +47 @@ -@@ -2495,6 +2506,4 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, +@@ -2496,6 +2507,4 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, @@ -53 +54 @@ -@@ -2507,5 +2516,5 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, +@@ -2508,5 +2517,5 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, @@ -58,2 +59,2 @@ - ether_type == RTE_ETHER_TYPE_IPV4 || - ether_type == RTE_ETHER_TYPE_IPV6 || + ether_type == ETHER_TYPE_IPv4 || + ether_type == ETHER_TYPE_IPv6 ||