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 62F6DA0C3F for ; Sat, 12 Jun 2021 01:09:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5CF834014F; Sat, 12 Jun 2021 01:09:56 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2062.outbound.protection.outlook.com [40.107.94.62]) by mails.dpdk.org (Postfix) with ESMTP id 7D7CE40E64 for ; Sat, 12 Jun 2021 01:09:54 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mPh+tKo2FotQwlCy8mmQYmwt1XdtgENryI6a0868nSJYOq9A8pL5LSzoua1udYfHwu037voIBoMxnTz29wlYIcRwPLNgk+tXi6MiZZd2I7wFJgeyhaqv0Vvt4e3mLvmZDEONOqn3Vw1r+Nij2PsHVkcrgg7SyOIxhLa0fft/OGYZgrtcoppq5Q69RGWJUZtR/aebmaaKnbsDBowE25cWQcRE+4famRtdNBtQYI34d9rSi19np3+HzyDJ4thZqiPpNi3JYIfkE+VXlLr75ZAl++Uedxd9EJLqTdsyMxmzcKWXhwQCEXBkQuqmNQZlck59V1Ybpi8g366dNlAYL40L8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kY9xISlmuRcF+ClHgX8zI3NYg/bZ0gP43/ypuoCsN4Q=; b=LQVQFmKFGCX95QVHFNWFPgcOxV8bOO4Bq662bWrzl3nBL7zW0RtWFRg4txGqgZJQx+qYPxnPMp1JNpJaoCix56l6MKJxKqmhjjbons0cMmiQJtVy7Ybrc6d0qCZ6nYFhhs9OwwHJEkAPlClzdVVkgb6lWgVTfadDapsCu78FelRNDmjvZNbiPPs3EH3wEQ/s+zXPr1U5SD+DxBsXoJ7UfUI0Gh1hE9B/E4nT0pPSz5DD+uBltc76U6X4sHjTC2qcusbKZiRvIOt8fc5vBDdSevqTyg7jkhq2p5EqSdPToxWcdLojMOU8Bz9jNvR+5vFpNgKsEFi+cDkmyeBMrT5k9Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kY9xISlmuRcF+ClHgX8zI3NYg/bZ0gP43/ypuoCsN4Q=; b=sy8/8neaFPUaTo2pJEK0obut5PQh5d1Ps2oRgOUNmIb54gWXiC9cn3sUwdi2cx1MdSvhzUQmpt9neOl2FnheE16u+DYvcWB00Jz2G+nAg2tyIKjb2H4WcMvPuad1/CCT6RWkydPzUrN1nDv00XE6eDegBTRaYNEKs+AzDFJGap3EqiGI9GrXPevo0NSaNRtYAdRvTtAn7dxlQyw98KTemDNIIShS2AdBBNEHLtC9gAjJonA5brv7rZRjyZOFubNdEeNmcmb6cqhJoijre+VAXEmXVhzh3sRX5q/6yZkXIITlwaAn5YIUHXBam5qbmGeDlB/suG+4sY6iEewqt7oehg== Received: from MW4PR03CA0167.namprd03.prod.outlook.com (2603:10b6:303:8d::22) by DM6PR12MB3401.namprd12.prod.outlook.com (2603:10b6:5:39::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.24; Fri, 11 Jun 2021 23:09:52 +0000 Received: from CO1NAM11FT008.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8d:cafe::4) by MW4PR03CA0167.outlook.office365.com (2603:10b6:303:8d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Fri, 11 Jun 2021 23:09:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; huawei.com; dkim=none (message not signed) header.d=none;huawei.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT008.mail.protection.outlook.com (10.13.175.191) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:09:51 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:09:50 +0000 From: Xueming Li To: Chengwen Feng CC: Luca Boccassi , Min Hu , dpdk stable Date: Sat, 12 Jun 2021 07:02:28 +0800 Message-ID: <20210611230433.8208-54-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7712c2ef-5e07-469f-3ccb-08d92d2e04b2 X-MS-TrafficTypeDiagnostic: DM6PR12MB3401: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GUTqeu7qvJiC/bdPLAZ0y/P66j23Fus8Cfvaoet3mGFRCDOsgbbJyyQD0KbFUr5Wq6c0xgEX8CiPlTHDYXLgnV5lSWRux2SWs4XMFmVzBcrw8oBjMFjnZPmOQOs7rRVwzfdgq6ORnfN/vwKsM331493/YbXTHcAYX1uHoU3+E36pIj1QRGLQnMevgTx/fICr4jPipMq/FGlnIq3VaeTqhk80Q6v7O4E0hePYsD/azxuQthmKAkV7YtmPTgDbVKcffFeAnnz9Qr42nBGgkZjB05Y2zRaW/z94EQDKG10VwXewwrUA+/WdVww7nFbCBougOqN76pCh/yGwc8zs9GybvsdF9tI8VZrEPvrSytyp8hgXYijGN/PAf6lmaX5ZQA74zeniX0gW5jC51Q4587EyPIqopt3J14j18pEo/cT7YT7n81ZsaYBEB/MqQHSVT+VnGAEvqFOuFktw8M+dtJGnm2VFK91ozbTuI9KxP5ODv5d4ldY0XVJFs8gBOBfqU0kBVzP0w4Kp1KjZCiF9PwHWDxDHzIVm59ncKpeW7jrNccwMYRaRtd39ogjPFALAr6RUbSsIG13PZJnvGzlJplyVTaeprUdINJYbzGgrkdgKgyRyMWvsjrymU2LuAKkW23g7TTnt2+V8dxXy41QVajm4y/gR3z9d8wRYgbKxmkbM1QCKCUoJHWV49+Tgze0qhknYkBS+dh6m4XLerDbfC/FRKTOfAELrsKsaTFugewG3Tm0cFXh7egJd+k2lR366BnbE1vRsFlOG8EiEoW7waf9aI5HLua2xuQwHio8VRDNMXw3QEkW3BsIVClMaLMP8Mjtb X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(346002)(136003)(396003)(39860400002)(376002)(36840700001)(46966006)(966005)(356005)(316002)(53546011)(478600001)(26005)(16526019)(86362001)(4326008)(7636003)(36756003)(6916009)(2906002)(82740400003)(186003)(55016002)(7696005)(54906003)(36906005)(70586007)(8676002)(1076003)(47076005)(426003)(5660300002)(2616005)(36860700001)(83380400001)(6666004)(82310400003)(336012)(6286002)(70206006)(8936002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:09:51.9121 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7712c2ef-5e07-469f-3ccb-08d92d2e04b2 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT008.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3401 Subject: [dpdk-stable] patch 'net/hns3: log time delta in decimal format' has been queued to stable release 20.11.2 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.2 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/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/589600a03af7071583d7a37b7cecdf2b6680048e Thanks. Xueming Li --- >From 589600a03af7071583d7a37b7cecdf2b6680048e 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 Cc: Luca Boccassi [ 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 40e4cfde31..a347533a94 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -5841,7 +5841,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 d2162158e6..20da418ba9 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -2633,7 +2633,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.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:58.049644300 +0800 +++ 0054-net-hns3-log-time-delta-in-decimal-format.patch 2021-06-12 06:53:56.270000000 +0800 @@ -1 +1 @@ -From c9a63bb64e79ab5fa6b5bd298df5b5695067d1e5 Mon Sep 17 00:00:00 2001 +From 589600a03af7071583d7a37b7cecdf2b6680048e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit c9a63bb64e79ab5fa6b5bd298df5b5695067d1e5 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 973384bd3e..02637e497b 100644 +index 40e4cfde31..a347533a94 100644 @@ -26 +28 @@ -@@ -6710,7 +6710,7 @@ hns3_reset_service(void *param) +@@ -5841,7 +5841,7 @@ hns3_reset_service(void *param) @@ -36 +38 @@ -index 74b90e214c..fcdf0e3e7b 100644 +index d2162158e6..20da418ba9 100644 @@ -39 +41 @@ -@@ -2782,7 +2782,7 @@ hns3vf_reset_service(void *param) +@@ -2633,7 +2633,7 @@ hns3vf_reset_service(void *param)