common/cnxk: add lower bound check for SSO resources

[dpdk.git] / drivers / net / ice / base / ice_fdir.c

diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c
index e5ad0f2..ae76361 100644 (file)
--- a/drivers/net/ice/base/ice_fdir.c
+++ b/drivers/net/ice/base/ice_fdir.c
@@ -97,6 +97,54 @@ static const u8 ice_fdir_tcp4_gtpu4_pkt[] = {
        0x00, 0x00, 0x00, 0x00,
 };
 
+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, 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_ipv4_gtpu4_eh_pkt[] = {
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
@@ -140,6 +188,57 @@ static const u8 ice_fdir_tcp4_gtpu4_eh_pkt[] = {
        0x00, 0x00, 0x00, 0x00,
 };
 
+static const u8 ice_fdir_ipv6_gtpu4_eh_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,
+       0x1e, 0x9d, 0x34, 0xff, 0x00, 0x32, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x00,
+       0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x02,
+       0x3b, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_udp6_gtpu4_eh_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x5e, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x8c, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x4a,
+       0x48, 0x9a, 0x34, 0xff, 0x00, 0x3a, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x00,
+       0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0a,
+       0x11, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a,
+       0xff, 0xd8, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp6_gtpu4_eh_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x6a, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x80, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x56,
+       0x53, 0x6b, 0x34, 0xff, 0x00, 0x46, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 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, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x02,
+       0x20, 0x00, 0x8f, 0xdf, 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,
@@ -183,6 +282,57 @@ static const u8 ice_fdir_tcp4_gtpu4_eh_dw_pkt[] = {
        0x00, 0x00, 0x00, 0x00,
 };
 
+static const u8 ice_fdir_ipv6_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,
+       0x1e, 0x9d, 0x34, 0xff, 0x00, 0x32, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x00,
+       0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x02,
+       0x3b, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_udp6_gtpu4_eh_dw_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x5e, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x8c, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x4a,
+       0x48, 0x9a, 0x34, 0xff, 0x00, 0x3a, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x00,
+       0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0a,
+       0x11, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a,
+       0xff, 0xd8, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp6_gtpu4_eh_dw_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x6a, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x80, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x56,
+       0x53, 0x6b, 0x34, 0xff, 0x00, 0x46, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 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, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x02,
+       0x20, 0x00, 0x8f, 0xdf, 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,
@@ -226,67 +376,70 @@ static const u8 ice_fdir_tcp4_gtpu4_eh_up_pkt[] = {
        0x00, 0x00, 0x00, 0x00,
 };
 
-static const u8 ice_fdir_icmp4_gtpu4_pkt[] = {
+static const u8 ice_fdir_ipv6_gtpu4_eh_up_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, 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, 0x01,
+       0x00, 0x56, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x94, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x42,
+       0x1e, 0x8d, 0x34, 0xff, 0x00, 0x32, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x10,
+       0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x02,
+       0x3b, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00,
 };
 
-static const u8 ice_fdir_ipv6_gtpu4_pkt[] = {
+static const u8 ice_fdir_udp6_gtpu4_eh_up_pkt[] = {
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
-       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, 0x5e, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x8c, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x4a,
+       0x48, 0x8a, 0x34, 0xff, 0x00, 0x3a, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x10,
+       0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0a,
+       0x11, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a,
+       0xff, 0xd8, 0x00, 0x00,
 };
 
-static const u8 ice_fdir_udp6_gtpu4_pkt[] = {
+static const u8 ice_fdir_tcp6_gtpu4_eh_up_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, 0x6a, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x80, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x56,
+       0x53, 0x5b, 0x34, 0xff, 0x00, 0x46, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x10,
+       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, 0x01, 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,
+       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x02,
+       0x20, 0x00, 0x8f, 0xdf, 0x00, 0x00, 0x00, 0x00,
 };
 
-static const u8 ice_fdir_tcp6_gtpu4_pkt[] = {
+static const u8 ice_fdir_icmp4_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, 0x4c, 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, 0x01,
        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,
+       0x00, 0x00,
 };
 
 static const u8 ice_fdir_ipv6_gtpu6_pkt[] = {
@@ -671,47 +824,1007 @@ static const u8 ice_fdir_ipv6_gre6_pkt[] = {
        0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-       0x86, 0xDD, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x3B, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x86, 0xDD, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x3B, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_udp6_gre6_pkt[] = {
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xDD, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x34, 0x2F, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 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, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x35, 0x00, 0x35, 0x00, 0x08,
+       0xFF, 0x72, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp6_gre6_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xDD, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x40, 0x2F, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x86, 0xDD, 0x60, 0x00, 0x00, 0x00, 0x00, 0x14,
+       0x06, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x02,
+       0x20, 0x00, 0x8F, 0xE1, 0x00, 0x00, 0x00, 0x00,
+};
+
+/* IPV4 GRE IPV4 GTPU IPV4 */
+static const u8 ice_fdir_ipv4_gtpu4_gre4_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x52, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+       0x7c, 0x7a, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x3a, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0xb0, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x26,
+       0xbf, 0xba, 0x30, 0xff, 0x00, 0x16, 0x00, 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_gre4_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x5a, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+       0x7c, 0x72, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 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,
+       0xbd, 0xc0, 0x30, 0xff, 0x00, 0x1e, 0x00, 0x00,
+       0x00, 0x00, 0x45, 0x00, 0x00, 0x1e, 0x00, 0x01,
+       0x00, 0x00, 0x40, 0x11, 0x7c, 0xcc, 0x7f, 0x00,
+       0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 0x00, 0x35,
+       0x00, 0x35, 0x00, 0x0a, 0x01, 0x6e, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp4_gtpu4_gre4_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x66, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+       0x7c, 0x66, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x4e, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x9c, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x3a,
+       0xbd, 0x9d, 0x30, 0xff, 0x00, 0x2a, 0x00, 0x00,
+       0x00, 0x00, 0x45, 0x00, 0x00, 0x2a, 0x00, 0x01,
+       0x00, 0x00, 0x40, 0x06, 0x7c, 0xcb, 0x7f, 0x00,
+       0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 0x00, 0x14,
+       0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x50, 0x02, 0x20, 0x00, 0x91, 0x7a,
+       0x00, 0x00, 0x00, 0x00,
+};
+
+/* IPV4 GRE IPV4 GTPU IPV6 */
+static const u8 ice_fdir_ipv6_gtpu4_gre4_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x66, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+       0x7c, 0x66, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x4e, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x9c, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x3a,
+       0x24, 0x3a, 0x30, 0xff, 0x00, 0x2a, 0x00, 0x00,
+       0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x02,
+       0x3b, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_udp6_gtpu4_gre4_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x6e, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+       0x7c, 0x5e, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 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,
+       0x4e, 0x37, 0x30, 0xff, 0x00, 0x32, 0x00, 0x00,
+       0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0a,
+       0x11, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x35, 0x00, 0x35, 0x00, 0x0a,
+       0xff, 0x6e, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp6_gtpu4_gre4_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x7a, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+       0x7c, 0x52, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x62, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x88, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 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, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x14, 0x00, 0x50, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x02,
+       0x20, 0x00, 0x8f, 0x7b, 0x00, 0x00, 0x00, 0x00,
+};
+
+/* IPV6 GRE IPV4 GTPU IPV4 */
+static const u8 ice_fdir_ipv4_gtpu4_gre6_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x3e, 0x2f, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x08, 0x00, 0x45, 0x00, 0x00, 0x3a, 0x00, 0x01,
+       0x00, 0x00, 0x40, 0x11, 0x7c, 0xb0, 0x7f, 0x00,
+       0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 0x08, 0x68,
+       0x08, 0x68, 0x00, 0x26, 0xbf, 0xba, 0x30, 0xff,
+       0x00, 0x16, 0x00, 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_gre6_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x46, 0x2f, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 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, 0xbd, 0xc0, 0x30, 0xff,
+       0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x45, 0x00,
+       0x00, 0x1e, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0xcc, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x00, 0x35, 0x00, 0x35, 0x00, 0x0a,
+       0x01, 0x6e, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp4_gtpu4_gre6_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x52, 0x2f, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x08, 0x00, 0x45, 0x00, 0x00, 0x4e, 0x00, 0x01,
+       0x00, 0x00, 0x40, 0x11, 0x7c, 0x9c, 0x7f, 0x00,
+       0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 0x08, 0x68,
+       0x08, 0x68, 0x00, 0x3a, 0xbd, 0x9d, 0x30, 0xff,
+       0x00, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x45, 0x00,
+       0x00, 0x2a, 0x00, 0x01, 0x00, 0x00, 0x40, 0x06,
+       0x7c, 0xcb, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x00, 0x14, 0x00, 0x50, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x02,
+       0x20, 0x00, 0x91, 0x7a, 0x00, 0x00, 0x00, 0x00,
+};
+
+/* IPV6 GRE IPV4 GTPU IPV6 */
+static const u8 ice_fdir_ipv6_gtpu4_gre6_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x52, 0x2f, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x08, 0x00, 0x45, 0x00, 0x00, 0x4e, 0x00, 0x01,
+       0x00, 0x00, 0x40, 0x11, 0x7c, 0x9c, 0x7f, 0x00,
+       0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 0x08, 0x68,
+       0x08, 0x68, 0x00, 0x3a, 0x24, 0x3a, 0x30, 0xff,
+       0x00, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x02, 0x3b, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_udp6_gtpu4_gre6_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x5a, 0x2f, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 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, 0x4e, 0x37, 0x30, 0xff,
+       0x00, 0x32, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x0a, 0x11, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x35,
+       0x00, 0x35, 0x00, 0x0a, 0xff, 0x6e, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp6_gtpu4_gre6_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x66, 0x2f, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x08, 0x00, 0x45, 0x00, 0x00, 0x62, 0x00, 0x01,
+       0x00, 0x00, 0x40, 0x11, 0x7c, 0x88, 0x7f, 0x00,
+       0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 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, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x14,
+       0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x50, 0x02, 0x20, 0x00, 0x8f, 0x7b,
+       0x00, 0x00, 0x00, 0x00,
+};
+
+/* IPV4 GRE IPV4 GTPU EH IPV4 */
+static const u8 ice_fdir_ipv4_gtpu4_eh_gre4_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x5a, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+       0x7c, 0x72, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 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_gre4_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x62, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+       0x7c, 0x6a, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 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, 0x35,
+       0x00, 0x35, 0x00, 0x0a, 0x01, 0x6e, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp4_gtpu4_eh_gre4_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x6e, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+       0x7c, 0x5e, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 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, 0x14,
+       0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x50, 0x02, 0x20, 0x00, 0x91, 0x7a,
+       0x00, 0x00, 0x00, 0x00,
+};
+
+/* IPV4 GRE IPV4 GTPU EH IPV6 */
+static const u8 ice_fdir_ipv6_gtpu4_eh_gre4_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x6e, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+       0x7c, 0x5e, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 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,
+       0x1e, 0x9d, 0x34, 0xff, 0x00, 0x32, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x00,
+       0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x02,
+       0x3b, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_udp6_gtpu4_eh_gre4_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x76, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+       0x7c, 0x56, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x5e, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x8c, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x4a,
+       0x48, 0x9a, 0x34, 0xff, 0x00, 0x3a, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x00,
+       0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0a,
+       0x11, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x35, 0x00, 0x35, 0x00, 0x0a,
+       0xff, 0x6e, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp6_gtpu4_eh_gre4_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x82, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+       0x7c, 0x4a, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x6a, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x80, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x56,
+       0x53, 0x6b, 0x34, 0xff, 0x00, 0x46, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 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, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x14, 0x00, 0x50, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x02,
+       0x20, 0x00, 0x8f, 0x7b, 0x00, 0x00, 0x00, 0x00,
+};
+
+/* IPV6 GRE IPV4 GTPU EH IPV4 */
+static const u8 ice_fdir_ipv4_gtpu4_eh_gre6_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x46, 0x2f, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 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_gre6_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x4e, 0x2f, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 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, 0x35, 0x00, 0x35, 0x00, 0x0a,
+       0x01, 0x6e, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp4_gtpu4_eh_gre6_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x5a, 0x2f, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 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, 0x14, 0x00, 0x50, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x02,
+       0x20, 0x00, 0x91, 0x7a, 0x00, 0x00, 0x00, 0x00,
+};
+
+/* IPV6 GRE IPV4 GTPU EH IPV6 */
+static const u8 ice_fdir_ipv6_gtpu4_eh_gre6_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x5a, 0x2f, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 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, 0x1e, 0x9d, 0x34, 0xff,
+       0x00, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x85, 0x01, 0x00, 0x00, 0x00, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x02, 0x3b, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_udp6_gtpu4_eh_gre6_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x62, 0x2f, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x08, 0x00, 0x45, 0x00, 0x00, 0x5e, 0x00, 0x01,
+       0x00, 0x00, 0x40, 0x11, 0x7c, 0x8c, 0x7f, 0x00,
+       0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 0x08, 0x68,
+       0x08, 0x68, 0x00, 0x4a, 0x48, 0x9a, 0x34, 0xff,
+       0x00, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x85, 0x01, 0x00, 0x00, 0x00, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x0a, 0x11, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x35,
+       0x00, 0x35, 0x00, 0x0a, 0xff, 0x6e, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp6_gtpu4_eh_gre6_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x6e, 0x2f, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x08, 0x00, 0x45, 0x00, 0x00, 0x6a, 0x00, 0x01,
+       0x00, 0x00, 0x40, 0x11, 0x7c, 0x80, 0x7f, 0x00,
+       0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 0x08, 0x68,
+       0x08, 0x68, 0x00, 0x56, 0x53, 0x6b, 0x34, 0xff,
+       0x00, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x85, 0x01, 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, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x14,
+       0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x50, 0x02, 0x20, 0x00, 0x8f, 0x7b,
+       0x00, 0x00, 0x00, 0x00,
+};
+
+/* IPV4 GRE IPV4 GTPU DW IPV4 */
+static const u8 ice_fdir_ipv4_gtpu4_eh_dw_gre4_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x5a, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+       0x7c, 0x72, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 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_gre4_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x62, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+       0x7c, 0x6a, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 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, 0x35,
+       0x00, 0x35, 0x00, 0x0a, 0x01, 0x6e, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp4_gtpu4_eh_dw_gre4_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x6e, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+       0x7c, 0x5e, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 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, 0x14,
+       0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x50, 0x02, 0x20, 0x00, 0x91, 0x7a,
+       0x00, 0x00, 0x00, 0x00,
+};
+
+/* IPV4 GRE IPV4 GTPU DW IPV6 */
+static const u8 ice_fdir_ipv6_gtpu4_eh_dw_gre4_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x6e, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+       0x7c, 0x5e, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 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,
+       0x1e, 0x9d, 0x34, 0xff, 0x00, 0x32, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x00,
+       0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x02,
+       0x3b, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_udp6_gtpu4_eh_dw_gre4_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x76, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+       0x7c, 0x56, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x5e, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x8c, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x4a,
+       0x48, 0x9a, 0x34, 0xff, 0x00, 0x3a, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x00,
+       0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0a,
+       0x11, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x35, 0x00, 0x35, 0x00, 0x0a,
+       0xff, 0x6e, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp6_gtpu4_eh_dw_gre4_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x82, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+       0x7c, 0x4a, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x6a, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x80, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x56,
+       0x53, 0x6b, 0x34, 0xff, 0x00, 0x46, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 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, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x14, 0x00, 0x50, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x02,
+       0x20, 0x00, 0x8f, 0x7b, 0x00, 0x00, 0x00, 0x00,
+};
+
+/* IPV6 GRE IPV4 GTPU DW IPV4 */
+static const u8 ice_fdir_ipv4_gtpu4_eh_dw_gre6_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x46, 0x2f, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 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_gre6_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x4e, 0x2f, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 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, 0x35, 0x00, 0x35, 0x00, 0x0a,
+       0x01, 0x6e, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp4_gtpu4_eh_dw_gre6_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x5a, 0x2f, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 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, 0x14, 0x00, 0x50, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x02,
+       0x20, 0x00, 0x91, 0x7a, 0x00, 0x00, 0x00, 0x00,
+};
+
+/* IPV6 GRE IPV4 GTPU DW IPV6 */
+static const u8 ice_fdir_ipv6_gtpu4_eh_dw_gre6_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x5a, 0x2f, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 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, 0x1e, 0x9d, 0x34, 0xff,
+       0x00, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x85, 0x01, 0x00, 0x00, 0x00, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x02, 0x3b, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_udp6_gtpu4_eh_dw_gre6_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x62, 0x2f, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x08, 0x00, 0x45, 0x00, 0x00, 0x5e, 0x00, 0x01,
+       0x00, 0x00, 0x40, 0x11, 0x7c, 0x8c, 0x7f, 0x00,
+       0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 0x08, 0x68,
+       0x08, 0x68, 0x00, 0x4a, 0x48, 0x9a, 0x34, 0xff,
+       0x00, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x85, 0x01, 0x00, 0x00, 0x00, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x0a, 0x11, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x35,
+       0x00, 0x35, 0x00, 0x0a, 0xff, 0x6e, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp6_gtpu4_eh_dw_gre6_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x6e, 0x2f, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x08, 0x00, 0x45, 0x00, 0x00, 0x6a, 0x00, 0x01,
+       0x00, 0x00, 0x40, 0x11, 0x7c, 0x80, 0x7f, 0x00,
+       0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 0x08, 0x68,
+       0x08, 0x68, 0x00, 0x56, 0x53, 0x6b, 0x34, 0xff,
+       0x00, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x85, 0x01, 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, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x14,
+       0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x50, 0x02, 0x20, 0x00, 0x8f, 0x7b,
+       0x00, 0x00, 0x00, 0x00,
+};
+
+/* IPV4 GRE IPV4 GTPU UP IPV4 */
+static const u8 ice_fdir_ipv4_gtpu4_eh_up_gre4_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x5a, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+       0x7c, 0x72, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 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_gre4_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x62, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+       0x7c, 0x6a, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 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, 0x35,
+       0x00, 0x35, 0x00, 0x0a, 0x01, 0x6e, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp4_gtpu4_eh_up_gre4_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x6e, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+       0x7c, 0x5e, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 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, 0x14,
+       0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x50, 0x02, 0x20, 0x00, 0x91, 0x7a,
+       0x00, 0x00, 0x00, 0x00,
+};
+
+/* IPV4 GRE IPV4 GTPU UP IPV6 */
+static const u8 ice_fdir_ipv6_gtpu4_eh_up_gre4_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x6e, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+       0x7c, 0x5e, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 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,
+       0x1e, 0x8d, 0x34, 0xff, 0x00, 0x32, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x10,
+       0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x02,
+       0x3b, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_udp6_gtpu4_eh_up_gre4_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x76, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+       0x7c, 0x56, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x5e, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x8c, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x4a,
+       0x48, 0x8a, 0x34, 0xff, 0x00, 0x3a, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x10,
+       0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0a,
+       0x11, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x35, 0x00, 0x35, 0x00, 0x0a,
+       0xff, 0x6e, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp6_gtpu4_eh_up_gre4_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x82, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+       0x7c, 0x4a, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x6a, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x80, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+       0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x56,
+       0x53, 0x5b, 0x34, 0xff, 0x00, 0x46, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x10,
+       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, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x00, 0x14, 0x00, 0x50, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x02,
+       0x20, 0x00, 0x8f, 0x7b, 0x00, 0x00, 0x00, 0x00,
+};
+
+/* IPV6 GRE IPV4 GTPU UP IPV4 */
+static const u8 ice_fdir_ipv4_gtpu4_eh_up_gre6_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x46, 0x2f, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 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_gre6_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x4e, 0x2f, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 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, 0x35, 0x00, 0x35, 0x00, 0x0a,
+       0x01, 0x6e, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp4_gtpu4_eh_up_gre6_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x5a, 0x2f, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 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, 0x14, 0x00, 0x50, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x02,
+       0x20, 0x00, 0x91, 0x7a, 0x00, 0x00, 0x00, 0x00,
+};
+
+/* IPV6 GRE IPV4 GTPU UP IPV6 */
+static const u8 ice_fdir_ipv6_gtpu4_eh_up_gre6_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x5a, 0x2f, 0x40, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 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, 0x1e, 0x8d, 0x34, 0xff,
+       0x00, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x85, 0x01, 0x10, 0x00, 0x00, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x02, 0x3b, 0x40, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
 };
 
-static const u8 ice_fdir_udp6_gre6_pkt[] = {
-       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x86, 0xDD, 0x60, 0x00,
-       0x00, 0x00, 0x00, 0x34, 0x2F, 0x40, 0x00, 0x00,
+static const u8 ice_fdir_udp6_gtpu4_eh_up_gre6_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x62, 0x2f, 0x40, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-       0x86, 0xDD, 0x60, 0x00, 0x00, 0x00, 0x00, 0x08,
-       0x11, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x08, 0x00, 0x45, 0x00, 0x00, 0x5e, 0x00, 0x01,
+       0x00, 0x00, 0x40, 0x11, 0x7c, 0x8c, 0x7f, 0x00,
+       0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 0x08, 0x68,
+       0x08, 0x68, 0x00, 0x4a, 0x48, 0x8a, 0x34, 0xff,
+       0x00, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x85, 0x01, 0x10, 0x00, 0x00, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x0a, 0x11, 0x40, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x01, 0x00, 0x35, 0x00, 0x35, 0x00, 0x08,
-       0xFF, 0x72, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x35,
+       0x00, 0x35, 0x00, 0x0a, 0xff, 0x6e, 0x00, 0x00,
 };
 
-static const u8 ice_fdir_tcp6_gre6_pkt[] = {
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x86, 0xDD, 0x60, 0x00,
-       0x00, 0x00, 0x00, 0x40, 0x2F, 0x40, 0x00, 0x00,
+static const u8 ice_fdir_tcp6_gtpu4_eh_up_gre6_pkt[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x6e, 0x2f, 0x40, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-       0x86, 0xDD, 0x60, 0x00, 0x00, 0x00, 0x00, 0x14,
-       0x06, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x08, 0x00, 0x45, 0x00, 0x00, 0x6a, 0x00, 0x01,
+       0x00, 0x00, 0x40, 0x11, 0x7c, 0x80, 0x7f, 0x00,
+       0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 0x08, 0x68,
+       0x08, 0x68, 0x00, 0x56, 0x53, 0x5b, 0x34, 0xff,
+       0x00, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x85, 0x01, 0x10, 0x00, 0x00, 0x60, 0x00,
+       0x00, 0x00, 0x00, 0x16, 0x06, 0x40, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x02,
-       0x20, 0x00, 0x8F, 0xE1, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 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_tcpv6_pkt[] = {
@@ -950,6 +2063,70 @@ static const struct ice_fdir_base_pkt ice_fdir_pkt[] = {
                sizeof(ice_fdir_ipv4_gtpu4_eh_up_pkt),
                ice_fdir_ipv4_gtpu4_eh_up_pkt,
        },
+       /* IPV4 GRE IPV4 GTPU */
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU,
+               sizeof(ice_fdir_ipv4_gtpu4_gre4_pkt),
+               ice_fdir_ipv4_gtpu4_gre4_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_gre4_pkt),
+               ice_fdir_ipv4_gtpu4_gre4_pkt,
+       },
+       /* IPV4 GRE IPV4 GTPU EH */
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_gre4_pkt),
+               ice_fdir_ipv4_gtpu4_eh_gre4_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_gre4_pkt),
+               ice_fdir_ipv4_gtpu4_eh_gre4_pkt,
+       },
+       /* IPV4 GRE IPV4 GTPU DW */
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_dw_gre4_pkt),
+               ice_fdir_ipv4_gtpu4_eh_dw_gre4_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_dw_gre4_pkt),
+               ice_fdir_ipv4_gtpu4_eh_dw_gre4_pkt,
+       },
+       /* IPV4 GRE IPV4 GTPU UP */
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_up_gre4_pkt),
+               ice_fdir_ipv4_gtpu4_eh_up_gre4_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_up_gre4_pkt),
+               ice_fdir_ipv4_gtpu4_eh_up_gre4_pkt,
+       },
+       /* IPV6 GRE IPV4 GTPU */
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU,
+               sizeof(ice_fdir_ipv4_gtpu4_gre6_pkt),
+               ice_fdir_ipv4_gtpu4_gre6_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_gre6_pkt),
+               ice_fdir_ipv4_gtpu4_gre6_pkt,
+       },
+       /* IPV6 GRE IPV4 GTPU EH */
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_gre6_pkt),
+               ice_fdir_ipv4_gtpu4_eh_gre6_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_gre6_pkt),
+               ice_fdir_ipv4_gtpu4_eh_gre6_pkt,
+       },
+       /* IPV6 GRE IPV4 GTPU DW */
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_dw_gre6_pkt),
+               ice_fdir_ipv4_gtpu4_eh_dw_gre6_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_dw_gre6_pkt),
+               ice_fdir_ipv4_gtpu4_eh_dw_gre6_pkt,
+       },
+       /* IPV6 GRE IPV4 GTPU UP */
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_UP,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_up_gre6_pkt),
+               ice_fdir_ipv4_gtpu4_eh_up_gre6_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_up_gre6_pkt),
+               ice_fdir_ipv4_gtpu4_eh_up_gre6_pkt,
+       },
        {
                ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4,
                sizeof(ice_fdir_ipv4_gtpu4_pkt),
@@ -971,6 +2148,27 @@ static const struct ice_fdir_base_pkt ice_fdir_pkt[] = {
                sizeof(ice_fdir_tcp4_gtpu4_pkt),
                ice_fdir_tcp4_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_IPV4_GTPU_EH_IPV4,
                sizeof(ice_fdir_ipv4_gtpu4_eh_pkt),
@@ -992,6 +2190,27 @@ static const struct ice_fdir_base_pkt ice_fdir_pkt[] = {
                sizeof(ice_fdir_tcp4_gtpu4_eh_pkt),
                ice_fdir_tcp4_gtpu4_eh_pkt,
        },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV6,
+               sizeof(ice_fdir_ipv6_gtpu4_eh_pkt),
+               ice_fdir_ipv6_gtpu4_eh_pkt,
+               sizeof(ice_fdir_ipv6_gtpu4_eh_pkt),
+               ice_fdir_ipv6_gtpu4_eh_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV6_UDP,
+               sizeof(ice_fdir_udp6_gtpu4_eh_pkt),
+               ice_fdir_udp6_gtpu4_eh_pkt,
+               sizeof(ice_fdir_udp6_gtpu4_eh_pkt),
+               ice_fdir_udp6_gtpu4_eh_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV6_TCP,
+               sizeof(ice_fdir_tcp6_gtpu4_eh_pkt),
+               ice_fdir_tcp6_gtpu4_eh_pkt,
+               sizeof(ice_fdir_tcp6_gtpu4_eh_pkt),
+               ice_fdir_tcp6_gtpu4_eh_pkt,
+       },
        {
                ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW_IPV4,
                sizeof(ice_fdir_ipv4_gtpu4_eh_dw_pkt),
@@ -1013,6 +2232,27 @@ static const struct ice_fdir_base_pkt ice_fdir_pkt[] = {
                sizeof(ice_fdir_tcp4_gtpu4_eh_dw_pkt),
                ice_fdir_tcp4_gtpu4_eh_dw_pkt,
        },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW_IPV6,
+               sizeof(ice_fdir_ipv6_gtpu4_eh_dw_pkt),
+               ice_fdir_ipv6_gtpu4_eh_dw_pkt,
+               sizeof(ice_fdir_ipv6_gtpu4_eh_dw_pkt),
+               ice_fdir_ipv6_gtpu4_eh_dw_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW_IPV6_UDP,
+               sizeof(ice_fdir_udp6_gtpu4_eh_dw_pkt),
+               ice_fdir_udp6_gtpu4_eh_dw_pkt,
+               sizeof(ice_fdir_udp6_gtpu4_eh_dw_pkt),
+               ice_fdir_udp6_gtpu4_eh_dw_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW_IPV6_TCP,
+               sizeof(ice_fdir_tcp6_gtpu4_eh_dw_pkt),
+               ice_fdir_tcp6_gtpu4_eh_dw_pkt,
+               sizeof(ice_fdir_tcp6_gtpu4_eh_dw_pkt),
+               ice_fdir_tcp6_gtpu4_eh_dw_pkt,
+       },
        {
                ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV4,
                sizeof(ice_fdir_ipv4_gtpu4_eh_up_pkt),
@@ -1034,6 +2274,27 @@ static const struct ice_fdir_base_pkt ice_fdir_pkt[] = {
                sizeof(ice_fdir_tcp4_gtpu4_eh_up_pkt),
                ice_fdir_tcp4_gtpu4_eh_up_pkt,
        },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV6,
+               sizeof(ice_fdir_ipv6_gtpu4_eh_up_pkt),
+               ice_fdir_ipv6_gtpu4_eh_up_pkt,
+               sizeof(ice_fdir_ipv6_gtpu4_eh_up_pkt),
+               ice_fdir_ipv6_gtpu4_eh_up_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV6_UDP,
+               sizeof(ice_fdir_udp6_gtpu4_eh_up_pkt),
+               ice_fdir_udp6_gtpu4_eh_up_pkt,
+               sizeof(ice_fdir_udp6_gtpu4_eh_up_pkt),
+               ice_fdir_udp6_gtpu4_eh_up_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV6_TCP,
+               sizeof(ice_fdir_tcp6_gtpu4_eh_up_pkt),
+               ice_fdir_tcp6_gtpu4_eh_up_pkt,
+               sizeof(ice_fdir_tcp6_gtpu4_eh_up_pkt),
+               ice_fdir_tcp6_gtpu4_eh_up_pkt,
+       },
        {
                ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_ICMP,
                sizeof(ice_fdir_icmp4_gtpu4_pkt),
@@ -1048,27 +2309,6 @@ static const struct ice_fdir_base_pkt ice_fdir_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),
@@ -1320,6 +2560,358 @@ static const struct ice_fdir_base_pkt ice_fdir_pkt[] = {
                sizeof(ice_fdir_tcp6_gre6_pkt),
                ice_fdir_tcp6_gre6_pkt,
        },
+       /* IPV4 GRE IPV4 GTPU IPV4 */
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_IPV4,
+               sizeof(ice_fdir_ipv4_gtpu4_gre4_pkt),
+               ice_fdir_ipv4_gtpu4_gre4_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_gre4_pkt),
+               ice_fdir_ipv4_gtpu4_gre4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_IPV4_UDP,
+               sizeof(ice_fdir_udp4_gtpu4_gre4_pkt),
+               ice_fdir_udp4_gtpu4_gre4_pkt,
+               sizeof(ice_fdir_udp4_gtpu4_gre4_pkt),
+               ice_fdir_udp4_gtpu4_gre4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_IPV4_TCP,
+               sizeof(ice_fdir_tcp4_gtpu4_gre4_pkt),
+               ice_fdir_tcp4_gtpu4_gre4_pkt,
+               sizeof(ice_fdir_tcp4_gtpu4_gre4_pkt),
+               ice_fdir_tcp4_gtpu4_gre4_pkt,
+       },
+       /* IPV4 GRE IPV4 GTPU IPV6 */
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_IPV6,
+               sizeof(ice_fdir_ipv6_gtpu4_gre4_pkt),
+               ice_fdir_ipv6_gtpu4_gre4_pkt,
+               sizeof(ice_fdir_ipv6_gtpu4_gre4_pkt),
+               ice_fdir_ipv6_gtpu4_gre4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_IPV6_UDP,
+               sizeof(ice_fdir_udp6_gtpu4_gre4_pkt),
+               ice_fdir_udp6_gtpu4_gre4_pkt,
+               sizeof(ice_fdir_udp6_gtpu4_gre4_pkt),
+               ice_fdir_udp6_gtpu4_gre4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_IPV6_TCP,
+               sizeof(ice_fdir_tcp6_gtpu4_gre4_pkt),
+               ice_fdir_tcp6_gtpu4_gre4_pkt,
+               sizeof(ice_fdir_tcp6_gtpu4_gre4_pkt),
+               ice_fdir_tcp6_gtpu4_gre4_pkt,
+       },
+       /* IPV6 GRE IPV4 GTPU IPV4 */
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_IPV4,
+               sizeof(ice_fdir_ipv4_gtpu4_gre6_pkt),
+               ice_fdir_ipv4_gtpu4_gre6_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_gre6_pkt),
+               ice_fdir_ipv4_gtpu4_gre6_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_IPV4_UDP,
+               sizeof(ice_fdir_udp4_gtpu4_gre6_pkt),
+               ice_fdir_udp4_gtpu4_gre6_pkt,
+               sizeof(ice_fdir_udp4_gtpu4_gre6_pkt),
+               ice_fdir_udp4_gtpu4_gre6_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_IPV4_TCP,
+               sizeof(ice_fdir_tcp4_gtpu4_gre6_pkt),
+               ice_fdir_tcp4_gtpu4_gre6_pkt,
+               sizeof(ice_fdir_tcp4_gtpu4_gre6_pkt),
+               ice_fdir_tcp4_gtpu4_gre6_pkt,
+       },
+       /* IPV6 GRE IPV4 GTPU IPV6 */
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_IPV6,
+               sizeof(ice_fdir_ipv6_gtpu4_gre6_pkt),
+               ice_fdir_ipv6_gtpu4_gre6_pkt,
+               sizeof(ice_fdir_ipv6_gtpu4_gre6_pkt),
+               ice_fdir_ipv6_gtpu4_gre6_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_IPV6_UDP,
+               sizeof(ice_fdir_udp6_gtpu4_gre6_pkt),
+               ice_fdir_udp6_gtpu4_gre6_pkt,
+               sizeof(ice_fdir_udp6_gtpu4_gre6_pkt),
+               ice_fdir_udp6_gtpu4_gre6_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_IPV6_TCP,
+               sizeof(ice_fdir_tcp6_gtpu4_gre6_pkt),
+               ice_fdir_tcp6_gtpu4_gre6_pkt,
+               sizeof(ice_fdir_tcp6_gtpu4_gre6_pkt),
+               ice_fdir_tcp6_gtpu4_gre6_pkt,
+       },
+       /* IPV4 GRE IPV4 GTPU EH IPV4 */
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_IPV4,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_gre4_pkt),
+               ice_fdir_ipv4_gtpu4_eh_gre4_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_gre4_pkt),
+               ice_fdir_ipv4_gtpu4_eh_gre4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_IPV4_UDP,
+               sizeof(ice_fdir_udp4_gtpu4_eh_gre4_pkt),
+               ice_fdir_udp4_gtpu4_eh_gre4_pkt,
+               sizeof(ice_fdir_udp4_gtpu4_eh_gre4_pkt),
+               ice_fdir_udp4_gtpu4_eh_gre4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_IPV4_TCP,
+               sizeof(ice_fdir_tcp4_gtpu4_eh_gre4_pkt),
+               ice_fdir_tcp4_gtpu4_eh_gre4_pkt,
+               sizeof(ice_fdir_tcp4_gtpu4_eh_gre4_pkt),
+               ice_fdir_tcp4_gtpu4_eh_gre4_pkt,
+       },
+       /* IPV4 GRE IPV4 GTPU EH IPV6 */
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_IPV6,
+               sizeof(ice_fdir_ipv6_gtpu4_eh_gre4_pkt),
+               ice_fdir_ipv6_gtpu4_eh_gre4_pkt,
+               sizeof(ice_fdir_ipv6_gtpu4_eh_gre4_pkt),
+               ice_fdir_ipv6_gtpu4_eh_gre4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_IPV6_UDP,
+               sizeof(ice_fdir_udp6_gtpu4_eh_gre4_pkt),
+               ice_fdir_udp6_gtpu4_eh_gre4_pkt,
+               sizeof(ice_fdir_udp6_gtpu4_eh_gre4_pkt),
+               ice_fdir_udp6_gtpu4_eh_gre4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_IPV6_TCP,
+               sizeof(ice_fdir_tcp6_gtpu4_eh_gre4_pkt),
+               ice_fdir_tcp6_gtpu4_eh_gre4_pkt,
+               sizeof(ice_fdir_tcp6_gtpu4_eh_gre4_pkt),
+               ice_fdir_tcp6_gtpu4_eh_gre4_pkt,
+       },
+       /* IPV6 GRE IPV4 GTPU EH IPV4 */
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_IPV4,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_gre6_pkt),
+               ice_fdir_ipv4_gtpu4_eh_gre6_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_gre6_pkt),
+               ice_fdir_ipv4_gtpu4_eh_gre6_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_IPV4_UDP,
+               sizeof(ice_fdir_udp4_gtpu4_eh_gre6_pkt),
+               ice_fdir_udp4_gtpu4_eh_gre6_pkt,
+               sizeof(ice_fdir_udp4_gtpu4_eh_gre6_pkt),
+               ice_fdir_udp4_gtpu4_eh_gre6_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_IPV4_TCP,
+               sizeof(ice_fdir_tcp4_gtpu4_eh_gre6_pkt),
+               ice_fdir_tcp4_gtpu4_eh_gre6_pkt,
+               sizeof(ice_fdir_tcp4_gtpu4_eh_gre6_pkt),
+               ice_fdir_tcp4_gtpu4_eh_gre6_pkt,
+       },
+       /* IPV6 GRE IPV4 GTPU EH IPV6 */
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_IPV6,
+               sizeof(ice_fdir_ipv6_gtpu4_eh_gre6_pkt),
+               ice_fdir_ipv6_gtpu4_eh_gre6_pkt,
+               sizeof(ice_fdir_ipv6_gtpu4_eh_gre6_pkt),
+               ice_fdir_ipv6_gtpu4_eh_gre6_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_IPV6_UDP,
+               sizeof(ice_fdir_udp6_gtpu4_eh_gre6_pkt),
+               ice_fdir_udp6_gtpu4_eh_gre6_pkt,
+               sizeof(ice_fdir_udp6_gtpu4_eh_gre6_pkt),
+               ice_fdir_udp6_gtpu4_eh_gre6_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_IPV6_TCP,
+               sizeof(ice_fdir_tcp6_gtpu4_eh_gre6_pkt),
+               ice_fdir_tcp6_gtpu4_eh_gre6_pkt,
+               sizeof(ice_fdir_tcp6_gtpu4_eh_gre6_pkt),
+               ice_fdir_tcp6_gtpu4_eh_gre6_pkt,
+       },
+       /* IPV4 GRE IPV4 GTPU DW IPV4 */
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW_IPV4,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_dw_gre4_pkt),
+               ice_fdir_ipv4_gtpu4_eh_dw_gre4_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_dw_gre4_pkt),
+               ice_fdir_ipv4_gtpu4_eh_dw_gre4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW_IPV4_UDP,
+               sizeof(ice_fdir_udp4_gtpu4_eh_dw_gre4_pkt),
+               ice_fdir_udp4_gtpu4_eh_dw_gre4_pkt,
+               sizeof(ice_fdir_udp4_gtpu4_eh_dw_gre4_pkt),
+               ice_fdir_udp4_gtpu4_eh_dw_gre4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW_IPV4_TCP,
+               sizeof(ice_fdir_tcp4_gtpu4_eh_dw_gre4_pkt),
+               ice_fdir_tcp4_gtpu4_eh_dw_gre4_pkt,
+               sizeof(ice_fdir_tcp4_gtpu4_eh_dw_gre4_pkt),
+               ice_fdir_tcp4_gtpu4_eh_dw_gre4_pkt,
+       },
+       /* IPV4 GRE IPV4 GTPU DW IPV6 */
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW_IPV6,
+               sizeof(ice_fdir_ipv6_gtpu4_eh_dw_gre4_pkt),
+               ice_fdir_ipv6_gtpu4_eh_dw_gre4_pkt,
+               sizeof(ice_fdir_ipv6_gtpu4_eh_dw_gre4_pkt),
+               ice_fdir_ipv6_gtpu4_eh_dw_gre4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW_IPV6_UDP,
+               sizeof(ice_fdir_udp6_gtpu4_eh_dw_gre4_pkt),
+               ice_fdir_udp6_gtpu4_eh_dw_gre4_pkt,
+               sizeof(ice_fdir_udp6_gtpu4_eh_dw_gre4_pkt),
+               ice_fdir_udp6_gtpu4_eh_dw_gre4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW_IPV6_TCP,
+               sizeof(ice_fdir_tcp6_gtpu4_eh_dw_gre4_pkt),
+               ice_fdir_tcp6_gtpu4_eh_dw_gre4_pkt,
+               sizeof(ice_fdir_tcp6_gtpu4_eh_dw_gre4_pkt),
+               ice_fdir_tcp6_gtpu4_eh_dw_gre4_pkt,
+       },
+       /* IPV6 GRE IPV4 GTPU DW IPV4 */
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW_IPV4,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_dw_gre6_pkt),
+               ice_fdir_ipv4_gtpu4_eh_dw_gre6_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_dw_gre6_pkt),
+               ice_fdir_ipv4_gtpu4_eh_dw_gre6_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW_IPV4_UDP,
+               sizeof(ice_fdir_udp4_gtpu4_eh_dw_gre6_pkt),
+               ice_fdir_udp4_gtpu4_eh_dw_gre6_pkt,
+               sizeof(ice_fdir_udp4_gtpu4_eh_dw_gre6_pkt),
+               ice_fdir_udp4_gtpu4_eh_dw_gre6_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW_IPV4_TCP,
+               sizeof(ice_fdir_tcp4_gtpu4_eh_dw_gre6_pkt),
+               ice_fdir_tcp4_gtpu4_eh_dw_gre6_pkt,
+               sizeof(ice_fdir_tcp4_gtpu4_eh_dw_gre6_pkt),
+               ice_fdir_tcp4_gtpu4_eh_dw_gre6_pkt,
+       },
+       /* IPV6 GRE IPV4 GTPU DW IPV6 */
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW_IPV6,
+               sizeof(ice_fdir_ipv6_gtpu4_eh_dw_gre6_pkt),
+               ice_fdir_ipv6_gtpu4_eh_dw_gre6_pkt,
+               sizeof(ice_fdir_ipv6_gtpu4_eh_dw_gre6_pkt),
+               ice_fdir_ipv6_gtpu4_eh_dw_gre6_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW_IPV6_UDP,
+               sizeof(ice_fdir_udp6_gtpu4_eh_dw_gre6_pkt),
+               ice_fdir_udp6_gtpu4_eh_dw_gre6_pkt,
+               sizeof(ice_fdir_udp6_gtpu4_eh_dw_gre6_pkt),
+               ice_fdir_udp6_gtpu4_eh_dw_gre6_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW_IPV6_TCP,
+               sizeof(ice_fdir_tcp6_gtpu4_eh_dw_gre6_pkt),
+               ice_fdir_tcp6_gtpu4_eh_dw_gre6_pkt,
+               sizeof(ice_fdir_tcp6_gtpu4_eh_dw_gre6_pkt),
+               ice_fdir_tcp6_gtpu4_eh_dw_gre6_pkt,
+       },
+       /* IPV4 GRE IPV4 GTPU UP IPV4 */
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP_IPV4,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_up_gre4_pkt),
+               ice_fdir_ipv4_gtpu4_eh_up_gre4_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_up_gre4_pkt),
+               ice_fdir_ipv4_gtpu4_eh_up_gre4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP_IPV4_UDP,
+               sizeof(ice_fdir_udp4_gtpu4_eh_up_gre4_pkt),
+               ice_fdir_udp4_gtpu4_eh_up_gre4_pkt,
+               sizeof(ice_fdir_udp4_gtpu4_eh_up_gre4_pkt),
+               ice_fdir_udp4_gtpu4_eh_up_gre4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP_IPV4_TCP,
+               sizeof(ice_fdir_tcp4_gtpu4_eh_up_gre4_pkt),
+               ice_fdir_tcp4_gtpu4_eh_up_gre4_pkt,
+               sizeof(ice_fdir_tcp4_gtpu4_eh_up_gre4_pkt),
+               ice_fdir_tcp4_gtpu4_eh_up_gre4_pkt,
+       },
+       /* IPV4 GRE IPV4 GTPU UP IPV6 */
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP_IPV6,
+               sizeof(ice_fdir_ipv6_gtpu4_eh_up_gre4_pkt),
+               ice_fdir_ipv6_gtpu4_eh_up_gre4_pkt,
+               sizeof(ice_fdir_ipv6_gtpu4_eh_up_gre4_pkt),
+               ice_fdir_ipv6_gtpu4_eh_up_gre4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP_IPV6_UDP,
+               sizeof(ice_fdir_udp6_gtpu4_eh_up_gre4_pkt),
+               ice_fdir_udp6_gtpu4_eh_up_gre4_pkt,
+               sizeof(ice_fdir_udp6_gtpu4_eh_up_gre4_pkt),
+               ice_fdir_udp6_gtpu4_eh_up_gre4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP_IPV6_TCP,
+               sizeof(ice_fdir_tcp6_gtpu4_eh_up_gre4_pkt),
+               ice_fdir_tcp6_gtpu4_eh_up_gre4_pkt,
+               sizeof(ice_fdir_tcp6_gtpu4_eh_up_gre4_pkt),
+               ice_fdir_tcp6_gtpu4_eh_up_gre4_pkt,
+       },
+       /* IPV6 GRE IPV4 GTPU UP IPV4 */
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_UP_IPV4,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_up_gre6_pkt),
+               ice_fdir_ipv4_gtpu4_eh_up_gre6_pkt,
+               sizeof(ice_fdir_ipv4_gtpu4_eh_up_gre6_pkt),
+               ice_fdir_ipv4_gtpu4_eh_up_gre6_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_UP_IPV4_UDP,
+               sizeof(ice_fdir_udp4_gtpu4_eh_up_gre6_pkt),
+               ice_fdir_udp4_gtpu4_eh_up_gre6_pkt,
+               sizeof(ice_fdir_udp4_gtpu4_eh_up_gre6_pkt),
+               ice_fdir_udp4_gtpu4_eh_up_gre6_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_UP_IPV4_TCP,
+               sizeof(ice_fdir_tcp4_gtpu4_eh_up_gre6_pkt),
+               ice_fdir_tcp4_gtpu4_eh_up_gre6_pkt,
+               sizeof(ice_fdir_tcp4_gtpu4_eh_up_gre6_pkt),
+               ice_fdir_tcp4_gtpu4_eh_up_gre6_pkt,
+       },
+       /* IPV6 GRE IPV4 GTPU UP IPV6 */
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_UP_IPV6,
+               sizeof(ice_fdir_ipv6_gtpu4_eh_up_gre6_pkt),
+               ice_fdir_ipv6_gtpu4_eh_up_gre6_pkt,
+               sizeof(ice_fdir_ipv6_gtpu4_eh_up_gre6_pkt),
+               ice_fdir_ipv6_gtpu4_eh_up_gre6_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_UP_IPV6_UDP,
+               sizeof(ice_fdir_udp6_gtpu4_eh_up_gre6_pkt),
+               ice_fdir_udp6_gtpu4_eh_up_gre6_pkt,
+               sizeof(ice_fdir_udp6_gtpu4_eh_up_gre6_pkt),
+               ice_fdir_udp6_gtpu4_eh_up_gre6_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_UP_IPV6_TCP,
+               sizeof(ice_fdir_tcp6_gtpu4_eh_up_gre6_pkt),
+               ice_fdir_tcp6_gtpu4_eh_up_gre6_pkt,
+               sizeof(ice_fdir_tcp6_gtpu4_eh_up_gre6_pkt),
+               ice_fdir_tcp6_gtpu4_eh_up_gre6_pkt,
+       },
        {
                ICE_FLTR_PTYPE_NONF_IPV6_TCP,
                sizeof(ice_fdir_tcpv6_pkt), ice_fdir_tcpv6_pkt,
@@ -1777,12 +3369,21 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,
                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_IPV6:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV6_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV6_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_DW_IPV6:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW_IPV6_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW_IPV6_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:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV6:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV6_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV6_TCP:
                        ice_memcpy(pkt, ice_fdir_pkt[idx].tun_pkt,
                                   ice_fdir_pkt[idx].tun_pkt_len,
                                   ICE_NONDMA_TO_NONDMA);
@@ -1810,6 +3411,74 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,
                                   ICE_NONDMA_TO_NONDMA);
                        loc = &pkt[ICE_FDIR_IPV6_GRE_INNER_PKT_OFF];
                        break;
+               case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_IPV4:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_IPV4_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_IPV4_TCP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_IPV6:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_IPV6_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GRE_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_V4_V4_GTPOGRE_PKT_OFF];
+                       break;
+               case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_IPV4:
+               case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_IPV4_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_IPV4_TCP:
+               case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_IPV6:
+               case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_IPV6_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV6_GRE_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_V6_V4_GTPOGRE_PKT_OFF];
+                       break;
+               case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_IPV4:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_IPV4_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_IPV4_TCP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_IPV6:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_IPV6_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_IPV6_TCP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW_IPV4:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW_IPV4_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW_IPV4_TCP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW_IPV6:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW_IPV6_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW_IPV6_TCP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP_IPV4:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP_IPV4_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP_IPV4_TCP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP_IPV6:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP_IPV6_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP_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_V4_V4_GTPOGRE_EH_PKT_OFF];
+                       break;
+               case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_IPV4:
+               case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_IPV4_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_IPV4_TCP:
+               case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_IPV6:
+               case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_IPV6_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_IPV6_TCP:
+               case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW_IPV4:
+               case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW_IPV4_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW_IPV4_TCP:
+               case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW_IPV6:
+               case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW_IPV6_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW_IPV6_TCP:
+               case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_UP_IPV4:
+               case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_UP_IPV4_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_UP_IPV4_TCP:
+               case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_UP_IPV6:
+               case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_UP_IPV6_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_UP_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_V6_V4_GTPOGRE_EH_PKT_OFF];
+                       break;
                default:
                        if (ice_fdir_get_open_tunnel_port(hw, flow, &tnl_port))
                                return ICE_ERR_DOES_NOT_EXIST;
@@ -2003,6 +3672,14 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,
        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:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_IPV4:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_IPV4:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_IPV4:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW_IPV4:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP_IPV4:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_IPV4:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW_IPV4:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_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,
@@ -2024,10 +3701,38 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,
                ice_pkt_insert_u6_qfi(loc, ICE_IPV4_GTPU_QFI_OFFSET,
                                      input->gtpu_data.qfi);
                break;
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_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_GTPOGRE_TEID_OFFSET,
+                                  input->gtpu_data.teid);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_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_GTPOGRE_TEID_OFFSET,
+                                  input->gtpu_data.teid);
+               ice_pkt_insert_u6_qfi(loc, ICE_IPV4_GTPOGRE_QFI_OFFSET,
+                                     input->gtpu_data.qfi);
+               break;
        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:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_IPV4_UDP:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_IPV4_UDP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_IPV4_UDP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW_IPV4_UDP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP_IPV4_UDP:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_IPV4_UDP:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW_IPV4_UDP:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_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,
@@ -2043,6 +3748,14 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,
        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:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_IPV4_TCP:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_IPV4_TCP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_IPV4_TCP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW_IPV4_TCP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP_IPV4_TCP:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_IPV4_TCP:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW_IPV4_TCP:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_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,
@@ -2055,6 +3768,17 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,
                ice_pkt_insert_u8(loc, ICE_IPV4_NO_MAC_TTL_OFFSET, input->ip.v4.ttl);
                break;
        case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV6:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV6:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW_IPV6:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV6:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_IPV6:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_IPV6:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_IPV6:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW_IPV6:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP_IPV6:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_IPV6:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW_IPV6:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_UP_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,
@@ -2065,6 +3789,17 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,
                                  input->ip.v6.proto);
                break;
        case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV6_UDP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV6_UDP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW_IPV6_UDP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV6_UDP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_IPV6_UDP:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_IPV6_UDP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_IPV6_UDP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW_IPV6_UDP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP_IPV6_UDP:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_IPV6_UDP:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW_IPV6_UDP:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_UP_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,
@@ -2077,6 +3812,17 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,
                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:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV6_TCP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW_IPV6_TCP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV6_TCP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_IPV6_TCP:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_IPV6_TCP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_IPV6_TCP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW_IPV6_TCP:
+       case ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP_IPV6_TCP:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_IPV6_TCP:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW_IPV6_TCP:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_UP_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,
@@ -2110,6 +3856,26 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,
                ice_pkt_insert_u6_qfi(loc, ICE_IPV6_GTPU_QFI_OFFSET,
                                      input->gtpu_data.qfi);
                break;
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU:
+               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_GTPOGRE_TEID_OFFSET,
+                                  input->gtpu_data.teid);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW:
+       case ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_UP:
+               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_GTPOGRE_TEID_OFFSET,
+                                  input->gtpu_data.teid);
+               ice_pkt_insert_u6_qfi(loc, ICE_IPV6_GTPOGRE_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);
@@ -2319,6 +4085,13 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,
                ice_pkt_insert_mac_addr(loc, input->ext_data.dst_mac);
                break;
        case ICE_FLTR_PTYPE_FRAG_IPV6:
+               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_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);
                ice_pkt_insert_u32(loc, ICE_IPV6_ID_OFFSET,
                                   input->ip.v6.packet_id);
                break;