net/mlx5: separate DPDK from verbs Rx queue objects

[dpdk.git] / drivers / net / mlx5 / mlx5_vlan.c

diff --git a/drivers/net/mlx5/mlx5_vlan.c b/drivers/net/mlx5/mlx5_vlan.c
index 3a07ad1..d707984 100644 (file)
--- a/drivers/net/mlx5/mlx5_vlan.c
+++ b/drivers/net/mlx5/mlx5_vlan.c
@@ -36,18 +36,12 @@
 #include <assert.h>
 #include <stdint.h>
 
-/* DPDK headers don't like -pedantic. */
-#ifdef PEDANTIC
-#pragma GCC diagnostic ignored "-pedantic"
-#endif
 #include <rte_ethdev.h>
 #include <rte_common.h>
-#ifdef PEDANTIC
-#pragma GCC diagnostic error "-pedantic"
-#endif
 
 #include "mlx5_utils.h"
 #include "mlx5.h"
+#include "mlx5_autoconf.h"
 
 /**
  * Configure a VLAN filter.
@@ -86,7 +80,8 @@ vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
                --priv->vlan_filter_n;
                memmove(&priv->vlan_filter[i],
                        &priv->vlan_filter[i + 1],
-                       priv->vlan_filter_n - i);
+                       sizeof(priv->vlan_filter[i]) *
+                       (priv->vlan_filter_n - i));
                priv->vlan_filter[priv->vlan_filter_n] = 0;
        } else {
                assert(i == priv->vlan_filter_n);
@@ -97,9 +92,10 @@ vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
                priv->vlan_filter[priv->vlan_filter_n] = vlan_id;
                ++priv->vlan_filter_n;
        }
-       /* Rehash MAC flows in all hash RX queues. */
+       /* Rehash flows in all hash RX queues. */
        priv_mac_addrs_disable(priv);
-       return priv_mac_addrs_enable(priv);
+       priv_special_flow_disable_all(priv);
+       return priv_rehash_flows(priv);
 }
 
 /**
@@ -127,3 +123,106 @@ mlx5_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
        assert(ret >= 0);
        return -ret;
 }
+
+/**
+ * Set/reset VLAN stripping for a specific queue.
+ *
+ * @param priv
+ *   Pointer to private structure.
+ * @param idx
+ *   RX queue index.
+ * @param on
+ *   Enable/disable VLAN stripping.
+ */
+static void
+priv_vlan_strip_queue_set(struct priv *priv, uint16_t idx, int on)
+{
+       struct mlx5_rxq_data *rxq = (*priv->rxqs)[idx];
+       struct mlx5_rxq_ctrl *rxq_ctrl =
+               container_of(rxq, struct mlx5_rxq_ctrl, rxq);
+       struct ibv_wq_attr mod;
+       uint16_t vlan_offloads =
+               (on ? IBV_WQ_FLAGS_CVLAN_STRIPPING : 0) |
+               0;
+       int err;
+
+       DEBUG("set VLAN offloads 0x%x for port %d queue %d",
+             vlan_offloads, rxq->port_id, idx);
+       mod = (struct ibv_wq_attr){
+               .attr_mask = IBV_WQ_ATTR_FLAGS,
+               .flags_mask = IBV_WQ_FLAGS_CVLAN_STRIPPING,
+               .flags = vlan_offloads,
+       };
+
+       err = ibv_modify_wq(rxq_ctrl->ibv->wq, &mod);
+       if (err) {
+               ERROR("%p: failed to modified stripping mode: %s",
+                     (void *)priv, strerror(err));
+               return;
+       }
+
+       /* Update related bits in RX queue. */
+       rxq->vlan_strip = !!on;
+}
+
+/**
+ * Callback to set/reset VLAN stripping for a specific queue.
+ *
+ * @param dev
+ *   Pointer to Ethernet device structure.
+ * @param queue
+ *   RX queue index.
+ * @param on
+ *   Enable/disable VLAN stripping.
+ */
+void
+mlx5_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on)
+{
+       struct priv *priv = dev->data->dev_private;
+
+       /* Validate hw support */
+       if (!priv->hw_vlan_strip) {
+               ERROR("VLAN stripping is not supported");
+               return;
+       }
+
+       /* Validate queue number */
+       if (queue >= priv->rxqs_n) {
+               ERROR("VLAN stripping, invalid queue number %d", queue);
+               return;
+       }
+
+       priv_lock(priv);
+       priv_vlan_strip_queue_set(priv, queue, on);
+       priv_unlock(priv);
+}
+
+/**
+ * Callback to set/reset VLAN offloads for a port.
+ *
+ * @param dev
+ *   Pointer to Ethernet device structure.
+ * @param mask
+ *   VLAN offload bit mask.
+ */
+void
+mlx5_vlan_offload_set(struct rte_eth_dev *dev, int mask)
+{
+       struct priv *priv = dev->data->dev_private;
+       unsigned int i;
+
+       if (mask & ETH_VLAN_STRIP_MASK) {
+               int hw_vlan_strip = !!dev->data->dev_conf.rxmode.hw_vlan_strip;
+
+               if (!priv->hw_vlan_strip) {
+                       ERROR("VLAN stripping is not supported");
+                       return;
+               }
+
+               /* Run on every RX queue and set/reset VLAN stripping. */
+               priv_lock(priv);
+               for (i = 0; (i != priv->rxqs_n); i++)
+                       priv_vlan_strip_queue_set(priv, i, hw_vlan_strip);
+               priv_unlock(priv);
+       }
+}