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 91B54A0A02 for ; Mon, 17 May 2021 18:17:45 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 888ED40041; Mon, 17 May 2021 18:17:45 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id C1AB040041 for ; Mon, 17 May 2021 18:17:44 +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 1lifw8-00006T-JR; Mon, 17 May 2021 16:17:44 +0000 From: Christian Ehrhardt To: Chengwen Feng Cc: Min Hu , dpdk stable Date: Mon, 17 May 2021 18:10:12 +0200 Message-Id: <20210517161039.3132619-183-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: log time delta in decimal format' 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/d0709299d0f1be83e9898dec00fe948c63bafe29 Thanks. Christian Ehrhardt --- >From d0709299d0f1be83e9898dec00fe948c63bafe29 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Wed, 28 Apr 2021 15:20:52 +0800 Subject: [PATCH] net/hns3: log time delta in decimal format [ upstream commit c9a63bb64e79ab5fa6b5bd298df5b5695067d1e5 ] If the reset process cost too much time, driver will log one error message which formats the time delta, but the formatting is using hexadecimal which was not readable. This patch fixes it by formatting in decimal format. Fixes: 2790c6464725 ("net/hns3: support device reset") Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_ethdev.c | 2 +- drivers/net/hns3/hns3_ethdev_vf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index c0620bf6a9..87244b9bac 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -5369,7 +5369,7 @@ hns3_reset_service(void *param) msec = tv_delta.tv_sec * MSEC_PER_SEC + tv_delta.tv_usec / USEC_PER_MSEC; if (msec > HNS3_RESET_PROCESS_MS) - hns3_err(hw, "%d handle long time delta %" PRIx64 + hns3_err(hw, "%d handle long time delta %" PRIu64 " ms time=%ld.%.6ld", hw->reset.level, msec, tv.tv_sec, tv.tv_usec); diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index 35345d8f2e..f53a834fcc 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -2157,7 +2157,7 @@ hns3vf_reset_service(void *param) msec = tv_delta.tv_sec * MSEC_PER_SEC + tv_delta.tv_usec / USEC_PER_MSEC; if (msec > HNS3_RESET_PROCESS_MS) - hns3_err(hw, "%d handle long time delta %" PRIx64 + hns3_err(hw, "%d handle long time delta %" PRIu64 " ms time=%ld.%.6ld", hw->reset.level, msec, tv.tv_sec, tv.tv_usec); } -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:36.549323756 +0200 +++ 0183-net-hns3-log-time-delta-in-decimal-format.patch 2021-05-17 17:40:29.531812311 +0200 @@ -1 +1 @@ -From c9a63bb64e79ab5fa6b5bd298df5b5695067d1e5 Mon Sep 17 00:00:00 2001 +From d0709299d0f1be83e9898dec00fe948c63bafe29 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c9a63bb64e79ab5fa6b5bd298df5b5695067d1e5 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 973384bd3e..02637e497b 100644 +index c0620bf6a9..87244b9bac 100644 @@ -26 +27 @@ -@@ -6710,7 +6710,7 @@ hns3_reset_service(void *param) +@@ -5369,7 +5369,7 @@ hns3_reset_service(void *param) @@ -36 +37 @@ -index 74b90e214c..fcdf0e3e7b 100644 +index 35345d8f2e..f53a834fcc 100644 @@ -39 +40 @@ -@@ -2782,7 +2782,7 @@ hns3vf_reset_service(void *param) +@@ -2157,7 +2157,7 @@ hns3vf_reset_service(void *param)