Commit 80a48007 authored by Junfeng Guo's avatar Junfeng Guo Committed by Tony Nguyen
Browse files

ice: add UDP tunnels support to the parser 



Add support for the vxlan, geneve, ecpri UDP tunnels through the
following APIs:
- ice_parser_vxlan_tunnel_set()
- ice_parser_geneve_tunnel_set()
- ice_parser_ecpri_tunnel_set()

Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Reviewed-by: default avatarMarcin Szycik <marcin.szycik@linux.intel.com>
Signed-off-by: default avatarQi Zhang <qi.z.zhang@intel.com>
Signed-off-by: default avatarJunfeng Guo <junfeng.guo@intel.com>
Signed-off-by: default avatarAhmed Zaki <ahmed.zaki@intel.com>
Tested-by: default avatarRafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent b2687653

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

+98 −0
Original line number Diff line number Diff line
@@ -1379,6 +1379,12 @@ static void ice_parse_lbl_item(struct ice_hw *hw, u16 idx, void *item, 
		lbl_item->type = ICE_LBL_BST_TYPE_DVM;

	else if (strstarts(lbl_item->label, ICE_LBL_BST_SVM))

		lbl_item->type = ICE_LBL_BST_TYPE_SVM;

	else if (strstarts(lbl_item->label, ICE_LBL_TNL_VXLAN))

		lbl_item->type = ICE_LBL_BST_TYPE_VXLAN;

	else if (strstarts(lbl_item->label, ICE_LBL_TNL_GENEVE))

		lbl_item->type = ICE_LBL_BST_TYPE_GENEVE;

	else if (strstarts(lbl_item->label, ICE_LBL_TNL_UDP_ECPRI))

		lbl_item->type = ICE_LBL_BST_TYPE_UDP_ECPRI;



	if (hw->debug_mask & ICE_DBG_PARSER)

		ice_lbl_dump(hw, lbl_item);
@@ -2204,3 +2210,95 @@ void ice_parser_dvm_set(struct ice_parser *psr, bool on) 
	ice_bst_dvm_set(psr, ICE_LBL_BST_TYPE_DVM, on);

	ice_bst_dvm_set(psr, ICE_LBL_BST_TYPE_SVM, !on);

}



static int ice_tunnel_port_set(struct ice_parser *psr, enum ice_lbl_type type,

			       u16 udp_port, bool on)

{

	u8 *buf = (u8 *)&udp_port;

	u16 i = 0;



	while (true) {

		struct ice_bst_tcam_item *item;



		item = ice_bst_tcam_search(psr->bst_tcam_table,

					   psr->bst_lbl_table,

					   type, &i);

		if (!item)

			break;



		/* found empty slot to add */

		if (on && item->key[ICE_BT_TUN_PORT_OFF_H] == ICE_BT_INV_KEY &&

		    item->key_inv[ICE_BT_TUN_PORT_OFF_H] == ICE_BT_INV_KEY) {

			item->key_inv[ICE_BT_TUN_PORT_OFF_L] =

						buf[ICE_UDP_PORT_OFF_L];

			item->key_inv[ICE_BT_TUN_PORT_OFF_H] =

						buf[ICE_UDP_PORT_OFF_H];



			item->key[ICE_BT_TUN_PORT_OFF_L] =

				ICE_BT_VLD_KEY - buf[ICE_UDP_PORT_OFF_L];

			item->key[ICE_BT_TUN_PORT_OFF_H] =

				ICE_BT_VLD_KEY - buf[ICE_UDP_PORT_OFF_H];



			return 0;

		/* found a matched slot to delete */

		} else if (!on &&

			   (item->key_inv[ICE_BT_TUN_PORT_OFF_L] ==

			    buf[ICE_UDP_PORT_OFF_L] ||

			    item->key_inv[ICE_BT_TUN_PORT_OFF_H] ==

			    buf[ICE_UDP_PORT_OFF_H])) {

			item->key_inv[ICE_BT_TUN_PORT_OFF_L] = ICE_BT_VLD_KEY;

			item->key_inv[ICE_BT_TUN_PORT_OFF_H] = ICE_BT_INV_KEY;



			item->key[ICE_BT_TUN_PORT_OFF_L] = ICE_BT_VLD_KEY;

			item->key[ICE_BT_TUN_PORT_OFF_H] = ICE_BT_INV_KEY;



			return 0;

		}

		i++;

	}



	return -EINVAL;

}



/**

 * ice_parser_vxlan_tunnel_set - configure vxlan tunnel for parser

 * @psr: pointer to a parser instance

 * @udp_port: vxlan tunnel port in UDP header

 * @on: true to turn on; false to turn off

 *

 * Return: 0 on success or errno on failure.

 */

int ice_parser_vxlan_tunnel_set(struct ice_parser *psr,

				u16 udp_port, bool on)

{

	return ice_tunnel_port_set(psr, ICE_LBL_BST_TYPE_VXLAN, udp_port, on);

}



/**

 * ice_parser_geneve_tunnel_set - configure geneve tunnel for parser

 * @psr: pointer to a parser instance

 * @udp_port: geneve tunnel port in UDP header

 * @on: true to turn on; false to turn off

 *

 * Return: 0 on success or errno on failure.

 */

int ice_parser_geneve_tunnel_set(struct ice_parser *psr,

				 u16 udp_port, bool on)

{

	return ice_tunnel_port_set(psr, ICE_LBL_BST_TYPE_GENEVE, udp_port, on);

}



/**

 * ice_parser_ecpri_tunnel_set - configure ecpri tunnel for parser

 * @psr: pointer to a parser instance

 * @udp_port: ecpri tunnel port in UDP header

 * @on: true to turn on; false to turn off

 *

 * Return: 0 on success or errno on failure.

 */

int ice_parser_ecpri_tunnel_set(struct ice_parser *psr,

				u16 udp_port, bool on)

{

	return ice_tunnel_port_set(psr, ICE_LBL_BST_TYPE_UDP_ECPRI,

				   udp_port, on);

}

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

+13 −0
Original line number Diff line number Diff line
@@ -276,11 +276,17 @@ struct ice_bst_tcam_item { 
#define ICE_LBL_LEN			64

#define ICE_LBL_BST_DVM			"BOOST_MAC_VLAN_DVM"

#define ICE_LBL_BST_SVM			"BOOST_MAC_VLAN_SVM"

#define ICE_LBL_TNL_VXLAN		"TNL_VXLAN"

#define ICE_LBL_TNL_GENEVE		"TNL_GENEVE"

#define ICE_LBL_TNL_UDP_ECPRI		"TNL_UDP_ECPRI"



enum ice_lbl_type {

	ICE_LBL_BST_TYPE_UNKNOWN,

	ICE_LBL_BST_TYPE_DVM,

	ICE_LBL_BST_TYPE_SVM,

	ICE_LBL_BST_TYPE_VXLAN,

	ICE_LBL_BST_TYPE_GENEVE,

	ICE_LBL_BST_TYPE_UDP_ECPRI,

};



struct ice_lbl_item {
@@ -445,7 +451,11 @@ struct ice_parser_proto_off { 


#define ICE_PARSER_PROTO_OFF_PAIR_SIZE	16

#define ICE_PARSER_FLAG_PSR_SIZE	8

#define ICE_BT_TUN_PORT_OFF_H		16

#define ICE_BT_TUN_PORT_OFF_L		15

#define ICE_BT_VM_OFF			0

#define ICE_UDP_PORT_OFF_H		1

#define ICE_UDP_PORT_OFF_L		0



struct ice_parser_result {

	u16 ptype;	/* 16 bits hardware PTYPE */
@@ -495,6 +505,9 @@ struct ice_parser { 
struct ice_parser *ice_parser_create(struct ice_hw *hw);

void ice_parser_destroy(struct ice_parser *psr);

void ice_parser_dvm_set(struct ice_parser *psr, bool on);

int ice_parser_vxlan_tunnel_set(struct ice_parser *psr, u16 udp_port, bool on);

int ice_parser_geneve_tunnel_set(struct ice_parser *psr, u16 udp_port, bool on);

int ice_parser_ecpri_tunnel_set(struct ice_parser *psr, u16 udp_port, bool on);

int ice_parser_run(struct ice_parser *psr, const u8 *pkt_buf,

		   int pkt_len, struct ice_parser_result *rslt);

void ice_parser_result_dump(struct ice_hw *hw, struct ice_parser_result *rslt);