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 B1A2BA0093 for ; Tue, 19 May 2020 15:13:08 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A8FE81D702; Tue, 19 May 2020 15:13:08 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 8AA1C1D702 for ; Tue, 19 May 2020 15:13:07 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id e1so15869861wrt.5 for ; Tue, 19 May 2020 06:13:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZdofXF2cFGV2IaoDosKnsyH7TQtAWnf8G5tHqq7q1qM=; b=GcKsknBKE2SlGlL2xvEgh3066LmEx77okACbepnfWmdwEOtOd6mObjRdNlQgPhDZfS JjROFDKlwRl8C1+l7f9y5lPJ0kOsylAsRCYNBvws1OmSNzM8BYUmJgE5q4avsfxOHKLp 8nrTv7P5XoCLzmBEL0qcy+2uyrQLIbpha2sq8SEsa3liI3UR3sKftF+MfJCahfLqTVyq I8xA1jNsehZcdPqP5MqV7DZL2jdC8pmi4re3GmbHLo6FRWWYNSlYT0xTRZalQhsbHi/M 5OjNaYwWfhP6MuoX6urXrovAYe3QStPSN30AZmFm9D0hoYfIaQOGYFyWhtCdOdl2tSU5 9tfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZdofXF2cFGV2IaoDosKnsyH7TQtAWnf8G5tHqq7q1qM=; b=GLi4zjO3O/DshFMImAof/yP7XN/19oGV09U1eIIzB+8B/MGSlErBMzERnAD2IJ+40f bIOcx+qiK6QWGCGmuuHdNaEo3Hzp5NgOhrbbmlDOHEOKAKgupGCjr8QP+pQODYk3k6LX oA6EgzLKnjv6pH0ZP9uDo2YEUbESA7iqUxNSGhDxZfdzbcnNwtm7X+UPWmC4Cfd7/uFB 7YTY+NDWrxguYXH367fQbpxDxvlhmrhB0bWVTBJwao+uv1ErzE+2zh/RTNV2dHN6AS8H Z/OTw/QxG8vM2EnjYwRcyYuE8di9fiwMoopZEo+VVn78Kx4f6Jrxq4rL06RCv/Hqx3l9 3x3Q== X-Gm-Message-State: AOAM533LVIdhH0BIuux3SK+HYaNckYsnRucB//uiLa5Eny1uuM67T3Rr FOqqjVsogmcm1Lun7uIF9JRfCr2pr4gyoJ81 X-Google-Smtp-Source: ABdhPJwIPafMmsNTYX2aThF2ZaFA3T2UFxanxXYr/PoSgMBWw5Tl2lwyA9DU44l5rGYs5psiJ2MOkQ== X-Received: by 2002:adf:e703:: with SMTP id c3mr26472107wrm.252.1589893987290; Tue, 19 May 2020 06:13:07 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id m6sm19899366wrq.5.2020.05.19.06.13.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:13:06 -0700 (PDT) From: luca.boccassi@gmail.com To: Wei Zhao Cc: Beilei Xing , dpdk stable Date: Tue, 19 May 2020 14:04:32 +0100 Message-Id: <20200519130549.112823-137-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/i40e: fix flow director for ARP packets' has been queued to stable release 19.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 stable release 19.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 05/21/20. 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. Thanks. Luca Boccassi --- >From 74095b0ca6c98ff3a51769689f6a2266cefe41c3 Mon Sep 17 00:00:00 2001 From: Wei Zhao Date: Wed, 29 Apr 2020 10:03:51 +0800 Subject: [PATCH] net/i40e: fix flow director for ARP packets [ upstream commit 73cc2f0ab5cfaa7f4b2dd4c0cacc98b8e17cc778 ] Currently, flow "pattern eth type is 0x0806 / end actions mark id 0x86 / rss / end" can't be created successfully. FDIR parser shouldn't deny RTE_ETHER_TYPE_ARP since ARP packets will be parsed as PCTYPE_L2_PAYLOAD. This patch fixes the issue. Bugzilla ID: 402 Fixes: 42044b69c67d ("net/i40e: support input set selection for FDIR") Signed-off-by: Wei Zhao Acked-by: Beilei Xing --- drivers/net/i40e/i40e_flow.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index a5bd1c7783..6cd39babba 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -2542,7 +2542,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, if (next_type == RTE_FLOW_ITEM_TYPE_VLAN || ether_type == RTE_ETHER_TYPE_IPV4 || ether_type == RTE_ETHER_TYPE_IPV6 || - ether_type == RTE_ETHER_TYPE_ARP || ether_type == outer_tpid) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, @@ -2587,7 +2586,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, if (ether_type == RTE_ETHER_TYPE_IPV4 || ether_type == RTE_ETHER_TYPE_IPV6 || - ether_type == RTE_ETHER_TYPE_ARP || ether_type == outer_tpid) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:50.004588081 +0100 +++ 0137-net-i40e-fix-flow-director-for-ARP-packets.patch 2020-05-19 14:04:44.448652578 +0100 @@ -1,8 +1,10 @@ -From 73cc2f0ab5cfaa7f4b2dd4c0cacc98b8e17cc778 Mon Sep 17 00:00:00 2001 +From 74095b0ca6c98ff3a51769689f6a2266cefe41c3 Mon Sep 17 00:00:00 2001 From: Wei Zhao Date: Wed, 29 Apr 2020 10:03:51 +0800 Subject: [PATCH] net/i40e: fix flow director for ARP packets +[ upstream commit 73cc2f0ab5cfaa7f4b2dd4c0cacc98b8e17cc778 ] + Currently, flow "pattern eth type is 0x0806 / end actions mark id 0x86 / rss / end" can't be created successfully. FDIR parser shouldn't deny RTE_ETHER_TYPE_ARP since ARP packets will be @@ -10,7 +12,6 @@ Bugzilla ID: 402 Fixes: 42044b69c67d ("net/i40e: support input set selection for FDIR") -Cc: stable@dpdk.org Signed-off-by: Wei Zhao Acked-by: Beilei Xing @@ -19,10 +20,10 @@ 1 file changed, 2 deletions(-) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c -index 7e64ae53a3..1533d5abbd 100644 +index a5bd1c7783..6cd39babba 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c -@@ -2666,7 +2666,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, +@@ -2542,7 +2542,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, if (next_type == RTE_FLOW_ITEM_TYPE_VLAN || ether_type == RTE_ETHER_TYPE_IPV4 || ether_type == RTE_ETHER_TYPE_IPV6 || @@ -30,7 +31,7 @@ ether_type == outer_tpid) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, -@@ -2711,7 +2710,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, +@@ -2587,7 +2586,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, if (ether_type == RTE_ETHER_TYPE_IPV4 || ether_type == RTE_ETHER_TYPE_IPV6 ||