net/ice/base: support flow director for GTPoGRE

Enable Flow Director filtering for GTPoGRE inner/outer fields
matching.

Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Junfeng Guo <junfeng.guo@intel.com>

diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c
index ae512e5..d50f54a 100644 (file)
--- a/drivers/net/ice/base/ice_fdir.c
+++ b/drivers/net/ice/base/ice_fdir.c
@@ -867,6 +867,966 @@ static const u8 ice_fdir_tcp6_gre6_pkt[] = {
        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, 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_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, 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_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, 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,
+};
+
 static const u8 ice_fdir_tcpv6_pkt[] = {
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x86, 0xDD, 0x60, 0x00,
@@ -1103,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),
@@ -1536,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,
@@ -2035,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;
@@ -2228,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,
@@ -2249,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,
@@ -2268,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,
@@ -2283,6 +3771,14 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,
        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,
@@ -2296,6 +3792,14 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,
        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,
@@ -2311,6 +3815,14 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,
        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,
@@ -2344,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);

diff --git a/drivers/net/ice/base/ice_fdir.h b/drivers/net/ice/base/ice_fdir.h
index a1147b4..b6325a3 100644 (file)
--- a/drivers/net/ice/base/ice_fdir.h
+++ b/drivers/net/ice/base/ice_fdir.h
@@ -18,6 +18,14 @@
 #define ICE_FDIR_GTPU_EH_INNER_PKT_OFF 58
 #define ICE_FDIR_IPV4_GRE_INNER_PKT_OFF 38
 #define ICE_FDIR_IPV6_GRE_INNER_PKT_OFF 58
+#define ICE_FDIR_V4_V4_GTPOGRE_PKT_OFF 74
+#define ICE_FDIR_V4_V6_GTPOGRE_PKT_OFF 94
+#define ICE_FDIR_V6_V4_GTPOGRE_PKT_OFF 94
+#define ICE_FDIR_V6_V6_GTPOGRE_PKT_OFF 114
+#define ICE_FDIR_V4_V4_GTPOGRE_EH_PKT_OFF      82
+#define ICE_FDIR_V4_V6_GTPOGRE_EH_PKT_OFF      102
+#define ICE_FDIR_V6_V4_GTPOGRE_EH_PKT_OFF      102
+#define ICE_FDIR_V6_V6_GTPOGRE_EH_PKT_OFF      122
 
 #define ICE_FDIR_TUN_PKT_OFF           50
 #define ICE_FDIR_MAX_RAW_PKT_SIZE      (512 + ICE_FDIR_TUN_PKT_OFF)
@@ -73,6 +81,10 @@
 #define ICE_IPV4_GTPU_QFI_OFFSET       56
 #define ICE_IPV6_GTPU_TEID_OFFSET      66
 #define ICE_IPV6_GTPU_QFI_OFFSET       76
+#define ICE_IPV4_GTPOGRE_TEID_OFFSET   70
+#define ICE_IPV4_GTPOGRE_QFI_OFFSET    80
+#define ICE_IPV6_GTPOGRE_TEID_OFFSET   90
+#define ICE_IPV6_GTPOGRE_QFI_OFFSET    100
 #define ICE_IPV4_L2TPV3_SESS_ID_OFFSET 34
 #define ICE_IPV6_L2TPV3_SESS_ID_OFFSET 54
 #define ICE_IPV4_ESP_SPI_OFFSET                34

diff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ice_flex_pipe.c
index b3cea73..fd98b38 100644 (file)
--- a/drivers/net/ice/base/ice_flex_pipe.c
+++ b/drivers/net/ice/base/ice_flex_pipe.c
@@ -4712,12 +4712,18 @@ static const struct ice_fd_src_dst_pair ice_fd_pairs[] = {
        { ICE_PROT_IPV4_IL, 2, 12 },
        { ICE_PROT_IPV4_IL, 2, 16 },
 
+       { ICE_PROT_IPV4_IL_IL, 2, 12 },
+       { ICE_PROT_IPV4_IL_IL, 2, 16 },
+
        { ICE_PROT_IPV6_OF_OR_S, 8, 8 },
        { ICE_PROT_IPV6_OF_OR_S, 8, 24 },
 
        { ICE_PROT_IPV6_IL, 8, 8 },
        { ICE_PROT_IPV6_IL, 8, 24 },
 
+       { ICE_PROT_IPV6_IL_IL, 8, 8 },
+       { ICE_PROT_IPV6_IL_IL, 8, 24 },
+
        { ICE_PROT_TCP_IL, 1, 0 },
        { ICE_PROT_TCP_IL, 1, 2 },
 

diff --git a/drivers/net/ice/base/ice_flex_type.h b/drivers/net/ice/base/ice_flex_type.h
index 8d2ba99..eb82907 100644 (file)
--- a/drivers/net/ice/base/ice_flex_type.h
+++ b/drivers/net/ice/base/ice_flex_type.h
@@ -446,6 +446,54 @@ enum ice_sect {
 #define ICE_MAC_IPV6_PPPOL2TPV2_IPV6_TCP       419
 #define ICE_MAC_IPV6_PPPOL2TPV2_IPV6_SCTP      420
 #define ICE_MAC_IPV6_PPPOL2TPV2_IPV6_ICMPV6    421
+#define MAC_IPV4_TUN_IPV4_GTPU_IPV4_FRAG       450
+#define MAC_IPV4_TUN_IPV4_GTPU_IPV4_PAY                451
+#define MAC_IPV4_TUN_IPV4_GTPU_IPV4_UDP_PAY    452
+#define MAC_IPV4_TUN_IPV4_GTPU_IPV4_TCP                453
+#define MAC_IPV4_TUN_IPV4_GTPU_IPV4_SCTP       454
+#define MAC_IPV4_TUN_IPV4_GTPU_IPV4_ICMP       455
+#define MAC_IPV4_TUN_IPV4_GTPU_IPV6_FRAG       456
+#define MAC_IPV4_TUN_IPV4_GTPU_IPV6_PAY                457
+#define MAC_IPV4_TUN_IPV4_GTPU_IPV6_UDP_PAY    458
+#define MAC_IPV4_TUN_IPV4_GTPU_IPV6_TCP                459
+#define MAC_IPV4_TUN_IPV4_GTPU_IPV6_SCTP       460
+#define MAC_IPV4_TUN_IPV4_GTPU_IPV6_ICMPV6     461
+#define MAC_IPV4_TUN_IPV6_GTPU_IPV4_FRAG       462
+#define MAC_IPV4_TUN_IPV6_GTPU_IPV4_PAY                463
+#define MAC_IPV4_TUN_IPV6_GTPU_IPV4_UDP_PAY    464
+#define MAC_IPV4_TUN_IPV6_GTPU_IPV4_TCP                465
+#define MAC_IPV4_TUN_IPV6_GTPU_IPV4_SCTP       466
+#define MAC_IPV4_TUN_IPV6_GTPU_IPV4_ICMP       467
+#define MAC_IPV4_TUN_IPV6_GTPU_IPV6_FRAG       468
+#define MAC_IPV4_TUN_IPV6_GTPU_IPV6_PAY                469
+#define MAC_IPV4_TUN_IPV6_GTPU_IPV6_UDP_PAY    470
+#define MAC_IPV4_TUN_IPV6_GTPU_IPV6_TCP                471
+#define MAC_IPV4_TUN_IPV6_GTPU_IPV6_SCTP       472
+#define MAC_IPV4_TUN_IPV6_GTPU_IPV6_ICMPV6     473
+#define MAC_IPV6_TUN_IPV4_GTPU_IPV4_FRAG       474
+#define MAC_IPV6_TUN_IPV4_GTPU_IPV4_PAY                475
+#define MAC_IPV6_TUN_IPV4_GTPU_IPV4_UDP_PAY    476
+#define MAC_IPV6_TUN_IPV4_GTPU_IPV4_TCP                477
+#define MAC_IPV6_TUN_IPV4_GTPU_IPV4_SCTP       478
+#define MAC_IPV6_TUN_IPV4_GTPU_IPV4_ICMP       479
+#define MAC_IPV6_TUN_IPV4_GTPU_IPV6_FRAG       480
+#define MAC_IPV6_TUN_IPV4_GTPU_IPV6_PAY                481
+#define MAC_IPV6_TUN_IPV4_GTPU_IPV6_UDP_PAY    482
+#define MAC_IPV6_TUN_IPV4_GTPU_IPV6_TCP                483
+#define MAC_IPV6_TUN_IPV4_GTPU_IPV6_SCTP       484
+#define MAC_IPV6_TUN_IPV4_GTPU_IPV6_ICMPV6     485
+#define MAC_IPV6_TUN_IPV6_GTPU_IPV4_FRAG       486
+#define MAC_IPV6_TUN_IPV6_GTPU_IPV4_PAY                487
+#define MAC_IPV6_TUN_IPV6_GTPU_IPV4_UDP_PAY    488
+#define MAC_IPV6_TUN_IPV6_GTPU_IPV4_TCP                489
+#define MAC_IPV6_TUN_IPV6_GTPU_IPV4_SCTP       490
+#define MAC_IPV6_TUN_IPV6_GTPU_IPV4_ICMP       491
+#define MAC_IPV6_TUN_IPV6_GTPU_IPV6_FRAG       492
+#define MAC_IPV6_TUN_IPV6_GTPU_IPV6_PAY                493
+#define MAC_IPV6_TUN_IPV6_GTPU_IPV6_UDP_PAY    494
+#define MAC_IPV6_TUN_IPV6_GTPU_IPV6_TCP                495
+#define MAC_IPV6_TUN_IPV6_GTPU_IPV6_SCTP       496
+#define MAC_IPV6_TUN_IPV6_GTPU_IPV6_ICMPV6     497
 
 /* Attributes that can modify PTYPE definitions.
  *

diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c
index e41082b..0b7d087 100644 (file)
--- a/drivers/net/ice/base/ice_flow.c
+++ b/drivers/net/ice/base/ice_flow.c
@@ -260,7 +260,7 @@ static const u32 ice_ptypes_ipv4_ofos_all[] = {
        0x1D800000, 0x27BF7800, 0x00000000, 0x00000000,
        0x00000000, 0x00000155, 0x00000000, 0x00000000,
        0x00000000, 0x000FC000, 0x83E0FAA0, 0x00000101,
-       0x03FFD500, 0x00000000, 0x00000000, 0x00000000,
+       0x03FFD000, 0x00000000, 0x02FBEFBC, 0x00000000,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -272,7 +272,7 @@ static const u32 ice_ptypes_ipv4_il[] = {
        0xE0000000, 0xB807700E, 0x80000003, 0xE01DC03B,
        0x0000000E, 0x00000000, 0x00000000, 0x00000000,
        0x00000000, 0x00000000, 0x001FF800, 0x00100000,
-       0xFC0FC000, 0x00000000, 0x00000000, 0x00000000,
+       0xFC0FC000, 0x00000000, 0xBC0BC0BC, 0x00000BC0,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -300,7 +300,7 @@ static const u32 ice_ptypes_ipv6_ofos_all[] = {
        0x00000000, 0x00000000, 0x76000000, 0x1EFDE000,
        0x00000000, 0x000002AA, 0x00000000, 0x00000000,
        0x00000000, 0x03F00000, 0x7C1F0540, 0x00000206,
-       0xFC002A00, 0x0000003F, 0x00000000, 0x00000000,
+       0xFC002000, 0x0000003F, 0xBC000000, 0x0002FBEF,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -312,7 +312,7 @@ static const u32 ice_ptypes_ipv6_il[] = {
        0x00000000, 0x03B80770, 0x000001DC, 0x0EE00000,
        0x00000770, 0x00000000, 0x00000000, 0x00000000,
        0x00000000, 0x00000000, 0x7FE00000, 0x00000000,
-       0x03F00000, 0x0000003F, 0x00000000, 0x00000000,
+       0x03F00000, 0x0000003F, 0x02F02F00, 0x0002F02F,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -390,7 +390,7 @@ static const u32 ice_ptypes_udp_il[] = {
        0x81000000, 0x20204040, 0x04000010, 0x80810102,
        0x00000040, 0x00000000, 0x00000000, 0x00000000,
        0x00000000, 0x00410000, 0x908427E0, 0x00100007,
-       0x10410000, 0x00000004, 0x00000000, 0x00000000,
+       0x10410000, 0x00000004, 0x10410410, 0x00004104,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -402,7 +402,7 @@ static const u32 ice_ptypes_tcp_il[] = {
        0x04000000, 0x80810102, 0x10000040, 0x02040408,
        0x00000102, 0x00000000, 0x00000000, 0x00000000,
        0x00000000, 0x00820000, 0x21084000, 0x00000000,
-       0x20820000, 0x00000008, 0x00000000, 0x00000000,
+       0x20820000, 0x00000008, 0x20820820, 0x00008208,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -450,7 +450,7 @@ static const u32 ice_ptypes_gre_of[] = {
        0x00000000, 0xBFBF7800, 0x000001DF, 0xFEFDE000,
        0x0000017E, 0x00000000, 0x00000000, 0x00000000,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
-       0x00000000, 0x00000000, 0x00000000, 0x00000000,
+       0x00000000, 0x00000000, 0xBEFBEFBC, 0x0002FBEF,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -527,6 +527,46 @@ static const struct ice_ptype_attributes ice_attr_gtpu_session[] = {
        { ICE_MAC_IPV6_GTPU_IPV6_UDP_PAY, ICE_PTYPE_ATTR_GTP_SESSION },
        { ICE_MAC_IPV6_GTPU_IPV6_TCP,     ICE_PTYPE_ATTR_GTP_SESSION },
        { ICE_MAC_IPV6_GTPU_IPV6_ICMPV6,  ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV4_FRAG,     ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV4_PAY,      ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV4_UDP_PAY,  ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV4_TCP,      ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV4_ICMP,     ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV6_FRAG,     ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV6_PAY,      ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV6_UDP_PAY,  ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV6_TCP,      ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV6_ICMPV6,   ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV4_FRAG,     ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV4_PAY,      ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV4_UDP_PAY,  ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV4_TCP,      ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV4_ICMP,     ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV6_FRAG,     ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV6_PAY,      ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV6_UDP_PAY,  ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV6_TCP,      ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV6_ICMPV6,   ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV4_FRAG,     ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV4_PAY,      ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV4_UDP_PAY,  ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV4_TCP,      ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV4_ICMP,     ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV6_FRAG,     ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV6_PAY,      ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV6_UDP_PAY,  ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV6_TCP,      ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV6_ICMPV6,   ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV4_FRAG,     ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV4_PAY,      ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV4_UDP_PAY,  ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV4_TCP,      ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV4_ICMP,     ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV6_FRAG,     ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV6_PAY,      ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV6_UDP_PAY,  ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV6_TCP,      ICE_PTYPE_ATTR_GTP_SESSION },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV6_ICMPV6,   ICE_PTYPE_ATTR_GTP_SESSION },
 };
 
 static const struct ice_ptype_attributes ice_attr_gtpu_eh[] = {
@@ -550,6 +590,46 @@ static const struct ice_ptype_attributes ice_attr_gtpu_eh[] = {
        { ICE_MAC_IPV6_GTPU_IPV6_UDP_PAY, ICE_PTYPE_ATTR_GTP_PDU_EH },
        { ICE_MAC_IPV6_GTPU_IPV6_TCP,     ICE_PTYPE_ATTR_GTP_PDU_EH },
        { ICE_MAC_IPV6_GTPU_IPV6_ICMPV6,  ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV4_FRAG,     ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV4_PAY,      ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV4_UDP_PAY,  ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV4_TCP,      ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV4_ICMP,     ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV6_FRAG,     ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV6_PAY,      ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV6_UDP_PAY,  ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV6_TCP,      ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV6_ICMPV6,   ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV4_FRAG,     ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV4_PAY,      ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV4_UDP_PAY,  ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV4_TCP,      ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV4_ICMP,     ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV6_FRAG,     ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV6_PAY,      ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV6_UDP_PAY,  ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV6_TCP,      ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV6_ICMPV6,   ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV4_FRAG,     ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV4_PAY,      ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV4_UDP_PAY,  ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV4_TCP,      ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV4_ICMP,     ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV6_FRAG,     ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV6_PAY,      ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV6_UDP_PAY,  ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV6_TCP,      ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV6_ICMPV6,   ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV4_FRAG,     ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV4_PAY,      ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV4_UDP_PAY,  ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV4_TCP,      ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV4_ICMP,     ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV6_FRAG,     ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV6_PAY,      ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV6_UDP_PAY,  ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV6_TCP,      ICE_PTYPE_ATTR_GTP_PDU_EH },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV6_ICMPV6,   ICE_PTYPE_ATTR_GTP_PDU_EH },
 };
 
 static const struct ice_ptype_attributes ice_attr_gtpu_down[] = {
@@ -573,6 +653,46 @@ static const struct ice_ptype_attributes ice_attr_gtpu_down[] = {
        { ICE_MAC_IPV6_GTPU_IPV6_UDP_PAY, ICE_PTYPE_ATTR_GTP_DOWNLINK },
        { ICE_MAC_IPV6_GTPU_IPV6_TCP,     ICE_PTYPE_ATTR_GTP_DOWNLINK },
        { ICE_MAC_IPV6_GTPU_IPV6_ICMPV6,  ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV4_FRAG,     ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV4_PAY,      ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV4_UDP_PAY,  ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV4_TCP,      ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV4_ICMP,     ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV6_FRAG,     ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV6_PAY,      ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV6_UDP_PAY,  ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV6_TCP,      ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV6_ICMPV6,   ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV4_FRAG,     ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV4_PAY,      ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV4_UDP_PAY,  ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV4_TCP,      ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV4_ICMP,     ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV6_FRAG,     ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV6_PAY,      ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV6_UDP_PAY,  ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV6_TCP,      ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV6_ICMPV6,   ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV4_FRAG,     ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV4_PAY,      ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV4_UDP_PAY,  ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV4_TCP,      ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV4_ICMP,     ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV6_FRAG,     ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV6_PAY,      ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV6_UDP_PAY,  ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV6_TCP,      ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV6_ICMPV6,   ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV4_FRAG,     ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV4_PAY,      ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV4_UDP_PAY,  ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV4_TCP,      ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV4_ICMP,     ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV6_FRAG,     ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV6_PAY,      ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV6_UDP_PAY,  ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV6_TCP,      ICE_PTYPE_ATTR_GTP_DOWNLINK },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV6_ICMPV6,   ICE_PTYPE_ATTR_GTP_DOWNLINK },
 };
 
 static const struct ice_ptype_attributes ice_attr_gtpu_up[] = {
@@ -596,13 +716,53 @@ static const struct ice_ptype_attributes ice_attr_gtpu_up[] = {
        { ICE_MAC_IPV6_GTPU_IPV6_UDP_PAY, ICE_PTYPE_ATTR_GTP_UPLINK },
        { ICE_MAC_IPV6_GTPU_IPV6_TCP,     ICE_PTYPE_ATTR_GTP_UPLINK },
        { ICE_MAC_IPV6_GTPU_IPV6_ICMPV6,  ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV4_FRAG,     ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV4_PAY,      ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV4_UDP_PAY,  ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV4_TCP,      ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV4_ICMP,     ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV6_FRAG,     ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV6_PAY,      ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV6_UDP_PAY,  ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV6_TCP,      ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV4_TUN_IPV4_GTPU_IPV6_ICMPV6,   ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV4_FRAG,     ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV4_PAY,      ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV4_UDP_PAY,  ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV4_TCP,      ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV4_ICMP,     ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV6_FRAG,     ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV6_PAY,      ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV6_UDP_PAY,  ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV6_TCP,      ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV4_TUN_IPV6_GTPU_IPV6_ICMPV6,   ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV4_FRAG,     ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV4_PAY,      ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV4_UDP_PAY,  ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV4_TCP,      ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV4_ICMP,     ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV6_FRAG,     ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV6_PAY,      ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV6_UDP_PAY,  ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV6_TCP,      ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV6_TUN_IPV4_GTPU_IPV6_ICMPV6,   ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV4_FRAG,     ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV4_PAY,      ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV4_UDP_PAY,  ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV4_TCP,      ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV4_ICMP,     ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV6_FRAG,     ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV6_PAY,      ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV6_UDP_PAY,  ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV6_TCP,      ICE_PTYPE_ATTR_GTP_UPLINK },
+       { MAC_IPV6_TUN_IPV6_GTPU_IPV6_ICMPV6,   ICE_PTYPE_ATTR_GTP_UPLINK },
 };
 
 static const u32 ice_ptypes_gtpu[] = {
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
        0x00000000, 0x00000000, 0x7FFFFE00, 0x00000000,
-       0x00000000, 0x00000000, 0x00000000, 0x00000000,
+       0x00000000, 0x0000003F, 0xBEFBEFBC, 0x0002FBEF,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -1251,6 +1411,10 @@ ice_flow_xtract_fld(struct ice_hw *hw, struct ice_flow_prof_params *params,
        case ICE_FLOW_FIELD_IDX_IPV4_SA:
        case ICE_FLOW_FIELD_IDX_IPV4_DA:
                prot_id = seg == 0 ? ICE_PROT_IPV4_OF_OR_S : ICE_PROT_IPV4_IL;
+               if (params->prof->segs[0].hdrs & ICE_FLOW_SEG_HDR_GRE &&
+                   params->prof->segs[1].hdrs & ICE_FLOW_SEG_HDR_GTPU &&
+                   seg == 1)
+                       prot_id = ICE_PROT_IPV4_IL_IL;
                break;
        case ICE_FLOW_FIELD_IDX_IPV4_ID:
                prot_id = ICE_PROT_IPV4_OF_OR_S;
@@ -1264,6 +1428,10 @@ ice_flow_xtract_fld(struct ice_hw *hw, struct ice_flow_prof_params *params,
        case ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA:
        case ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA:
                prot_id = seg == 0 ? ICE_PROT_IPV6_OF_OR_S : ICE_PROT_IPV6_IL;
+               if (params->prof->segs[0].hdrs & ICE_FLOW_SEG_HDR_GRE &&
+                   params->prof->segs[1].hdrs & ICE_FLOW_SEG_HDR_GTPU &&
+                   seg == 1)
+                       prot_id = ICE_PROT_IPV6_IL_IL;
                break;
        case ICE_FLOW_FIELD_IDX_IPV6_ID:
                prot_id = ICE_PROT_IPV6_FRAG;

diff --git a/drivers/net/ice/base/ice_protocol_type.h b/drivers/net/ice/base/ice_protocol_type.h
index 220ff3b..cef8354 100644 (file)
--- a/drivers/net/ice/base/ice_protocol_type.h
+++ b/drivers/net/ice/base/ice_protocol_type.h
@@ -159,8 +159,10 @@ enum ice_prot_id {
        ICE_PROT_MPLS_IL        = 29,
        ICE_PROT_IPV4_OF_OR_S   = 32,
        ICE_PROT_IPV4_IL        = 33,
+       ICE_PROT_IPV4_IL_IL     = 34,
        ICE_PROT_IPV6_OF_OR_S   = 40,
        ICE_PROT_IPV6_IL        = 41,
+       ICE_PROT_IPV6_IL_IL     = 42,
        ICE_PROT_IPV6_FRAG      = 47,
        ICE_PROT_TCP_IL         = 49,
        ICE_PROT_UDP_OF         = 52,

diff --git a/drivers/net/ice/base/ice_type.h b/drivers/net/ice/base/ice_type.h
index 6ae39a3..4e33d14 100644 (file)
--- a/drivers/net/ice/base/ice_type.h
+++ b/drivers/net/ice/base/ice_type.h
@@ -373,6 +373,118 @@ enum ice_fltr_ptype {
        ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6,
        ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_UDP,
        ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_IPV4,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_IPV4_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_IPV4_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_IPV6,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_IPV6_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_IPV6_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_IPV4,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_IPV4_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_IPV4_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_IPV6,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_IPV6_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_IPV6_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_IPV4,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_IPV4_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_IPV4_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_IPV6,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_IPV6_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_IPV6_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_IPV4,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_IPV4_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_IPV4_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_IPV6,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_IPV6_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_IPV6_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_IPV4,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_IPV4_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_IPV4_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_IPV6,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_IPV6_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_IPV6_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_EH,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_EH_IPV4,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_EH_IPV4_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_EH_IPV4_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_EH_IPV6,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_EH_IPV6_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_EH_IPV6_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_IPV4,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_IPV4_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_IPV4_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_IPV6,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_IPV6_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_IPV6_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_EH,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_EH_IPV4,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_EH_IPV4_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_EH_IPV4_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_EH_IPV6,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_EH_IPV6_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_EH_IPV6_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW_IPV4,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW_IPV4_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW_IPV4_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW_IPV6,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW_IPV6_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_DW_IPV6_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_EH_DW,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_EH_DW_IPV4,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_EH_DW_IPV4_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_EH_DW_IPV4_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_EH_DW_IPV6,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_EH_DW_IPV6_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_EH_DW_IPV6_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW_IPV4,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW_IPV4_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW_IPV4_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW_IPV6,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW_IPV6_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_DW_IPV6_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_EH_DW,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_EH_DW_IPV4,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_EH_DW_IPV4_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_EH_DW_IPV4_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_EH_DW_IPV6,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_EH_DW_IPV6_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_EH_DW_IPV6_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP_IPV4,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP_IPV4_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP_IPV4_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP_IPV6,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP_IPV6_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV4_GTPU_EH_UP_IPV6_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_EH_UP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_EH_UP_IPV4,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_EH_UP_IPV4_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_EH_UP_IPV4_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_EH_UP_IPV6,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_EH_UP_IPV6_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GRE_IPV6_GTPU_EH_UP_IPV6_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_UP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_UP_IPV4,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_UP_IPV4_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_UP_IPV4_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_UP_IPV6,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_UP_IPV6_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV4_GTPU_EH_UP_IPV6_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_EH_UP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_EH_UP_IPV4,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_EH_UP_IPV4_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_EH_UP_IPV4_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_EH_UP_IPV6,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_EH_UP_IPV6_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV6_GRE_IPV6_GTPU_EH_UP_IPV6_TCP,
        ICE_FLTR_PTYPE_NONF_IPV6_UDP,
        ICE_FLTR_PTYPE_NONF_IPV6_TCP,
        ICE_FLTR_PTYPE_NONF_IPV6_SCTP,