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 AD241A0C4C for ; Mon, 12 Jul 2021 15:13:11 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A701A40685; Mon, 12 Jul 2021 15:13:11 +0200 (CEST) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id E5D6E4119E for ; Mon, 12 Jul 2021 15:13:10 +0200 (CEST) Received: by mail-wr1-f50.google.com with SMTP id k4so19244192wrc.8 for ; Mon, 12 Jul 2021 06:13:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lBBDY69lQfZ1qYTWyAUaK3vvDWPZL8nxGI/sbYWXzBg=; b=RtSbiHLGO9nB7wh0Y/juYMU0s4sNFkXV61IUsE5+zC+No2+bWZ0d9BHcIKHRj61b8i iVbBzUvtw6BcCuy3j+osar50Oa+0HPL8eJWUTkunQe0Hg29qBnDXMAfTx3AZZNwSHXKb 6MWzn3hwe249nGaq442KDuwkVPxyY4s5tR/1GkZQGUaLhSyHDOML1m0N252+leFfX234 8PQouarnD5hy+E/jZup3KHdVlx2PeKCLOR9xqN3aADq/TE/Mk5iQCfwbOyqlLWZcAvh4 kzJwWkn5iR1LYZP8Kr9o1LGnbCPPFi+0jDgcRmLfIhSayFXlEx4hCm+w70LJWkjyNgqb McjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lBBDY69lQfZ1qYTWyAUaK3vvDWPZL8nxGI/sbYWXzBg=; b=SWrxVMribknvUP8Shacv3ypUlF7mSgIbIdvg67f1n+6/2Ob//x4kQDtg/YTVGL1P1p P7vmQo9bqwC2Z+JQEyyO6mcVIYoi1MLgG7rEb5fbVXag694e19dXbo7zxgi7KeiZFPZI MEQk4SUIQCORLEk14I5wy54zP5/U9GCp2w2cfU2NXmIiOIV6fnisWNt56zn5FZTRTrCm hfv0MUjAc7V31h9YSItUNgwXnNHRwx02lT7xMEQ5pcInwkYKWanDWFSQeJswqtHdxxKD 9wnY+d1EdR5fZyQ0QT6CiIkfI9GdEesXqMqGbiRRM0jgQkDHCLQAlwgrJhjSWDpKoL0f 27Fw== X-Gm-Message-State: AOAM532cmfBvXwvy1LSUqYusAWB/CcCirccrhGySEdP2UMAWe7ogSM/o kmKi+8SCRJAVse6W9X7UsII= X-Google-Smtp-Source: ABdhPJxDXdZp3eEYUFffSDhAN7qg1j34f8bGdJINoH+uFyezeIVP4nVrrQoH+C7VJJ7E8/Nx77NVeQ== X-Received: by 2002:adf:e101:: with SMTP id t1mr59285395wrz.215.1626095590766; Mon, 12 Jul 2021 06:13:10 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id 129sm5713427wmz.26.2021.07.12.06.13.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:13:10 -0700 (PDT) From: luca.boccassi@gmail.com To: Hongbo Zheng Cc: Min Hu , dpdk stable Date: Mon, 12 Jul 2021 14:04:55 +0100 Message-Id: <20210712130551.2462159-60-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: increase VF reset retry maximum' has been queued to stable release 20.11.3 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 20.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/6b38d23ef19a44cd42edb6344e42e5b0d3b91743 Thanks. Luca Boccassi --- >From 6b38d23ef19a44cd42edb6344e42e5b0d3b91743 Mon Sep 17 00:00:00 2001 From: Hongbo Zheng Date: Sun, 13 Jun 2021 10:31:51 +0800 Subject: [PATCH] net/hns3: increase VF reset retry maximum [ upstream commit b25987fa7e25b3ba852f9433d22761c006884205 ] When the device is very busy, VF reset may have to be retried many times to succeed, leading to the current max reset fail retry count not enough. Modify max reset fail retry count to 30 to enhance the reliability of reset function. Fixes: 2790c6464725 ("net/hns3: support device reset") Signed-off-by: Hongbo Zheng Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_intr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/hns3/hns3_intr.c b/drivers/net/hns3/hns3_intr.c index 0bba3abb84..0fa21e4824 100644 --- a/drivers/net/hns3/hns3_intr.c +++ b/drivers/net/hns3/hns3_intr.c @@ -1947,7 +1947,7 @@ hns3_clear_reset_level(struct hns3_hw *hw, uint64_t *levels) static bool hns3_reset_err_handle(struct hns3_adapter *hns) { -#define MAX_RESET_FAIL_CNT 5 +#define MAX_RESET_FAIL_CNT 30 struct hns3_hw *hw = &hns->hw; @@ -2041,7 +2041,7 @@ hns3_reset_pre(struct hns3_adapter *hns) static int hns3_reset_post(struct hns3_adapter *hns) { -#define TIMEOUT_RETRIES_CNT 5 +#define TIMEOUT_RETRIES_CNT 30 struct hns3_hw *hw = &hns->hw; struct timeval tv_delta; struct timeval tv; -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:39.782428215 +0100 +++ 0060-net-hns3-increase-VF-reset-retry-maximum.patch 2021-07-12 13:41:36.494122694 +0100 @@ -1 +1 @@ -From b25987fa7e25b3ba852f9433d22761c006884205 Mon Sep 17 00:00:00 2001 +From 6b38d23ef19a44cd42edb6344e42e5b0d3b91743 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b25987fa7e25b3ba852f9433d22761c006884205 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 6bdb17f622..0b307fdd1d 100644 +index 0bba3abb84..0fa21e4824 100644 @@ -26 +27 @@ -@@ -2582,7 +2582,7 @@ hns3_clear_reset_level(struct hns3_hw *hw, uint64_t *levels) +@@ -1947,7 +1947,7 @@ hns3_clear_reset_level(struct hns3_hw *hw, uint64_t *levels) @@ -35 +36 @@ -@@ -2676,7 +2676,7 @@ hns3_reset_pre(struct hns3_adapter *hns) +@@ -2041,7 +2041,7 @@ hns3_reset_pre(struct hns3_adapter *hns)