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 B28EFA0A02 for ; Mon, 17 May 2021 18:14:27 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AB67A4014E; Mon, 17 May 2021 18:14:27 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 116DC40041 for ; Mon, 17 May 2021 18:14:27 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifsw-00083p-RR; Mon, 17 May 2021 16:14:26 +0000 From: Christian Ehrhardt To: Chengwen Feng Cc: Min Hu , dpdk stable Date: Mon, 17 May 2021 18:08:45 +0200 Message-Id: <20210517161039.3132619-96-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: fix VF mailbox head field' 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 05/19/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/9b6a8b6a039f45673127bad73f759b6fca3fab61 Thanks. Christian Ehrhardt --- >From 9b6a8b6a039f45673127bad73f759b6fca3fab61 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Wed, 31 Mar 2021 18:01:41 +0800 Subject: [PATCH] net/hns3: fix VF mailbox head field [ upstream commit 38d5b71c27d6fd9324cbaeed972df382c2c7a34b ] Currently, the VF mailbox synchronization communication is based on three fields: head/tail/lost, when head equals tail plus lost, it means the response is received successfully. The head field indicates the number of requests that are successfully sent. If the request sending fails, it should not be updated. This patch fix the above bug by roll back updates when the sending fails. Fixes: 463e748964f5 ("net/hns3: support mailbox") Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_mbx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/hns3/hns3_mbx.c b/drivers/net/hns3/hns3_mbx.c index b7d0519131..3f97b8100b 100644 --- a/drivers/net/hns3/hns3_mbx.c +++ b/drivers/net/hns3/hns3_mbx.c @@ -184,6 +184,7 @@ hns3_send_mbx_msg(struct hns3_hw *hw, uint16_t code, uint16_t subcode, hw->mbx_resp.head++; ret = hns3_cmd_send(hw, &desc, 1); if (ret) { + hw->mbx_resp.head--; rte_spinlock_unlock(&hw->mbx_resp.lock); hns3_err(hw, "VF failed(=%d) to send mbx message to PF", ret); -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:33.250726646 +0200 +++ 0096-net-hns3-fix-VF-mailbox-head-field.patch 2021-05-17 17:40:29.303810514 +0200 @@ -1 +1 @@ -From 38d5b71c27d6fd9324cbaeed972df382c2c7a34b Mon Sep 17 00:00:00 2001 +From 9b6a8b6a039f45673127bad73f759b6fca3fab61 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 38d5b71c27d6fd9324cbaeed972df382c2c7a34b ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 499285d7c2..8ea8998ac7 100644 +index b7d0519131..3f97b8100b 100644 @@ -29 +30 @@ -@@ -142,6 +142,7 @@ hns3_send_mbx_msg(struct hns3_hw *hw, uint16_t code, uint16_t subcode, +@@ -184,6 +184,7 @@ hns3_send_mbx_msg(struct hns3_hw *hw, uint16_t code, uint16_t subcode,