ICE_INSET_VLAN_OUTER | ICE_INSET_VLAN_INNER | \
ICE_INSET_DMAC | ICE_INSET_ETHERTYPE | ICE_INSET_PPPOE_SESSION | \
ICE_INSET_PPPOE_PROTO)
+#define ICE_SW_INSET_MAC_IPV4_ESP ( \
+ ICE_SW_INSET_MAC_IPV4 | ICE_INSET_ESP_SPI)
+#define ICE_SW_INSET_MAC_IPV6_ESP ( \
+ ICE_SW_INSET_MAC_IPV6 | ICE_INSET_ESP_SPI)
+#define ICE_SW_INSET_MAC_IPV4_AH ( \
+ ICE_SW_INSET_MAC_IPV4 | ICE_INSET_AH_SPI)
+#define ICE_SW_INSET_MAC_IPV6_AH ( \
+ ICE_SW_INSET_MAC_IPV6 | ICE_INSET_AH_SPI)
+#define ICE_SW_INSET_MAC_IPV4_L2TP ( \
+ ICE_SW_INSET_MAC_IPV4 | ICE_INSET_L2TPV3OIP_SESSION_ID)
+#define ICE_SW_INSET_MAC_IPV6_L2TP ( \
+ ICE_SW_INSET_MAC_IPV6 | ICE_INSET_L2TPV3OIP_SESSION_ID)
+#define ICE_SW_INSET_MAC_IPV4_PFCP ( \
+ ICE_SW_INSET_MAC_IPV4 | \
+ ICE_INSET_PFCP_S_FIELD | ICE_INSET_PFCP_SEID)
+#define ICE_SW_INSET_MAC_IPV6_PFCP ( \
+ ICE_SW_INSET_MAC_IPV6 | \
+ ICE_INSET_PFCP_S_FIELD | ICE_INSET_PFCP_SEID)
struct sw_meta {
struct ice_adv_lkup_elem *list;
ICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE},
{pattern_eth_vlan_pppoes_proto,
ICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE},
+ {pattern_eth_ipv4_esp,
+ ICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE},
+ {pattern_eth_ipv4_udp_esp,
+ ICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE},
{pattern_eth_ipv6_esp,
- ICE_INSET_NONE, ICE_INSET_NONE},
+ ICE_SW_INSET_MAC_IPV6_ESP, ICE_INSET_NONE},
{pattern_eth_ipv6_udp_esp,
- ICE_INSET_NONE, ICE_INSET_NONE},
+ ICE_SW_INSET_MAC_IPV6_ESP, ICE_INSET_NONE},
+ {pattern_eth_ipv4_ah,
+ ICE_SW_INSET_MAC_IPV4_AH, ICE_INSET_NONE},
{pattern_eth_ipv6_ah,
- ICE_INSET_NONE, ICE_INSET_NONE},
+ ICE_SW_INSET_MAC_IPV6_AH, ICE_INSET_NONE},
{pattern_eth_ipv6_udp_ah,
ICE_INSET_NONE, ICE_INSET_NONE},
+ {pattern_eth_ipv4_l2tp,
+ ICE_SW_INSET_MAC_IPV4_L2TP, ICE_INSET_NONE},
{pattern_eth_ipv6_l2tp,
- ICE_INSET_NONE, ICE_INSET_NONE},
+ ICE_SW_INSET_MAC_IPV6_L2TP, ICE_INSET_NONE},
{pattern_eth_ipv4_pfcp,
ICE_INSET_NONE, ICE_INSET_NONE},
{pattern_eth_ipv6_pfcp,
ICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE},
{pattern_eth_vlan_pppoes_proto,
ICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE},
+ {pattern_eth_ipv4_esp,
+ ICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE},
+ {pattern_eth_ipv4_udp_esp,
+ ICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE},
{pattern_eth_ipv6_esp,
- ICE_INSET_NONE, ICE_INSET_NONE},
+ ICE_SW_INSET_MAC_IPV6_ESP, ICE_INSET_NONE},
{pattern_eth_ipv6_udp_esp,
- ICE_INSET_NONE, ICE_INSET_NONE},
+ ICE_SW_INSET_MAC_IPV6_ESP, ICE_INSET_NONE},
+ {pattern_eth_ipv4_ah,
+ ICE_SW_INSET_MAC_IPV4_AH, ICE_INSET_NONE},
{pattern_eth_ipv6_ah,
- ICE_INSET_NONE, ICE_INSET_NONE},
+ ICE_SW_INSET_MAC_IPV6_AH, ICE_INSET_NONE},
{pattern_eth_ipv6_udp_ah,
ICE_INSET_NONE, ICE_INSET_NONE},
+ {pattern_eth_ipv4_l2tp,
+ ICE_SW_INSET_MAC_IPV4_L2TP, ICE_INSET_NONE},
{pattern_eth_ipv6_l2tp,
- ICE_INSET_NONE, ICE_INSET_NONE},
+ ICE_SW_INSET_MAC_IPV6_L2TP, ICE_INSET_NONE},
{pattern_eth_ipv4_pfcp,
ICE_INSET_NONE, ICE_INSET_NONE},
{pattern_eth_ipv6_pfcp,
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;
- uint16_t pppoe_valid = 0;
- uint16_t ipv6_valiad = 0;
- uint16_t udp_valiad = 0;
-
+ bool profile_rule = 0;
+ bool tunnel_valid = 0;
+ bool pppoe_valid = 0;
+ bool ipv6_valiad = 0;
+ bool ipv4_valiad = 0;
+ bool udp_valiad = 0;
for (item = pattern; item->type !=
RTE_FLOW_ITEM_TYPE_END; item++) {
case RTE_FLOW_ITEM_TYPE_IPV4:
ipv4_spec = item->spec;
ipv4_mask = item->mask;
+ ipv4_valiad = 1;
if (ipv4_spec && ipv4_mask) {
/* Check IPv4 mask and update input set */
if (ipv4_mask->hdr.version_ihl ||
vlan_spec->inner_type;
list[t].m_u.vlan_hdr.type =
vlan_mask->inner_type;
- input_set |= ICE_INSET_VLAN_OUTER;
+ input_set |= ICE_INSET_ETHERTYPE;
}
t++;
}
case RTE_FLOW_ITEM_TYPE_ESP:
esp_spec = item->spec;
esp_mask = item->mask;
- if (esp_spec || esp_mask) {
+ if ((esp_spec && !esp_mask) ||
+ (!esp_spec && esp_mask)) {
rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ITEM,
item,
"Invalid esp item");
- return -ENOTSUP;
+ return 0;
+ }
+ /* Check esp mask and update input set */
+ if (esp_mask && esp_mask->hdr.seq) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "Invalid esp mask");
+ return 0;
+ }
+
+ if (!esp_spec && !esp_mask && !input_set) {
+ profile_rule = 1;
+ if (ipv6_valiad && udp_valiad)
+ *tun_type =
+ ICE_SW_TUN_PROFID_IPV6_NAT_T;
+ else if (ipv6_valiad)
+ *tun_type = ICE_SW_TUN_PROFID_IPV6_ESP;
+ else if (ipv4_valiad)
+ return 0;
+ } else if (esp_spec && esp_mask &&
+ esp_mask->hdr.spi){
+ if (udp_valiad)
+ list[t].type = ICE_NAT_T;
+ else
+ list[t].type = ICE_ESP;
+ list[t].h_u.esp_hdr.spi =
+ esp_spec->hdr.spi;
+ list[t].m_u.esp_hdr.spi =
+ esp_mask->hdr.spi;
+ input_set |= ICE_INSET_ESP_SPI;
+ t++;
+ }
+
+ if (!profile_rule) {
+ if (ipv6_valiad && udp_valiad)
+ *tun_type = ICE_SW_TUN_IPV6_NAT_T;
+ else if (ipv4_valiad && udp_valiad)
+ *tun_type = ICE_SW_TUN_IPV4_NAT_T;
+ else if (ipv6_valiad)
+ *tun_type = ICE_SW_TUN_IPV6_ESP;
+ else if (ipv4_valiad)
+ *tun_type = ICE_SW_TUN_IPV4_ESP;
}
- if (ipv6_valiad && udp_valiad)
- *tun_type = ICE_SW_TUN_PROFID_IPV6_NAT_T;
- else if (ipv6_valiad)
- *tun_type = ICE_SW_TUN_PROFID_IPV6_ESP;
break;
case RTE_FLOW_ITEM_TYPE_AH:
ah_spec = item->spec;
ah_mask = item->mask;
- if (ah_spec || ah_mask) {
+ if ((ah_spec && !ah_mask) ||
+ (!ah_spec && ah_mask)) {
rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ITEM,
item,
"Invalid ah item");
- return -ENOTSUP;
+ return 0;
+ }
+ /* Check ah mask and update input set */
+ if (ah_mask &&
+ (ah_mask->next_hdr ||
+ ah_mask->payload_len ||
+ ah_mask->seq_num ||
+ ah_mask->reserved)) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "Invalid ah mask");
+ return 0;
+ }
+
+ if (!ah_spec && !ah_mask && !input_set) {
+ profile_rule = 1;
+ if (ipv6_valiad && udp_valiad)
+ *tun_type =
+ ICE_SW_TUN_PROFID_IPV6_NAT_T;
+ else if (ipv6_valiad)
+ *tun_type = ICE_SW_TUN_PROFID_IPV6_AH;
+ else if (ipv4_valiad)
+ return 0;
+ } else if (ah_spec && ah_mask &&
+ ah_mask->spi){
+ list[t].type = ICE_AH;
+ list[t].h_u.ah_hdr.spi =
+ ah_spec->spi;
+ list[t].m_u.ah_hdr.spi =
+ ah_mask->spi;
+ input_set |= ICE_INSET_AH_SPI;
+ t++;
+ }
+
+ if (!profile_rule) {
+ if (udp_valiad)
+ return 0;
+ else if (ipv6_valiad)
+ *tun_type = ICE_SW_TUN_IPV6_AH;
+ else if (ipv4_valiad)
+ *tun_type = ICE_SW_TUN_IPV4_AH;
}
- if (ipv6_valiad && udp_valiad)
- *tun_type = ICE_SW_TUN_PROFID_IPV6_NAT_T;
- else if (ipv6_valiad)
- *tun_type = ICE_SW_TUN_PROFID_IPV6_AH;
break;
case RTE_FLOW_ITEM_TYPE_L2TPV3OIP:
l2tp_spec = item->spec;
l2tp_mask = item->mask;
- if (l2tp_spec || l2tp_mask) {
+ if ((l2tp_spec && !l2tp_mask) ||
+ (!l2tp_spec && l2tp_mask)) {
rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ITEM,
item,
"Invalid l2tp item");
- return -ENOTSUP;
+ return 0;
+ }
+
+ if (!l2tp_spec && !l2tp_mask && !input_set) {
+ if (ipv6_valiad)
+ *tun_type =
+ ICE_SW_TUN_PROFID_MAC_IPV6_L2TPV3;
+ else if (ipv4_valiad)
+ return 0;
+ } else if (l2tp_spec && l2tp_mask &&
+ l2tp_mask->session_id){
+ list[t].type = ICE_L2TPV3;
+ list[t].h_u.l2tpv3_sess_hdr.session_id =
+ l2tp_spec->session_id;
+ list[t].m_u.l2tpv3_sess_hdr.session_id =
+ l2tp_mask->session_id;
+ input_set |= ICE_INSET_L2TPV3OIP_SESSION_ID;
+ t++;
+ }
+
+ if (!profile_rule) {
+ if (ipv6_valiad)
+ *tun_type =
+ ICE_SW_TUN_IPV6_L2TPV3;
+ else if (ipv4_valiad)
+ *tun_type =
+ ICE_SW_TUN_IPV4_L2TPV3;
}
- 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;
}
break;
-
case RTE_FLOW_ITEM_TYPE_VOID:
break;
}
rule_info->sw_act.src = rule_info->sw_act.vsi_handle;
+ rule_info->sw_act.flag = ICE_FLTR_RX;
rule_info->rx = 1;
rule_info->priority = 5;
switch (action_type) {
case RTE_FLOW_ACTION_TYPE_RSS:
act_qgrop = action->conf;
+ if (act_qgrop->queue_num <= 1)
+ goto error;
rule_info->sw_act.fltr_act =
ICE_FWD_TO_QGRP;
rule_info->sw_act.fwd_id.q_id =
}
}
- if (actions_num > 1) {
+ if (actions_num != 1) {
rte_flow_error_set(error,
EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
actions,
goto error;
}
+ memset(&rule_info, 0, sizeof(rule_info));
rule_info.tun_type = tun_type;
ret = ice_switch_check_action(actions, error);
return -rte_errno;
}
+static int
+ice_switch_redirect(struct ice_adapter *ad,
+ struct rte_flow *flow,
+ struct ice_flow_redirect *rd)
+{
+ struct ice_rule_query_data *rdata = flow->rule;
+ struct ice_adv_fltr_mgmt_list_entry *list_itr;
+ struct ice_adv_lkup_elem *lkups_dp = NULL;
+ struct LIST_HEAD_TYPE *list_head;
+ struct ice_adv_rule_info rinfo;
+ struct ice_hw *hw = &ad->hw;
+ struct ice_switch_info *sw;
+ uint16_t lkups_cnt;
+ int ret;
+
+ sw = hw->switch_info;
+ if (!sw->recp_list[rdata->rid].recp_created)
+ return -EINVAL;
+
+ if (rd->type != ICE_FLOW_REDIRECT_VSI)
+ return -ENOTSUP;
+
+ list_head = &sw->recp_list[rdata->rid].filt_rules;
+ LIST_FOR_EACH_ENTRY(list_itr, list_head, ice_adv_fltr_mgmt_list_entry,
+ list_entry) {
+ rinfo = list_itr->rule_info;
+ if (rinfo.fltr_rule_id == rdata->rule_id &&
+ rinfo.sw_act.fltr_act == ICE_FWD_TO_VSI &&
+ rinfo.sw_act.vsi_handle == rd->vsi_handle) {
+ lkups_cnt = list_itr->lkups_cnt;
+ lkups_dp = (struct ice_adv_lkup_elem *)
+ ice_memdup(hw, list_itr->lkups,
+ sizeof(*list_itr->lkups) *
+ lkups_cnt, ICE_NONDMA_TO_NONDMA);
+ if (!lkups_dp) {
+ PMD_DRV_LOG(ERR, "Failed to allocate memory.");
+ return -EINVAL;
+ }
+
+ break;
+ }
+ }
+
+ if (!lkups_dp)
+ return 0;
+
+ /* Remove the old rule */
+ ret = ice_rem_adv_rule(hw, list_itr->lkups,
+ lkups_cnt, &rinfo);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "Failed to delete the old rule %d",
+ rdata->rule_id);
+ ret = -EINVAL;
+ goto out;
+ }
+
+ /* Update VSI context */
+ hw->vsi_ctx[rd->vsi_handle]->vsi_num = rd->new_vsi_num;
+
+ /* Replay the rule */
+ ret = ice_add_adv_rule(hw, lkups_dp, lkups_cnt,
+ &rinfo, rdata);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "Failed to replay the rule");
+ ret = -EINVAL;
+ }
+
+out:
+ ice_free(hw, lkups_dp);
+ return ret;
+}
+
static int
ice_switch_init(struct ice_adapter *ad)
{
.create = ice_switch_create,
.destroy = ice_switch_destroy,
.query_count = ice_switch_query,
+ .redirect = ice_switch_redirect,
.free = ice_switch_filter_rule_free,
.type = ICE_FLOW_ENGINE_SWITCH,
};
git.droids-corp.org / dpdk.git / blobdiff