net/ice/base: fix inner TCP and UDP support for GRE

The dummy packets for GRE were set up for IP, but not inner
TCP or UDP. There are some applications that want to be
able to parse on those inner L4 headers so add them to
the dummy packets.

Also, the GRE dummy packet was formatted differently from
the other dummy packets so change the formatting to match
all the other dummy packets.

Fixes: 839c0a4b77e6 ("net/ice/base: enable additional switch rules")

Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Qiming Yang <qiming.yang@intel.com>

diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c
index be43c8b..0b5b1f4 100644 (file)
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -59,38 +59,95 @@ struct ice_dummy_pkt_offsets {
 };
 
 static const
-struct ice_dummy_pkt_offsets dummy_gre_packet_offsets[] = {
+struct ice_dummy_pkt_offsets dummy_gre_tcp_packet_offsets[] = {
        { ICE_MAC_OFOS,         0 },
        { ICE_ETYPE_OL,         12 },
        { ICE_IPV4_OFOS,        14 },
        { ICE_NVGRE,            34 },
        { ICE_MAC_IL,           42 },
        { ICE_IPV4_IL,          56 },
+       { ICE_TCP_IL,           76 },
        { ICE_PROTOCOL_LAST,    0 },
 };
 
 static const
-u8 dummy_gre_packet[] = { 0, 0, 0, 0,          /* ICE_MAC_OFOS 0 */
-                         0, 0, 0, 0,
-                         0, 0, 0, 0,
-                         0x08, 0,              /* ICE_ETYPE_OL 12 */
-                         0x45, 0, 0, 0x3E,     /* ICE_IPV4_OFOS 14 */
-                         0, 0, 0, 0,
-                         0, 0x2F, 0, 0,
-                         0, 0, 0, 0,
-                         0, 0, 0, 0,
-                         0x80, 0, 0x65, 0x58,  /* ICE_NVGRE 34 */
-                         0, 0, 0, 0,
-                         0, 0, 0, 0,           /* ICE_MAC_IL 42 */
-                         0, 0, 0, 0,
-                         0, 0, 0, 0,
-                         0x08, 0,
-                         0x45, 0, 0, 0x14,     /* ICE_IPV4_IL 54 */
-                         0, 0, 0, 0,
-                         0, 0, 0, 0,
-                         0, 0, 0, 0,
-                         0, 0, 0, 0
-                       };
+u8 dummy_gre_tcp_packet[] = {
+       0x00, 0x00, 0x00, 0x00, /* ICE_MAC_OFOS 0 */
+       0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+
+       0x08, 0x00,             /* ICE_ETYPE_OL 12 */
+
+       0x45, 0x00, 0x00, 0x3E, /* ICE_IPV4_OFOS 14 */
+       0x00, 0x00, 0x00, 0x00,
+       0x00, 0x2F, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+
+       0x80, 0x00, 0x65, 0x58, /* ICE_NVGRE 34 */
+       0x00, 0x00, 0x00, 0x00,
+
+       0x00, 0x00, 0x00, 0x00, /* ICE_MAC_IL 42 */
+       0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+       0x08, 0x00,
+
+       0x45, 0x00, 0x00, 0x14, /* ICE_IPV4_IL 56 */
+       0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+
+       0x00, 0x00, 0x00, 0x00, /* ICE_TCP_IL 76 */
+       0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+       0x50, 0x02, 0x20, 0x00,
+       0x00, 0x00, 0x00, 0x00
+};
+
+static const
+struct ice_dummy_pkt_offsets dummy_gre_udp_packet_offsets[] = {
+       { ICE_MAC_OFOS,         0 },
+       { ICE_ETYPE_OL,         12 },
+       { ICE_IPV4_OFOS,        14 },
+       { ICE_NVGRE,            34 },
+       { ICE_MAC_IL,           42 },
+       { ICE_IPV4_IL,          56 },
+       { ICE_UDP_ILOS,         76 },
+       { ICE_PROTOCOL_LAST,    0 },
+};
+
+static const
+u8 dummy_gre_udp_packet[] = {
+       0x00, 0x00, 0x00, 0x00, /* ICE_MAC_OFOS 0 */
+       0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+
+       0x08, 0x00,             /* ICE_ETYPE_OL 12 */
+
+       0x45, 0x00, 0x00, 0x3E, /* ICE_IPV4_OFOS 14 */
+       0x00, 0x00, 0x00, 0x00,
+       0x00, 0x2F, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+
+       0x80, 0x00, 0x65, 0x58, /* ICE_NVGRE 34 */
+       0x00, 0x00, 0x00, 0x00,
+
+       0x00, 0x00, 0x00, 0x00, /* ICE_MAC_IL 42 */
+       0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+       0x08, 0x00,
+
+       0x45, 0x00, 0x00, 0x14, /* ICE_IPV4_IL 56 */
+       0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+
+       0x00, 0x00, 0x00, 0x00, /* ICE_UDP_ILOS 76 */
+       0x00, 0x08, 0x00, 0x00,
+};
 
 static const
 struct ice_dummy_pkt_offsets dummy_udp_tun_tcp_packet_offsets[] = {
@@ -5369,10 +5426,24 @@ ice_find_dummy_packet(struct ice_adv_lkup_elem *lkups, u16 lkups_cnt,
                        ipv6 = true;
        }
 
-       if (tun_type == ICE_SW_TUN_NVGRE || tun_type == ICE_ALL_TUNNELS) {
-               *pkt = dummy_gre_packet;
-               *pkt_len = sizeof(dummy_gre_packet);
-               *offsets = dummy_gre_packet_offsets;
+       if (tun_type == ICE_ALL_TUNNELS) {
+               *pkt = dummy_gre_udp_packet;
+               *pkt_len = sizeof(dummy_gre_udp_packet);
+               *offsets = dummy_gre_udp_packet_offsets;
+               return;
+       }
+
+       if (tun_type == ICE_SW_TUN_NVGRE) {
+               if (tcp) {
+                       *pkt = dummy_gre_tcp_packet;
+                       *pkt_len = sizeof(dummy_gre_tcp_packet);
+                       *offsets = dummy_gre_tcp_packet_offsets;
+                       return;
+               }
+
+               *pkt = dummy_gre_udp_packet;
+               *pkt_len = sizeof(dummy_gre_udp_packet);
+               *offsets = dummy_gre_udp_packet_offsets;
                return;
        }