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 5805AA0C47 for ; Tue, 10 Aug 2021 17:41:58 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5225B4014F; Tue, 10 Aug 2021 17:41:58 +0200 (CEST) Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) by mails.dpdk.org (Postfix) with ESMTP id EBE594114F for ; Tue, 10 Aug 2021 17:41:56 +0200 (CEST) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPS id D0FA03F0A1 for ; Tue, 10 Aug 2021 15:41:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610116; bh=+Gmj1/YVlAGjuxL4U2qJJYa8AwFyGz3OJs6RCg4AsY8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Xaaili2YttEsxfMr1+BOYL/1RVm3AiQch3H0q8Eeo39x9Jtv0tJRsyAEP9Jfa16pI qtyt8vHCLEqCy0955wsQosio1hpVVX1NYcwM4sWP1bLMZ96qsaal7k8TRzxN6xjlcm cl++27B+F3SQ90cbryB1xsanHfVnERgqpm8TQMugyR6duYnKHbLGBizryKK6JNHqrz y3LFnkEJfDhwfqD1lhTco76gCD2PXqFg0BP+Jj/Zru+EdUxEh7cXLYcL8TOeZGdv6C d43bIZJHI955gDcZqrOk0iLfEaiA4J4e5Olm//kWP1KDpdhnCv665T0Eyxw1+YYDc5 PMxGiFE9XtjWw== Received: by mail-ed1-f71.google.com with SMTP id d12-20020a50fe8c0000b02903a4b519b413so10950762edt.9 for ; Tue, 10 Aug 2021 08:41:56 -0700 (PDT) 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=+Gmj1/YVlAGjuxL4U2qJJYa8AwFyGz3OJs6RCg4AsY8=; b=j/PagzIBJ86Zaq+CVKNrJfMV+pvw3UvcUxxdf7F8t7ZlZ0OPbI/6SIzTB7MoUkuyE+ 6h5T1Oe+/dwUsi02VgFoyBRLkxehXKO6soxhUFBHEOwtVQ07F11fCrTeR6GXeV3Lb0xa AtehINg9E17Ptfdi6qDFUS6btYag1xYxezvxOYuhWboh7r95EBla+fybRWaH1taC/74k VpAX/dRh3g8HoPwvzC+cT2wUB3pST1t4/HDCR5zEbF5SZtt/DYeNmWPL5qs/spvSuC3I 2rQCFORn4x48y/4wVV4MN5NH6l2QGEW4y2CO0+ZQbe3Hb+em5XK5ZAeyXmal1fu3aUlZ M7lA== X-Gm-Message-State: AOAM5306D87XXWO990FoQ9hWeYmbiPCUeRzDF9CXLKXk0MGeCBgafEZu Rkix2AwV1CJsB49dyjUlzCytCz7KNWQy7+aagb7P3TejRP2FG6dattJ+ikVQrdFT1rftU5zXR3M 3oxiPyAPtlLKplHB/KI/EjQr7 X-Received: by 2002:a05:6402:5:: with SMTP id d5mr5519558edu.359.1628610116150; Tue, 10 Aug 2021 08:41:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxCA9Km7i5EclAuLYtfgK1D25v174vCkzpqsT/Wde8jxdvUMHQ8FPiy0LGRmcxQA5lq2yqtFw== X-Received: by 2002:a05:6402:5:: with SMTP id d5mr5519541edu.359.1628610115988; Tue, 10 Aug 2021 08:41:55 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id f20sm6969858ejz.30.2021.08.10.08.41.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:41:55 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Hongbo Zheng Cc: Min Hu , dpdk stable Date: Tue, 10 Aug 2021 17:39:10 +0200 Message-Id: <20210810154022.749358-30-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.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 19.11.10 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.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/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/ba81e4b31721957e9140494f7ccc4149962de6d5 Thanks. Christian Ehrhardt --- >From ba81e4b31721957e9140494f7ccc4149962de6d5 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 3c754cccd2..44038788fc 100644 --- a/drivers/net/hns3/hns3_intr.c +++ b/drivers/net/hns3/hns3_intr.c @@ -855,7 +855,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; @@ -949,7 +949,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.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:14.228618741 +0200 +++ 0030-net-hns3-increase-VF-reset-retry-maximum.patch 2021-08-10 15:11:12.954637638 +0200 @@ -1 +1 @@ -From b25987fa7e25b3ba852f9433d22761c006884205 Mon Sep 17 00:00:00 2001 +From ba81e4b31721957e9140494f7ccc4149962de6d5 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 3c754cccd2..44038788fc 100644 @@ -26 +27 @@ -@@ -2582,7 +2582,7 @@ hns3_clear_reset_level(struct hns3_hw *hw, uint64_t *levels) +@@ -855,7 +855,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) +@@ -949,7 +949,7 @@ hns3_reset_pre(struct hns3_adapter *hns)