git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
net/bnxt: fix endianness while setting L4 destination port
[dpdk.git] / drivers / net / ice / ice_switch_filter.c
diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c
index 9db89a3..24320ac 100644 (file)
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -481,10 +481,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
        bool profile_rule = 0;
        bool nvgre_valid = 0;
        bool vxlan_valid = 0;
-       bool ipv6_valiad = 0;
-       bool ipv4_valiad = 0;
-       bool udp_valiad = 0;
-       bool tcp_valiad = 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 !=
@@ -571,7 +571,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
                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 ||
@@ -663,7 +663,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
                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,
@@ -781,7 +781,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
                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 ||
@@ -834,7 +834,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
                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 ||
@@ -1152,16 +1152,16 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
 
                        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;
@@ -1175,13 +1175,13 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
                        }
 
                        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;
@@ -1212,12 +1212,12 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
 
                        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){
@@ -1232,11 +1232,11 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
                        }
 
                        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;
@@ -1254,10 +1254,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
                        }
 
                        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){
@@ -1272,10 +1272,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
                        }
 
                        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;
                        }
@@ -1309,7 +1309,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
                                }
                                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 &&
@@ -1318,7 +1318,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
                                        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 &&
@@ -1342,17 +1342,17 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
        }
 
        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;
@@ -1363,13 +1363,13 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
                        *tun_type = ICE_SW_TUN_VXLAN;
                else if (nvgre_valid)
                        *tun_type = ICE_SW_TUN_NVGRE;
-               else if (ipv4_valiad && tcp_valiad)
+               else if (ipv4_valid && tcp_valid)
                        *tun_type = ICE_SW_IPV4_TCP;
-               else if (ipv4_valiad && udp_valiad)
+               else if (ipv4_valid && udp_valid)
                        *tun_type = ICE_SW_IPV4_UDP;
-               else if (ipv6_valiad && tcp_valiad)
+               else if (ipv6_valid && tcp_valid)
                        *tun_type = ICE_SW_IPV6_TCP;
-               else if (ipv6_valiad && udp_valiad)
+               else if (ipv6_valid && udp_valid)
                        *tun_type = ICE_SW_IPV6_UDP;
        }
 
@@ -1405,6 +1405,16 @@ ice_switch_parse_dcf_action(struct ice_dcf_adapter *ad,
                case RTE_FLOW_ACTION_TYPE_VF:
                        rule_info->sw_act.fltr_act = ICE_FWD_TO_VSI;
                        act_vf = action->conf;
+
+                       if (act_vf->id >= ad->real_hw.num_vfs &&
+                               !act_vf->original) {
+                               rte_flow_error_set(error,
+                                       EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
+                                       actions,
+                                       "Invalid vf id");
+                               return -rte_errno;
+                       }
+
                        if (act_vf->original)
                                rule_info->sw_act.vsi_handle =
                                        ad->real_hw.avf.bus.func;
@@ -1415,7 +1425,7 @@ ice_switch_parse_dcf_action(struct ice_dcf_adapter *ad,
                        rte_flow_error_set(error,
                                           EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
                                           actions,
-                                          "Invalid action type or queue number");
+                                          "Invalid action type");
                        return -rte_errno;
                }
        }
@@ -1467,11 +1477,11 @@ ice_switch_parse_action(struct ice_pf *pf,
                        if ((act_qgrop->queue[0] +
                                act_qgrop->queue_num) >
                                dev->data->nb_rx_queues)
-                               goto error;
+                               goto error1;
                        for (i = 0; i < act_qgrop->queue_num - 1; i++)
                                if (act_qgrop->queue[i + 1] !=
                                        act_qgrop->queue[i] + 1)
-                                       goto error;
+                                       goto error2;
                        rule_info->sw_act.qgrp_size =
                                act_qgrop->queue_num;
                        break;
@@ -1511,6 +1521,20 @@ error:
                actions,
                "Invalid action type or queue number");
        return -rte_errno;
+
+error1:
+       rte_flow_error_set(error,
+               EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
+               actions,
+               "Invalid queue region indexes");
+       return -rte_errno;
+
+error2:
+       rte_flow_error_set(error,
+               EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
+               actions,
+               "Discontinuous queue region");
+       return -rte_errno;
 }
 
 static int
@@ -1654,12 +1678,8 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,
        rule_info.tun_type = tun_type;
 
        ret = ice_switch_check_action(actions, error);
-       if (ret) {
-               rte_flow_error_set(error, EINVAL,
-                                  RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
-                                  "Invalid input action number");
+       if (ret)
                goto error;
-       }
 
        if (ad->hw.dcf_enabled)
                ret = ice_switch_parse_dcf_action((void *)ad, actions, error,
@@ -1667,12 +1687,8 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,
        else
                ret = ice_switch_parse_action(pf, actions, error, &rule_info);
 
-       if (ret) {
-               rte_flow_error_set(error, EINVAL,
-                                  RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
-                                  "Invalid input action");
+       if (ret)
                goto error;
-       }
 
        if (meta) {
                *meta = sw_meta_ptr;
DPDK repo used for reviews