From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 69D5FA04A3
for <public@inbox.dpdk.org>; Fri, 5 Jun 2020 20:25:54 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 5ECD61D510;
Fri, 5 Jun 2020 20:25:54 +0200 (CEST)
Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com
[207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 7C8E51D528
for <stable@dpdk.org>; Fri, 5 Jun 2020 20:25:52 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1591381551;
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=Xj9zi+i7NZw7HiIbJoXBuGvNVtxvh7Fi0KpXTrwmAqI=;
b=aAiQB+R4WI0PJnm64AnHTlGrvElLIqM7dFwPT+Ly6PJq4i1osDFXNlUmT8XYAeCkkmjxie
UXBSwbYFF/5E9tgTomUEnP9rDyZek1y/pt+CHBnA9prcGpuWZfCG32IZ4YLw2ynC7JUWnT
TiSGPdqU1DAq7jyaaN9XlxkHWoXvcpU=
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
[209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
us-mta-475-ThDesQCvOwiCFtSQbyylrQ-1; Fri, 05 Jun 2020 14:25:47 -0400
X-MC-Unique: ThDesQCvOwiCFtSQbyylrQ-1
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
[10.5.11.12])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 59B77106B24A;
Fri, 5 Jun 2020 18:25:46 +0000 (UTC)
Received: from rh.redhat.com (unknown [10.33.36.130])
by smtp.corp.redhat.com (Postfix) with ESMTP id 75A0F610F2;
Fri, 5 Jun 2020 18:25:45 +0000 (UTC)
From: Kevin Traynor <ktraynor@redhat.com>
To: Wei Zhao <wei.zhao1@intel.com>
Cc: Beilei Xing <beilei.xing@intel.com>,
dpdk stable <stable@dpdk.org>
Date: Fri, 5 Jun 2020 19:24:05 +0100
Message-Id: <20200605182525.22483-8-ktraynor@redhat.com>
In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com>
References: <20200605182525.22483-1-ktraynor@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'net/i40e: fix flow director for ARP packets'
has been queued to LTS release 18.11.9
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to LTS release 18.11.9
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/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.
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/0518c7dcaa6dafb087c2811a57b2d03111fde8fe
Thanks.
Kevin.
---
>From 0518c7dcaa6dafb087c2811a57b2d03111fde8fe Mon Sep 17 00:00:00 2001
From: Wei Zhao <wei.zhao1@intel.com>
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 <wei.zhao1@intel.com>
Acked-by: Beilei Xing <beilei.xing@intel.com>
---
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 642532ba96..98588d0113 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -2544,5 +2544,4 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
ether_type == ETHER_TYPE_IPv4 ||
ether_type == ETHER_TYPE_IPv6 ||
- ether_type == ETHER_TYPE_ARP ||
ether_type == outer_tpid) {
rte_flow_error_set(error, EINVAL,
@@ -2589,5 +2588,4 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
if (ether_type == ETHER_TYPE_IPv4 ||
ether_type == ETHER_TYPE_IPv6 ||
- ether_type == ETHER_TYPE_ARP ||
ether_type == outer_tpid) {
rte_flow_error_set(error, EINVAL,
--
2.21.3
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-06-05 19:20:51.394630669 +0100
+++ 0008-net-i40e-fix-flow-director-for-ARP-packets.patch 2020-06-05 19:20:50.713043017 +0100
@@ -1 +1 @@
-From 73cc2f0ab5cfaa7f4b2dd4c0cacc98b8e17cc778 Mon Sep 17 00:00:00 2001
+From 0518c7dcaa6dafb087c2811a57b2d03111fde8fe Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 73cc2f0ab5cfaa7f4b2dd4c0cacc98b8e17cc778 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 7e64ae53a3..1533d5abbd 100644
+index 642532ba96..98588d0113 100644
@@ -25,4 +26,4 @@
-@@ -2667,5 +2667,4 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
- ether_type == RTE_ETHER_TYPE_IPV4 ||
- ether_type == RTE_ETHER_TYPE_IPV6 ||
-- ether_type == RTE_ETHER_TYPE_ARP ||
+@@ -2544,5 +2544,4 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
+ ether_type == ETHER_TYPE_IPv4 ||
+ ether_type == ETHER_TYPE_IPv6 ||
+- ether_type == ETHER_TYPE_ARP ||
@@ -31,4 +32,4 @@
-@@ -2712,5 +2711,4 @@ 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 ||
+@@ -2589,5 +2588,4 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
+ if (ether_type == ETHER_TYPE_IPv4 ||
+ ether_type == ETHER_TYPE_IPv6 ||
+- ether_type == ETHER_TYPE_ARP ||