From 14b6df2399e05851c44075f457088ce63b6480d7 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Mon, 10 May 2021 20:06:02 +0800 Subject: [PATCH] net/mlx4: fix secondary process initialization ordering [ upstream commit e5d94cf94e9d7c240e73b390c8c292fc9595f971 ] The memory barrier is used to ensure that the response is returned only after the Tx/Rx function is set, it should place after the Rx/Tx function is set. Fixes: 0203d33a1059 ("net/mlx4: support secondary process") Signed-off-by: Chengwen Feng Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx4/mlx4_mp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx4/mlx4_mp.c b/drivers/net/mlx4/mlx4_mp.c index 3622d610753..dd727552528 100644 --- a/drivers/net/mlx4/mlx4_mp.c +++ b/drivers/net/mlx4/mlx4_mp.c @@ -126,7 +126,6 @@ mp_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer) switch (param->type) { case MLX4_MP_REQ_START_RXTX: INFO("port %u starting datapath", dev->data->port_id); - rte_mb(); dev->tx_pkt_burst = mlx4_tx_burst; dev->rx_pkt_burst = mlx4_rx_burst; #ifdef HAVE_IBV_MLX4_UAR_MMAP_OFFSET @@ -144,6 +143,7 @@ mp_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer) } } #endif + rte_mb(); mp_init_msg(dev, &mp_res, param->type); res->result = 0; ret = rte_mp_reply(&mp_res, peer);