git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
net/mlx5: use flow to enable all multi mode
[dpdk.git] / drivers / net / mlx5 / mlx5_rxmode.c
diff --git a/drivers/net/mlx5/mlx5_rxmode.c b/drivers/net/mlx5/mlx5_rxmode.c
index 51e2aca..0c75889 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxmode.c
+++ b/drivers/net/mlx5/mlx5_rxmode.c
@@ -38,21 +38,14 @@
 /* Verbs header. */
 /* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */
 #ifdef PEDANTIC
-#pragma GCC diagnostic ignored "-pedantic"
+#pragma GCC diagnostic ignored "-Wpedantic"
 #endif
 #include <infiniband/verbs.h>
 #ifdef PEDANTIC
-#pragma GCC diagnostic error "-pedantic"
+#pragma GCC diagnostic error "-Wpedantic"
 #endif
 
-/* DPDK headers don't like -pedantic. */
-#ifdef PEDANTIC
-#pragma GCC diagnostic ignored "-pedantic"
-#endif
 #include <rte_ethdev.h>
-#ifdef PEDANTIC
-#pragma GCC diagnostic error "-pedantic"
-#endif
 
 #include "mlx5.h"
 #include "mlx5_rxtx.h"
@@ -60,32 +53,6 @@
 
 /* Initialization data for special flows. */
 static const struct special_flow_init special_flow_init[] = {
-       [HASH_RXQ_FLOW_TYPE_PROMISC] = {
-               .dst_mac_val = "\x00\x00\x00\x00\x00\x00",
-               .dst_mac_mask = "\x00\x00\x00\x00\x00\x00",
-               .hash_types =
-                       1 << HASH_RXQ_TCPV4 |
-                       1 << HASH_RXQ_UDPV4 |
-                       1 << HASH_RXQ_IPV4 |
-                       1 << HASH_RXQ_TCPV6 |
-                       1 << HASH_RXQ_UDPV6 |
-                       1 << HASH_RXQ_IPV6 |
-                       1 << HASH_RXQ_ETH |
-                       0,
-               .per_vlan = 0,
-       },
-       [HASH_RXQ_FLOW_TYPE_ALLMULTI] = {
-               .dst_mac_val = "\x01\x00\x00\x00\x00\x00",
-               .dst_mac_mask = "\x01\x00\x00\x00\x00\x00",
-               .hash_types =
-                       1 << HASH_RXQ_UDPV4 |
-                       1 << HASH_RXQ_IPV4 |
-                       1 << HASH_RXQ_UDPV6 |
-                       1 << HASH_RXQ_IPV6 |
-                       1 << HASH_RXQ_ETH |
-                       0,
-               .per_vlan = 0,
-       },
        [HASH_RXQ_FLOW_TYPE_BROADCAST] = {
                .dst_mac_val = "\xff\xff\xff\xff\xff\xff",
                .dst_mac_mask = "\xff\xff\xff\xff\xff\xff",
@@ -129,10 +96,10 @@ hash_rxq_special_flow_enable_vlan(struct hash_rxq *hash_rxq,
                                  unsigned int vlan_index)
 {
        struct priv *priv = hash_rxq->priv;
-       struct ibv_exp_flow *flow;
+       struct ibv_flow *flow;
        FLOW_ATTR_SPEC_ETH(data, priv_flow_attr(priv, NULL, 0, hash_rxq->type));
-       struct ibv_exp_flow_attr *attr = &data->attr;
-       struct ibv_exp_flow_spec_eth *spec = &data->spec;
+       struct ibv_flow_attr *attr = &data->attr;
+       struct ibv_flow_spec_eth *spec = &data->spec;
        const uint8_t *mac;
        const uint8_t *mask;
        unsigned int vlan_enabled = (priv->vlan_filter_n &&
@@ -153,32 +120,36 @@ hash_rxq_special_flow_enable_vlan(struct hash_rxq *hash_rxq,
        assert(((uint8_t *)attr + sizeof(*attr)) == (uint8_t *)spec);
        priv_flow_attr(priv, attr, sizeof(data), hash_rxq->type);
        /* The first specification must be Ethernet. */
-       assert(spec->type == IBV_EXP_FLOW_SPEC_ETH);
+       assert(spec->type == IBV_FLOW_SPEC_ETH);
        assert(spec->size == sizeof(*spec));
 
        mac = special_flow_init[flow_type].dst_mac_val;
        mask = special_flow_init[flow_type].dst_mac_mask;
-       *spec = (struct ibv_exp_flow_spec_eth){
-               .type = IBV_EXP_FLOW_SPEC_ETH,
+       *spec = (struct ibv_flow_spec_eth){
+               .type = IBV_FLOW_SPEC_ETH,
                .size = sizeof(*spec),
                .val = {
                        .dst_mac = {
                                mac[0], mac[1], mac[2],
                                mac[3], mac[4], mac[5],
                        },
-                       .vlan_tag = (vlan_enabled ? htons(vlan_id) : 0),
+                       .vlan_tag = (vlan_enabled ?
+                                    rte_cpu_to_be_16(vlan_id) :
+                                    0),
                },
                .mask = {
                        .dst_mac = {
                                mask[0], mask[1], mask[2],
                                mask[3], mask[4], mask[5],
                        },
-                       .vlan_tag = (vlan_enabled ? htons(0xfff) : 0),
+                       .vlan_tag = (vlan_enabled ?
+                                    rte_cpu_to_be_16(0xfff) :
+                                    0),
                },
        };
 
        errno = 0;
-       flow = ibv_exp_create_flow(hash_rxq->qp, attr);
+       flow = ibv_create_flow(hash_rxq->qp, attr);
        if (flow == NULL) {
                /* It's not clear whether errno is always set in this case. */
                ERROR("%p: flow configuration failed, errno=%d: %s",
@@ -210,12 +181,12 @@ hash_rxq_special_flow_disable_vlan(struct hash_rxq *hash_rxq,
                                   enum hash_rxq_flow_type flow_type,
                                   unsigned int vlan_index)
 {
-       struct ibv_exp_flow *flow =
+       struct ibv_flow *flow =
                hash_rxq->special_flow[flow_type][vlan_index];
 
        if (flow == NULL)
                return;
-       claim_zero(ibv_exp_destroy_flow(flow));
+       claim_zero(ibv_destroy_flow(flow));
        hash_rxq->special_flow[flow_type][vlan_index] = NULL;
        DEBUG("%p: special flow %s (index %d) VLAN %u (index %u) disabled",
              (void *)hash_rxq, hash_rxq_flow_type_str(flow_type), flow_type,
@@ -347,7 +318,11 @@ priv_special_flow_enable_all(struct priv *priv)
 {
        enum hash_rxq_flow_type flow_type;
 
-       for (flow_type = 0; flow_type != HASH_RXQ_FLOW_TYPE_MAC; ++flow_type) {
+       if (priv->isolated)
+               return 0;
+       for (flow_type = HASH_RXQ_FLOW_TYPE_BROADCAST;
+                       flow_type != HASH_RXQ_FLOW_TYPE_MAC;
+                       ++flow_type) {
                int ret;
 
                ret = priv_special_flow_enable(priv, flow_type);
@@ -372,7 +347,9 @@ priv_special_flow_disable_all(struct priv *priv)
 {
        enum hash_rxq_flow_type flow_type;
 
-       for (flow_type = 0; flow_type != HASH_RXQ_FLOW_TYPE_MAC; ++flow_type)
+       for (flow_type = HASH_RXQ_FLOW_TYPE_BROADCAST;
+                       flow_type != HASH_RXQ_FLOW_TYPE_MAC;
+                       ++flow_type)
                priv_special_flow_disable(priv, flow_type);
 }
 
@@ -385,19 +362,16 @@ priv_special_flow_disable_all(struct priv *priv)
 void
 mlx5_promiscuous_enable(struct rte_eth_dev *dev)
 {
-       struct priv *priv = dev->data->dev_private;
-       int ret;
+       struct rte_flow_item_eth eth = {
+               .dst.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+               .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+               .type = 0,
+       };
 
        if (mlx5_is_secondary())
                return;
-
-       priv_lock(priv);
-       priv->promisc_req = 1;
-       ret = priv_rehash_flows(priv);
-       if (ret)
-               ERROR("error while enabling promiscuous mode: %s",
-                     strerror(ret));
-       priv_unlock(priv);
+       dev->data->promiscuous = 1;
+       claim_zero(mlx5_ctrl_flow(dev, &eth, &eth, 1));
 }
 
 /**
@@ -409,19 +383,16 @@ mlx5_promiscuous_enable(struct rte_eth_dev *dev)
 void
 mlx5_promiscuous_disable(struct rte_eth_dev *dev)
 {
-       struct priv *priv = dev->data->dev_private;
-       int ret;
+       struct rte_flow_item_eth eth = {
+               .dst.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+               .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+               .type = 0,
+       };
 
        if (mlx5_is_secondary())
                return;
-
-       priv_lock(priv);
-       priv->promisc_req = 0;
-       ret = priv_rehash_flows(priv);
-       if (ret)
-               ERROR("error while disabling promiscuous mode: %s",
-                     strerror(ret));
-       priv_unlock(priv);
+       dev->data->promiscuous = 0;
+       claim_zero(mlx5_ctrl_flow(dev, &eth, &eth, 0));
 }
 
 /**
@@ -433,19 +404,17 @@ mlx5_promiscuous_disable(struct rte_eth_dev *dev)
 void
 mlx5_allmulticast_enable(struct rte_eth_dev *dev)
 {
-       struct priv *priv = dev->data->dev_private;
-       int ret;
+       struct rte_flow_item_eth eth = {
+               .dst.addr_bytes = "\x01\x00\x00\x00\x00\x00",
+               .src.addr_bytes = "\x01\x00\x00\x00\x00\x00",
+               .type = 0,
+       };
 
        if (mlx5_is_secondary())
                return;
-
-       priv_lock(priv);
-       priv->allmulti_req = 1;
-       ret = priv_rehash_flows(priv);
-       if (ret)
-               ERROR("error while enabling allmulticast mode: %s",
-                     strerror(ret));
-       priv_unlock(priv);
+       dev->data->all_multicast = 1;
+       if (dev->data->dev_started)
+               claim_zero(mlx5_ctrl_flow(dev, &eth, &eth, 1));
 }
 
 /**
@@ -457,17 +426,15 @@ mlx5_allmulticast_enable(struct rte_eth_dev *dev)
 void
 mlx5_allmulticast_disable(struct rte_eth_dev *dev)
 {
-       struct priv *priv = dev->data->dev_private;
-       int ret;
+       struct rte_flow_item_eth eth = {
+               .dst.addr_bytes = "\x01\x00\x00\x00\x00\x00",
+               .src.addr_bytes = "\x01\x00\x00\x00\x00\x00",
+               .type = 0,
+       };
 
        if (mlx5_is_secondary())
                return;
-
-       priv_lock(priv);
-       priv->allmulti_req = 0;
-       ret = priv_rehash_flows(priv);
-       if (ret)
-               ERROR("error while disabling allmulticast mode: %s",
-                     strerror(ret));
-       priv_unlock(priv);
+       dev->data->all_multicast = 0;
+       if (dev->data->dev_started)
+               claim_zero(mlx5_ctrl_flow(dev, &eth, &eth, 0));
 }
DPDK repo used for reviews