net: add rte prefix to ether structures

[dpdk.git] / drivers / net / mlx4 / mlx4_flow.c

diff --git a/drivers/net/mlx4/mlx4_flow.c b/drivers/net/mlx4/mlx4_flow.c
index 6c927a6..78bd452 100644 (file)
--- a/drivers/net/mlx4/mlx4_flow.c
+++ b/drivers/net/mlx4/mlx4_flow.c
@@ -28,7 +28,6 @@
 
 #include <rte_byteorder.h>
 #include <rte_errno.h>
-#include <rte_eth_ctrl.h>
 #include <rte_ethdev_driver.h>
 #include <rte_ether.h>
 #include <rte_flow.h>
@@ -71,7 +70,7 @@ struct mlx4_flow_proc_item {
 struct mlx4_drop {
        struct ibv_qp *qp; /**< QP target. */
        struct ibv_cq *cq; /**< CQ associated with above QP. */
-       struct priv *priv; /**< Back pointer to private data. */
+       struct mlx4_priv *priv; /**< Back pointer to private data. */
        uint32_t refcnt; /**< Reference count. */
 };
 
@@ -95,7 +94,7 @@ struct mlx4_drop {
  *   rte_errno is set.
  */
 uint64_t
-mlx4_conv_rss_types(struct priv *priv, uint64_t types, int verbs_to_dpdk)
+mlx4_conv_rss_types(struct mlx4_priv *priv, uint64_t types, int verbs_to_dpdk)
 {
        enum {
                INNER,
@@ -248,7 +247,9 @@ mlx4_flow_merge_eth(struct rte_flow *flow,
                .size = sizeof(*eth),
        };
        if (!mask) {
+               eth->val.dst_mac[0] = 0xff;
                flow->ibv_attr->type = IBV_FLOW_ATTR_ALL_DEFAULT;
+               flow->promisc = 1;
                return 0;
        }
        memcpy(eth->val.dst_mac, spec->dst.addr_bytes, ETHER_ADDR_LEN);
@@ -661,7 +662,7 @@ static const struct mlx4_flow_proc_item mlx4_flow_proc_item_list[] = {
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 static int
-mlx4_flow_prepare(struct priv *priv,
+mlx4_flow_prepare(struct mlx4_priv *priv,
                  const struct rte_flow_attr *attr,
                  const struct rte_flow_item pattern[],
                  const struct rte_flow_action actions[],
@@ -771,7 +772,7 @@ fill:
                        if (flow->rss)
                                break;
                        queue = action->conf;
-                       if (queue->index >= priv->dev->data->nb_rx_queues) {
+                       if (queue->index >= ETH_DEV(priv)->data->nb_rx_queues) {
                                msg = "queue target index beyond number of"
                                        " configured Rx queues";
                                goto exit_action_not_supported;
@@ -800,7 +801,7 @@ fill:
                        /* Sanity checks. */
                        for (i = 0; i < rss->queue_num; ++i)
                                if (rss->queue[i] >=
-                                   priv->dev->data->nb_rx_queues)
+                                   ETH_DEV(priv)->data->nb_rx_queues)
                                        break;
                        if (i != rss->queue_num) {
                                msg = "queue index target beyond number of"
@@ -932,7 +933,7 @@ mlx4_flow_validate(struct rte_eth_dev *dev,
                   const struct rte_flow_action actions[],
                   struct rte_flow_error *error)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx4_priv *priv = dev->data->dev_private;
 
        return mlx4_flow_prepare(priv, attr, pattern, actions, error, NULL);
 }
@@ -948,7 +949,7 @@ mlx4_flow_validate(struct rte_eth_dev *dev,
  *   is set.
  */
 static struct mlx4_drop *
-mlx4_drop_get(struct priv *priv)
+mlx4_drop_get(struct mlx4_priv *priv)
 {
        struct mlx4_drop *drop = priv->drop;
 
@@ -1024,7 +1025,7 @@ mlx4_drop_put(struct mlx4_drop *drop)
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 static int
-mlx4_flow_toggle(struct priv *priv,
+mlx4_flow_toggle(struct mlx4_priv *priv,
                 struct rte_flow *flow,
                 int enable,
                 struct rte_flow_error *error)
@@ -1070,8 +1071,8 @@ mlx4_flow_toggle(struct priv *priv,
                /* Stop at the first nonexistent target queue. */
                for (i = 0; i != rss->queues; ++i)
                        if (rss->queue_id[i] >=
-                           priv->dev->data->nb_rx_queues ||
-                           !priv->dev->data->rx_queues[rss->queue_id[i]]) {
+                           ETH_DEV(priv)->data->nb_rx_queues ||
+                           !ETH_DEV(priv)->data->rx_queues[rss->queue_id[i]]) {
                                missing = 1;
                                break;
                        }
@@ -1140,7 +1141,7 @@ mlx4_flow_create(struct rte_eth_dev *dev,
                 const struct rte_flow_action actions[],
                 struct rte_flow_error *error)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx4_priv *priv = dev->data->dev_private;
        struct rte_flow *flow;
        int err;
 
@@ -1181,7 +1182,7 @@ mlx4_flow_isolate(struct rte_eth_dev *dev,
                  int enable,
                  struct rte_flow_error *error)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx4_priv *priv = dev->data->dev_private;
 
        if (!!enable == !!priv->isolated)
                return 0;
@@ -1204,7 +1205,7 @@ mlx4_flow_destroy(struct rte_eth_dev *dev,
                  struct rte_flow *flow,
                  struct rte_flow_error *error)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx4_priv *priv = dev->data->dev_private;
        int err = mlx4_flow_toggle(priv, flow, 0, error);
 
        if (err)
@@ -1228,7 +1229,7 @@ static int
 mlx4_flow_flush(struct rte_eth_dev *dev,
                struct rte_flow_error *error)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx4_priv *priv = dev->data->dev_private;
        struct rte_flow *flow = LIST_FIRST(&priv->flows);
 
        while (flow) {
@@ -1253,10 +1254,10 @@ mlx4_flow_flush(struct rte_eth_dev *dev,
  *   Next configured VLAN ID or a high value (>= 4096) if there is none.
  */
 static uint16_t
-mlx4_flow_internal_next_vlan(struct priv *priv, uint16_t vlan)
+mlx4_flow_internal_next_vlan(struct mlx4_priv *priv, uint16_t vlan)
 {
        while (vlan < 4096) {
-               if (priv->dev->data->vlan_filter_conf.ids[vlan / 64] &
+               if (ETH_DEV(priv)->data->vlan_filter_conf.ids[vlan / 64] &
                    (UINT64_C(1) << (vlan % 64)))
                        return vlan;
                ++vlan;
@@ -1293,7 +1294,7 @@ mlx4_flow_internal_next_vlan(struct priv *priv, uint16_t vlan)
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 static int
-mlx4_flow_internal(struct priv *priv, struct rte_flow_error *error)
+mlx4_flow_internal(struct mlx4_priv *priv, struct rte_flow_error *error)
 {
        struct rte_flow_attr attr = {
                .priority = MLX4_FLOW_PRIORITY_LAST,
@@ -1333,7 +1334,7 @@ mlx4_flow_internal(struct priv *priv, struct rte_flow_error *error)
         * get RSS by default.
         */
        uint32_t queues =
-               rte_align32pow2(priv->dev->data->nb_rx_queues + 1) >> 1;
+               rte_align32pow2(ETH_DEV(priv)->data->nb_rx_queues + 1) >> 1;
        uint16_t queue[queues];
        struct rte_flow_action_rss action_rss = {
                .func = RTE_ETH_HASH_FUNCTION_DEFAULT,
@@ -1353,11 +1354,11 @@ mlx4_flow_internal(struct priv *priv, struct rte_flow_error *error)
                        .type = RTE_FLOW_ACTION_TYPE_END,
                },
        };
-       struct ether_addr *rule_mac = &eth_spec.dst;
+       struct rte_ether_addr *rule_mac = &eth_spec.dst;
        rte_be16_t *rule_vlan =
-               (priv->dev->data->dev_conf.rxmode.offloads &
+               (ETH_DEV(priv)->data->dev_conf.rxmode.offloads &
                 DEV_RX_OFFLOAD_VLAN_FILTER) &&
-               !priv->dev->data->promiscuous ?
+               !ETH_DEV(priv)->data->promiscuous ?
                &vlan_spec.tci :
                NULL;
        uint16_t vlan = 0;
@@ -1390,7 +1391,7 @@ next_vlan:
                }
        }
        for (i = 0; i != RTE_DIM(priv->mac) + 1; ++i) {
-               const struct ether_addr *mac;
+               const struct rte_ether_addr *mac;
 
                /* Broadcasts are handled by an extra iteration. */
                if (i < RTE_DIM(priv->mac))
@@ -1437,7 +1438,7 @@ next_vlan:
                if (!flow || !flow->internal) {
                        /* Not found, create a new flow rule. */
                        memcpy(rule_mac, mac, sizeof(*mac));
-                       flow = mlx4_flow_create(priv->dev, &attr, pattern,
+                       flow = mlx4_flow_create(ETH_DEV(priv), &attr, pattern,
                                                actions, error);
                        if (!flow) {
                                err = -rte_errno;
@@ -1453,15 +1454,16 @@ next_vlan:
                        goto next_vlan;
        }
        /* Take care of promiscuous and all multicast flow rules. */
-       if (priv->dev->data->promiscuous || priv->dev->data->all_multicast) {
+       if (ETH_DEV(priv)->data->promiscuous ||
+           ETH_DEV(priv)->data->all_multicast) {
                for (flow = LIST_FIRST(&priv->flows);
                     flow && flow->internal;
                     flow = LIST_NEXT(flow, next)) {
-                       if (priv->dev->data->promiscuous) {
+                       if (ETH_DEV(priv)->data->promiscuous) {
                                if (flow->promisc)
                                        break;
                        } else {
-                               assert(priv->dev->data->all_multicast);
+                               assert(ETH_DEV(priv)->data->all_multicast);
                                if (flow->allmulti)
                                        break;
                        }
@@ -1475,16 +1477,16 @@ next_vlan:
                }
                if (!flow || !flow->internal) {
                        /* Not found, create a new flow rule. */
-                       if (priv->dev->data->promiscuous) {
+                       if (ETH_DEV(priv)->data->promiscuous) {
                                pattern[1].spec = NULL;
                                pattern[1].mask = NULL;
                        } else {
-                               assert(priv->dev->data->all_multicast);
+                               assert(ETH_DEV(priv)->data->all_multicast);
                                pattern[1].spec = &eth_allmulti;
                                pattern[1].mask = &eth_allmulti;
                        }
                        pattern[2] = pattern[3];
-                       flow = mlx4_flow_create(priv->dev, &attr, pattern,
+                       flow = mlx4_flow_create(ETH_DEV(priv), &attr, pattern,
                                                actions, error);
                        if (!flow) {
                                err = -rte_errno;
@@ -1501,7 +1503,8 @@ error:
                struct rte_flow *next = LIST_NEXT(flow, next);
 
                if (!flow->select)
-                       claim_zero(mlx4_flow_destroy(priv->dev, flow, error));
+                       claim_zero(mlx4_flow_destroy(ETH_DEV(priv), flow,
+                                                    error));
                else
                        flow->select = 0;
                flow = next;
@@ -1525,7 +1528,7 @@ error:
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 int
-mlx4_flow_sync(struct priv *priv, struct rte_flow_error *error)
+mlx4_flow_sync(struct mlx4_priv *priv, struct rte_flow_error *error)
 {
        struct rte_flow *flow;
        int ret;
@@ -1539,7 +1542,8 @@ mlx4_flow_sync(struct priv *priv, struct rte_flow_error *error)
                for (flow = LIST_FIRST(&priv->flows);
                     flow && flow->internal;
                     flow = LIST_FIRST(&priv->flows))
-                       claim_zero(mlx4_flow_destroy(priv->dev, flow, error));
+                       claim_zero(mlx4_flow_destroy(ETH_DEV(priv), flow,
+                                                    error));
        } else {
                /* Refresh internal rules. */
                ret = mlx4_flow_internal(priv, error);
@@ -1567,12 +1571,12 @@ mlx4_flow_sync(struct priv *priv, struct rte_flow_error *error)
  *   Pointer to private structure.
  */
 void
-mlx4_flow_clean(struct priv *priv)
+mlx4_flow_clean(struct mlx4_priv *priv)
 {
        struct rte_flow *flow;
 
        while ((flow = LIST_FIRST(&priv->flows)))
-               mlx4_flow_destroy(priv->dev, flow, NULL);
+               mlx4_flow_destroy(ETH_DEV(priv), flow, NULL);
        assert(LIST_EMPTY(&priv->rss));
 }