git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
crypto/scheduler: change enqueue and dequeue functions
[dpdk.git] / drivers / net / ixgbe / ixgbe_flow.c
diff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c
index 7747831..e2ba9c2 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_flow.c
+++ b/drivers/net/ixgbe/ixgbe_flow.c
@@ -75,104 +75,6 @@
 #include "base/ixgbe_phy.h"
 #include "rte_pmd_ixgbe.h"
 
-static int ixgbe_flow_flush(struct rte_eth_dev *dev,
-               struct rte_flow_error *error);
-static int
-cons_parse_ntuple_filter(const struct rte_flow_attr *attr,
-                                       const struct rte_flow_item pattern[],
-                                       const struct rte_flow_action actions[],
-                                       struct rte_eth_ntuple_filter *filter,
-                                       struct rte_flow_error *error);
-static int
-ixgbe_parse_ntuple_filter(const struct rte_flow_attr *attr,
-                                       const struct rte_flow_item pattern[],
-                                       const struct rte_flow_action actions[],
-                                       struct rte_eth_ntuple_filter *filter,
-                                       struct rte_flow_error *error);
-static int
-cons_parse_ethertype_filter(const struct rte_flow_attr *attr,
-                           const struct rte_flow_item *pattern,
-                           const struct rte_flow_action *actions,
-                           struct rte_eth_ethertype_filter *filter,
-                           struct rte_flow_error *error);
-static int
-ixgbe_parse_ethertype_filter(const struct rte_flow_attr *attr,
-                               const struct rte_flow_item pattern[],
-                               const struct rte_flow_action actions[],
-                               struct rte_eth_ethertype_filter *filter,
-                               struct rte_flow_error *error);
-static int
-cons_parse_syn_filter(const struct rte_flow_attr *attr,
-               const struct rte_flow_item pattern[],
-               const struct rte_flow_action actions[],
-               struct rte_eth_syn_filter *filter,
-               struct rte_flow_error *error);
-static int
-ixgbe_parse_syn_filter(const struct rte_flow_attr *attr,
-                               const struct rte_flow_item pattern[],
-                               const struct rte_flow_action actions[],
-                               struct rte_eth_syn_filter *filter,
-                               struct rte_flow_error *error);
-static int
-cons_parse_l2_tn_filter(const struct rte_flow_attr *attr,
-               const struct rte_flow_item pattern[],
-               const struct rte_flow_action actions[],
-               struct rte_eth_l2_tunnel_conf *filter,
-               struct rte_flow_error *error);
-static int
-ixgbe_validate_l2_tn_filter(struct rte_eth_dev *dev,
-                       const struct rte_flow_attr *attr,
-                       const struct rte_flow_item pattern[],
-                       const struct rte_flow_action actions[],
-                       struct rte_eth_l2_tunnel_conf *rule,
-                       struct rte_flow_error *error);
-static int
-ixgbe_validate_fdir_filter(struct rte_eth_dev *dev,
-                       const struct rte_flow_attr *attr,
-                       const struct rte_flow_item pattern[],
-                       const struct rte_flow_action actions[],
-                       struct ixgbe_fdir_rule *rule,
-                       struct rte_flow_error *error);
-static int
-ixgbe_parse_fdir_filter_normal(const struct rte_flow_attr *attr,
-               const struct rte_flow_item pattern[],
-               const struct rte_flow_action actions[],
-               struct ixgbe_fdir_rule *rule,
-               struct rte_flow_error *error);
-static int
-ixgbe_parse_fdir_filter_tunnel(const struct rte_flow_attr *attr,
-               const struct rte_flow_item pattern[],
-               const struct rte_flow_action actions[],
-               struct ixgbe_fdir_rule *rule,
-               struct rte_flow_error *error);
-static int
-ixgbe_parse_fdir_filter(const struct rte_flow_attr *attr,
-               const struct rte_flow_item pattern[],
-               const struct rte_flow_action actions[],
-               struct ixgbe_fdir_rule *rule,
-               struct rte_flow_error *error);
-static int
-ixgbe_flow_validate(__rte_unused struct rte_eth_dev *dev,
-               const struct rte_flow_attr *attr,
-               const struct rte_flow_item pattern[],
-               const struct rte_flow_action actions[],
-               struct rte_flow_error *error);
-static struct rte_flow *ixgbe_flow_create(struct rte_eth_dev *dev,
-               const struct rte_flow_attr *attr,
-               const struct rte_flow_item pattern[],
-               const struct rte_flow_action actions[],
-               struct rte_flow_error *error);
-static int ixgbe_flow_destroy(struct rte_eth_dev *dev,
-               struct rte_flow *flow,
-               struct rte_flow_error *error);
-
-const struct rte_flow_ops ixgbe_flow_ops = {
-       ixgbe_flow_validate,
-       ixgbe_flow_create,
-       ixgbe_flow_destroy,
-       ixgbe_flow_flush,
-       NULL,
-};
 
 #define IXGBE_MIN_N_TUPLE_PRIO 1
 #define IXGBE_MAX_N_TUPLE_PRIO 7
@@ -518,13 +420,17 @@ cons_parse_ntuple_filter(const struct rte_flow_attr *attr,
 
 /* a specific function for ixgbe because the flags is specific */
 static int
-ixgbe_parse_ntuple_filter(const struct rte_flow_attr *attr,
+ixgbe_parse_ntuple_filter(struct rte_eth_dev *dev,
+                         const struct rte_flow_attr *attr,
                          const struct rte_flow_item pattern[],
                          const struct rte_flow_action actions[],
                          struct rte_eth_ntuple_filter *filter,
                          struct rte_flow_error *error)
 {
        int ret;
+       struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+
+       MAC_TYPE_FILTER_SUP_EXT(hw->mac.type);
 
        ret = cons_parse_ntuple_filter(attr, pattern, actions, filter, error);
 
@@ -766,13 +672,17 @@ cons_parse_ethertype_filter(const struct rte_flow_attr *attr,
 }
 
 static int
-ixgbe_parse_ethertype_filter(const struct rte_flow_attr *attr,
+ixgbe_parse_ethertype_filter(struct rte_eth_dev *dev,
+                                const struct rte_flow_attr *attr,
                             const struct rte_flow_item pattern[],
                             const struct rte_flow_action actions[],
                             struct rte_eth_ethertype_filter *filter,
                             struct rte_flow_error *error)
 {
        int ret;
+       struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+
+       MAC_TYPE_FILTER_SUP(hw->mac.type);
 
        ret = cons_parse_ethertype_filter(attr, pattern,
                                        actions, filter, error);
@@ -1061,13 +971,17 @@ cons_parse_syn_filter(const struct rte_flow_attr *attr,
 }
 
 static int
-ixgbe_parse_syn_filter(const struct rte_flow_attr *attr,
+ixgbe_parse_syn_filter(struct rte_eth_dev *dev,
+                                const struct rte_flow_attr *attr,
                             const struct rte_flow_item pattern[],
                             const struct rte_flow_action actions[],
                             struct rte_eth_syn_filter *filter,
                             struct rte_flow_error *error)
 {
        int ret;
+       struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+
+       MAC_TYPE_FILTER_SUP(hw->mac.type);
 
        ret = cons_parse_syn_filter(attr, pattern,
                                        actions, filter, error);
@@ -1250,7 +1164,7 @@ cons_parse_l2_tn_filter(const struct rte_flow_attr *attr,
 }
 
 static int
-ixgbe_validate_l2_tn_filter(struct rte_eth_dev *dev,
+ixgbe_parse_l2_tn_filter(struct rte_eth_dev *dev,
                        const struct rte_flow_attr *attr,
                        const struct rte_flow_item pattern[],
                        const struct rte_flow_action actions[],
@@ -1617,7 +1531,7 @@ ixgbe_parse_fdir_filter_normal(const struct rte_flow_attr *attr,
                        return -rte_errno;
                }
                rule->mask.vlan_tci_mask = vlan_mask->tci;
-               rule->mask.vlan_tci_mask &= 0xEFFF;
+               rule->mask.vlan_tci_mask &= rte_cpu_to_be_16(0xEFFF);
                /* More than one tags are not supported. */
 
                /**
@@ -2362,7 +2276,7 @@ ixgbe_parse_fdir_filter_tunnel(const struct rte_flow_attr *attr,
                        return -rte_errno;
                }
                rule->mask.vlan_tci_mask = vlan_mask->tci;
-               rule->mask.vlan_tci_mask &= 0xEFFF;
+               rule->mask.vlan_tci_mask &= rte_cpu_to_be_16(0xEFFF);
                /* More than one tags are not supported. */
 
                /**
@@ -2404,46 +2318,37 @@ ixgbe_parse_fdir_filter_tunnel(const struct rte_flow_attr *attr,
 }
 
 static int
-ixgbe_validate_fdir_filter(struct rte_eth_dev *dev,
+ixgbe_parse_fdir_filter(struct rte_eth_dev *dev,
                        const struct rte_flow_attr *attr,
                        const struct rte_flow_item pattern[],
                        const struct rte_flow_action actions[],
                        struct ixgbe_fdir_rule *rule,
                        struct rte_flow_error *error)
 {
-       int ret = 0;
-
+       int ret;
+       struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        enum rte_fdir_mode fdir_mode = dev->data->dev_conf.fdir_conf.mode;
 
-       ixgbe_parse_fdir_filter(attr, pattern, actions,
-                               rule, error);
-
-
-       if (fdir_mode == RTE_FDIR_MODE_NONE ||
-           fdir_mode != rule->mode)
+       if (hw->mac.type != ixgbe_mac_82599EB &&
+               hw->mac.type != ixgbe_mac_X540 &&
+               hw->mac.type != ixgbe_mac_X550 &&
+               hw->mac.type != ixgbe_mac_X550EM_x &&
+               hw->mac.type != ixgbe_mac_X550EM_a)
                return -ENOTSUP;
 
-       return ret;
-}
-
-static int
-ixgbe_parse_fdir_filter(const struct rte_flow_attr *attr,
-                       const struct rte_flow_item pattern[],
-                       const struct rte_flow_action actions[],
-                       struct ixgbe_fdir_rule *rule,
-                       struct rte_flow_error *error)
-{
-       int ret;
-
        ret = ixgbe_parse_fdir_filter_normal(attr, pattern,
                                        actions, rule, error);
 
        if (!ret)
-               return 0;
+               goto step_next;
 
        ret = ixgbe_parse_fdir_filter_tunnel(attr, pattern,
                                        actions, rule, error);
 
+step_next:
+       if (fdir_mode == RTE_FDIR_MODE_NONE ||
+           fdir_mode != rule->mode)
+               return -ENOTSUP;
        return ret;
 }
 
@@ -2547,7 +2452,7 @@ ixgbe_flow_create(struct rte_eth_dev *dev,
                                ixgbe_flow_mem_ptr, entries);
 
        memset(&ntuple_filter, 0, sizeof(struct rte_eth_ntuple_filter));
-       ret = ixgbe_parse_ntuple_filter(attr, pattern,
+       ret = ixgbe_parse_ntuple_filter(dev, attr, pattern,
                        actions, &ntuple_filter, error);
        if (!ret) {
                ret = ixgbe_add_del_ntuple_filter(dev, &ntuple_filter, TRUE);
@@ -2567,7 +2472,7 @@ ixgbe_flow_create(struct rte_eth_dev *dev,
        }
 
        memset(&ethertype_filter, 0, sizeof(struct rte_eth_ethertype_filter));
-       ret = ixgbe_parse_ethertype_filter(attr, pattern,
+       ret = ixgbe_parse_ethertype_filter(dev, attr, pattern,
                                actions, &ethertype_filter, error);
        if (!ret) {
                ret = ixgbe_add_del_ethertype_filter(dev,
@@ -2589,7 +2494,8 @@ ixgbe_flow_create(struct rte_eth_dev *dev,
        }
 
        memset(&syn_filter, 0, sizeof(struct rte_eth_syn_filter));
-       ret = cons_parse_syn_filter(attr, pattern, actions, &syn_filter, error);
+       ret = ixgbe_parse_syn_filter(dev, attr, pattern,
+                               actions, &syn_filter, error);
        if (!ret) {
                ret = ixgbe_syn_filter_set(dev, &syn_filter, TRUE);
                if (!ret) {
@@ -2609,7 +2515,7 @@ ixgbe_flow_create(struct rte_eth_dev *dev,
        }
 
        memset(&fdir_rule, 0, sizeof(struct ixgbe_fdir_rule));
-       ret = ixgbe_parse_fdir_filter(attr, pattern,
+       ret = ixgbe_parse_fdir_filter(dev, attr, pattern,
                                actions, &fdir_rule, error);
        if (!ret) {
                /* A mask cannot be deleted. */
@@ -2662,7 +2568,7 @@ ixgbe_flow_create(struct rte_eth_dev *dev,
        }
 
        memset(&l2_tn_filter, 0, sizeof(struct rte_eth_l2_tunnel_conf));
-       ret = cons_parse_l2_tn_filter(attr, pattern,
+       ret = ixgbe_parse_l2_tn_filter(dev, attr, pattern,
                                        actions, &l2_tn_filter, error);
        if (!ret) {
                ret = ixgbe_dev_l2_tunnel_filter_add(dev, &l2_tn_filter, FALSE);
@@ -2708,31 +2614,31 @@ ixgbe_flow_validate(__rte_unused struct rte_eth_dev *dev,
        int ret;
 
        memset(&ntuple_filter, 0, sizeof(struct rte_eth_ntuple_filter));
-       ret = ixgbe_parse_ntuple_filter(attr, pattern,
+       ret = ixgbe_parse_ntuple_filter(dev, attr, pattern,
                                actions, &ntuple_filter, error);
        if (!ret)
                return 0;
 
        memset(&ethertype_filter, 0, sizeof(struct rte_eth_ethertype_filter));
-       ret = ixgbe_parse_ethertype_filter(attr, pattern,
+       ret = ixgbe_parse_ethertype_filter(dev, attr, pattern,
                                actions, &ethertype_filter, error);
        if (!ret)
                return 0;
 
        memset(&syn_filter, 0, sizeof(struct rte_eth_syn_filter));
-       ret = ixgbe_parse_syn_filter(attr, pattern,
+       ret = ixgbe_parse_syn_filter(dev, attr, pattern,
                                actions, &syn_filter, error);
        if (!ret)
                return 0;
 
        memset(&fdir_rule, 0, sizeof(struct ixgbe_fdir_rule));
-       ret = ixgbe_validate_fdir_filter(dev, attr, pattern,
+       ret = ixgbe_parse_fdir_filter(dev, attr, pattern,
                                actions, &fdir_rule, error);
        if (!ret)
                return 0;
 
        memset(&l2_tn_filter, 0, sizeof(struct rte_eth_l2_tunnel_conf));
-       ret = ixgbe_validate_l2_tn_filter(dev, attr, pattern,
+       ret = ixgbe_parse_l2_tn_filter(dev, attr, pattern,
                                actions, &l2_tn_filter, error);
 
        return ret;
@@ -2879,3 +2785,11 @@ ixgbe_flow_flush(struct rte_eth_dev *dev,
 
        return 0;
 }
+
+const struct rte_flow_ops ixgbe_flow_ops = {
+       ixgbe_flow_validate,
+       ixgbe_flow_create,
+       ixgbe_flow_destroy,
+       ixgbe_flow_flush,
+       NULL,
+};
DPDK repo used for reviews