Commit 34a89775 authored by Martyna Szapar-Mudlaw's avatar Martyna Szapar-Mudlaw Committed by Tony Nguyen
Browse files

ice: Add support for inner etype in switchdev 



Enable support for adding TC rules that filter on the inner
EtherType field of tunneled packet headers.

Signed-off-by: default avatarMartyna Szapar-Mudlaw <martyna.szapar-mudlaw@intel.com>
Reviewed-by: default avatarAlexander Lobakin <alexandr.lobakin@intel.com>
Tested-by: default avatarSandeep Penigalapati <sandeep.penigalapati@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 7f415828

drivers/net/ethernet/intel/ice/ice_protocol_type.h

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ enum ice_protocol_type { 
	ICE_MAC_OFOS = 0,

	ICE_MAC_IL,

	ICE_ETYPE_OL,

	ICE_ETYPE_IL,

	ICE_VLAN_OFOS,

	ICE_IPV4_OFOS,

	ICE_IPV4_IL,
@@ -92,6 +93,7 @@ enum ice_prot_id { 
#define ICE_MAC_OFOS_HW		1

#define ICE_MAC_IL_HW		4

#define ICE_ETYPE_OL_HW		9

#define ICE_ETYPE_IL_HW		10

#define ICE_VLAN_OF_HW		16

#define ICE_VLAN_OL_HW		17

#define ICE_IPV4_OFOS_HW	32

drivers/net/ethernet/intel/ice/ice_switch.c

+265 −7
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ static const struct ice_dummy_pkt_offsets dummy_gre_tcp_packet_offsets[] = { 
	{ ICE_IPV4_OFOS,	14 },

	{ ICE_NVGRE,		34 },

	{ ICE_MAC_IL,		42 },

	{ ICE_ETYPE_IL,		54 },

	{ ICE_IPV4_IL,		56 },

	{ ICE_TCP_IL,		76 },

	{ ICE_PROTOCOL_LAST,	0 },
@@ -65,7 +66,8 @@ static const u8 dummy_gre_tcp_packet[] = { 
	0x00, 0x00, 0x00, 0x00,	/* ICE_MAC_IL 42 */

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x08, 0x00,



	0x08, 0x00,		/* ICE_ETYPE_IL 54 */



	0x45, 0x00, 0x00, 0x14,	/* ICE_IPV4_IL 56 */

	0x00, 0x00, 0x00, 0x00,
@@ -86,6 +88,7 @@ static const struct ice_dummy_pkt_offsets dummy_gre_udp_packet_offsets[] = { 
	{ ICE_IPV4_OFOS,	14 },

	{ ICE_NVGRE,		34 },

	{ ICE_MAC_IL,		42 },

	{ ICE_ETYPE_IL,		54 },

	{ ICE_IPV4_IL,		56 },

	{ ICE_UDP_ILOS,		76 },

	{ ICE_PROTOCOL_LAST,	0 },
@@ -110,7 +113,8 @@ static const u8 dummy_gre_udp_packet[] = { 
	0x00, 0x00, 0x00, 0x00,	/* ICE_MAC_IL 42 */

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x08, 0x00,



	0x08, 0x00,		/* ICE_ETYPE_IL 54 */



	0x45, 0x00, 0x00, 0x14,	/* ICE_IPV4_IL 56 */

	0x00, 0x00, 0x00, 0x00,
@@ -131,6 +135,7 @@ static const struct ice_dummy_pkt_offsets dummy_udp_tun_tcp_packet_offsets[] = { 
	{ ICE_GENEVE,		42 },

	{ ICE_VXLAN_GPE,	42 },

	{ ICE_MAC_IL,		50 },

	{ ICE_ETYPE_IL,		62 },

	{ ICE_IPV4_IL,		64 },

	{ ICE_TCP_IL,		84 },

	{ ICE_PROTOCOL_LAST,	0 },
@@ -158,7 +163,8 @@ static const u8 dummy_udp_tun_tcp_packet[] = { 
	0x00, 0x00, 0x00, 0x00, /* ICE_MAC_IL 50 */

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x08, 0x00,



	0x08, 0x00,		/* ICE_ETYPE_IL 62 */



	0x45, 0x00, 0x00, 0x28, /* ICE_IPV4_IL 64 */

	0x00, 0x01, 0x00, 0x00,
@@ -182,6 +188,7 @@ static const struct ice_dummy_pkt_offsets dummy_udp_tun_udp_packet_offsets[] = { 
	{ ICE_GENEVE,		42 },

	{ ICE_VXLAN_GPE,	42 },

	{ ICE_MAC_IL,		50 },

	{ ICE_ETYPE_IL,		62 },

	{ ICE_IPV4_IL,		64 },

	{ ICE_UDP_ILOS,		84 },

	{ ICE_PROTOCOL_LAST,	0 },
@@ -209,7 +216,8 @@ static const u8 dummy_udp_tun_udp_packet[] = { 
	0x00, 0x00, 0x00, 0x00, /* ICE_MAC_IL 50 */

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x08, 0x00,



	0x08, 0x00,		/* ICE_ETYPE_IL 62 */



	0x45, 0x00, 0x00, 0x1c, /* ICE_IPV4_IL 64 */

	0x00, 0x01, 0x00, 0x00,
@@ -221,6 +229,224 @@ static const u8 dummy_udp_tun_udp_packet[] = { 
	0x00, 0x08, 0x00, 0x00,

};



static const struct ice_dummy_pkt_offsets

dummy_gre_ipv6_tcp_packet_offsets[] = {

	{ ICE_MAC_OFOS,		0 },

	{ ICE_ETYPE_OL,		12 },

	{ ICE_IPV4_OFOS,	14 },

	{ ICE_NVGRE,		34 },

	{ ICE_MAC_IL,		42 },

	{ ICE_ETYPE_IL,		54 },

	{ ICE_IPV6_IL,		56 },

	{ ICE_TCP_IL,		96 },

	{ ICE_PROTOCOL_LAST,	0 },

};



static const u8 dummy_gre_ipv6_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, 0x66, /* 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,



	0x86, 0xdd,		/* ICE_ETYPE_IL 54 */



	0x60, 0x00, 0x00, 0x00, /* ICE_IPV6_IL 56 */

	0x00, 0x08, 0x06, 0x40,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,



	0x00, 0x00, 0x00, 0x00, /* ICE_TCP_IL 96 */

	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_ipv6_udp_packet_offsets[] = {

	{ ICE_MAC_OFOS,		0 },

	{ ICE_ETYPE_OL,		12 },

	{ ICE_IPV4_OFOS,	14 },

	{ ICE_NVGRE,		34 },

	{ ICE_MAC_IL,		42 },

	{ ICE_ETYPE_IL,		54 },

	{ ICE_IPV6_IL,		56 },

	{ ICE_UDP_ILOS,		96 },

	{ ICE_PROTOCOL_LAST,	0 },

};



static const u8 dummy_gre_ipv6_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, 0x5a, /* 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,



	0x86, 0xdd,		/* ICE_ETYPE_IL 54 */



	0x60, 0x00, 0x00, 0x00, /* ICE_IPV6_IL 56 */

	0x00, 0x08, 0x11, 0x40,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,



	0x00, 0x00, 0x00, 0x00, /* ICE_UDP_ILOS 96 */

	0x00, 0x08, 0x00, 0x00,

};



static const struct ice_dummy_pkt_offsets

dummy_udp_tun_ipv6_tcp_packet_offsets[] = {

	{ ICE_MAC_OFOS,		0 },

	{ ICE_ETYPE_OL,		12 },

	{ ICE_IPV4_OFOS,	14 },

	{ ICE_UDP_OF,		34 },

	{ ICE_VXLAN,		42 },

	{ ICE_GENEVE,		42 },

	{ ICE_VXLAN_GPE,	42 },

	{ ICE_MAC_IL,		50 },

	{ ICE_ETYPE_IL,		62 },

	{ ICE_IPV6_IL,		64 },

	{ ICE_TCP_IL,		104 },

	{ ICE_PROTOCOL_LAST,	0 },

};



static const u8 dummy_udp_tun_ipv6_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, 0x6e, /* ICE_IPV4_OFOS 14 */

	0x00, 0x01, 0x00, 0x00,

	0x40, 0x11, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,



	0x00, 0x00, 0x12, 0xb5, /* ICE_UDP_OF 34 */

	0x00, 0x5a, 0x00, 0x00,



	0x00, 0x00, 0x65, 0x58, /* ICE_VXLAN 42 */

	0x00, 0x00, 0x00, 0x00,



	0x00, 0x00, 0x00, 0x00, /* ICE_MAC_IL 50 */

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,



	0x86, 0xdd,		/* ICE_ETYPE_IL 62 */



	0x60, 0x00, 0x00, 0x00, /* ICE_IPV6_IL 64 */

	0x00, 0x08, 0x06, 0x40,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,



	0x00, 0x00, 0x00, 0x00, /* ICE_TCP_IL 104 */

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x50, 0x02, 0x20, 0x00,

	0x00, 0x00, 0x00, 0x00

};



static const struct ice_dummy_pkt_offsets

dummy_udp_tun_ipv6_udp_packet_offsets[] = {

	{ ICE_MAC_OFOS,		0 },

	{ ICE_ETYPE_OL,		12 },

	{ ICE_IPV4_OFOS,	14 },

	{ ICE_UDP_OF,		34 },

	{ ICE_VXLAN,		42 },

	{ ICE_GENEVE,		42 },

	{ ICE_VXLAN_GPE,	42 },

	{ ICE_MAC_IL,		50 },

	{ ICE_ETYPE_IL,		62 },

	{ ICE_IPV6_IL,		64 },

	{ ICE_UDP_ILOS,		104 },

	{ ICE_PROTOCOL_LAST,	0 },

};



static const u8 dummy_udp_tun_ipv6_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, 0x62, /* ICE_IPV4_OFOS 14 */

	0x00, 0x01, 0x00, 0x00,

	0x00, 0x11, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,



	0x00, 0x00, 0x12, 0xb5, /* ICE_UDP_OF 34 */

	0x00, 0x4e, 0x00, 0x00,



	0x00, 0x00, 0x65, 0x58, /* ICE_VXLAN 42 */

	0x00, 0x00, 0x00, 0x00,



	0x00, 0x00, 0x00, 0x00, /* ICE_MAC_IL 50 */

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,



	0x86, 0xdd,		/* ICE_ETYPE_IL 62 */



	0x60, 0x00, 0x00, 0x00, /* ICE_IPV6_IL 64 */

	0x00, 0x08, 0x11, 0x40,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,



	0x00, 0x00, 0x00, 0x00, /* ICE_UDP_ILOS 104 */

	0x00, 0x08, 0x00, 0x00,

};



/* offset info for MAC + IPv4 + UDP dummy packet */

static const struct ice_dummy_pkt_offsets dummy_udp_packet_offsets[] = {

	{ ICE_MAC_OFOS,		0 },
@@ -3818,6 +4044,7 @@ static const struct ice_prot_ext_tbl_entry ice_prot_ext[ICE_PROTOCOL_LAST] = { 
	{ ICE_MAC_OFOS,		{ 0, 2, 4, 6, 8, 10, 12 } },

	{ ICE_MAC_IL,		{ 0, 2, 4, 6, 8, 10, 12 } },

	{ ICE_ETYPE_OL,		{ 0 } },

	{ ICE_ETYPE_IL,		{ 0 } },

	{ ICE_VLAN_OFOS,	{ 2, 0 } },

	{ ICE_IPV4_OFOS,	{ 0, 2, 4, 6, 8, 10, 12, 14, 16, 18 } },

	{ ICE_IPV4_IL,		{ 0, 2, 4, 6, 8, 10, 12, 14, 16, 18 } },
@@ -3837,6 +4064,7 @@ static struct ice_protocol_entry ice_prot_id_tbl[ICE_PROTOCOL_LAST] = { 
	{ ICE_MAC_OFOS,		ICE_MAC_OFOS_HW },

	{ ICE_MAC_IL,		ICE_MAC_IL_HW },

	{ ICE_ETYPE_OL,		ICE_ETYPE_OL_HW },

	{ ICE_ETYPE_IL,		ICE_ETYPE_IL_HW },

	{ ICE_VLAN_OFOS,	ICE_VLAN_OL_HW },

	{ ICE_IPV4_OFOS,	ICE_IPV4_OFOS_HW },

	{ ICE_IPV4_IL,		ICE_IPV4_IL_HW },
@@ -4818,6 +5046,7 @@ ice_find_dummy_packet(struct ice_adv_lkup_elem *lkups, u16 lkups_cnt, 
		      const struct ice_dummy_pkt_offsets **offsets)

{

	bool tcp = false, udp = false, ipv6 = false, vlan = false;

	bool ipv6_il = false;

	u16 i;



	for (i = 0; i < lkups_cnt; i++) {
@@ -4835,16 +5064,33 @@ ice_find_dummy_packet(struct ice_adv_lkup_elem *lkups, u16 lkups_cnt, 
			 lkups[i].m_u.ethertype.ethtype_id ==

				cpu_to_be16(0xFFFF))

			ipv6 = true;

		else if (lkups[i].type == ICE_ETYPE_IL &&

			 lkups[i].h_u.ethertype.ethtype_id ==

				cpu_to_be16(ICE_IPV6_ETHER_ID) &&

			 lkups[i].m_u.ethertype.ethtype_id ==

				cpu_to_be16(0xFFFF))

			ipv6_il = true;

	}



	if (tun_type == ICE_SW_TUN_NVGRE) {

		if (tcp && ipv6_il) {

			*pkt = dummy_gre_ipv6_tcp_packet;

			*pkt_len = sizeof(dummy_gre_ipv6_tcp_packet);

			*offsets = dummy_gre_ipv6_tcp_packet_offsets;

			return;

		}

		if (tcp) {

			*pkt = dummy_gre_tcp_packet;

			*pkt_len = sizeof(dummy_gre_tcp_packet);

			*offsets = dummy_gre_tcp_packet_offsets;

			return;

		}



		if (ipv6_il) {

			*pkt = dummy_gre_ipv6_udp_packet;

			*pkt_len = sizeof(dummy_gre_ipv6_udp_packet);

			*offsets = dummy_gre_ipv6_udp_packet_offsets;

			return;

		}

		*pkt = dummy_gre_udp_packet;

		*pkt_len = sizeof(dummy_gre_udp_packet);

		*offsets = dummy_gre_udp_packet_offsets;
@@ -4853,13 +5099,24 @@ ice_find_dummy_packet(struct ice_adv_lkup_elem *lkups, u16 lkups_cnt, 


	if (tun_type == ICE_SW_TUN_VXLAN ||

	    tun_type == ICE_SW_TUN_GENEVE) {

		if (tcp && ipv6_il) {

			*pkt = dummy_udp_tun_ipv6_tcp_packet;

			*pkt_len = sizeof(dummy_udp_tun_ipv6_tcp_packet);

			*offsets = dummy_udp_tun_ipv6_tcp_packet_offsets;

			return;

		}

		if (tcp) {

			*pkt = dummy_udp_tun_tcp_packet;

			*pkt_len = sizeof(dummy_udp_tun_tcp_packet);

			*offsets = dummy_udp_tun_tcp_packet_offsets;

			return;

		}



		if (ipv6_il) {

			*pkt = dummy_udp_tun_ipv6_udp_packet;

			*pkt_len = sizeof(dummy_udp_tun_ipv6_udp_packet);

			*offsets = dummy_udp_tun_ipv6_udp_packet_offsets;

			return;

		}

		*pkt = dummy_udp_tun_udp_packet;

		*pkt_len = sizeof(dummy_udp_tun_udp_packet);

		*offsets = dummy_udp_tun_udp_packet_offsets;
@@ -4965,6 +5222,7 @@ ice_fill_adv_dummy_packet(struct ice_adv_lkup_elem *lkups, u16 lkups_cnt, 
			len = sizeof(struct ice_ether_hdr);

			break;

		case ICE_ETYPE_OL:

		case ICE_ETYPE_IL:

			len = sizeof(struct ice_ethtype_hdr);

			break;

		case ICE_VLAN_OFOS:

drivers/net/ethernet/intel/ice/ice_tc_lib.c

+10 −5
Original line number Diff line number Diff line
@@ -33,9 +33,7 @@ ice_tc_count_lkups(u32 flags, struct ice_tc_flower_lyr_2_4_hdrs *headers, 
	if (flags & ICE_TC_FLWR_FIELD_ENC_DEST_L4_PORT)

		lkups_cnt++;



	/* currently inner etype filter isn't supported */

	if ((flags & ICE_TC_FLWR_FIELD_ETH_TYPE_ID) &&

	    fltr->tunnel_type == TNL_LAST)

	if (flags & ICE_TC_FLWR_FIELD_ETH_TYPE_ID)

		lkups_cnt++;



	/* are MAC fields specified? */
@@ -64,6 +62,11 @@ static enum ice_protocol_type ice_proto_type_from_mac(bool inner) 
	return inner ? ICE_MAC_IL : ICE_MAC_OFOS;

}



static enum ice_protocol_type ice_proto_type_from_etype(bool inner)

{

	return inner ? ICE_ETYPE_IL : ICE_ETYPE_OL;

}



static enum ice_protocol_type ice_proto_type_from_ipv4(bool inner)

{

	return inner ? ICE_IPV4_IL : ICE_IPV4_OFOS;
@@ -224,8 +227,10 @@ ice_tc_fill_rules(struct ice_hw *hw, u32 flags, 


		headers = &tc_fltr->inner_headers;

		inner = true;

	} else if (flags & ICE_TC_FLWR_FIELD_ETH_TYPE_ID) {

		list[i].type = ICE_ETYPE_OL;

	}



	if (flags & ICE_TC_FLWR_FIELD_ETH_TYPE_ID) {

		list[i].type = ice_proto_type_from_etype(inner);

		list[i].h_u.ethertype.ethtype_id = headers->l2_key.n_proto;

		list[i].m_u.ethertype.ethtype_id = headers->l2_mask.n_proto;

		i++;