net/mlx5: support Tx hairpin queues

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

diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c
index 3015edd..3ec86c4 100644 (file)
--- a/drivers/net/mlx5/mlx5_trigger.c
+++ b/drivers/net/mlx5/mlx5_trigger.c
@@ -23,7 +23,7 @@
 static void
 mlx5_txq_stop(struct rte_eth_dev *dev)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
        unsigned int i;
 
        for (i = 0; i != priv->txqs_n; ++i)
@@ -42,7 +42,7 @@ mlx5_txq_stop(struct rte_eth_dev *dev)
 static int
 mlx5_txq_start(struct rte_eth_dev *dev)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
        unsigned int i;
        int ret;
 
@@ -51,19 +51,19 @@ mlx5_txq_start(struct rte_eth_dev *dev)
 
                if (!txq_ctrl)
                        continue;
-               txq_alloc_elts(txq_ctrl);
-               txq_ctrl->ibv = mlx5_txq_ibv_new(dev, i);
-               if (!txq_ctrl->ibv) {
+               if (txq_ctrl->type == MLX5_TXQ_TYPE_HAIRPIN) {
+                       txq_ctrl->obj = mlx5_txq_obj_new
+                               (dev, i, MLX5_TXQ_OBJ_TYPE_DEVX_HAIRPIN);
+               } else {
+                       txq_alloc_elts(txq_ctrl);
+                       txq_ctrl->obj = mlx5_txq_obj_new
+                               (dev, i, MLX5_TXQ_OBJ_TYPE_IBV);
+               }
+               if (!txq_ctrl->obj) {
                        rte_errno = ENOMEM;
                        goto error;
                }
        }
-       ret = mlx5_tx_uar_remap(dev, priv->ctx->cmd_fd);
-       if (ret) {
-               /* Adjust index for rollback. */
-               i = priv->txqs_n - 1;
-               goto error;
-       }
        return 0;
 error:
        ret = rte_errno; /* Save rte_errno before cleanup. */
@@ -83,7 +83,7 @@ error:
 static void
 mlx5_rxq_stop(struct rte_eth_dev *dev)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
        unsigned int i;
 
        for (i = 0; i != priv->rxqs_n; ++i)
@@ -102,10 +102,17 @@ mlx5_rxq_stop(struct rte_eth_dev *dev)
 static int
 mlx5_rxq_start(struct rte_eth_dev *dev)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
        unsigned int i;
        int ret = 0;
+       enum mlx5_rxq_obj_type obj_type = MLX5_RXQ_OBJ_TYPE_IBV;
 
+       for (i = 0; i < priv->rxqs_n; ++i) {
+               if ((*priv->rxqs)[i]->lro) {
+                       obj_type =  MLX5_RXQ_OBJ_TYPE_DEVX_RQ;
+                       break;
+               }
+       }
        /* Allocate/reuse/resize mempool for Multi-Packet RQ. */
        if (mlx5_mprq_alloc_mp(dev)) {
                /* Should not release Rx queues but return immediately. */
@@ -117,21 +124,32 @@ mlx5_rxq_start(struct rte_eth_dev *dev)
 
                if (!rxq_ctrl)
                        continue;
+               if (rxq_ctrl->type == MLX5_RXQ_TYPE_HAIRPIN) {
+                       rxq_ctrl->obj = mlx5_rxq_obj_new
+                               (dev, i, MLX5_RXQ_OBJ_TYPE_DEVX_HAIRPIN);
+                       if (!rxq_ctrl->obj)
+                               goto error;
+                       continue;
+               }
                /* Pre-register Rx mempool. */
                mp = mlx5_rxq_mprq_enabled(&rxq_ctrl->rxq) ?
                     rxq_ctrl->rxq.mprq_mp : rxq_ctrl->rxq.mp;
                DRV_LOG(DEBUG,
                        "port %u Rx queue %u registering"
                        " mp %s having %u chunks",
-                       dev->data->port_id, rxq_ctrl->idx,
+                       dev->data->port_id, rxq_ctrl->rxq.idx,
                        mp->name, mp->nb_mem_chunks);
                mlx5_mr_update_mp(dev, &rxq_ctrl->rxq.mr_ctrl, mp);
                ret = rxq_alloc_elts(rxq_ctrl);
                if (ret)
                        goto error;
-               rxq_ctrl->ibv = mlx5_rxq_ibv_new(dev, i);
-               if (!rxq_ctrl->ibv)
+               rxq_ctrl->obj = mlx5_rxq_obj_new(dev, i, obj_type);
+               if (!rxq_ctrl->obj)
                        goto error;
+               if (obj_type == MLX5_RXQ_OBJ_TYPE_IBV)
+                       rxq_ctrl->wqn = rxq_ctrl->obj->wq->wq_num;
+               else if (obj_type == MLX5_RXQ_OBJ_TYPE_DEVX_RQ)
+                       rxq_ctrl->wqn = rxq_ctrl->obj->rq->id;
        }
        return 0;
 error:
@@ -157,7 +175,7 @@ error:
 int
 mlx5_dev_start(struct rte_eth_dev *dev)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
        int ret;
 
        DRV_LOG(DEBUG, "port %u starting device", dev->data->port_id);
@@ -194,8 +212,11 @@ mlx5_dev_start(struct rte_eth_dev *dev)
                        dev->data->port_id);
                goto error;
        }
+       rte_wmb();
        dev->tx_pkt_burst = mlx5_select_tx_function(dev);
        dev->rx_pkt_burst = mlx5_select_rx_function(dev);
+       /* Enable datapath on secondary process. */
+       mlx5_mp_req_start_rxtx(dev);
        mlx5_dev_interrupt_handler_install(dev);
        return 0;
 error:
@@ -221,13 +242,15 @@ error:
 void
 mlx5_dev_stop(struct rte_eth_dev *dev)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
 
        dev->data->dev_started = 0;
        /* Prevent crashes when queues are still in use. */
        dev->rx_pkt_burst = removed_rx_burst;
        dev->tx_pkt_burst = removed_tx_burst;
        rte_wmb();
+       /* Disable datapath on secondary process. */
+       mlx5_mp_req_stop_rxtx(dev);
        usleep(1000 * priv->rxqs_n);
        DRV_LOG(DEBUG, "port %u stopping device", dev->data->port_id);
        mlx5_flow_stop(dev, &priv->flows);
@@ -252,7 +275,7 @@ mlx5_dev_stop(struct rte_eth_dev *dev)
 int
 mlx5_traffic_enable(struct rte_eth_dev *dev)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
        struct rte_flow_item_eth bcast = {
                .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
        };
@@ -269,13 +292,16 @@ mlx5_traffic_enable(struct rte_eth_dev *dev)
                .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
        };
        const unsigned int vlan_filter_n = priv->vlan_filter_n;
-       const struct ether_addr cmp = {
+       const struct rte_ether_addr cmp = {
                .addr_bytes = "\x00\x00\x00\x00\x00\x00",
        };
        unsigned int i;
        unsigned int j;
        int ret;
 
+       if (priv->config.dv_esw_en && !priv->config.vf)
+               if (!mlx5_flow_create_esw_table_zero_flow(dev))
+                       goto error;
        if (priv->isolated)
                return 0;
        if (dev->data->promiscuous) {
@@ -332,13 +358,13 @@ mlx5_traffic_enable(struct rte_eth_dev *dev)
        }
        /* Add MAC address flows. */
        for (i = 0; i != MLX5_MAX_MAC_ADDRESSES; ++i) {
-               struct ether_addr *mac = &dev->data->mac_addrs[i];
+               struct rte_ether_addr *mac = &dev->data->mac_addrs[i];
 
                if (!memcmp(mac, &cmp, sizeof(*mac)))
                        continue;
                memcpy(&unicast.dst.addr_bytes,
                       mac->addr_bytes,
-                      ETHER_ADDR_LEN);
+                      RTE_ETHER_ADDR_LEN);
                for (j = 0; j != vlan_filter_n; ++j) {
                        uint16_t vlan = priv->vlan_filter[j];
 
@@ -379,7 +405,7 @@ error:
 void
 mlx5_traffic_disable(struct rte_eth_dev *dev)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
 
        mlx5_flow_list_flush(dev, &priv->ctrl_flows);
 }