#include "ice_dcf_ethdev.h"
-#define MAX_QGRP_NUM_TYPE 7
+#define MAX_QGRP_NUM_TYPE 7
+#define MAX_INPUT_SET_BYTE 32
#define ICE_PPP_IPV4_PROTO 0x0021
#define ICE_PPP_IPV6_PROTO 0x0057
#define ICE_IPV4_PROTO_NVGRE 0x002F
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 input_set_byte = 0;
bool pppoe_elem_valid = 0;
bool pppoe_patt_valid = 0;
bool pppoe_prot_valid = 0;
- bool profile_rule = 0;
bool tunnel_valid = 0;
- bool ipv6_valiad = 0;
- bool ipv4_valiad = 0;
- bool udp_valiad = 0;
- bool tcp_valiad = 0;
+ bool profile_rule = 0;
+ bool nvgre_valid = 0;
+ bool vxlan_valid = 0;
+ bool ipv6_valid = 0;
+ bool ipv4_valid = 0;
+ bool udp_valid = 0;
+ bool tcp_valid = 0;
uint16_t j, t = 0;
for (item = pattern; item->type !=
m->src_addr[j] =
eth_mask->src.addr_bytes[j];
i = 1;
+ input_set_byte++;
}
if (eth_mask->dst.addr_bytes[j]) {
h->dst_addr[j] =
m->dst_addr[j] =
eth_mask->dst.addr_bytes[j];
i = 1;
+ input_set_byte++;
}
}
if (i)
eth_spec->type;
list[t].m_u.ethertype.ethtype_id =
eth_mask->type;
+ input_set_byte += 2;
t++;
}
}
case RTE_FLOW_ITEM_TYPE_IPV4:
ipv4_spec = item->spec;
ipv4_mask = item->mask;
- ipv4_valiad = 1;
+ ipv4_valid = 1;
if (ipv4_spec && ipv4_mask) {
/* Check IPv4 mask and update input set */
if (ipv4_mask->hdr.version_ihl ||
ipv4_spec->hdr.src_addr;
list[t].m_u.ipv4_hdr.src_addr =
ipv4_mask->hdr.src_addr;
+ input_set_byte += 2;
}
if (ipv4_mask->hdr.dst_addr) {
list[t].h_u.ipv4_hdr.dst_addr =
ipv4_spec->hdr.dst_addr;
list[t].m_u.ipv4_hdr.dst_addr =
ipv4_mask->hdr.dst_addr;
+ input_set_byte += 2;
}
if (ipv4_mask->hdr.time_to_live) {
list[t].h_u.ipv4_hdr.time_to_live =
ipv4_spec->hdr.time_to_live;
list[t].m_u.ipv4_hdr.time_to_live =
ipv4_mask->hdr.time_to_live;
+ input_set_byte++;
}
if (ipv4_mask->hdr.next_proto_id) {
list[t].h_u.ipv4_hdr.protocol =
ipv4_spec->hdr.next_proto_id;
list[t].m_u.ipv4_hdr.protocol =
ipv4_mask->hdr.next_proto_id;
+ input_set_byte++;
}
if ((ipv4_spec->hdr.next_proto_id &
ipv4_mask->hdr.next_proto_id) ==
ipv4_spec->hdr.type_of_service;
list[t].m_u.ipv4_hdr.tos =
ipv4_mask->hdr.type_of_service;
+ input_set_byte++;
}
t++;
}
case RTE_FLOW_ITEM_TYPE_IPV6:
ipv6_spec = item->spec;
ipv6_mask = item->mask;
- ipv6_valiad = 1;
+ ipv6_valid = 1;
if (ipv6_spec && ipv6_mask) {
if (ipv6_mask->hdr.payload_len) {
rte_flow_error_set(error, EINVAL,
ipv6_spec->hdr.src_addr[j];
s->src_addr[j] =
ipv6_mask->hdr.src_addr[j];
+ input_set_byte++;
}
if (ipv6_mask->hdr.dst_addr[j]) {
f->dst_addr[j] =
ipv6_spec->hdr.dst_addr[j];
s->dst_addr[j] =
ipv6_mask->hdr.dst_addr[j];
+ input_set_byte++;
}
}
if (ipv6_mask->hdr.proto) {
ipv6_spec->hdr.proto;
s->next_hdr =
ipv6_mask->hdr.proto;
+ input_set_byte++;
}
if (ipv6_mask->hdr.hop_limits) {
f->hop_limit =
ipv6_spec->hdr.hop_limits;
s->hop_limit =
ipv6_mask->hdr.hop_limits;
+ input_set_byte++;
}
if (ipv6_mask->hdr.vtc_flow &
rte_cpu_to_be_32
RTE_IPV6_HDR_TC_MASK) >>
RTE_IPV6_HDR_TC_SHIFT;
s->be_ver_tc_flow = CPU_TO_BE32(vtf.u.val);
+ input_set_byte += 4;
}
t++;
}
case RTE_FLOW_ITEM_TYPE_UDP:
udp_spec = item->spec;
udp_mask = item->mask;
- udp_valiad = 1;
+ udp_valid = 1;
if (udp_spec && udp_mask) {
/* Check UDP mask and update input set*/
if (udp_mask->hdr.dgram_len ||
udp_spec->hdr.src_port;
list[t].m_u.l4_hdr.src_port =
udp_mask->hdr.src_port;
+ input_set_byte += 2;
}
if (udp_mask->hdr.dst_port) {
list[t].h_u.l4_hdr.dst_port =
udp_spec->hdr.dst_port;
list[t].m_u.l4_hdr.dst_port =
udp_mask->hdr.dst_port;
+ input_set_byte += 2;
}
- t++;
+ t++;
}
break;
case RTE_FLOW_ITEM_TYPE_TCP:
tcp_spec = item->spec;
tcp_mask = item->mask;
- tcp_valiad = 1;
+ tcp_valid = 1;
if (tcp_spec && tcp_mask) {
/* Check TCP mask and update input set */
if (tcp_mask->hdr.sent_seq ||
tcp_spec->hdr.src_port;
list[t].m_u.l4_hdr.src_port =
tcp_mask->hdr.src_port;
+ input_set_byte += 2;
}
if (tcp_mask->hdr.dst_port) {
list[t].h_u.l4_hdr.dst_port =
tcp_spec->hdr.dst_port;
list[t].m_u.l4_hdr.dst_port =
tcp_mask->hdr.dst_port;
+ input_set_byte += 2;
}
t++;
}
sctp_spec->hdr.src_port;
list[t].m_u.sctp_hdr.src_port =
sctp_mask->hdr.src_port;
+ input_set_byte += 2;
}
if (sctp_mask->hdr.dst_port) {
list[t].h_u.sctp_hdr.dst_port =
sctp_spec->hdr.dst_port;
list[t].m_u.sctp_hdr.dst_port =
sctp_mask->hdr.dst_port;
+ input_set_byte += 2;
}
t++;
}
"Invalid VXLAN item");
return 0;
}
-
+ vxlan_valid = 1;
tunnel_valid = 1;
if (vxlan_spec && vxlan_mask) {
list[t].type = ICE_VXLAN;
vxlan_mask->vni[0];
input_set |=
ICE_INSET_TUN_VXLAN_VNI;
+ input_set_byte += 2;
}
t++;
}
"Invalid NVGRE item");
return 0;
}
+ nvgre_valid = 1;
tunnel_valid = 1;
if (nvgre_spec && nvgre_mask) {
list[t].type = ICE_NVGRE;
nvgre_mask->tni[0];
input_set |=
ICE_INSET_TUN_NVGRE_TNI;
+ input_set_byte += 2;
}
t++;
}
list[t].m_u.vlan_hdr.vlan =
vlan_mask->tci;
input_set |= ICE_INSET_VLAN_OUTER;
+ input_set_byte += 2;
}
if (vlan_mask->inner_type) {
list[t].h_u.vlan_hdr.type =
list[t].m_u.vlan_hdr.type =
vlan_mask->inner_type;
input_set |= ICE_INSET_ETHERTYPE;
+ input_set_byte += 2;
}
t++;
}
list[t].m_u.pppoe_hdr.session_id =
pppoe_mask->session_id;
input_set |= ICE_INSET_PPPOE_SESSION;
+ input_set_byte += 2;
}
t++;
pppoe_elem_valid = 1;
list[t].m_u.pppoe_hdr.ppp_prot_id =
pppoe_proto_mask->proto_id;
input_set |= ICE_INSET_PPPOE_PROTO;
-
+ input_set_byte += 2;
pppoe_prot_valid = 1;
}
if ((pppoe_proto_mask->proto_id &
if (!esp_spec && !esp_mask && !input_set) {
profile_rule = 1;
- if (ipv6_valiad && udp_valiad)
+ if (ipv6_valid && udp_valid)
*tun_type =
ICE_SW_TUN_PROFID_IPV6_NAT_T;
- else if (ipv6_valiad)
+ else if (ipv6_valid)
*tun_type = ICE_SW_TUN_PROFID_IPV6_ESP;
- else if (ipv4_valiad)
+ else if (ipv4_valid)
return 0;
} else if (esp_spec && esp_mask &&
esp_mask->hdr.spi){
- if (udp_valiad)
+ if (udp_valid)
list[t].type = ICE_NAT_T;
else
list[t].type = ICE_ESP;
list[t].m_u.esp_hdr.spi =
esp_mask->hdr.spi;
input_set |= ICE_INSET_ESP_SPI;
+ input_set_byte += 4;
t++;
}
if (!profile_rule) {
- if (ipv6_valiad && udp_valiad)
+ if (ipv6_valid && udp_valid)
*tun_type = ICE_SW_TUN_IPV6_NAT_T;
- else if (ipv4_valiad && udp_valiad)
+ else if (ipv4_valid && udp_valid)
*tun_type = ICE_SW_TUN_IPV4_NAT_T;
- else if (ipv6_valiad)
+ else if (ipv6_valid)
*tun_type = ICE_SW_TUN_IPV6_ESP;
- else if (ipv4_valiad)
+ else if (ipv4_valid)
*tun_type = ICE_SW_TUN_IPV4_ESP;
}
break;
if (!ah_spec && !ah_mask && !input_set) {
profile_rule = 1;
- if (ipv6_valiad && udp_valiad)
+ if (ipv6_valid && udp_valid)
*tun_type =
ICE_SW_TUN_PROFID_IPV6_NAT_T;
- else if (ipv6_valiad)
+ else if (ipv6_valid)
*tun_type = ICE_SW_TUN_PROFID_IPV6_AH;
- else if (ipv4_valiad)
+ else if (ipv4_valid)
return 0;
} else if (ah_spec && ah_mask &&
ah_mask->spi){
list[t].m_u.ah_hdr.spi =
ah_mask->spi;
input_set |= ICE_INSET_AH_SPI;
+ input_set_byte += 4;
t++;
}
if (!profile_rule) {
- if (udp_valiad)
+ if (udp_valid)
return 0;
- else if (ipv6_valiad)
+ else if (ipv6_valid)
*tun_type = ICE_SW_TUN_IPV6_AH;
- else if (ipv4_valiad)
+ else if (ipv4_valid)
*tun_type = ICE_SW_TUN_IPV4_AH;
}
break;
}
if (!l2tp_spec && !l2tp_mask && !input_set) {
- if (ipv6_valiad)
+ if (ipv6_valid)
*tun_type =
ICE_SW_TUN_PROFID_MAC_IPV6_L2TPV3;
- else if (ipv4_valiad)
+ else if (ipv4_valid)
return 0;
} else if (l2tp_spec && l2tp_mask &&
l2tp_mask->session_id){
list[t].m_u.l2tpv3_sess_hdr.session_id =
l2tp_mask->session_id;
input_set |= ICE_INSET_L2TPV3OIP_SESSION_ID;
+ input_set_byte += 4;
t++;
}
if (!profile_rule) {
- if (ipv6_valiad)
+ if (ipv6_valid)
*tun_type =
ICE_SW_TUN_IPV6_L2TPV3;
- else if (ipv4_valiad)
+ else if (ipv4_valid)
*tun_type =
ICE_SW_TUN_IPV4_L2TPV3;
}
}
if (pfcp_mask->s_field &&
pfcp_spec->s_field == 0x01 &&
- ipv6_valiad)
+ ipv6_valid)
*tun_type =
ICE_SW_TUN_PROFID_IPV6_PFCP_SESSION;
else if (pfcp_mask->s_field &&
ICE_SW_TUN_PROFID_IPV4_PFCP_SESSION;
else if (pfcp_mask->s_field &&
!pfcp_spec->s_field &&
- ipv6_valiad)
+ ipv6_valid)
*tun_type =
ICE_SW_TUN_PROFID_IPV6_PFCP_NODE;
else if (pfcp_mask->s_field &&
}
if (pppoe_patt_valid && !pppoe_prot_valid) {
- if (ipv6_valiad && udp_valiad)
+ if (ipv6_valid && udp_valid)
*tun_type = ICE_SW_TUN_PPPOE_IPV6_UDP;
- else if (ipv6_valiad && tcp_valiad)
+ else if (ipv6_valid && tcp_valid)
*tun_type = ICE_SW_TUN_PPPOE_IPV6_TCP;
- else if (ipv4_valiad && udp_valiad)
+ else if (ipv4_valid && udp_valid)
*tun_type = ICE_SW_TUN_PPPOE_IPV4_UDP;
- else if (ipv4_valiad && tcp_valiad)
+ else if (ipv4_valid && tcp_valid)
*tun_type = ICE_SW_TUN_PPPOE_IPV4_TCP;
- else if (ipv6_valiad)
+ else if (ipv6_valid)
*tun_type = ICE_SW_TUN_PPPOE_IPV6;
- else if (ipv4_valiad)
+ else if (ipv4_valid)
*tun_type = ICE_SW_TUN_PPPOE_IPV4;
else
*tun_type = ICE_SW_TUN_PPPOE;
}
+ if (*tun_type == ICE_NON_TUN) {
+ if (vxlan_valid)
+ *tun_type = ICE_SW_TUN_VXLAN;
+ else if (nvgre_valid)
+ *tun_type = ICE_SW_TUN_NVGRE;
+ else if (ipv4_valid && tcp_valid)
+ *tun_type = ICE_SW_IPV4_TCP;
+ else if (ipv4_valid && udp_valid)
+ *tun_type = ICE_SW_IPV4_UDP;
+ else if (ipv6_valid && tcp_valid)
+ *tun_type = ICE_SW_IPV6_TCP;
+ else if (ipv6_valid && udp_valid)
+ *tun_type = ICE_SW_IPV6_UDP;
+ }
+
+ if (input_set_byte > MAX_INPUT_SET_BYTE) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "too much input set");
+ return -ENOTSUP;
+ }
+
*lkups_num = t;
return input_set;
for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
item_num++;
- if (item->type == RTE_FLOW_ITEM_TYPE_VXLAN)
- tun_type = ICE_SW_TUN_VXLAN;
- if (item->type == RTE_FLOW_ITEM_TYPE_NVGRE)
- tun_type = ICE_SW_TUN_NVGRE;
if (item->type == RTE_FLOW_ITEM_TYPE_ETH) {
const struct rte_flow_item_eth *eth_mask;
if (item->mask)