From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6D1D5A0C45 for ; Thu, 10 Jun 2021 14:07:48 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 65E13410D8; Thu, 10 Jun 2021 14:07:48 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 021F440E64 for ; Thu, 10 Jun 2021 14:07:47 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lrJTN-00008r-6a; Thu, 10 Jun 2021 12:07:45 +0000 From: Christian Ehrhardt To: Chengwen Feng Cc: Viacheslav Ovsiienko , dpdk stable Date: Thu, 10 Jun 2021 14:06:16 +0200 Message-Id: <20210610120641.885862-28-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210610120641.885862-1-christian.ehrhardt@canonical.com> References: <20210610120641.885862-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx4: fix secondary process initialization ordering' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/12/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/8b700cbb8c888f2fd17c8ce1ef86134a143ae5a1 Thanks. Christian Ehrhardt --- >From 8b700cbb8c888f2fd17c8ce1ef86134a143ae5a1 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 4da743d9e3..1e9b4de500 100644 --- a/drivers/net/mlx4/mlx4_mp.c +++ b/drivers/net/mlx4/mlx4_mp.c @@ -127,7 +127,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 @@ -145,6 +144,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); -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-10 14:04:59.410480383 +0200 +++ 0028-net-mlx4-fix-secondary-process-initialization-orderi.patch 2021-06-10 14:04:58.058024583 +0200 @@ -1 +1 @@ -From e5d94cf94e9d7c240e73b390c8c292fc9595f971 Mon Sep 17 00:00:00 2001 +From 8b700cbb8c888f2fd17c8ce1ef86134a143ae5a1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e5d94cf94e9d7c240e73b390c8c292fc9595f971 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index ddf7bdb9ef..8fcfb5490e 100644 +index 4da743d9e3..1e9b4de500 100644 @@ -23 +24 @@ -@@ -126,7 +126,6 @@ mp_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer) +@@ -127,7 +127,6 @@ mp_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer) @@ -31 +32 @@ -@@ -144,6 +143,7 @@ mp_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer) +@@ -145,6 +144,7 @@ mp_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer)