net/mlx5: sync stop/start with secondary process

Rx/Tx burst function pointers are stored in the rte_eth_dev structure,
which is local to a process. Even though primary process replaces the
function pointers, secondary will not run the new ones. With rte_mp
APIs, primary can easily broadcast a request to stop/start the datapath
of secondary processes.

Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
Acked-by: Shahaf Shuler <shahafs@mellanox.com>

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 14dfad3..2b7a6d1 100644 (file)
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -470,6 +470,9 @@ mlx5_dev_close(struct rte_eth_dev *dev)
        /* 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);
        if (priv->rxqs != NULL) {
                /* XXX race condition if mlx5_rx_burst() is still running. */
                usleep(1000);
@@ -966,6 +969,7 @@ mlx5_init_once(void)
        case RTE_PROC_SECONDARY:
                if (ld->init_done)
                        break;
+               mlx5_mp_init_secondary();
                ret = mlx5_uar_init_secondary();
                if (ret)
                        goto error;
@@ -986,6 +990,7 @@ error:
                break;
        case RTE_PROC_SECONDARY:
                mlx5_uar_uninit_secondary();
+               mlx5_mp_uninit_secondary();
                break;
        default:
                break;

diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index fe30353..1269250 100644 (file)
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -59,6 +59,8 @@ enum {
 /* Request types for IPC. */
 enum mlx5_mp_req_type {
        MLX5_MP_REQ_VERBS_CMD_FD = 1,
+       MLX5_MP_REQ_START_RXTX,
+       MLX5_MP_REQ_STOP_RXTX,
 };
 
 /* Pameters for IPC. */
@@ -461,9 +463,13 @@ int mlx5_flow_create_drop_queue(struct rte_eth_dev *dev);
 void mlx5_flow_delete_drop_queue(struct rte_eth_dev *dev);
 
 /* mlx5_mp.c */
+void mlx5_mp_req_start_rxtx(struct rte_eth_dev *dev);
+void mlx5_mp_req_stop_rxtx(struct rte_eth_dev *dev);
 int mlx5_mp_req_verbs_cmd_fd(struct rte_eth_dev *dev);
 void mlx5_mp_init_primary(void);
 void mlx5_mp_uninit_primary(void);
+void mlx5_mp_init_secondary(void);
+void mlx5_mp_uninit_secondary(void);
 
 /* mlx5_nl.c */
 

diff --git a/drivers/net/mlx5/mlx5_mp.c b/drivers/net/mlx5/mlx5_mp.c
index 701ee1d..45dcc30 100644 (file)
--- a/drivers/net/mlx5/mlx5_mp.c
+++ b/drivers/net/mlx5/mlx5_mp.c
@@ -12,6 +12,7 @@
 #include <rte_string_fns.h>
 
 #include "mlx5.h"
+#include "mlx5_rxtx.h"
 #include "mlx5_utils.h"
 
 /**
@@ -84,6 +85,141 @@ mp_primary_handle(const struct rte_mp_msg *mp_msg, const void *peer)
        return ret;
 }
 
+/**
+ * IPC message handler of a secondary process.
+ *
+ * @param[in] dev
+ *   Pointer to Ethernet structure.
+ * @param[in] peer
+ *   Pointer to the peer socket path.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+static int
+mp_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer)
+{
+       struct rte_mp_msg mp_res;
+       struct mlx5_mp_param *res = (struct mlx5_mp_param *)mp_res.param;
+       const struct mlx5_mp_param *param =
+               (const struct mlx5_mp_param *)mp_msg->param;
+       struct rte_eth_dev *dev;
+       int ret;
+
+       assert(rte_eal_process_type() == RTE_PROC_SECONDARY);
+       if (!rte_eth_dev_is_valid_port(param->port_id)) {
+               rte_errno = ENODEV;
+               DRV_LOG(ERR, "port %u invalid port ID", param->port_id);
+               return -rte_errno;
+       }
+       dev = &rte_eth_devices[param->port_id];
+       switch (param->type) {
+       case MLX5_MP_REQ_START_RXTX:
+               DRV_LOG(INFO, "port %u starting datapath", dev->data->port_id);
+               rte_mb();
+               dev->rx_pkt_burst = mlx5_select_rx_function(dev);
+               dev->tx_pkt_burst = mlx5_select_tx_function(dev);
+               mp_init_msg(dev, &mp_res, param->type);
+               res->result = 0;
+               ret = rte_mp_reply(&mp_res, peer);
+               break;
+       case MLX5_MP_REQ_STOP_RXTX:
+               DRV_LOG(INFO, "port %u stopping datapath", dev->data->port_id);
+               dev->rx_pkt_burst = removed_rx_burst;
+               dev->tx_pkt_burst = removed_tx_burst;
+               rte_mb();
+               mp_init_msg(dev, &mp_res, param->type);
+               res->result = 0;
+               ret = rte_mp_reply(&mp_res, peer);
+               break;
+       default:
+               rte_errno = EINVAL;
+               DRV_LOG(ERR, "port %u invalid mp request type",
+                       dev->data->port_id);
+               return -rte_errno;
+       }
+       return ret;
+}
+
+/**
+ * Broadcast request of stopping/starting data-path to secondary processes.
+ *
+ * @param[in] dev
+ *   Pointer to Ethernet structure.
+ * @param[in] type
+ *   Request type.
+ */
+static void
+mp_req_on_rxtx(struct rte_eth_dev *dev, enum mlx5_mp_req_type type)
+{
+       struct rte_mp_msg mp_req;
+       struct rte_mp_msg *mp_res;
+       struct rte_mp_reply mp_rep;
+       struct mlx5_mp_param *res;
+       struct timespec ts = {.tv_sec = MLX5_MP_REQ_TIMEOUT_SEC, .tv_nsec = 0};
+       int ret;
+       int i;
+
+       assert(rte_eal_process_type() == RTE_PROC_PRIMARY);
+       if (!mlx5_shared_data->secondary_cnt)
+               return;
+       if (type != MLX5_MP_REQ_START_RXTX && type != MLX5_MP_REQ_STOP_RXTX) {
+               DRV_LOG(ERR, "port %u unknown request (req_type %d)",
+                       dev->data->port_id, type);
+               return;
+       }
+       mp_init_msg(dev, &mp_req, type);
+       ret = rte_mp_request_sync(&mp_req, &mp_rep, &ts);
+       if (ret) {
+               DRV_LOG(ERR, "port %u failed to request stop/start Rx/Tx (%d)",
+                       dev->data->port_id, type);
+               goto exit;
+       }
+       if (mp_rep.nb_sent != mp_rep.nb_received) {
+               DRV_LOG(ERR,
+                       "port %u not all secondaries responded (req_type %d)",
+                       dev->data->port_id, type);
+               goto exit;
+       }
+       for (i = 0; i < mp_rep.nb_received; i++) {
+               mp_res = &mp_rep.msgs[i];
+               res = (struct mlx5_mp_param *)mp_res->param;
+               if (res->result) {
+                       DRV_LOG(ERR, "port %u request failed on secondary #%d",
+                               dev->data->port_id, i);
+                       goto exit;
+               }
+       }
+exit:
+       free(mp_rep.msgs);
+}
+
+/**
+ * Broadcast request of starting data-path to secondary processes. The request
+ * is synchronous.
+ *
+ * @param[in] dev
+ *   Pointer to Ethernet structure.
+ */
+void
+mlx5_mp_req_start_rxtx(struct rte_eth_dev *dev)
+{
+       mp_req_on_rxtx(dev, MLX5_MP_REQ_START_RXTX);
+}
+
+/**
+ * Broadcast request of stopping data-path to secondary processes. The request
+ * is synchronous.
+ *
+ * @param[in] dev
+ *   Pointer to Ethernet structure.
+ */
+void
+mlx5_mp_req_stop_rxtx(struct rte_eth_dev *dev)
+{
+       mp_req_on_rxtx(dev, MLX5_MP_REQ_STOP_RXTX);
+}
+
 /**
  * Request Verbs command file descriptor for mmap to the primary process.
  *
@@ -150,3 +286,23 @@ mlx5_mp_uninit_primary(void)
        assert(rte_eal_process_type() == RTE_PROC_PRIMARY);
        rte_mp_action_unregister(MLX5_MP_NAME);
 }
+
+/**
+ * Initialize by secondary process.
+ */
+void
+mlx5_mp_init_secondary(void)
+{
+       assert(rte_eal_process_type() == RTE_PROC_SECONDARY);
+       rte_mp_action_register(MLX5_MP_NAME, mp_secondary_handle);
+}
+
+/**
+ * Un-initialize by secondary process.
+ */
+void
+mlx5_mp_uninit_secondary(void)
+{
+       assert(rte_eal_process_type() == RTE_PROC_SECONDARY);
+       rte_mp_action_unregister(MLX5_MP_NAME);
+}

diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index 38ce0e2..3da3f62 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -2373,6 +2373,7 @@ removed_tx_burst(void *dpdk_txq __rte_unused,
                 struct rte_mbuf **pkts __rte_unused,
                 uint16_t pkts_n __rte_unused)
 {
+       rte_mb();
        return 0;
 }
 
@@ -2397,6 +2398,7 @@ removed_rx_burst(void *dpdk_txq __rte_unused,
                 struct rte_mbuf **pkts __rte_unused,
                 uint16_t pkts_n __rte_unused)
 {
+       rte_mb();
        return 0;
 }
 

diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c
index d13a1a1..5b73f0f 100644 (file)
--- a/drivers/net/mlx5/mlx5_trigger.c
+++ b/drivers/net/mlx5/mlx5_trigger.c
@@ -194,8 +194,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:
@@ -228,6 +231,8 @@ mlx5_dev_stop(struct rte_eth_dev *dev)
        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);