net/ice/base: allow GTP-U filter using only inner protocols
[dpdk.git] / drivers / net / ice / base / ice_fdir.c
index 219588c..8f9c0d3 100644 (file)
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2019
+ * Copyright(c) 2001-2021 Intel Corporation
  */
 
 #include "ice_common.h"
@@ -42,35 +42,188 @@ static const u8 ice_fdir_ipv4_pkt[] = {
        0x00, 0x00
 };
 
-static const u8 ice_fdir_udp4_gtpu4_pkt[] = {
+static const u8 ice_fdir_udp4_vxlan_pkt[] = {
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
-       0x00, 0x4c, 0x00, 0x00, 0x40, 0x00, 0x40, 0x11,
+       0x00, 0x4e, 0x00, 0x00, 0x40, 0x00, 0x40, 0x11,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x08, 0x68, 0x08, 0x68, 0x00, 0x00,
-       0x00, 0x00, 0x34, 0xff, 0x00, 0x28, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x02, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x00,
-       0x00, 0x1c, 0x00, 0x00, 0x40, 0x00, 0x40, 0x11,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x04, 0x00, 0x00, 0x03, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00,
+       0x45, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x40, 0x00,
+       0x40, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_ipv4_gtpu4_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x38, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x08, 0x68, 0x08, 0x68, 0x00, 0x24,
+       0xbf, 0xc0, 0x30, 0xff, 0x00, 0x14, 0x00, 0x00,
+       0x00, 0x00, 0x45, 0x00, 0x00, 0x14, 0x00, 0x01,
+       0x00, 0x00, 0x40, 0x00, 0x3a, 0x3d, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_udp4_gtpu4_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x40, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x08, 0x68, 0x08, 0x68, 0x00, 0x2c,
+       0x00, 0x6f, 0x30, 0xff, 0x00, 0x1c, 0x00, 0x00,
+       0x00, 0x00, 0x45, 0x00, 0x00, 0x1c, 0x00, 0x01,
+       0x00, 0x00, 0x40, 0x11, 0x3a, 0x24, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x08, 0xbe, 0xc7, 0x00, 0x00,
 };
 
 static const u8 ice_fdir_tcp4_gtpu4_pkt[] = {
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
-       0x00, 0x58, 0x00, 0x00, 0x40, 0x00, 0x40, 0x11,
+       0x00, 0x4c, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x9e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x08, 0x68, 0x08, 0x68, 0x00, 0x38,
+       0x00, 0x4c, 0x30, 0xff, 0x00, 0x28, 0x00, 0x00,
+       0x00, 0x00, 0x45, 0x00, 0x00, 0x28, 0x00, 0x01,
+       0x00, 0x00, 0x40, 0x06, 0x3a, 0x23, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x08, 0x68, 0x08, 0x68, 0x00, 0x00,
-       0x00, 0x00, 0x34, 0xff, 0x00, 0x28, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x02, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x00,
-       0x00, 0x28, 0x00, 0x00, 0x40, 0x00, 0x40, 0x06,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x50, 0x02, 0x20, 0x00, 0x4e, 0xd2,
+       0x00, 0x00, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_ipv4_gtpu4_eh_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x42, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0xa8, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x2e,
+       0xba, 0x1d, 0x34, 0xff, 0x00, 0x1e, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x00,
+       0x00, 0x00, 0x45, 0x00, 0x00, 0x16, 0x00, 0x01,
+       0x00, 0x00, 0x40, 0x00, 0x7c, 0xe5, 0x7f, 0x00,
+       0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_udp4_gtpu4_eh_pkt[] = {
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x4a, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0xa0, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x36,
+       0xb8, 0x23, 0x34, 0xff, 0x00, 0x26, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x00,
+       0x00, 0x00, 0x45, 0x00, 0x00, 0x1e, 0x00, 0x01,
+       0x00, 0x00, 0x40, 0x11, 0x7c, 0xcc, 0x7f, 0x00,
+       0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x0a, 0x01, 0xd8, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp4_gtpu4_eh_pkt[] = {
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x56, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x94, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x42,
+       0xb8, 0x00, 0x34, 0xff, 0x00, 0x32, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x00,
+       0x00, 0x00, 0x45, 0x00, 0x00, 0x2a, 0x00, 0x01,
+       0x00, 0x00, 0x40, 0x06, 0x7c, 0xcb, 0x7f, 0x00,
+       0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x50, 0x02, 0x20, 0x00, 0x91, 0xde,
+       0x00, 0x00, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_ipv4_gtpu4_eh_dw_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x42, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0xa8, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x2e,
+       0xba, 0x1d, 0x34, 0xff, 0x00, 0x1e, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x00,
+       0x00, 0x00, 0x45, 0x00, 0x00, 0x16, 0x00, 0x01,
+       0x00, 0x00, 0x40, 0x00, 0x7c, 0xe5, 0x7f, 0x00,
+       0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_udp4_gtpu4_eh_dw_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x4a, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0xa0, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x36,
+       0xb8, 0x23, 0x34, 0xff, 0x00, 0x26, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x00,
+       0x00, 0x00, 0x45, 0x00, 0x00, 0x1e, 0x00, 0x01,
+       0x00, 0x00, 0x40, 0x11, 0x7c, 0xcc, 0x7f, 0x00,
+       0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x0a, 0x01, 0xd8, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp4_gtpu4_eh_dw_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x56, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x94, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x42,
+       0xb8, 0x00, 0x34, 0xff, 0x00, 0x32, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x00,
+       0x00, 0x00, 0x45, 0x00, 0x00, 0x2a, 0x00, 0x01,
+       0x00, 0x00, 0x40, 0x06, 0x7c, 0xcb, 0x7f, 0x00,
+       0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x50, 0x02, 0x20, 0x00, 0x91, 0xde,
+       0x00, 0x00, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_ipv4_gtpu4_eh_up_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x42, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0xa8, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x2e,
+       0xba, 0x0d, 0x34, 0xff, 0x00, 0x1e, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x10,
+       0x00, 0x00, 0x45, 0x00, 0x00, 0x16, 0x00, 0x01,
+       0x00, 0x00, 0x40, 0x00, 0x7c, 0xe5, 0x7f, 0x00,
+       0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_udp4_gtpu4_eh_up_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x4a, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0xa0, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x36,
+       0xb8, 0x13, 0x34, 0xff, 0x00, 0x26, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x10,
+       0x00, 0x00, 0x45, 0x00, 0x00, 0x1e, 0x00, 0x01,
+       0x00, 0x00, 0x40, 0x11, 0x7c, 0xcc, 0x7f, 0x00,
+       0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x0a, 0x01, 0xd8, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp4_gtpu4_eh_up_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x56, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x94, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x42,
+       0xb7, 0xf0, 0x34, 0xff, 0x00, 0x32, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x10,
+       0x00, 0x00, 0x45, 0x00, 0x00, 0x2a, 0x00, 0x01,
+       0x00, 0x00, 0x40, 0x06, 0x7c, 0xcb, 0x7f, 0x00,
+       0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x50, 0x02, 0x20, 0x00, 0x91, 0xde,
+       0x00, 0x00, 0x00, 0x00,
 };
 
 static const u8 ice_fdir_icmp4_gtpu4_pkt[] = {
@@ -88,20 +241,283 @@ static const u8 ice_fdir_icmp4_gtpu4_pkt[] = {
        0x00, 0x00,
 };
 
-static const u8 ice_fdir_ipv4_gtpu4_pkt[] = {
+static const u8 ice_fdir_ipv6_gtpu4_pkt[] = {
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
-       0x00, 0x44, 0x00, 0x00, 0x40, 0x00, 0x40, 0x11,
+       0x00, 0x4c, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x9e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x08, 0x68, 0x08, 0x68, 0x00, 0x38,
+       0x24, 0x42, 0x30, 0xff, 0x00, 0x28, 0x00, 0x00,
+       0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x3b, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_udp6_gtpu4_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x54, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x08, 0x68, 0x08, 0x68, 0x00, 0x40,
+       0x4e, 0x3d, 0x30, 0xff, 0x00, 0x30, 0x00, 0x00,
+       0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x08,
+       0x11, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
+       0xff, 0xdc, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp6_gtpu4_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x62, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x08, 0x68, 0x08, 0x68, 0x00, 0x4e,
+       0x59, 0x08, 0x30, 0xff, 0x00, 0x3e, 0x00, 0x00,
+       0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x16,
+       0x06, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x14, 0x00, 0x50, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x02,
+       0x20, 0x00, 0x8f, 0x7b, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_ipv6_gtpu6_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x38, 0x11, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x68,
+       0x08, 0x68, 0x00, 0x38, 0x22, 0x43, 0x30, 0xff,
+       0x00, 0x28, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x3b, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_ipv6_gtpu6_eh_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x44, 0x11, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x68,
+       0x08, 0x68, 0x00, 0x44, 0x1b, 0x9a, 0x34, 0xff,
+       0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x85, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x3b, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_ipv6_gtpu6_eh_dw_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x44, 0x11, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x68,
+       0x08, 0x68, 0x00, 0x44, 0x1b, 0x9a, 0x34, 0xff,
+       0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x85, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x3b, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_ipv6_gtpu6_eh_up_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x44, 0x11, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x68,
+       0x08, 0x68, 0x00, 0x44, 0x1b, 0x8a, 0x34, 0xff,
+       0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x85, 0x02, 0x10, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x3b, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_ipv4_l2tpv3_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x14, 0x00, 0x00, 0x40, 0x00, 0x40, 0x73,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_ipv6_l2tpv3_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xDD, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x73, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x08, 0x68, 0x08, 0x68, 0x00, 0x00,
-       0x00, 0x00, 0x34, 0xff, 0x00, 0x28, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x02, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x00,
-       0x00, 0x14, 0x00, 0x00, 0x40, 0x00, 0x40, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00,
 };
 
+static const u8 ice_fdir_ipv4_esp_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x14, 0x00, 0x00, 0x40, 0x00, 0x40, 0x32,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00
+};
+
+static const u8 ice_fdir_ipv6_esp_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xDD, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x32, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_ipv4_ah_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x14, 0x00, 0x00, 0x40, 0x00, 0x40, 0x33,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00
+};
+
+static const u8 ice_fdir_ipv6_ah_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xDD, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x33, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_ipv4_nat_t_esp_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x1C, 0x00, 0x00, 0x40, 0x00, 0x40, 0x11,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x11, 0x94, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00,
+};
+
+static const u8 ice_fdir_ipv6_nat_t_esp_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xDD, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x08, 0x11, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x11, 0x94, 0x00, 0x00, 0x00, 0x08,
+};
+
+static const u8 ice_fdir_ipv4_pfcp_node_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x2C, 0x00, 0x00, 0x40, 0x00, 0x40, 0x11,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x22, 0x65, 0x22, 0x65, 0x00, 0x00,
+       0x00, 0x00, 0x20, 0x00, 0x00, 0x10, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00,
+};
+
+static const u8 ice_fdir_ipv4_pfcp_session_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x2C, 0x00, 0x00, 0x40, 0x00, 0x40, 0x11,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x22, 0x65, 0x22, 0x65, 0x00, 0x00,
+       0x00, 0x00, 0x21, 0x00, 0x00, 0x10, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00,
+};
+
+static const u8 ice_fdir_ipv6_pfcp_node_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xDD, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x18, 0x11, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x65,
+       0x22, 0x65, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00,
+       0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_ipv6_pfcp_session_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xDD, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x18, 0x11, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x65,
+       0x22, 0x65, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00,
+       0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_non_ip_l2_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_ecpri_tp0_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0xAE, 0xFE, 0x10, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_ipv4_udp_ecpri_tp0_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x1C, 0x00, 0x00, 0x40, 0x00, 0x40, 0x11,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
 static const u8 ice_fdir_tcpv6_pkt[] = {
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x86, 0xDD, 0x60, 0x00,
@@ -281,52 +697,314 @@ static const u8 ice_fdir_ip6_tun_pkt[] = {
 /* Flow Director no-op training packet table */
 static const struct ice_fdir_base_pkt ice_fdir_pkt[] = {
        {
-               ICE_FLTR_PTYPE_NONF_IPV4_TCP,
-               sizeof(ice_fdir_tcpv4_pkt), ice_fdir_tcpv4_pkt,
-               sizeof(ice_fdir_tcp4_tun_pkt), ice_fdir_tcp4_tun_pkt,
+               ICE_FLTR_PTYPE_NONF_IPV4_TCP,
+               sizeof(ice_fdir_tcpv4_pkt), ice_fdir_tcpv4_pkt,
+               sizeof(ice_fdir_tcp4_tun_pkt), ice_fdir_tcp4_tun_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_UDP,
+               sizeof(ice_fdir_udpv4_pkt), ice_fdir_udpv4_pkt,
+               sizeof(ice_fdir_udp4_tun_pkt), ice_fdir_udp4_tun_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_SCTP,
+               sizeof(ice_fdir_sctpv4_pkt), ice_fdir_sctpv4_pkt,
+               sizeof(ice_fdir_sctp4_tun_pkt), ice_fdir_sctp4_tun_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_OTHER,
+               sizeof(ice_fdir_ipv4_pkt), ice_fdir_ipv4_pkt,
+               sizeof(ice_fdir_ip4_tun_pkt), ice_fdir_ip4_tun_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU,
+               sizeof(ice_fdir_ipv4_gtpu4_pkt),
+               ice_fdir_ipv4_gtpu4_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_pkt),
+               ice_fdir_ipv4_gtpu4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_pkt),
+               ice_fdir_ipv4_gtpu4_eh_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_pkt),
+               ice_fdir_ipv4_gtpu4_eh_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_dw_pkt),
+               ice_fdir_ipv4_gtpu4_eh_dw_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_dw_pkt),
+               ice_fdir_ipv4_gtpu4_eh_dw_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_up_pkt),
+               ice_fdir_ipv4_gtpu4_eh_up_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_up_pkt),
+               ice_fdir_ipv4_gtpu4_eh_up_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4,
+               sizeof(ice_fdir_ipv4_gtpu4_pkt),
+               ice_fdir_ipv4_gtpu4_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_pkt),
+               ice_fdir_ipv4_gtpu4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_UDP,
+               sizeof(ice_fdir_udp4_gtpu4_pkt),
+               ice_fdir_udp4_gtpu4_pkt,
+               sizeof(ice_fdir_udp4_gtpu4_pkt),
+               ice_fdir_udp4_gtpu4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_TCP,
+               sizeof(ice_fdir_tcp4_gtpu4_pkt),
+               ice_fdir_tcp4_gtpu4_pkt,
+               sizeof(ice_fdir_tcp4_gtpu4_pkt),
+               ice_fdir_tcp4_gtpu4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_pkt),
+               ice_fdir_ipv4_gtpu4_eh_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_pkt),
+               ice_fdir_ipv4_gtpu4_eh_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4_UDP,
+               sizeof(ice_fdir_udp4_gtpu4_eh_pkt),
+               ice_fdir_udp4_gtpu4_eh_pkt,
+               sizeof(ice_fdir_udp4_gtpu4_eh_pkt),
+               ice_fdir_udp4_gtpu4_eh_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4_TCP,
+               sizeof(ice_fdir_tcp4_gtpu4_eh_pkt),
+               ice_fdir_tcp4_gtpu4_eh_pkt,
+               sizeof(ice_fdir_tcp4_gtpu4_eh_pkt),
+               ice_fdir_tcp4_gtpu4_eh_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW_IPV4,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_dw_pkt),
+               ice_fdir_ipv4_gtpu4_eh_dw_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_dw_pkt),
+               ice_fdir_ipv4_gtpu4_eh_dw_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW_IPV4_UDP,
+               sizeof(ice_fdir_udp4_gtpu4_eh_dw_pkt),
+               ice_fdir_udp4_gtpu4_eh_dw_pkt,
+               sizeof(ice_fdir_udp4_gtpu4_eh_dw_pkt),
+               ice_fdir_udp4_gtpu4_eh_dw_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW_IPV4_TCP,
+               sizeof(ice_fdir_tcp4_gtpu4_eh_dw_pkt),
+               ice_fdir_tcp4_gtpu4_eh_dw_pkt,
+               sizeof(ice_fdir_tcp4_gtpu4_eh_dw_pkt),
+               ice_fdir_tcp4_gtpu4_eh_dw_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV4,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_up_pkt),
+               ice_fdir_ipv4_gtpu4_eh_up_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_up_pkt),
+               ice_fdir_ipv4_gtpu4_eh_up_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV4_UDP,
+               sizeof(ice_fdir_udp4_gtpu4_eh_up_pkt),
+               ice_fdir_udp4_gtpu4_eh_up_pkt,
+               sizeof(ice_fdir_udp4_gtpu4_eh_up_pkt),
+               ice_fdir_udp4_gtpu4_eh_up_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV4_TCP,
+               sizeof(ice_fdir_tcp4_gtpu4_eh_up_pkt),
+               ice_fdir_tcp4_gtpu4_eh_up_pkt,
+               sizeof(ice_fdir_tcp4_gtpu4_eh_up_pkt),
+               ice_fdir_tcp4_gtpu4_eh_up_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_ICMP,
+               sizeof(ice_fdir_icmp4_gtpu4_pkt),
+               ice_fdir_icmp4_gtpu4_pkt,
+               sizeof(ice_fdir_icmp4_gtpu4_pkt),
+               ice_fdir_icmp4_gtpu4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER,
+               sizeof(ice_fdir_ipv4_gtpu4_pkt),
+               ice_fdir_ipv4_gtpu4_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_pkt),
+               ice_fdir_ipv4_gtpu4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV6,
+               sizeof(ice_fdir_ipv6_gtpu4_pkt),
+               ice_fdir_ipv6_gtpu4_pkt,
+               sizeof(ice_fdir_ipv6_gtpu4_pkt),
+               ice_fdir_ipv6_gtpu4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV6_UDP,
+               sizeof(ice_fdir_udp6_gtpu4_pkt),
+               ice_fdir_udp6_gtpu4_pkt,
+               sizeof(ice_fdir_udp6_gtpu4_pkt),
+               ice_fdir_udp6_gtpu4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV6_TCP,
+               sizeof(ice_fdir_tcp6_gtpu4_pkt),
+               ice_fdir_tcp6_gtpu4_pkt,
+               sizeof(ice_fdir_tcp6_gtpu4_pkt),
+               ice_fdir_tcp6_gtpu4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GTPU,
+               sizeof(ice_fdir_ipv6_gtpu6_pkt),
+               ice_fdir_ipv6_gtpu6_pkt,
+               sizeof(ice_fdir_ipv6_gtpu6_pkt),
+               ice_fdir_ipv6_gtpu6_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH,
+               sizeof(ice_fdir_ipv6_gtpu6_eh_pkt),
+               ice_fdir_ipv6_gtpu6_eh_pkt,
+               sizeof(ice_fdir_ipv6_gtpu6_eh_pkt),
+               ice_fdir_ipv6_gtpu6_eh_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH_DW,
+               sizeof(ice_fdir_ipv6_gtpu6_eh_dw_pkt),
+               ice_fdir_ipv6_gtpu6_eh_dw_pkt,
+               sizeof(ice_fdir_ipv6_gtpu6_eh_dw_pkt),
+               ice_fdir_ipv6_gtpu6_eh_dw_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH_UP,
+               sizeof(ice_fdir_ipv6_gtpu6_eh_up_pkt),
+               ice_fdir_ipv6_gtpu6_eh_up_pkt,
+               sizeof(ice_fdir_ipv6_gtpu6_eh_up_pkt),
+               ice_fdir_ipv6_gtpu6_eh_up_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER,
+               sizeof(ice_fdir_ipv6_gtpu6_pkt),
+               ice_fdir_ipv6_gtpu6_pkt,
+               sizeof(ice_fdir_ipv6_gtpu6_pkt),
+               ice_fdir_ipv6_gtpu6_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4_OTHER,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_pkt),
+               ice_fdir_ipv4_gtpu4_eh_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_pkt),
+               ice_fdir_ipv4_gtpu4_eh_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH_IPV6_OTHER,
+               sizeof(ice_fdir_ipv6_gtpu6_eh_pkt),
+               ice_fdir_ipv6_gtpu6_eh_pkt,
+               sizeof(ice_fdir_ipv6_gtpu6_eh_pkt),
+               ice_fdir_ipv6_gtpu6_eh_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_L2TPV3,
+               sizeof(ice_fdir_ipv4_l2tpv3_pkt), ice_fdir_ipv4_l2tpv3_pkt,
+               sizeof(ice_fdir_ipv4_l2tpv3_pkt), ice_fdir_ipv4_l2tpv3_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_L2TPV3,
+               sizeof(ice_fdir_ipv6_l2tpv3_pkt), ice_fdir_ipv6_l2tpv3_pkt,
+               sizeof(ice_fdir_ipv6_l2tpv3_pkt), ice_fdir_ipv6_l2tpv3_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_ESP,
+               sizeof(ice_fdir_ipv4_esp_pkt), ice_fdir_ipv4_esp_pkt,
+               sizeof(ice_fdir_ipv4_esp_pkt), ice_fdir_ipv4_esp_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_ESP,
+               sizeof(ice_fdir_ipv6_esp_pkt), ice_fdir_ipv6_esp_pkt,
+               sizeof(ice_fdir_ipv6_esp_pkt), ice_fdir_ipv6_esp_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_AH,
+               sizeof(ice_fdir_ipv4_ah_pkt), ice_fdir_ipv4_ah_pkt,
+               sizeof(ice_fdir_ipv4_ah_pkt), ice_fdir_ipv4_ah_pkt,
        },
        {
-               ICE_FLTR_PTYPE_NONF_IPV4_UDP,
-               sizeof(ice_fdir_udpv4_pkt), ice_fdir_udpv4_pkt,
-               sizeof(ice_fdir_udp4_tun_pkt), ice_fdir_udp4_tun_pkt,
+               ICE_FLTR_PTYPE_NONF_IPV6_AH,
+               sizeof(ice_fdir_ipv6_ah_pkt), ice_fdir_ipv6_ah_pkt,
+               sizeof(ice_fdir_ipv6_ah_pkt), ice_fdir_ipv6_ah_pkt,
        },
        {
-               ICE_FLTR_PTYPE_NONF_IPV4_SCTP,
-               sizeof(ice_fdir_sctpv4_pkt), ice_fdir_sctpv4_pkt,
-               sizeof(ice_fdir_sctp4_tun_pkt), ice_fdir_sctp4_tun_pkt,
+               ICE_FLTR_PTYPE_NONF_IPV4_NAT_T_ESP,
+               sizeof(ice_fdir_ipv4_nat_t_esp_pkt),
+               ice_fdir_ipv4_nat_t_esp_pkt,
+               sizeof(ice_fdir_ipv4_nat_t_esp_pkt),
+               ice_fdir_ipv4_nat_t_esp_pkt,
        },
        {
-               ICE_FLTR_PTYPE_NONF_IPV4_OTHER,
-               sizeof(ice_fdir_ipv4_pkt), ice_fdir_ipv4_pkt,
-               sizeof(ice_fdir_ip4_tun_pkt), ice_fdir_ip4_tun_pkt,
+               ICE_FLTR_PTYPE_NONF_IPV6_NAT_T_ESP,
+               sizeof(ice_fdir_ipv6_nat_t_esp_pkt),
+               ice_fdir_ipv6_nat_t_esp_pkt,
+               sizeof(ice_fdir_ipv6_nat_t_esp_pkt),
+               ice_fdir_ipv6_nat_t_esp_pkt,
        },
        {
-               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_UDP,
-               sizeof(ice_fdir_udp4_gtpu4_pkt),
-               ice_fdir_udp4_gtpu4_pkt,
-               sizeof(ice_fdir_udp4_gtpu4_pkt),
-               ice_fdir_udp4_gtpu4_pkt,
+               ICE_FLTR_PTYPE_NONF_IPV4_PFCP_NODE,
+               sizeof(ice_fdir_ipv4_pfcp_node_pkt),
+               ice_fdir_ipv4_pfcp_node_pkt,
+               sizeof(ice_fdir_ipv4_pfcp_node_pkt),
+               ice_fdir_ipv4_pfcp_node_pkt,
        },
        {
-               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_TCP,
-               sizeof(ice_fdir_tcp4_gtpu4_pkt),
-               ice_fdir_tcp4_gtpu4_pkt,
-               sizeof(ice_fdir_tcp4_gtpu4_pkt),
-               ice_fdir_tcp4_gtpu4_pkt,
+               ICE_FLTR_PTYPE_NONF_IPV4_PFCP_SESSION,
+               sizeof(ice_fdir_ipv4_pfcp_session_pkt),
+               ice_fdir_ipv4_pfcp_session_pkt,
+               sizeof(ice_fdir_ipv4_pfcp_session_pkt),
+               ice_fdir_ipv4_pfcp_session_pkt,
        },
        {
-               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_ICMP,
-               sizeof(ice_fdir_icmp4_gtpu4_pkt),
-               ice_fdir_icmp4_gtpu4_pkt,
-               sizeof(ice_fdir_icmp4_gtpu4_pkt),
-               ice_fdir_icmp4_gtpu4_pkt,
+               ICE_FLTR_PTYPE_NONF_IPV6_PFCP_NODE,
+               sizeof(ice_fdir_ipv6_pfcp_node_pkt),
+               ice_fdir_ipv6_pfcp_node_pkt,
+               sizeof(ice_fdir_ipv6_pfcp_node_pkt),
+               ice_fdir_ipv6_pfcp_node_pkt,
        },
        {
-               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER,
-               sizeof(ice_fdir_ipv4_gtpu4_pkt),
-               ice_fdir_ipv4_gtpu4_pkt,
-               sizeof(ice_fdir_ipv4_gtpu4_pkt),
-               ice_fdir_ipv4_gtpu4_pkt,
+               ICE_FLTR_PTYPE_NONF_IPV6_PFCP_SESSION,
+               sizeof(ice_fdir_ipv6_pfcp_session_pkt),
+               ice_fdir_ipv6_pfcp_session_pkt,
+               sizeof(ice_fdir_ipv6_pfcp_session_pkt),
+               ice_fdir_ipv6_pfcp_session_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NON_IP_L2,
+               sizeof(ice_fdir_non_ip_l2_pkt), ice_fdir_non_ip_l2_pkt,
+               sizeof(ice_fdir_non_ip_l2_pkt), ice_fdir_non_ip_l2_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN,
+               sizeof(ice_fdir_udp4_vxlan_pkt), ice_fdir_udp4_vxlan_pkt,
+               sizeof(ice_fdir_udp4_vxlan_pkt), ice_fdir_udp4_vxlan_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_ECPRI_TP0,
+               sizeof(ice_fdir_ecpri_tp0_pkt), ice_fdir_ecpri_tp0_pkt,
+               sizeof(ice_fdir_ecpri_tp0_pkt), ice_fdir_ecpri_tp0_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_UDP_ECPRI_TP0,
+               sizeof(ice_fdir_ipv4_udp_ecpri_tp0_pkt),
+               ice_fdir_ipv4_udp_ecpri_tp0_pkt,
+               sizeof(ice_fdir_ipv4_udp_ecpri_tp0_pkt),
+               ice_fdir_ipv4_udp_ecpri_tp0_pkt,
        },
        {
                ICE_FLTR_PTYPE_NONF_IPV6_TCP,
@@ -352,41 +1030,11 @@ static const struct ice_fdir_base_pkt ice_fdir_pkt[] = {
 
 #define ICE_FDIR_NUM_PKT ARRAY_SIZE(ice_fdir_pkt)
 
-/* Flow Direcotr (FD) filter program descriptor Context */
-static const struct ice_ctx_ele ice_fd_fltr_desc_ctx_info[] = {
-                                          /* Field             Width   LSB */
-       ICE_CTX_STORE(ice_fd_fltr_desc_ctx, qindex,             11,     0),
-       ICE_CTX_STORE(ice_fd_fltr_desc_ctx, comp_q,             1,      11),
-       ICE_CTX_STORE(ice_fd_fltr_desc_ctx, comp_report,        2,      12),
-       ICE_CTX_STORE(ice_fd_fltr_desc_ctx, fd_space,           2,      14),
-       ICE_CTX_STORE(ice_fd_fltr_desc_ctx, cnt_index,          13,     16),
-       ICE_CTX_STORE(ice_fd_fltr_desc_ctx, cnt_ena,            2,      29),
-       ICE_CTX_STORE(ice_fd_fltr_desc_ctx, evict_ena,          1,      31),
-       ICE_CTX_STORE(ice_fd_fltr_desc_ctx, toq,                3,      32),
-       ICE_CTX_STORE(ice_fd_fltr_desc_ctx, toq_prio,           3,      35),
-       ICE_CTX_STORE(ice_fd_fltr_desc_ctx, dpu_recipe,         2,      38),
-       ICE_CTX_STORE(ice_fd_fltr_desc_ctx, drop,               1,      40),
-       ICE_CTX_STORE(ice_fd_fltr_desc_ctx, flex_prio,          3,      41),
-       ICE_CTX_STORE(ice_fd_fltr_desc_ctx, flex_mdid,          4,      44),
-       ICE_CTX_STORE(ice_fd_fltr_desc_ctx, flex_val,           16,     48),
-       ICE_CTX_STORE(ice_fd_fltr_desc_ctx, dtype,              4,      64),
-       ICE_CTX_STORE(ice_fd_fltr_desc_ctx, pcmd,               1,      68),
-       ICE_CTX_STORE(ice_fd_fltr_desc_ctx, desc_prof_prio,     3,      69),
-       ICE_CTX_STORE(ice_fd_fltr_desc_ctx, desc_prof,          6,      72),
-       ICE_CTX_STORE(ice_fd_fltr_desc_ctx, fd_vsi,             10,     78),
-       ICE_CTX_STORE(ice_fd_fltr_desc_ctx, swap,               1,      88),
-       ICE_CTX_STORE(ice_fd_fltr_desc_ctx, fdid_prio,          3,      89),
-       ICE_CTX_STORE(ice_fd_fltr_desc_ctx, fdid_mdid,          4,      92),
-       ICE_CTX_STORE(ice_fd_fltr_desc_ctx, fdid,               32,     96),
-       { 0 }
-};
-
 /**
  * ice_set_dflt_val_fd_desc
  * @fd_fltr_ctx: pointer to fd filter descriptor
  */
-void
-ice_set_dflt_val_fd_desc(struct ice_fd_fltr_desc_ctx *fd_fltr_ctx)
+static void ice_set_dflt_val_fd_desc(struct ice_fd_fltr_desc_ctx *fd_fltr_ctx)
 {
        fd_fltr_ctx->comp_q = ICE_FXD_FLTR_QW0_COMP_Q_ZERO;
        fd_fltr_ctx->comp_report = ICE_FXD_FLTR_QW0_COMP_REPORT_SW_FAIL;
@@ -409,6 +1057,70 @@ ice_set_dflt_val_fd_desc(struct ice_fd_fltr_desc_ctx *fd_fltr_ctx)
        fd_fltr_ctx->fdid = ICE_FXD_FLTR_QW1_FDID_ZERO;
 }
 
+/**
+ * ice_set_fd_desc_val
+ * @ctx: pointer to fd filter descriptor context
+ * @fdir_desc: populated with fd filter descriptor values
+ */
+static void
+ice_set_fd_desc_val(struct ice_fd_fltr_desc_ctx *ctx,
+                   struct ice_fltr_desc *fdir_desc)
+{
+       u64 qword;
+
+       /* prep QW0 of FD filter programming desc */
+       qword = ((u64)ctx->qindex << ICE_FXD_FLTR_QW0_QINDEX_S) &
+               ICE_FXD_FLTR_QW0_QINDEX_M;
+       qword |= ((u64)ctx->comp_q << ICE_FXD_FLTR_QW0_COMP_Q_S) &
+                ICE_FXD_FLTR_QW0_COMP_Q_M;
+       qword |= ((u64)ctx->comp_report << ICE_FXD_FLTR_QW0_COMP_REPORT_S) &
+                ICE_FXD_FLTR_QW0_COMP_REPORT_M;
+       qword |= ((u64)ctx->fd_space << ICE_FXD_FLTR_QW0_FD_SPACE_S) &
+                ICE_FXD_FLTR_QW0_FD_SPACE_M;
+       qword |= ((u64)ctx->cnt_index << ICE_FXD_FLTR_QW0_STAT_CNT_S) &
+                ICE_FXD_FLTR_QW0_STAT_CNT_M;
+       qword |= ((u64)ctx->cnt_ena << ICE_FXD_FLTR_QW0_STAT_ENA_S) &
+                ICE_FXD_FLTR_QW0_STAT_ENA_M;
+       qword |= ((u64)ctx->evict_ena << ICE_FXD_FLTR_QW0_EVICT_ENA_S) &
+                ICE_FXD_FLTR_QW0_EVICT_ENA_M;
+       qword |= ((u64)ctx->toq << ICE_FXD_FLTR_QW0_TO_Q_S) &
+                ICE_FXD_FLTR_QW0_TO_Q_M;
+       qword |= ((u64)ctx->toq_prio << ICE_FXD_FLTR_QW0_TO_Q_PRI_S) &
+                ICE_FXD_FLTR_QW0_TO_Q_PRI_M;
+       qword |= ((u64)ctx->dpu_recipe << ICE_FXD_FLTR_QW0_DPU_RECIPE_S) &
+                ICE_FXD_FLTR_QW0_DPU_RECIPE_M;
+       qword |= ((u64)ctx->drop << ICE_FXD_FLTR_QW0_DROP_S) &
+                ICE_FXD_FLTR_QW0_DROP_M;
+       qword |= ((u64)ctx->flex_prio << ICE_FXD_FLTR_QW0_FLEX_PRI_S) &
+                ICE_FXD_FLTR_QW0_FLEX_PRI_M;
+       qword |= ((u64)ctx->flex_mdid << ICE_FXD_FLTR_QW0_FLEX_MDID_S) &
+                ICE_FXD_FLTR_QW0_FLEX_MDID_M;
+       qword |= ((u64)ctx->flex_val << ICE_FXD_FLTR_QW0_FLEX_VAL_S) &
+                ICE_FXD_FLTR_QW0_FLEX_VAL_M;
+       fdir_desc->qidx_compq_space_stat = CPU_TO_LE64(qword);
+
+       /* prep QW1 of FD filter programming desc */
+       qword = ((u64)ctx->dtype << ICE_FXD_FLTR_QW1_DTYPE_S) &
+               ICE_FXD_FLTR_QW1_DTYPE_M;
+       qword |= ((u64)ctx->pcmd << ICE_FXD_FLTR_QW1_PCMD_S) &
+                ICE_FXD_FLTR_QW1_PCMD_M;
+       qword |= ((u64)ctx->desc_prof_prio << ICE_FXD_FLTR_QW1_PROF_PRI_S) &
+                ICE_FXD_FLTR_QW1_PROF_PRI_M;
+       qword |= ((u64)ctx->desc_prof << ICE_FXD_FLTR_QW1_PROF_S) &
+                ICE_FXD_FLTR_QW1_PROF_M;
+       qword |= ((u64)ctx->fd_vsi << ICE_FXD_FLTR_QW1_FD_VSI_S) &
+                ICE_FXD_FLTR_QW1_FD_VSI_M;
+       qword |= ((u64)ctx->swap << ICE_FXD_FLTR_QW1_SWAP_S) &
+                ICE_FXD_FLTR_QW1_SWAP_M;
+       qword |= ((u64)ctx->fdid_prio << ICE_FXD_FLTR_QW1_FDID_PRI_S) &
+                ICE_FXD_FLTR_QW1_FDID_PRI_M;
+       qword |= ((u64)ctx->fdid_mdid << ICE_FXD_FLTR_QW1_FDID_MDID_S) &
+                ICE_FXD_FLTR_QW1_FDID_MDID_M;
+       qword |= ((u64)ctx->fdid << ICE_FXD_FLTR_QW1_FDID_S) &
+                ICE_FXD_FLTR_QW1_FDID_M;
+       fdir_desc->dtype_cmd_vsi_fdid = CPU_TO_LE64(qword);
+}
+
 /**
  * ice_fdir_get_prgm_desc - set a fdir descriptor from a fdir filter struct
  * @hw: pointer to the hardware structure
@@ -430,6 +1142,10 @@ ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input,
        if (input->dest_ctl == ICE_FLTR_PRGM_DESC_DEST_DROP_PKT) {
                fdir_fltr_ctx.drop = ICE_FXD_FLTR_QW0_DROP_YES;
                fdir_fltr_ctx.qindex = 0;
+       } else if (input->dest_ctl ==
+                  ICE_FLTR_PRGM_DESC_DEST_DIRECT_PKT_OTHER) {
+               fdir_fltr_ctx.drop = ICE_FXD_FLTR_QW0_DROP_NO;
+               fdir_fltr_ctx.qindex = 0;
        } else {
                if (input->dest_ctl ==
                    ICE_FLTR_PRGM_DESC_DEST_DIRECT_PKT_QGROUP)
@@ -441,35 +1157,21 @@ ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input,
        fdir_fltr_ctx.cnt_index = input->cnt_index;
        fdir_fltr_ctx.fd_vsi = ice_get_hw_vsi_num(hw, input->dest_vsi);
        fdir_fltr_ctx.evict_ena = ICE_FXD_FLTR_QW0_EVICT_ENA_FALSE;
-       fdir_fltr_ctx.toq_prio = 3;
-       fdir_fltr_ctx.pcmd = (add) ? ICE_FXD_FLTR_QW1_PCMD_ADD :
+       if (input->dest_ctl == ICE_FLTR_PRGM_DESC_DEST_DIRECT_PKT_OTHER)
+               fdir_fltr_ctx.toq_prio = 0;
+       else
+               fdir_fltr_ctx.toq_prio = 3;
+       fdir_fltr_ctx.pcmd = add ? ICE_FXD_FLTR_QW1_PCMD_ADD :
                ICE_FXD_FLTR_QW1_PCMD_REMOVE;
        fdir_fltr_ctx.swap = ICE_FXD_FLTR_QW1_SWAP_NOT_SET;
        fdir_fltr_ctx.comp_q = ICE_FXD_FLTR_QW0_COMP_Q_ZERO;
-       fdir_fltr_ctx.comp_report = ICE_FXD_FLTR_QW0_COMP_REPORT_SW;
-       fdir_fltr_ctx.fdid_prio = 3;
+       fdir_fltr_ctx.comp_report = input->comp_report;
+       fdir_fltr_ctx.fdid_prio = input->fdid_prio;
        fdir_fltr_ctx.desc_prof = 1;
        fdir_fltr_ctx.desc_prof_prio = 3;
        ice_set_fd_desc_val(&fdir_fltr_ctx, fdesc);
 }
 
-/**
- * ice_set_fd_desc_val
- * @fd_fltr_ctx: pointer to fd filter descriptor context
- * @fdir_desc: populated with fd filter descriptor values
- */
-void
-ice_set_fd_desc_val(struct ice_fd_fltr_desc_ctx *fd_fltr_ctx,
-                   struct ice_fltr_desc *fdir_desc)
-{
-       u64 ctx_buf[2] = { 0 };
-
-       ice_set_ctx((u8 *)fd_fltr_ctx, (u8 *)ctx_buf,
-                   ice_fd_fltr_desc_ctx_info);
-       fdir_desc->qidx_compq_space_stat = CPU_TO_LE64(ctx_buf[0]);
-       fdir_desc->dtype_cmd_vsi_fdid = CPU_TO_LE64(ctx_buf[1]);
-}
-
 /**
  * ice_alloc_fd_res_cntr - obtain counter resource for FD type
  * @hw: pointer to the hardware structure
@@ -556,8 +1258,7 @@ ice_free_fd_shrd_item(struct ice_hw *hw, u16 cntr_id, u16 num_fltr)
  */
 int ice_get_fdir_cnt_all(struct ice_hw *hw)
 {
-       return hw->func_caps.fd_fltr_guar +
-              hw->func_caps.fd_fltr_best_effort;
+       return hw->func_caps.fd_fltr_guar + hw->func_caps.fd_fltr_best_effort;
 }
 
 /**
@@ -603,13 +1304,13 @@ static void ice_pkt_insert_u8(u8 *pkt, int offset, u8 data)
 }
 
 /**
- * ice_pkt_insert_u8_tc - insert a u8 value into a memory buffer for tc ipv6.
+ * ice_pkt_insert_u8_tc - insert a u8 value into a memory buffer for TC ipv6.
  * @pkt: packet buffer
  * @offset: offset into buffer
  * @data: 8 bit value to convert and insert into pkt at offset
  *
- * This function is designed for inserting Traffic Class (tc) for IPv6,
- * since that tc is not aligned in number of bytes. Here we split it out
+ * This function is designed for inserting Traffic Class (TC) for IPv6,
+ * since that TC is not aligned in number of bytes. Here we split it out
  * into two part and fill each byte with data copy from pkt, then insert
  * the two bytes data one by one.
  */
@@ -649,7 +1350,6 @@ static void ice_pkt_insert_u32(u8 *pkt, int offset, __be32 data)
 /**
  * ice_pkt_insert_mac_addr - insert a MAC addr into a memory buffer.
  * @pkt: packet buffer
- * @offset: offset into buffer
  * @addr: MAC address to convert and insert into pkt at offset
  */
 static void ice_pkt_insert_mac_addr(u8 *pkt, u8 *addr)
@@ -657,6 +1357,33 @@ static void ice_pkt_insert_mac_addr(u8 *pkt, u8 *addr)
        ice_memcpy(pkt, addr, ETH_ALEN, ICE_NONDMA_TO_NONDMA);
 }
 
+/**
+ * ice_fdir_get_open_tunnel_port
+ * @hw: pointer to the hardware structure
+ * @flow: flow ptype
+ * @port: returns open port
+ *
+ * returns an open tunnel port specified for this flow type
+ */
+static enum ice_status
+ice_fdir_get_open_tunnel_port(struct ice_hw *hw, enum ice_fltr_ptype flow,
+                             u16 *port)
+{
+       switch (flow) {
+       case ICE_FLTR_PTYPE_NONF_IPV4_UDP_ECPRI_TP0:
+               /* eCPRI tunnel */
+               if (!ice_get_open_tunnel_port(hw, TNL_ECPRI, port))
+                       return ICE_ERR_DOES_NOT_EXIST;
+               break;
+       default:
+               if (!ice_get_open_tunnel_port(hw, TNL_VXLAN, port) &&
+                   !ice_get_open_tunnel_port(hw, TNL_GENEVE, port))
+                       return ICE_ERR_DOES_NOT_EXIST;
+       }
+
+       return ICE_SUCCESS;
+}
+
 /**
  * ice_fdir_get_gen_prgm_pkt - generate a training packet
  * @hw: pointer to the hardware structure
@@ -718,27 +1445,62 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,
                           ice_fdir_pkt[idx].pkt_len, ICE_NONDMA_TO_NONDMA);
                loc = pkt;
        } else {
-               if (!ice_get_open_tunnel_port(hw, TNL_ALL, &tnl_port))
-                       return ICE_ERR_DOES_NOT_EXIST;
                if (!ice_fdir_pkt[idx].tun_pkt)
                        return ICE_ERR_PARAM;
-               ice_memcpy(pkt, ice_fdir_pkt[idx].tun_pkt,
-                          ice_fdir_pkt[idx].tun_pkt_len, ICE_NONDMA_TO_NONDMA);
-               ice_pkt_insert_u16(pkt, ICE_IPV4_UDP_DST_PORT_OFFSET,
-                                  HTONS(tnl_port));
-               loc = &pkt[ICE_FDIR_TUN_PKT_OFF];
+
+               switch (flow) {
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_TCP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV6:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV6_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV6_TCP:
+                       ice_memcpy(pkt, ice_fdir_pkt[idx].tun_pkt,
+                                  ice_fdir_pkt[idx].tun_pkt_len,
+                                  ICE_NONDMA_TO_NONDMA);
+                       loc = &pkt[ICE_FDIR_GTPU_IP_INNER_PKT_OFF];
+                       break;
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4_TCP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW_IPV4:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW_IPV4_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW_IPV4_TCP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV4:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV4_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV4_TCP:
+                       ice_memcpy(pkt, ice_fdir_pkt[idx].tun_pkt,
+                                  ice_fdir_pkt[idx].tun_pkt_len,
+                                  ICE_NONDMA_TO_NONDMA);
+                       loc = &pkt[ICE_FDIR_GTPU_EH_INNER_PKT_OFF];
+                       break;
+               default:
+                       if (ice_fdir_get_open_tunnel_port(hw, flow, &tnl_port))
+                               return ICE_ERR_DOES_NOT_EXIST;
+
+                       ice_memcpy(pkt, ice_fdir_pkt[idx].tun_pkt,
+                                  ice_fdir_pkt[idx].tun_pkt_len,
+                                  ICE_NONDMA_TO_NONDMA);
+                       ice_pkt_insert_u16(pkt, ICE_IPV4_UDP_DST_PORT_OFFSET,
+                                          HTONS(tnl_port));
+                       loc = &pkt[ICE_FDIR_TUN_PKT_OFF];
+                       break;
+               }
        }
 
+       /* Reverse the src and dst, since the HW expects them to be from Tx
+        * perspective. The input from user is from Rx filter perspective.
+        */
        switch (flow) {
        case ICE_FLTR_PTYPE_NONF_IPV4_TCP:
                ice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET,
-                                  input->ip.v4.dst_ip);
+                                  input->ip.v4.src_ip);
                ice_pkt_insert_u16(loc, ICE_IPV4_TCP_DST_PORT_OFFSET,
-                                  input->ip.v4.dst_port);
+                                  input->ip.v4.src_port);
                ice_pkt_insert_u32(loc, ICE_IPV4_SRC_ADDR_OFFSET,
-                                  input->ip.v4.src_ip);
+                                  input->ip.v4.dst_ip);
                ice_pkt_insert_u16(loc, ICE_IPV4_TCP_SRC_PORT_OFFSET,
-                                  input->ip.v4.src_port);
+                                  input->ip.v4.dst_port);
                ice_pkt_insert_u8(loc, ICE_IPV4_TOS_OFFSET, input->ip.v4.tos);
                ice_pkt_insert_u8(loc, ICE_IPV4_TTL_OFFSET, input->ip.v4.ttl);
                ice_pkt_insert_mac_addr(loc, input->ext_data.dst_mac);
@@ -746,93 +1508,300 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,
                        loc[20] = ICE_FDIR_IPV4_PKT_FLAG_DF;
                break;
        case ICE_FLTR_PTYPE_NONF_IPV4_UDP:
+               ice_pkt_insert_mac_addr(pkt, input->ext_data_outer.dst_mac);
+               ice_pkt_insert_mac_addr(pkt + ETH_ALEN,
+                                       input->ext_data_outer.src_mac);
+               ice_pkt_insert_u32(pkt, ICE_IPV4_SRC_ADDR_OFFSET,
+                                  input->ip_outer.v4.dst_ip);
+               ice_pkt_insert_u32(pkt, ICE_IPV4_DST_ADDR_OFFSET,
+                                  input->ip_outer.v4.src_ip);
+               ice_pkt_insert_u8(pkt, ICE_IPV4_TOS_OFFSET, input->ip_outer.v4.tos);
                ice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET,
-                                  input->ip.v4.dst_ip);
+                                  input->ip.v4.src_ip);
                ice_pkt_insert_u16(loc, ICE_IPV4_UDP_DST_PORT_OFFSET,
-                                  input->ip.v4.dst_port);
+                                  input->ip.v4.src_port);
                ice_pkt_insert_u32(loc, ICE_IPV4_SRC_ADDR_OFFSET,
-                                  input->ip.v4.src_ip);
+                                  input->ip.v4.dst_ip);
                ice_pkt_insert_u16(loc, ICE_IPV4_UDP_SRC_PORT_OFFSET,
-                                  input->ip.v4.src_port);
+                                  input->ip.v4.dst_port);
                ice_pkt_insert_u8(loc, ICE_IPV4_TOS_OFFSET, input->ip.v4.tos);
                ice_pkt_insert_u8(loc, ICE_IPV4_TTL_OFFSET, input->ip.v4.ttl);
                ice_pkt_insert_mac_addr(loc, input->ext_data.dst_mac);
+               ice_pkt_insert_mac_addr(loc + ETH_ALEN, input->ext_data.src_mac);
                break;
        case ICE_FLTR_PTYPE_NONF_IPV4_SCTP:
                ice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET,
-                                  input->ip.v4.dst_ip);
+                                  input->ip.v4.src_ip);
                ice_pkt_insert_u16(loc, ICE_IPV4_SCTP_DST_PORT_OFFSET,
-                                  input->ip.v4.dst_port);
+                                  input->ip.v4.src_port);
                ice_pkt_insert_u32(loc, ICE_IPV4_SRC_ADDR_OFFSET,
-                                  input->ip.v4.src_ip);
+                                  input->ip.v4.dst_ip);
                ice_pkt_insert_u16(loc, ICE_IPV4_SCTP_SRC_PORT_OFFSET,
-                                  input->ip.v4.src_port);
+                                  input->ip.v4.dst_port);
                ice_pkt_insert_u8(loc, ICE_IPV4_TOS_OFFSET, input->ip.v4.tos);
                ice_pkt_insert_u8(loc, ICE_IPV4_TTL_OFFSET, input->ip.v4.ttl);
                ice_pkt_insert_mac_addr(loc, input->ext_data.dst_mac);
                break;
        case ICE_FLTR_PTYPE_NONF_IPV4_OTHER:
                ice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET,
-                                  input->ip.v4.dst_ip);
-               ice_pkt_insert_u32(loc, ICE_IPV4_SRC_ADDR_OFFSET,
                                   input->ip.v4.src_ip);
+               ice_pkt_insert_u32(loc, ICE_IPV4_SRC_ADDR_OFFSET,
+                                  input->ip.v4.dst_ip);
                ice_pkt_insert_u8(loc, ICE_IPV4_TOS_OFFSET, input->ip.v4.tos);
                ice_pkt_insert_u8(loc, ICE_IPV4_TTL_OFFSET, input->ip.v4.ttl);
                ice_pkt_insert_u8(loc, ICE_IPV4_PROTO_OFFSET,
                                  input->ip.v4.proto);
                ice_pkt_insert_mac_addr(loc, input->ext_data.dst_mac);
                break;
-       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_UDP:
-       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:
+       case ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN:
+               ice_pkt_insert_mac_addr(pkt, input->ext_data_outer.dst_mac);
+               ice_pkt_insert_mac_addr(pkt + ETH_ALEN, input->ext_data_outer.src_mac);
+               ice_pkt_insert_u32(pkt, ICE_IPV4_SRC_ADDR_OFFSET,
+                                  input->ip_outer.v4.dst_ip);
+               ice_pkt_insert_u32(pkt, ICE_IPV4_DST_ADDR_OFFSET,
+                                  input->ip_outer.v4.src_ip);
+               ice_pkt_insert_u8(pkt, ICE_IPV4_TOS_OFFSET, input->ip_outer.v4.tos);
+               ice_pkt_insert_u32(pkt, ICE_IPV4_VXLAN_VNI_OFFSET,
+                                  input->vxlan_data.vni);
+               ice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET,
+                                  input->ip.v4.src_ip);
+               ice_pkt_insert_u16(loc, ICE_IPV4_UDP_DST_PORT_OFFSET,
+                                  input->ip.v4.src_port);
+               ice_pkt_insert_u32(loc, ICE_IPV4_SRC_ADDR_OFFSET,
+                                  input->ip.v4.dst_ip);
+               ice_pkt_insert_u16(loc, ICE_IPV4_UDP_SRC_PORT_OFFSET,
+                                  input->ip.v4.dst_port);
+               ice_pkt_insert_u8(loc, ICE_IPV4_TOS_OFFSET, input->ip.v4.tos);
+               ice_pkt_insert_u8(loc, ICE_IPV4_TTL_OFFSET, input->ip.v4.ttl);
+               ice_pkt_insert_mac_addr(loc, input->ext_data.dst_mac);
+               ice_pkt_insert_mac_addr(loc + ETH_ALEN, input->ext_data.src_mac);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU:
+               ice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET,
+                                  input->ip.v4.src_ip);
+               ice_pkt_insert_u32(loc, ICE_IPV4_SRC_ADDR_OFFSET,
+                                  input->ip.v4.dst_ip);
+               ice_pkt_insert_u32(loc, ICE_IPV4_GTPU_TEID_OFFSET,
+                                  input->gtpu_data.teid);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW_IPV4:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV4:
+               ice_pkt_insert_u32(loc, ICE_IPV4_NO_MAC_DST_ADDR_OFFSET,
+                                  input->ip.v4.src_ip);
+               ice_pkt_insert_u32(loc, ICE_IPV4_NO_MAC_SRC_ADDR_OFFSET,
+                                  input->ip.v4.dst_ip);
+               ice_pkt_insert_u8(loc, ICE_IPV4_NO_MAC_TOS_OFFSET, input->ip.v4.tos);
+               ice_pkt_insert_u8(loc, ICE_IPV4_NO_MAC_TTL_OFFSET, input->ip.v4.ttl);
+               ice_pkt_insert_u8(loc, ICE_IPV4_NO_MAC_PROTO_OFFSET,
+                                 input->ip.v4.proto);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP:
+               ice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET,
+                                  input->ip.v4.src_ip);
+               ice_pkt_insert_u32(loc, ICE_IPV4_SRC_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,
                                      input->gtpu_data.qfi);
                break;
-       case ICE_FLTR_PTYPE_NONF_IPV6_TCP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_UDP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4_UDP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW_IPV4_UDP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV4_UDP:
+               ice_pkt_insert_u32(loc, ICE_IPV4_NO_MAC_DST_ADDR_OFFSET,
+                                  input->ip.v4.src_ip);
+               ice_pkt_insert_u16(loc, ICE_UDP4_NO_MAC_DST_PORT_OFFSET,
+                                  input->ip.v4.src_port);
+               ice_pkt_insert_u32(loc, ICE_IPV4_NO_MAC_SRC_ADDR_OFFSET,
+                                  input->ip.v4.dst_ip);
+               ice_pkt_insert_u16(loc, ICE_UDP4_NO_MAC_SRC_PORT_OFFSET,
+                                  input->ip.v4.dst_port);
+               ice_pkt_insert_u8(loc, ICE_IPV4_NO_MAC_TOS_OFFSET, input->ip.v4.tos);
+               ice_pkt_insert_u8(loc, ICE_IPV4_NO_MAC_TTL_OFFSET, input->ip.v4.ttl);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_TCP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4_TCP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW_IPV4_TCP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV4_TCP:
+               ice_pkt_insert_u32(loc, ICE_IPV4_NO_MAC_DST_ADDR_OFFSET,
+                                  input->ip.v4.src_ip);
+               ice_pkt_insert_u16(loc, ICE_TCP4_NO_MAC_DST_PORT_OFFSET,
+                                  input->ip.v4.src_port);
+               ice_pkt_insert_u32(loc, ICE_IPV4_NO_MAC_SRC_ADDR_OFFSET,
+                                  input->ip.v4.dst_ip);
+               ice_pkt_insert_u16(loc, ICE_TCP4_NO_MAC_SRC_PORT_OFFSET,
+                                  input->ip.v4.dst_port);
+               ice_pkt_insert_u8(loc, ICE_IPV4_NO_MAC_TOS_OFFSET, input->ip.v4.tos);
+               ice_pkt_insert_u8(loc, ICE_IPV4_NO_MAC_TTL_OFFSET, input->ip.v4.ttl);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV6:
+               ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_NO_MAC_DST_ADDR_OFFSET,
+                                        input->ip.v6.src_ip);
+               ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_NO_MAC_SRC_ADDR_OFFSET,
+                                        input->ip.v6.dst_ip);
+               ice_pkt_insert_u8_tc(loc, ICE_IPV6_NO_MAC_TC_OFFSET, input->ip.v6.tc);
+               ice_pkt_insert_u8(loc, ICE_IPV6_NO_MAC_HLIM_OFFSET, input->ip.v6.hlim);
+               ice_pkt_insert_u8(loc, ICE_IPV6_NO_MAC_PROTO_OFFSET,
+                                 input->ip.v6.proto);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV6_UDP:
+               ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_NO_MAC_DST_ADDR_OFFSET,
+                                        input->ip.v6.src_ip);
+               ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_NO_MAC_SRC_ADDR_OFFSET,
+                                        input->ip.v6.dst_ip);
+               ice_pkt_insert_u16(loc, ICE_UDP6_NO_MAC_DST_PORT_OFFSET,
+                                  input->ip.v6.src_port);
+               ice_pkt_insert_u16(loc, ICE_UDP6_NO_MAC_SRC_PORT_OFFSET,
+                                  input->ip.v6.dst_port);
+               ice_pkt_insert_u8_tc(loc, ICE_IPV6_NO_MAC_TC_OFFSET, input->ip.v6.tc);
+               ice_pkt_insert_u8(loc, ICE_IPV6_NO_MAC_HLIM_OFFSET, input->ip.v6.hlim);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV6_TCP:
+               ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_NO_MAC_DST_ADDR_OFFSET,
+                                        input->ip.v6.src_ip);
+               ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_NO_MAC_SRC_ADDR_OFFSET,
+                                        input->ip.v6.dst_ip);
+               ice_pkt_insert_u16(loc, ICE_TCP6_NO_MAC_DST_PORT_OFFSET,
+                                  input->ip.v6.src_port);
+               ice_pkt_insert_u16(loc, ICE_TCP6_NO_MAC_SRC_PORT_OFFSET,
+                                  input->ip.v6.dst_port);
+               ice_pkt_insert_u8_tc(loc, ICE_IPV6_NO_MAC_TC_OFFSET, input->ip.v6.tc);
+               ice_pkt_insert_u8(loc, ICE_IPV6_NO_MAC_HLIM_OFFSET, input->ip.v6.hlim);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV6_GTPU:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER:
+               ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_DST_ADDR_OFFSET,
+                                        input->ip.v6.src_ip);
+               ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_SRC_ADDR_OFFSET,
+                                        input->ip.v6.dst_ip);
+               ice_pkt_insert_u32(loc, ICE_IPV6_GTPU_TEID_OFFSET,
+                                  input->gtpu_data.teid);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH_DW:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH_UP:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH_IPV6_OTHER:
                ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_DST_ADDR_OFFSET,
+                                        input->ip.v6.src_ip);
+               ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_SRC_ADDR_OFFSET,
                                         input->ip.v6.dst_ip);
+               ice_pkt_insert_u32(loc, ICE_IPV6_GTPU_TEID_OFFSET,
+                                  input->gtpu_data.teid);
+               ice_pkt_insert_u6_qfi(loc, ICE_IPV6_GTPU_QFI_OFFSET,
+                                     input->gtpu_data.qfi);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV4_L2TPV3:
+               ice_pkt_insert_u32(loc, ICE_IPV4_L2TPV3_SESS_ID_OFFSET,
+                                  input->l2tpv3_data.session_id);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV6_L2TPV3:
+               ice_pkt_insert_u32(loc, ICE_IPV6_L2TPV3_SESS_ID_OFFSET,
+                                  input->l2tpv3_data.session_id);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV4_ESP:
+               ice_pkt_insert_u32(loc, ICE_IPV4_ESP_SPI_OFFSET,
+                                  input->ip.v4.sec_parm_idx);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV6_ESP:
+               ice_pkt_insert_u32(loc, ICE_IPV6_ESP_SPI_OFFSET,
+                                  input->ip.v6.sec_parm_idx);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV4_AH:
+               ice_pkt_insert_u32(loc, ICE_IPV4_AH_SPI_OFFSET,
+                                  input->ip.v4.sec_parm_idx);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV6_AH:
+               ice_pkt_insert_u32(loc, ICE_IPV6_AH_SPI_OFFSET,
+                                  input->ip.v6.sec_parm_idx);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV4_NAT_T_ESP:
+               ice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET,
+                                  input->ip.v4.src_ip);
+               ice_pkt_insert_u32(loc, ICE_IPV4_SRC_ADDR_OFFSET,
+                                  input->ip.v4.dst_ip);
+               ice_pkt_insert_u32(loc, ICE_IPV4_NAT_T_ESP_SPI_OFFSET,
+                                  input->ip.v4.sec_parm_idx);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV6_NAT_T_ESP:
+               ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_DST_ADDR_OFFSET,
+                                        input->ip.v6.src_ip);
                ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_SRC_ADDR_OFFSET,
+                                        input->ip.v6.dst_ip);
+               ice_pkt_insert_u32(loc, ICE_IPV6_NAT_T_ESP_SPI_OFFSET,
+                                  input->ip.v6.sec_parm_idx);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV4_PFCP_NODE:
+       case ICE_FLTR_PTYPE_NONF_IPV4_PFCP_SESSION:
+               ice_pkt_insert_u16(loc, ICE_IPV4_UDP_SRC_PORT_OFFSET,
+                                  input->ip.v4.dst_port);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV6_PFCP_NODE:
+       case ICE_FLTR_PTYPE_NONF_IPV6_PFCP_SESSION:
+               ice_pkt_insert_u16(loc, ICE_IPV6_UDP_SRC_PORT_OFFSET,
+                                  input->ip.v6.dst_port);
+               break;
+       case ICE_FLTR_PTYPE_NON_IP_L2:
+               ice_pkt_insert_u16(loc, ICE_MAC_ETHTYPE_OFFSET,
+                                  input->ext_data.ether_type);
+               break;
+       case ICE_FLTR_PTYPE_NONF_ECPRI_TP0:
+               ice_pkt_insert_u16(loc, ICE_ECPRI_TP0_PC_ID_OFFSET,
+                                  input->ecpri_data.pc_id);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV4_UDP_ECPRI_TP0:
+               /* Use pkt instead of loc, since PC_ID is in outer part */
+               ice_pkt_insert_u16(pkt, ICE_IPV4_UDP_ECPRI_TP0_PC_ID_OFFSET,
+                                  input->ecpri_data.pc_id);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV6_TCP:
+               ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_DST_ADDR_OFFSET,
                                         input->ip.v6.src_ip);
+               ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_SRC_ADDR_OFFSET,
+                                        input->ip.v6.dst_ip);
                ice_pkt_insert_u16(loc, ICE_IPV6_TCP_DST_PORT_OFFSET,
-                                  input->ip.v6.dst_port);
-               ice_pkt_insert_u16(loc, ICE_IPV6_TCP_SRC_PORT_OFFSET,
                                   input->ip.v6.src_port);
+               ice_pkt_insert_u16(loc, ICE_IPV6_TCP_SRC_PORT_OFFSET,
+                                  input->ip.v6.dst_port);
                ice_pkt_insert_u8_tc(loc, ICE_IPV6_TC_OFFSET, input->ip.v6.tc);
                ice_pkt_insert_u8(loc, ICE_IPV6_HLIM_OFFSET, input->ip.v6.hlim);
                ice_pkt_insert_mac_addr(loc, input->ext_data.dst_mac);
                break;
        case ICE_FLTR_PTYPE_NONF_IPV6_UDP:
                ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_DST_ADDR_OFFSET,
-                                        input->ip.v6.dst_ip);
-               ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_SRC_ADDR_OFFSET,
                                         input->ip.v6.src_ip);
+               ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_SRC_ADDR_OFFSET,
+                                        input->ip.v6.dst_ip);
                ice_pkt_insert_u16(loc, ICE_IPV6_UDP_DST_PORT_OFFSET,
-                                  input->ip.v6.dst_port);
-               ice_pkt_insert_u16(loc, ICE_IPV6_UDP_SRC_PORT_OFFSET,
                                   input->ip.v6.src_port);
+               ice_pkt_insert_u16(loc, ICE_IPV6_UDP_SRC_PORT_OFFSET,
+                                  input->ip.v6.dst_port);
                ice_pkt_insert_u8_tc(loc, ICE_IPV6_TC_OFFSET, input->ip.v6.tc);
                ice_pkt_insert_u8(loc, ICE_IPV6_HLIM_OFFSET, input->ip.v6.hlim);
                ice_pkt_insert_mac_addr(loc, input->ext_data.dst_mac);
                break;
        case ICE_FLTR_PTYPE_NONF_IPV6_SCTP:
                ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_DST_ADDR_OFFSET,
-                                        input->ip.v6.dst_ip);
-               ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_SRC_ADDR_OFFSET,
                                         input->ip.v6.src_ip);
+               ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_SRC_ADDR_OFFSET,
+                                        input->ip.v6.dst_ip);
                ice_pkt_insert_u16(loc, ICE_IPV6_SCTP_DST_PORT_OFFSET,
-                                  input->ip.v6.dst_port);
-               ice_pkt_insert_u16(loc, ICE_IPV6_SCTP_SRC_PORT_OFFSET,
                                   input->ip.v6.src_port);
+               ice_pkt_insert_u16(loc, ICE_IPV6_SCTP_SRC_PORT_OFFSET,
+                                  input->ip.v6.dst_port);
                ice_pkt_insert_u8_tc(loc, ICE_IPV6_TC_OFFSET, input->ip.v6.tc);
                ice_pkt_insert_u8(loc, ICE_IPV6_HLIM_OFFSET, input->ip.v6.hlim);
                ice_pkt_insert_mac_addr(loc, input->ext_data.dst_mac);
                break;
        case ICE_FLTR_PTYPE_NONF_IPV6_OTHER:
                ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_DST_ADDR_OFFSET,
-                                        input->ip.v6.dst_ip);
-               ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_SRC_ADDR_OFFSET,
                                         input->ip.v6.src_ip);
+               ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_SRC_ADDR_OFFSET,
+                                        input->ip.v6.dst_ip);
                ice_pkt_insert_u8_tc(loc, ICE_IPV6_TC_OFFSET, input->ip.v6.tc);
                ice_pkt_insert_u8(loc, ICE_IPV6_HLIM_OFFSET, input->ip.v6.hlim);
                ice_pkt_insert_u8(loc, ICE_IPV6_PROTO_OFFSET,
@@ -876,7 +1845,7 @@ bool ice_fdir_has_frag(enum ice_fltr_ptype flow)
 }
 
 /**
- * ice_fdir_find_by_idx - find filter with idx
+ * ice_fdir_find_fltr_by_idx - find filter with idx
  * @hw: pointer to hardware structure
  * @fltr_idx: index to find.
  *
@@ -885,7 +1854,7 @@ bool ice_fdir_has_frag(enum ice_fltr_ptype flow)
 struct ice_fdir_fltr *
 ice_fdir_find_fltr_by_idx(struct ice_hw *hw, u32 fltr_idx)
 {
-       struct ice_fdir_fltr *rule = NULL;
+       struct ice_fdir_fltr *rule;
 
        LIST_FOR_EACH_ENTRY(rule, &hw->fdir_list_head, ice_fdir_fltr,
                            fltr_node) {
@@ -925,19 +1894,25 @@ void ice_fdir_list_add_fltr(struct ice_hw *hw, struct ice_fdir_fltr *fltr)
  * ice_fdir_update_cntrs - increment / decrement filter counter
  * @hw: pointer to hardware structure
  * @flow: filter flow type
+ * @acl_fltr: true indicates an ACL filter
  * @add: true implies filters added
  */
 void
-ice_fdir_update_cntrs(struct ice_hw *hw, enum ice_fltr_ptype flow, bool add)
+ice_fdir_update_cntrs(struct ice_hw *hw, enum ice_fltr_ptype flow,
+                     bool acl_fltr, bool add)
 {
        int incr;
 
-       incr = (add) ? 1 : -1;
+       incr = add ? 1 : -1;
        hw->fdir_active_fltr += incr;
-       if (flow == ICE_FLTR_PTYPE_NONF_NONE || flow >= ICE_FLTR_PTYPE_MAX)
+       if (flow == ICE_FLTR_PTYPE_NONF_NONE || flow >= ICE_FLTR_PTYPE_MAX) {
                ice_debug(hw, ICE_DBG_SW, "Unknown filter type %d\n", flow);
-       else
-               hw->fdir_fltr_cnt[flow] += incr;
+       } else {
+               if (acl_fltr)
+                       hw->acl_fltr_cnt[flow] += incr;
+               else
+                       hw->fdir_fltr_cnt[flow] += incr;
+       }
 }
 
 /**
@@ -953,7 +1928,7 @@ static int ice_cmp_ipv6_addr(__be32 *a, __be32 *b)
 }
 
 /**
- * ice_fdir_comp_ipv6_rules - compare 2 filters
+ * ice_fdir_comp_rules - compare 2 filters
  * @a: a Flow Director filter data structure
  * @b: a Flow Director filter data structure
  * @v6: bool true if v6 filter
@@ -1016,57 +1991,36 @@ ice_fdir_comp_rules(struct ice_fdir_fltr *a,  struct ice_fdir_fltr *b, bool v6)
  */
 bool ice_fdir_is_dup_fltr(struct ice_hw *hw, struct ice_fdir_fltr *input)
 {
-       enum ice_fltr_ptype flow_type;
        struct ice_fdir_fltr *rule;
        bool ret = false;
 
-       rule = NULL;
-
        LIST_FOR_EACH_ENTRY(rule, &hw->fdir_list_head, ice_fdir_fltr,
                            fltr_node) {
-               if (rule->flow_type == input->flow_type) {
-                       flow_type = input->flow_type;
-                       if (flow_type == ICE_FLTR_PTYPE_NONF_IPV4_TCP ||
-                           flow_type == ICE_FLTR_PTYPE_NONF_IPV4_UDP ||
-                           flow_type == ICE_FLTR_PTYPE_NONF_IPV4_SCTP ||
-                           flow_type == ICE_FLTR_PTYPE_NONF_IPV4_OTHER)
-                               ret = ice_fdir_comp_rules(rule, input, false);
+               enum ice_fltr_ptype flow_type;
+
+               if (rule->flow_type != input->flow_type)
+                       continue;
+
+               flow_type = input->flow_type;
+               if (flow_type == ICE_FLTR_PTYPE_NONF_IPV4_TCP ||
+                   flow_type == ICE_FLTR_PTYPE_NONF_IPV4_UDP ||
+                   flow_type == ICE_FLTR_PTYPE_NONF_IPV4_SCTP ||
+                   flow_type == ICE_FLTR_PTYPE_NONF_IPV4_OTHER)
+                       ret = ice_fdir_comp_rules(rule, input, false);
+               else
+                       ret = ice_fdir_comp_rules(rule, input, true);
+               if (ret) {
+                       if (rule->fltr_id == input->fltr_id &&
+                           rule->q_index != input->q_index)
+                               ret = false;
                        else
-                               ret = ice_fdir_comp_rules(rule, input, true);
-                       if (ret) {
-                               if (rule->fltr_id == input->fltr_id &&
-                                   rule->q_index != input->q_index)
-                                       ret = false;
-                               else
-                                       break;
-                       }
+                               break;
                }
        }
 
        return ret;
 }
 
-/**
- * ice_clear_vsi_fd_table - admin command to clear FD table for a VSI
- * @hw: hardware data structure
- * @vsi_num: vsi_num (HW VSI num)
- *
- * Clears FD table entries by issuing admin command (direct, 0x0B06)
- * Must to pass valid vsi_num as returned by "AddVSI".
- */
-enum ice_status ice_clear_vsi_fd_table(struct ice_hw *hw, u16 vsi_num)
-{
-       struct ice_aqc_clear_fd_table *cmd;
-       struct ice_aq_desc desc;
-
-       cmd = &desc.params.clear_fd_table;
-       ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_clear_fd_table);
-       cmd->clear_type = CL_FD_VM_VF_TYPE_VSI_IDX;
-
-       cmd->vsi_index = CPU_TO_LE16(vsi_num);
-       return ice_aq_send_cmd(hw, &desc, NULL, 0, NULL);
-}
-
 /**
  * ice_clear_pf_fd_table - admin command to clear FD table for PF
  * @hw: hardware data structure