From: Chenmin Sun <chenmin.sun@intel.com> 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@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 87fa0afba..2d61dbfd1 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, 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 f356581d1..5aaa7abcf 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.17.1
> -----Original Message-----
> From: Sun, Chenmin <chenmin.sun@intel.com>
> Sent: Tuesday, January 21, 2020 7:57 PM
> To: Cao, Yahui <yahui.cao@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>;
> Xing, Beilei <beilei.xing@intel.com>
> Cc: dev@dpdk.org; Sun, Chenmin <chenmin.sun@intel.com>
> Subject: [DPDK] net/ice: add outer IPv4 matching for GTPU flow
>
> From: Chenmin Sun <chenmin.sun@intel.com>
>
> 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@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
On 01/21, chenmin.sun@intel.com wrote:
>From: Chenmin Sun <chenmin.sun@intel.com>
>
>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@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 87fa0afba..2d61dbfd1 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,
> 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 f356581d1..5aaa7abcf 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.17.1
>
Acked-by: Xiaolong Ye <xiaolong.ye@intel.com>
Applied to dpdk-next-net-intel, Thanks.