[dpdk-stable] patch 'net/ice: add outer IPv4 matching for GTP-U flow' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

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/13/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 385898db6780b6b236319d660fcccaaeac9a122b Mon Sep 17 00:00:00 2001
From: Chenmin Sun <chenmin.sun at intel.com>
Date: Tue, 21 Jan 2020 19:56:53 +0800
Subject: [PATCH] net/ice: add outer IPv4 matching for GTP-U flow

[ upstream commit 1bfc89ec1e47e0f91a62ed8f9465e020c3732bba ]

This patch adds the capability of matching the outer IPv4
headers for GTPU flows.

Fixes: efc16c621415 ("net/ice: support flow director GTPU tunnel")

Signed-off-by: Chenmin Sun <chenmin.sun at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
Acked-by: Xiaolong Ye <xiaolong.ye at intel.com>
---
 drivers/net/ice/base/ice_fdir.c   | 4 ++++
 drivers/net/ice/ice_fdir_filter.c | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c
index 41136d1f0c..551c7a6bc6 100644
--- a/drivers/net/ice/base/ice_fdir.c
+++ b/drivers/net/ice/base/ice_fdir.c
@@ -786,6 +786,10 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,
 	case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_TCP:
 	case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_ICMP:
 	case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER:
+		ice_pkt_insert_u32(loc, ICE_IPV4_SRC_ADDR_OFFSET,
+					input->ip.v4.src_ip);
+		ice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET,
+					input->ip.v4.dst_ip);
 		ice_pkt_insert_u32(loc, ICE_IPV4_GTPU_TEID_OFFSET,
 				   input->gtpu_data.teid);
 		ice_pkt_insert_u6_qfi(loc, ICE_IPV4_GTPU_QFI_OFFSET,
diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c
index 2d8cdadf59..79e4d2edf8 100644
--- a/drivers/net/ice/ice_fdir_filter.c
+++ b/drivers/net/ice/ice_fdir_filter.c
@@ -68,9 +68,10 @@
 	ICE_INSET_TUN_SCTP_SRC_PORT | ICE_INSET_TUN_SCTP_DST_PORT)
 
 #define ICE_FDIR_INSET_GTPU (\
-	ICE_INSET_GTPU_TEID)
+	ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | ICE_INSET_GTPU_TEID)
 
 #define ICE_FDIR_INSET_GTPU_EH (\
+	ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \
 	ICE_INSET_GTPU_TEID | ICE_INSET_GTPU_QFI)
 
 static struct ice_pattern_match_item ice_fdir_pattern_os[] = {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:43.617111104 +0000
+++ 0143-net-ice-add-outer-IPv4-matching-for-GTP-U-flow.patch	2020-02-11 11:17:38.656006134 +0000
@@ -1,13 +1,14 @@
-From 1bfc89ec1e47e0f91a62ed8f9465e020c3732bba Mon Sep 17 00:00:00 2001
+From 385898db6780b6b236319d660fcccaaeac9a122b Mon Sep 17 00:00:00 2001
 From: Chenmin Sun <chenmin.sun at intel.com>
 Date: Tue, 21 Jan 2020 19:56:53 +0800
 Subject: [PATCH] net/ice: add outer IPv4 matching for GTP-U flow
 
+[ upstream commit 1bfc89ec1e47e0f91a62ed8f9465e020c3732bba ]
+
 This patch adds the capability of matching the outer IPv4
 headers for GTPU flows.
 
 Fixes: efc16c621415 ("net/ice: support flow director GTPU tunnel")
-Cc: stable at dpdk.org
 
 Signed-off-by: Chenmin Sun <chenmin.sun at intel.com>
 Acked-by: Qi Zhang <qi.z.zhang at intel.com>
@@ -18,10 +19,10 @@
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c
-index 20d64f8612..56c1c1c845 100644
+index 41136d1f0c..551c7a6bc6 100644
 --- a/drivers/net/ice/base/ice_fdir.c
 +++ b/drivers/net/ice/base/ice_fdir.c
-@@ -804,6 +804,10 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,
+@@ -786,6 +786,10 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,
  	case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_TCP:
  	case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_ICMP:
  	case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER: