Commit 21606584 authored by Qi Zhang's avatar Qi Zhang Committed by Tony Nguyen
Browse files

ice: Add non-IP Layer2 protocol FDIR filter for AVF 



Add new filter type that allow forward non-IP Ethernet packets base on its
ethertype. The filter is only enabled when COMMS DDP package is loaded.

Signed-off-by: default avatarYahui Cao <yahui.cao@intel.com>
Signed-off-by: default avatarQi Zhang <qi.z.zhang@intel.com>
Tested-by: default avatarChen Bo <BoX.C.Chen@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 346bf250

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

+15 −0
Original line number Diff line number Diff line
@@ -40,6 +40,12 @@ static const u8 ice_fdir_ipv4_pkt[] = { 
	0x00, 0x00

};



static const u8 ice_fdir_non_ip_l2_pkt[] = {

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

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

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

};



static const u8 ice_fdir_tcpv6_pkt[] = {

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

	0x00, 0x00, 0x00, 0x00, 0x86, 0xDD, 0x60, 0x00,
@@ -238,6 +244,11 @@ static const struct ice_fdir_base_pkt ice_fdir_pkt[] = { 
		sizeof(ice_fdir_ipv4_pkt), ice_fdir_ipv4_pkt,

		sizeof(ice_fdir_ip4_tun_pkt), ice_fdir_ip4_tun_pkt,

	},

	{

		ICE_FLTR_PTYPE_NON_IP_L2,

		sizeof(ice_fdir_non_ip_l2_pkt), ice_fdir_non_ip_l2_pkt,

		sizeof(ice_fdir_non_ip_l2_pkt), ice_fdir_non_ip_l2_pkt,

	},

	{

		ICE_FLTR_PTYPE_NONF_IPV6_TCP,

		sizeof(ice_fdir_tcpv6_pkt), ice_fdir_tcpv6_pkt,
@@ -674,6 +685,10 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input, 
				  input->ip.v4.proto);

		ice_pkt_insert_mac_addr(loc, input->ext_data.dst_mac);

		break;

	case ICE_FLTR_PTYPE_NON_IP_L2:

		ice_pkt_insert_u16(loc, ICE_MAC_ETHTYPE_OFFSET,

				   input->ext_data.ether_type);

		break;

	case ICE_FLTR_PTYPE_NONF_IPV6_TCP:

		ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_DST_ADDR_OFFSET,

					 input->ip.v6.src_ip);

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

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#define ICE_IPV6_UDP_DST_PORT_OFFSET	56

#define ICE_IPV6_SCTP_SRC_PORT_OFFSET	54

#define ICE_IPV6_SCTP_DST_PORT_OFFSET	56

#define ICE_MAC_ETHTYPE_OFFSET		12

#define ICE_IPV4_TOS_OFFSET		15

#define ICE_IPV4_TTL_OFFSET		22

#define ICE_IPV6_TC_OFFSET		14
@@ -116,6 +117,7 @@ struct ice_fdir_v6 { 
struct ice_fdir_extra {

	u8 dst_mac[ETH_ALEN];	/* dest MAC address */

	u8 src_mac[ETH_ALEN];	/* src MAC address */

	__be16 ether_type;	/* for NON_IP_L2 */

	u32 usr_def[2];		/* user data */

	__be16 vlan_type;	/* VLAN ethertype */

	__be16 vlan_tag;	/* VLAN tag info */

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

+16 −1
Original line number Diff line number Diff line
@@ -572,6 +572,17 @@ static const u32 ice_ptypes_nat_t_esp[] = { 
	0x00000000, 0x00000000, 0x00000000, 0x00000000,

};



static const u32 ice_ptypes_mac_non_ip_ofos[] = {

	0x00000846, 0x00000000, 0x00000000, 0x00000000,

	0x00000000, 0x00000000, 0x00000000, 0x00000000,

	0x00400000, 0x03FFF000, 0x00000000, 0x00000000,

	0x00000000, 0x00000000, 0x00000000, 0x00000000,

	0x00000000, 0x00000000, 0x00000000, 0x00000000,

	0x00000000, 0x00000000, 0x00000000, 0x00000000,

	0x00000000, 0x00000000, 0x00000000, 0x00000000,

	0x00000000, 0x00000000, 0x00000000, 0x00000000,

};



/* Manage parameters and info. used during the creation of a flow profile */

struct ice_flow_prof_params {

	enum ice_block blk;
@@ -760,7 +771,11 @@ ice_flow_proc_seg_hdrs(struct ice_flow_prof_params *params) 
				   ICE_FLOW_PTYPE_MAX);

		}



		if (hdrs & ICE_FLOW_SEG_HDR_PPPOE) {

		if (hdrs & ICE_FLOW_SEG_HDR_ETH_NON_IP) {

			src = (const unsigned long *)ice_ptypes_mac_non_ip_ofos;

			bitmap_and(params->ptypes, params->ptypes, src,

				   ICE_FLOW_PTYPE_MAX);

		} else if (hdrs & ICE_FLOW_SEG_HDR_PPPOE) {

			src = (const unsigned long *)ice_ptypes_pppoe;

			bitmap_and(params->ptypes, params->ptypes, src,

				   ICE_FLOW_PTYPE_MAX);

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

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ enum ice_flow_seg_hdr { 
	ICE_FLOW_SEG_HDR_ESP		= 0x00100000,

	ICE_FLOW_SEG_HDR_AH		= 0x00200000,

	ICE_FLOW_SEG_HDR_NAT_T_ESP	= 0x00400000,

	ICE_FLOW_SEG_HDR_ETH_NON_IP	= 0x00800000,

	/* The following is an additive bit for ICE_FLOW_SEG_HDR_IPV4 and

	 * ICE_FLOW_SEG_HDR_IPV6 which include the IPV4 other PTYPEs

	 */

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

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ enum ice_fltr_ptype { 
	ICE_FLTR_PTYPE_NONF_IPV4_TCP,

	ICE_FLTR_PTYPE_NONF_IPV4_SCTP,

	ICE_FLTR_PTYPE_NONF_IPV4_OTHER,

	ICE_FLTR_PTYPE_NON_IP_L2,

	ICE_FLTR_PTYPE_FRAG_IPV4,

	ICE_FLTR_PTYPE_NONF_IPV6_UDP,

	ICE_FLTR_PTYPE_NONF_IPV6_TCP,