[Intel-wired-lan] [PATCH S48 v3 13/14] ice: Add more FDIR filter type for AVF
Kirsher, Jeffrey T
jeffrey.t.kirsher at intel.com
Fri Jul 3 05:43:02 UTC 2020
> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-bounces at osuosl.org> On Behalf Of Qi
> Zhang
> Sent: Thursday, July 2, 2020 15:58
> To: intel-wired-lan at lists.osuosl.org
> Cc: Zhang, Qi Z <qi.z.zhang at intel.com>
> Subject: [Intel-wired-lan] [PATCH S48 v3 13/14] ice: Add more FDIR filter type
> for AVF
>
> FDIR for AVF can forward
> - L2TPV3 packets by matching session id.
> - IPSEC ESP packets by matching security parameter index.
> - IPSEC AH packets by matching security parameter index.
> - NAT_T ESP packets by matching security parameter index.
> - Any PFCP session packets(s field is 1).
>
> Signed-off-by: Yahui Cao <yahui.cao at intel.com>
> Signed-off-by: Qi Zhang <qi.z.zhang at intel.com>
> ---
> drivers/net/ethernet/intel/ice/ice_fdir.h | 7 +
> drivers/net/ethernet/intel/ice/ice_type.h | 13 +
> drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c | 313
> +++++++++++++++++++--
> 3 files changed, 315 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_fdir.h
> b/drivers/net/ethernet/intel/ice/ice_fdir.h
> index 9943c2b0f474..320f19cd748f 100644
> --- a/drivers/net/ethernet/intel/ice/ice_fdir.h
> +++ b/drivers/net/ethernet/intel/ice/ice_fdir.h
> @@ -124,6 +124,10 @@ struct ice_fdir_udp_gtp {
> u8 next_ext;
> };
>
> +struct ice_fdir_l2tpv3 {
> + __be32 session_id;
> +};
> +
> struct ice_fdir_extra {
> u8 dst_mac[ETH_ALEN]; /* dest MAC address */
> __be16 ether_type; /* for NON_IP_L2 */
> @@ -144,6 +148,9 @@ struct ice_fdir_fltr {
> struct ice_fdir_udp_gtp gtpu_data;
> struct ice_fdir_udp_gtp gtpu_mask;
>
> + struct ice_fdir_l2tpv3 l2tpv3_data;
> + struct ice_fdir_l2tpv3 l2tpv3_mask;
> +
> struct ice_fdir_extra ext_data;
> struct ice_fdir_extra ext_mask;
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_type.h
> b/drivers/net/ethernet/intel/ice/ice_type.h
> index 0df159a1619a..1aaa06c01a55 100644
> --- a/drivers/net/ethernet/intel/ice/ice_type.h
> +++ b/drivers/net/ethernet/intel/ice/ice_type.h
> @@ -174,6 +174,19 @@ enum ice_fltr_ptype {
> ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_TCP,
> ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_ICMP,
> ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER,
> + ICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER,
> + ICE_FLTR_PTYPE_NONF_IPV4_L2TPV3,
> + ICE_FLTR_PTYPE_NONF_IPV6_L2TPV3,
> + ICE_FLTR_PTYPE_NONF_IPV4_ESP,
> + ICE_FLTR_PTYPE_NONF_IPV6_ESP,
> + ICE_FLTR_PTYPE_NONF_IPV4_AH,
> + ICE_FLTR_PTYPE_NONF_IPV6_AH,
> + ICE_FLTR_PTYPE_NONF_IPV4_NAT_T_ESP,
> + ICE_FLTR_PTYPE_NONF_IPV6_NAT_T_ESP,
> + ICE_FLTR_PTYPE_NONF_IPV4_PFCP_NODE,
> + ICE_FLTR_PTYPE_NONF_IPV4_PFCP_SESSION,
> + ICE_FLTR_PTYPE_NONF_IPV6_PFCP_NODE,
> + ICE_FLTR_PTYPE_NONF_IPV6_PFCP_SESSION,
> ICE_FLTR_PTYPE_NON_IP_L2,
> ICE_FLTR_PTYPE_FRAG_IPV4,
> ICE_FLTR_PTYPE_NONF_IPV6_UDP,
> diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c
> b/drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c
> index 325ba70b0635..f66b04a0a62f 100644
> --- a/drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c
> +++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c
> @@ -26,6 +26,14 @@
> #define GTPU_TEID_OFFSET 4
> #define GTPU_EH_QFI_OFFSET 1
> #define GTPU_EH_QFI_MASK 0x3F
> +#define PFCP_S_OFFSET 0
> +#define PFCP_S_MASK 0x1
> +#define PFCP_PORT_NR 8805
> +
> +#define FDIR_INSET_FLAG_ESP_S 0
> +#define FDIR_INSET_FLAG_ESP_M BIT_ULL(FDIR_INSET_FLAG_ESP_S)
> #define
> +FDIR_INSET_FLAG_ESP_UDP BIT_ULL(FDIR_INSET_FLAG_ESP_S) #define
> +FDIR_INSET_FLAG_ESP_IPSEC (0ULL << FDIR_INSET_FLAG_ESP_S)
>
> enum ice_fdir_tunnel_type {
> ICE_FDIR_TUNNEL_TYPE_NONE = 0,
> @@ -36,6 +44,7 @@ enum ice_fdir_tunnel_type { struct virtchnl_fdir_fltr_conf
> {
> struct ice_fdir_fltr input;
> enum ice_fdir_tunnel_type ttype;
> + u64 inset_flag;
> };
>
> static enum virtchnl_proto_hdr_type vc_pattern_ether[] = { @@ -114,6
> +123,80 @@ static enum virtchnl_proto_hdr_type vc_pattern_ipv4_gtpu_eh[] =
> {
> VIRTCHNL_PROTO_HDR_NONE,
> };
>
> +static enum virtchnl_proto_hdr_type vc_pattern_ipv4_l2tpv3[] = {
> + VIRTCHNL_PROTO_HDR_ETH,
> + VIRTCHNL_PROTO_HDR_IPV4,
> + VIRTCHNL_PROTO_HDR_L2TPV3,
> + VIRTCHNL_PROTO_HDR_NONE,
> +};
> +
> +static enum virtchnl_proto_hdr_type vc_pattern_ipv6_l2tpv3[] = {
> + VIRTCHNL_PROTO_HDR_ETH,
> + VIRTCHNL_PROTO_HDR_IPV6,
> + VIRTCHNL_PROTO_HDR_L2TPV3,
> + VIRTCHNL_PROTO_HDR_NONE,
> +};
> +
> +static enum virtchnl_proto_hdr_type vc_pattern_ipv4_esp[] = {
> + VIRTCHNL_PROTO_HDR_ETH,
> + VIRTCHNL_PROTO_HDR_IPV4,
> + VIRTCHNL_PROTO_HDR_ESP,
> + VIRTCHNL_PROTO_HDR_NONE,
> +};
> +
> +static enum virtchnl_proto_hdr_type vc_pattern_ipv6_esp[] = {
> + VIRTCHNL_PROTO_HDR_ETH,
> + VIRTCHNL_PROTO_HDR_IPV6,
> + VIRTCHNL_PROTO_HDR_ESP,
> + VIRTCHNL_PROTO_HDR_NONE,
> +};
> +
> +static enum virtchnl_proto_hdr_type vc_pattern_ipv4_ah[] = {
> + VIRTCHNL_PROTO_HDR_ETH,
> + VIRTCHNL_PROTO_HDR_IPV4,
> + VIRTCHNL_PROTO_HDR_AH,
> + VIRTCHNL_PROTO_HDR_NONE,
> +};
> +
> +static enum virtchnl_proto_hdr_type vc_pattern_ipv6_ah[] = {
> + VIRTCHNL_PROTO_HDR_ETH,
> + VIRTCHNL_PROTO_HDR_IPV6,
> + VIRTCHNL_PROTO_HDR_AH,
> + VIRTCHNL_PROTO_HDR_NONE,
> +};
> +
> +static enum virtchnl_proto_hdr_type vc_pattern_ipv4_nat_t_esp[] = {
> + VIRTCHNL_PROTO_HDR_ETH,
> + VIRTCHNL_PROTO_HDR_IPV4,
> + VIRTCHNL_PROTO_HDR_UDP,
> + VIRTCHNL_PROTO_HDR_ESP,
> + VIRTCHNL_PROTO_HDR_NONE,
> +};
> +
> +static enum virtchnl_proto_hdr_type vc_pattern_ipv6_nat_t_esp[] = {
> + VIRTCHNL_PROTO_HDR_ETH,
> + VIRTCHNL_PROTO_HDR_IPV6,
> + VIRTCHNL_PROTO_HDR_UDP,
> + VIRTCHNL_PROTO_HDR_ESP,
> + VIRTCHNL_PROTO_HDR_NONE,
> +};
> +
> +static enum virtchnl_proto_hdr_type vc_pattern_ipv4_pfcp[] = {
> + VIRTCHNL_PROTO_HDR_ETH,
> + VIRTCHNL_PROTO_HDR_IPV4,
> + VIRTCHNL_PROTO_HDR_UDP,
> + VIRTCHNL_PROTO_HDR_PFCP,
> + VIRTCHNL_PROTO_HDR_NONE,
> +};
> +
> +static enum virtchnl_proto_hdr_type vc_pattern_ipv6_pfcp[] = {
> + VIRTCHNL_PROTO_HDR_ETH,
> + VIRTCHNL_PROTO_HDR_IPV6,
> + VIRTCHNL_PROTO_HDR_UDP,
> + VIRTCHNL_PROTO_HDR_PFCP,
> + VIRTCHNL_PROTO_HDR_NONE,
> +};
> +
> struct virtchnl_fdir_pattern_match_item {
> enum virtchnl_proto_hdr_type *list;
> u64 input_set;
> @@ -143,32 +226,74 @@ static const struct virtchnl_fdir_pattern_match_item
> vc_fdir_pattern_comms[] = {
> {vc_pattern_ether, 0, NULL},
> {vc_pattern_ipv4_gtpu, 0, NULL},
> {vc_pattern_ipv4_gtpu_eh, 0, NULL},
> + {vc_pattern_ipv4_l2tpv3, 0, NULL},
> + {vc_pattern_ipv6_l2tpv3, 0, NULL},
> + {vc_pattern_ipv4_esp, 0, NULL},
> + {vc_pattern_ipv6_esp, 0, NULL},
> + {vc_pattern_ipv4_ah, 0, NULL},
> + {vc_pattern_ipv6_ah, 0, NULL},
> + {vc_pattern_ipv4_nat_t_esp, 0, NULL},
> + {vc_pattern_ipv6_nat_t_esp, 0, NULL},
> + {vc_pattern_ipv4_pfcp, 0, NULL},
> + {vc_pattern_ipv6_pfcp, 0, NULL},
> };
>
> struct virtchnl_fdir_inset_map {
> enum virtchnl_proto_hdr_field field;
> enum ice_flow_field fld;
> + u64 flag;
> + u64 mask;
> };
>
> static const struct virtchnl_fdir_inset_map fdir_inset_map[] = {
> - {VIRTCHNL_PROTO_HDR_IPV4_SRC, ICE_FLOW_FIELD_IDX_IPV4_SA},
> - {VIRTCHNL_PROTO_HDR_IPV4_DST, ICE_FLOW_FIELD_IDX_IPV4_DA},
> - {VIRTCHNL_PROTO_HDR_IPV4_DSCP,
> ICE_FLOW_FIELD_IDX_IPV4_DSCP},
> - {VIRTCHNL_PROTO_HDR_IPV4_TTL,
> ICE_FLOW_FIELD_IDX_IPV4_TTL},
> - {VIRTCHNL_PROTO_HDR_IPV4_PROT,
> ICE_FLOW_FIELD_IDX_IPV4_PROT},
> - {VIRTCHNL_PROTO_HDR_IPV6_SRC, ICE_FLOW_FIELD_IDX_IPV6_SA},
> - {VIRTCHNL_PROTO_HDR_IPV6_DST, ICE_FLOW_FIELD_IDX_IPV6_DA},
> - {VIRTCHNL_PROTO_HDR_IPV6_TC,
> ICE_FLOW_FIELD_IDX_IPV6_DSCP},
> - {VIRTCHNL_PROTO_HDR_IPV6_HOP_LIMIT,
> ICE_FLOW_FIELD_IDX_IPV6_TTL},
> - {VIRTCHNL_PROTO_HDR_IPV6_PROT,
> ICE_FLOW_FIELD_IDX_IPV6_PROT},
> - {VIRTCHNL_PROTO_HDR_UDP_SRC_PORT,
> ICE_FLOW_FIELD_IDX_UDP_SRC_PORT},
> - {VIRTCHNL_PROTO_HDR_UDP_DST_PORT,
> ICE_FLOW_FIELD_IDX_UDP_DST_PORT},
> - {VIRTCHNL_PROTO_HDR_TCP_SRC_PORT,
> ICE_FLOW_FIELD_IDX_TCP_SRC_PORT},
> - {VIRTCHNL_PROTO_HDR_TCP_DST_PORT,
> ICE_FLOW_FIELD_IDX_TCP_DST_PORT},
> - {VIRTCHNL_PROTO_HDR_SCTP_SRC_PORT,
> ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT},
> - {VIRTCHNL_PROTO_HDR_SCTP_DST_PORT,
> ICE_FLOW_FIELD_IDX_SCTP_DST_PORT},
> - {VIRTCHNL_PROTO_HDR_GTPU_IP_TEID,
> ICE_FLOW_FIELD_IDX_GTPU_IP_TEID},
> - {VIRTCHNL_PROTO_HDR_GTPU_EH_QFI,
> ICE_FLOW_FIELD_IDX_GTPU_EH_QFI},
> + {VIRTCHNL_PROTO_HDR_ETH_ETHERTYPE,
> ICE_FLOW_FIELD_IDX_ETH_TYPE,
> + 0, 0},
> + {VIRTCHNL_PROTO_HDR_IPV4_SRC, ICE_FLOW_FIELD_IDX_IPV4_SA,
> + 0, 0},
> + {VIRTCHNL_PROTO_HDR_IPV4_DST, ICE_FLOW_FIELD_IDX_IPV4_DA,
> + 0, 0},
> + {VIRTCHNL_PROTO_HDR_IPV4_DSCP,
> ICE_FLOW_FIELD_IDX_IPV4_DSCP,
> + 0, 0},
> + {VIRTCHNL_PROTO_HDR_IPV4_TTL, ICE_FLOW_FIELD_IDX_IPV4_TTL,
> + 0, 0},
> + {VIRTCHNL_PROTO_HDR_IPV4_PROT,
> ICE_FLOW_FIELD_IDX_IPV4_PROT,
> + 0, 0},
> + {VIRTCHNL_PROTO_HDR_IPV6_SRC, ICE_FLOW_FIELD_IDX_IPV6_SA,
> + 0, 0},
> + {VIRTCHNL_PROTO_HDR_IPV6_DST, ICE_FLOW_FIELD_IDX_IPV6_DA,
> + 0, 0},
> + {VIRTCHNL_PROTO_HDR_IPV6_TC, ICE_FLOW_FIELD_IDX_IPV6_DSCP,
> + 0, 0},
> + {VIRTCHNL_PROTO_HDR_IPV6_HOP_LIMIT,
> ICE_FLOW_FIELD_IDX_IPV6_TTL,
> + 0, 0},
> + {VIRTCHNL_PROTO_HDR_IPV6_PROT,
> ICE_FLOW_FIELD_IDX_IPV6_PROT,
> + 0, 0},
> + {VIRTCHNL_PROTO_HDR_UDP_SRC_PORT,
> ICE_FLOW_FIELD_IDX_UDP_SRC_PORT,
> + 0, 0},
> + {VIRTCHNL_PROTO_HDR_UDP_DST_PORT,
> ICE_FLOW_FIELD_IDX_UDP_DST_PORT,
> + 0, 0},
> + {VIRTCHNL_PROTO_HDR_TCP_SRC_PORT,
> ICE_FLOW_FIELD_IDX_TCP_SRC_PORT,
> + 0, 0},
> + {VIRTCHNL_PROTO_HDR_TCP_DST_PORT,
> ICE_FLOW_FIELD_IDX_TCP_DST_PORT,
> + 0, 0},
> + {VIRTCHNL_PROTO_HDR_SCTP_SRC_PORT,
> ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT,
> + 0, 0},
> + {VIRTCHNL_PROTO_HDR_SCTP_DST_PORT,
> ICE_FLOW_FIELD_IDX_SCTP_DST_PORT,
> + 0, 0},
> + {VIRTCHNL_PROTO_HDR_GTPU_IP_TEID,
> ICE_FLOW_FIELD_IDX_GTPU_IP_TEID,
> + 0, 0},
> + {VIRTCHNL_PROTO_HDR_GTPU_EH_QFI,
> ICE_FLOW_FIELD_IDX_GTPU_EH_QFI,
> + 0, 0},
> + {VIRTCHNL_PROTO_HDR_ESP_SPI, ICE_FLOW_FIELD_IDX_ESP_SPI,
> + FDIR_INSET_FLAG_ESP_IPSEC, FDIR_INSET_FLAG_ESP_M},
> + {VIRTCHNL_PROTO_HDR_ESP_SPI,
> ICE_FLOW_FIELD_IDX_NAT_T_ESP_SPI,
> + FDIR_INSET_FLAG_ESP_UDP, FDIR_INSET_FLAG_ESP_M},
> + {VIRTCHNL_PROTO_HDR_AH_SPI, ICE_FLOW_FIELD_IDX_AH_SPI,
> + 0, 0},
> + {VIRTCHNL_PROTO_HDR_L2TPV3_SESS_ID,
> ICE_FLOW_FIELD_IDX_L2TPV3_SESS_ID,
> + 0, 0},
> + {VIRTCHNL_PROTO_HDR_PFCP_S_FIELD,
> ICE_FLOW_FIELD_IDX_UDP_DST_PORT,
> + 0, 0},
> };
Ugh, none of the above wrapped lines need to be wrapped
>
> /**
> @@ -345,6 +470,11 @@ ice_vc_fdir_parse_flow_fld(struct virtchnl_proto_hdr
> *proto_hdr,
> for (i = 0; (i < ARRAY_SIZE(fdir_inset_map)) &&
> VIRTCHNL_GET_PROTO_HDR_FIELD(&hdr); i++)
> if (VIRTCHNL_TEST_PROTO_HDR(&hdr, fdir_inset_map[i].field)) {
> + if (fdir_inset_map[i].mask &&
> + ((fdir_inset_map[i].mask & conf->inset_flag)
> + != fdir_inset_map[i].flag))
> + continue;
> +
> fld[*fld_cnt] = fdir_inset_map[i].fld;
> *fld_cnt += 1;
> if (*fld_cnt >= ICE_FLOW_FIELD_IDX_MAX) @@ -425,6
> +555,36 @@ ice_vc_fdir_set_flow_hdr(struct ice_vf *vf,
> case ICE_FLTR_PTYPE_NON_IP_L2:
> ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_ETH_NON_IP);
> break;
> + case ICE_FLTR_PTYPE_NONF_IPV4_L2TPV3:
> + ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_L2TPV3 |
> + ICE_FLOW_SEG_HDR_IPV4 |
> + ICE_FLOW_SEG_HDR_IPV_OTHER);
> + break;
> + case ICE_FLTR_PTYPE_NONF_IPV4_ESP:
> + ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_ESP |
> + ICE_FLOW_SEG_HDR_IPV4 |
> + ICE_FLOW_SEG_HDR_IPV_OTHER);
> + break;
> + case ICE_FLTR_PTYPE_NONF_IPV4_AH:
> + ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_AH |
> + ICE_FLOW_SEG_HDR_IPV4 |
> + ICE_FLOW_SEG_HDR_IPV_OTHER);
> + break;
> + case ICE_FLTR_PTYPE_NONF_IPV4_NAT_T_ESP:
> + ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_NAT_T_ESP |
> + ICE_FLOW_SEG_HDR_IPV4 |
> + ICE_FLOW_SEG_HDR_IPV_OTHER);
> + break;
> + case ICE_FLTR_PTYPE_NONF_IPV4_PFCP_NODE:
> + ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_PFCP_NODE |
> + ICE_FLOW_SEG_HDR_IPV4 |
> + ICE_FLOW_SEG_HDR_IPV_OTHER);
> + break;
> + case ICE_FLTR_PTYPE_NONF_IPV4_PFCP_SESSION:
> + ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_PFCP_SESSION
> |
> + ICE_FLOW_SEG_HDR_IPV4 |
> + ICE_FLOW_SEG_HDR_IPV_OTHER);
> + break;
> case ICE_FLTR_PTYPE_NONF_IPV4_OTHER:
> ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_IPV4 |
> ICE_FLOW_SEG_HDR_IPV_OTHER);
> @@ -463,6 +623,36 @@ ice_vc_fdir_set_flow_hdr(struct ice_vf *vf,
> ICE_FLOW_SEG_HDR_IPV4 |
> ICE_FLOW_SEG_HDR_IPV_OTHER);
> break;
> + case ICE_FLTR_PTYPE_NONF_IPV6_L2TPV3:
> + ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_L2TPV3 |
> + ICE_FLOW_SEG_HDR_IPV6 |
> + ICE_FLOW_SEG_HDR_IPV_OTHER);
> + break;
> + case ICE_FLTR_PTYPE_NONF_IPV6_ESP:
> + ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_ESP |
> + ICE_FLOW_SEG_HDR_IPV6 |
> + ICE_FLOW_SEG_HDR_IPV_OTHER);
> + break;
> + case ICE_FLTR_PTYPE_NONF_IPV6_AH:
> + ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_AH |
> + ICE_FLOW_SEG_HDR_IPV6 |
> + ICE_FLOW_SEG_HDR_IPV_OTHER);
> + break;
> + case ICE_FLTR_PTYPE_NONF_IPV6_NAT_T_ESP:
> + ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_NAT_T_ESP |
> + ICE_FLOW_SEG_HDR_IPV6 |
> + ICE_FLOW_SEG_HDR_IPV_OTHER);
> + break;
> + case ICE_FLTR_PTYPE_NONF_IPV6_PFCP_NODE:
> + ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_PFCP_NODE |
> + ICE_FLOW_SEG_HDR_IPV6 |
> + ICE_FLOW_SEG_HDR_IPV_OTHER);
> + break;
> + case ICE_FLTR_PTYPE_NONF_IPV6_PFCP_SESSION:
> + ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_PFCP_SESSION
> |
> + ICE_FLOW_SEG_HDR_IPV6 |
> + ICE_FLOW_SEG_HDR_IPV_OTHER);
> + break;
> case ICE_FLTR_PTYPE_NONF_IPV6_OTHER:
> ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_IPV6 |
> ICE_FLOW_SEG_HDR_IPV_OTHER);
> @@ -849,12 +1039,15 @@ ice_vc_fdir_parse_pattern(struct ice_vf *vf, struct
> virtchnl_fdir_add *fltr,
>
> for (i = 0; i < proto->count; i++) {
> struct virtchnl_proto_hdr *hdr = &proto->proto_hdr[i];
> + struct ip_esp_hdr *esph;
> + struct ip_auth_hdr *ah;
> struct sctphdr *sctph;
> struct ipv6hdr *ip6h;
> struct udphdr *udph;
> struct tcphdr *tcph;
> struct ethhdr *eth;
> struct iphdr *iph;
> + u8 s_field;
> u8 *rawh;
>
> switch (hdr->type) {
> @@ -948,6 +1141,86 @@ ice_vc_fdir_parse_pattern(struct ice_vf *vf, struct
> virtchnl_fdir_add *fltr,
> }
> }
> break;
> + case VIRTCHNL_PROTO_HDR_L2TPV3:
> + if (l3 == VIRTCHNL_PROTO_HDR_IPV4)
> + input->flow_type =
> + ICE_FLTR_PTYPE_NONF_IPV4_L2TPV3;
No wrapping please
> + else if (l3 == VIRTCHNL_PROTO_HDR_IPV6)
> + input->flow_type =
> + ICE_FLTR_PTYPE_NONF_IPV6_L2TPV3;
Here as well
> +
> + if (hdr->field_selector)
> + input->l2tpv3_data.session_id =
> + *((__be32 *)hdr->buffer);
And here
> + break;
> + case VIRTCHNL_PROTO_HDR_ESP:
> + esph = (struct ip_esp_hdr *)hdr->buffer;
> + if (l3 == VIRTCHNL_PROTO_HDR_IPV4 &&
> + l4 == VIRTCHNL_PROTO_HDR_UDP)
> + input->flow_type =
> + ICE_FLTR_PTYPE_NONF_IPV4_NAT_T_ESP;
And here
> + else if (l3 == VIRTCHNL_PROTO_HDR_IPV6 &&
> + l4 == VIRTCHNL_PROTO_HDR_UDP)
> + input->flow_type =
> + ICE_FLTR_PTYPE_NONF_IPV6_NAT_T_ESP;
And here
> + else if (l3 == VIRTCHNL_PROTO_HDR_IPV4 &&
> + l4 == VIRTCHNL_PROTO_HDR_NONE)
> + input->flow_type =
> ICE_FLTR_PTYPE_NONF_IPV4_ESP;
> + else if (l3 == VIRTCHNL_PROTO_HDR_IPV6 &&
> + l4 == VIRTCHNL_PROTO_HDR_NONE)
> + input->flow_type =
> ICE_FLTR_PTYPE_NONF_IPV6_ESP;
> +
> + if (l4 == VIRTCHNL_PROTO_HDR_UDP)
> + conf->inset_flag |= FDIR_INSET_FLAG_ESP_UDP;
> + else
> + conf->inset_flag |= FDIR_INSET_FLAG_ESP_IPSEC;
> +
> + if (hdr->field_selector) {
> + if (l3 == VIRTCHNL_PROTO_HDR_IPV4)
> + input->ip.v4.sec_parm_idx = esph->spi;
> + else if (l3 == VIRTCHNL_PROTO_HDR_IPV6)
> + input->ip.v6.sec_parm_idx = esph->spi;
> + }
> + break;
> + case VIRTCHNL_PROTO_HDR_AH:
> + ah = (struct ip_auth_hdr *)hdr->buffer;
> + if (l3 == VIRTCHNL_PROTO_HDR_IPV4)
> + input->flow_type =
> ICE_FLTR_PTYPE_NONF_IPV4_AH;
> + else if (l3 == VIRTCHNL_PROTO_HDR_IPV6)
> + input->flow_type =
> ICE_FLTR_PTYPE_NONF_IPV6_AH;
> +
> + if (hdr->field_selector) {
> + if (l3 == VIRTCHNL_PROTO_HDR_IPV4)
> + input->ip.v4.sec_parm_idx = ah->spi;
> + else if (l3 == VIRTCHNL_PROTO_HDR_IPV6)
> + input->ip.v6.sec_parm_idx = ah->spi;
> + }
> + break;
> + case VIRTCHNL_PROTO_HDR_PFCP:
> + rawh = (u8 *)hdr->buffer;
> + s_field = (rawh[0] >> PFCP_S_OFFSET) & PFCP_S_MASK;
> + if (l3 == VIRTCHNL_PROTO_HDR_IPV4 && s_field == 0)
> + input->flow_type =
> + ICE_FLTR_PTYPE_NONF_IPV4_PFCP_NODE;
And here
> + else if (l3 == VIRTCHNL_PROTO_HDR_IPV4 && s_field
> == 1)
> + input->flow_type =
> +
> ICE_FLTR_PTYPE_NONF_IPV4_PFCP_SESSION;
> + else if (l3 == VIRTCHNL_PROTO_HDR_IPV6 && s_field
> == 0)
> + input->flow_type =
> + ICE_FLTR_PTYPE_NONF_IPV6_PFCP_NODE;
And here
> + else if (l3 == VIRTCHNL_PROTO_HDR_IPV6 && s_field
> == 1)
> + input->flow_type =
> +
> ICE_FLTR_PTYPE_NONF_IPV6_PFCP_SESSION;
And here
> +
> + if (hdr->field_selector) {
> + if (l3 == VIRTCHNL_PROTO_HDR_IPV4)
> + input->ip.v4.dst_port =
> + cpu_to_be16(PFCP_PORT_NR);
And here
> + else if (l3 == VIRTCHNL_PROTO_HDR_IPV6)
> + input->ip.v6.dst_port =
> + cpu_to_be16(PFCP_PORT_NR);
And here
> + }
> + break;
> case VIRTCHNL_PROTO_HDR_GTPU_IP:
> rawh = (u8 *)hdr->buffer;
> input->flow_type =
> @@ -1108,6 +1381,10 @@ ice_vc_fdir_comp_rules(struct virtchnl_fdir_fltr_conf
> *conf_a,
> return false;
> if (memcmp(&a->gtpu_mask, &b->gtpu_mask, sizeof(a->gtpu_mask)))
> return false;
> + if (memcmp(&a->l2tpv3_data, &b->l2tpv3_data, sizeof(a-
> >l2tpv3_data)))
> + return false;
> + if (memcmp(&a->l2tpv3_mask, &b->l2tpv3_mask, sizeof(a-
> >l2tpv3_mask)))
> + return false;
> if (memcmp(&a->ext_data, &b->ext_data, sizeof(a->ext_data)))
> return false;
> if (memcmp(&a->ext_mask, &b->ext_mask, sizeof(a->ext_mask)))
> --
> 2.13.6
>
> _______________________________________________
> Intel-wired-lan mailing list
> Intel-wired-lan at osuosl.org
> https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
More information about the Intel-wired-lan
mailing list