[dpdk-dev] [PATCH v3 08/13] net/ice: add support for PFCP

[Zhao1, Wei]

Ok 

> -----Original Message-----
> From: Zhang, Qi Z <qi.z.zhang at intel.com>
> Sent: Friday, April 3, 2020 11:17 AM
> To: Zhao1, Wei <wei.zhao1 at intel.com>; dev at dpdk.org
> Cc: Lu, Nannan <nannan.lu at intel.com>; Fu, Qi <qi.fu at intel.com>; Peng, Yuan
> <yuan.peng at intel.com>
> Subject: RE: [PATCH v3 08/13] net/ice: add support for PFCP
> 
> 
> 
> > -----Original Message-----
> > From: Zhao1, Wei <wei.zhao1 at intel.com>
> > Sent: Friday, April 3, 2020 10:44 AM
> > To: dev at dpdk.org
> > Cc: Zhang, Qi Z <qi.z.zhang at intel.com>; Lu, Nannan
> > <nannan.lu at intel.com>; Fu, Qi <qi.fu at intel.com>; Peng, Yuan
> > <yuan.peng at intel.com>; Zhao1, Wei <wei.zhao1 at intel.com>
> > Subject: [PATCH v3 08/13] net/ice: add support for PFCP
> >
> > This patch add switch filter support for PFCP packets, it enable
> > swicth filter to direct ipv4/ipv6 packets with PFCP session or node
> > payload to specific action.
> >
> > Signed-off-by: Wei Zhao <wei.zhao1 at intel.com>
> > ---
> >  drivers/net/ice/ice_generic_flow.c  | 15 +++++++
> > drivers/net/ice/ice_generic_flow.h  |  6 +++
> > drivers/net/ice/ice_switch_filter.c | 62 +++++++++++++++++++++++++++++
> >  3 files changed, 83 insertions(+)
> >
> > diff --git a/drivers/net/ice/ice_generic_flow.c
> > b/drivers/net/ice/ice_generic_flow.c
> > index 189ef6c4a..04dcaba08 100644
> > --- a/drivers/net/ice/ice_generic_flow.c
> > +++ b/drivers/net/ice/ice_generic_flow.c
> > @@ -1400,6 +1400,21 @@ enum rte_flow_item_type
> pattern_eth_ipv6_l2tp[]
> > = {
> >  	RTE_FLOW_ITEM_TYPE_L2TPV3OIP,
> >  	RTE_FLOW_ITEM_TYPE_END,
> >  };
> > +enum rte_flow_item_type pattern_eth_ipv4_pfcp[] = {
> > +	RTE_FLOW_ITEM_TYPE_ETH,
> > +	RTE_FLOW_ITEM_TYPE_IPV4,
> > +	RTE_FLOW_ITEM_TYPE_UDP,
> > +	RTE_FLOW_ITEM_TYPE_PFCP,
> > +	RTE_FLOW_ITEM_TYPE_END,
> > +};
> > +enum rte_flow_item_type pattern_eth_ipv6_pfcp[] = {
> > +	RTE_FLOW_ITEM_TYPE_ETH,
> > +	RTE_FLOW_ITEM_TYPE_IPV6,
> > +	RTE_FLOW_ITEM_TYPE_UDP,
> > +	RTE_FLOW_ITEM_TYPE_PFCP,
> > +	RTE_FLOW_ITEM_TYPE_END,
> > +};
> > +
> >
> >
> >  typedef struct ice_flow_engine * (*parse_engine_t)(struct ice_adapter
> > *ad, diff --git a/drivers/net/ice/ice_generic_flow.h
> > b/drivers/net/ice/ice_generic_flow.h
> > index 006fd00b3..65cd64c7f 100644
> > --- a/drivers/net/ice/ice_generic_flow.h
> > +++ b/drivers/net/ice/ice_generic_flow.h
> > @@ -400,6 +400,12 @@ extern enum rte_flow_item_type
> > pattern_eth_ipv6_ah[];
> >  /* L2TP */
> >  extern enum rte_flow_item_type pattern_eth_ipv6_l2tp[];
> >
> > +/* PFCP */
> > +extern enum rte_flow_item_type pattern_eth_ipv4_pfcp[]; extern enum
> > +rte_flow_item_type pattern_eth_ipv6_pfcp[];
> > +
> > +
> > +
> 
> Remove dummy empty lines
> 
> >  struct ice_adapter;
> >
> >  extern const struct rte_flow_ops ice_flow_ops; diff --git
> > a/drivers/net/ice/ice_switch_filter.c
> > b/drivers/net/ice/ice_switch_filter.c
> > index 9c87a16dd..9b4b9346c 100644
> > --- a/drivers/net/ice/ice_switch_filter.c
> > +++ b/drivers/net/ice/ice_switch_filter.c
> > @@ -154,6 +154,10 @@ ice_pattern_match_item
> > ice_switch_pattern_dist_comms[] = {
> >  			ICE_INSET_NONE, ICE_INSET_NONE},
> >  	{pattern_eth_ipv6_l2tp,
> >  			ICE_INSET_NONE, ICE_INSET_NONE},
> > +	{pattern_eth_ipv4_pfcp,
> > +			ICE_INSET_NONE, ICE_INSET_NONE},
> > +	{pattern_eth_ipv6_pfcp,
> > +			ICE_INSET_NONE, ICE_INSET_NONE},
> >  };
> >
> >  static struct
> > @@ -224,6 +228,10 @@ ice_pattern_match_item
> ice_switch_pattern_perm[]
> > = {
> >  			ICE_INSET_NONE, ICE_INSET_NONE},
> >  	{pattern_eth_ipv6_l2tp,
> >  			ICE_INSET_NONE, ICE_INSET_NONE},
> > +	{pattern_eth_ipv4_pfcp,
> > +			ICE_INSET_NONE, ICE_INSET_NONE},
> > +	{pattern_eth_ipv6_pfcp,
> > +			ICE_INSET_NONE, ICE_INSET_NONE},
> >  };
> >
> >  static int
> > @@ -350,6 +358,7 @@ ice_switch_inset_get(const struct rte_flow_item
> > pattern[],
> >  	const struct rte_flow_item_esp *esp_spec, *esp_mask;
> >  	const struct rte_flow_item_ah *ah_spec, *ah_mask;
> >  	const struct rte_flow_item_l2tpv3oip *l2tp_spec, *l2tp_mask;
> > +	const struct rte_flow_item_pfcp *pfcp_spec, *pfcp_mask;
> >  	uint64_t input_set = ICE_INSET_NONE;
> >  	uint16_t j, t = 0;
> >  	uint16_t tunnel_valid = 0;
> > @@ -996,6 +1005,55 @@ ice_switch_inset_get(const struct rte_flow_item
> > pattern[],
> >  			if (ipv6_valiad)
> >  				*tun_type = ICE_SW_TUN_PROFID_MAC_IPV6_L2TPV3;
> >  			break;
> > +		case RTE_FLOW_ITEM_TYPE_PFCP:
> > +			pfcp_spec = item->spec;
> > +			pfcp_mask = item->mask;
> > +			/* Check if PFCP item is used to describe protocol.
> > +			 * If yes, both spec and mask should be NULL.
> > +			 * If no, both spec and mask shouldn't be NULL.
> > +			 */
> > +			if ((!pfcp_spec && pfcp_mask) ||
> > +			    (pfcp_spec && !pfcp_mask)) {
> > +				rte_flow_error_set(error, EINVAL,
> > +					   RTE_FLOW_ERROR_TYPE_ITEM,
> > +					   item,
> > +					   "Invalid PFCP item");
> > +				return -ENOTSUP;
> > +			}
> > +			if (pfcp_spec && pfcp_mask) {
> > +				/* Check pfcp mask and update input set */
> > +				if (pfcp_mask->msg_type ||
> > +					pfcp_mask->msg_len ||
> > +					pfcp_mask->seid) {
> > +					rte_flow_error_set(error, EINVAL,
> > +						RTE_FLOW_ERROR_TYPE_ITEM,
> > +						item,
> > +						"Invalid pfcp mask");
> > +					return -ENOTSUP;
> > +				}
> > +				if (pfcp_mask->s_field &&
> > +					pfcp_spec->s_field == 0x01 &&
> > +					ipv6_valiad)
> > +					*tun_type =
> > +					ICE_SW_TUN_PROFID_IPV6_PFCP_SESSION;
> > +				else if (pfcp_mask->s_field &&
> > +					pfcp_spec->s_field == 0x01)
> > +					*tun_type =
> > +					ICE_SW_TUN_PROFID_IPV4_PFCP_SESSION;
> > +				else if (pfcp_mask->s_field &&
> > +					!pfcp_spec->s_field &&
> > +					ipv6_valiad)
> > +					*tun_type =
> > +					ICE_SW_TUN_PROFID_IPV6_PFCP_NODE;
> > +				else if (pfcp_mask->s_field &&
> > +					!pfcp_spec->s_field)
> > +					*tun_type =
> > +					ICE_SW_TUN_PROFID_IPV4_PFCP_NODE;
> > +				else
> > +					return -ENOTSUP;
> > +			}
> > +			break;
> > +
> >
> >  		case RTE_FLOW_ITEM_TYPE_VOID:
> >  			break;
> > @@ -1179,6 +1237,10 @@ ice_is_profile_rule(enum ice_sw_tunnel_type
> > tun_type)
> >  	case ICE_SW_TUN_PROFID_IPV6_ESP:
> >  	case ICE_SW_TUN_PROFID_IPV6_AH:
> >  	case ICE_SW_TUN_PROFID_MAC_IPV6_L2TPV3:
> > +	case ICE_SW_TUN_PROFID_IPV4_PFCP_NODE:
> > +	case ICE_SW_TUN_PROFID_IPV4_PFCP_SESSION:
> > +	case ICE_SW_TUN_PROFID_IPV6_PFCP_NODE:
> > +	case ICE_SW_TUN_PROFID_IPV6_PFCP_SESSION:
> >  		return true;
> >  	default:
> >  		break;
> > --
> > 2.19.1