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 7A336A0C3F for ; Sat, 12 Jun 2021 01:11:17 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6FC544003F; Sat, 12 Jun 2021 01:11:17 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2049.outbound.protection.outlook.com [40.107.94.49]) by mails.dpdk.org (Postfix) with ESMTP id A00AF4003F for ; Sat, 12 Jun 2021 01:11:15 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CQyL5xZT+NCJEnbHfEq3q+Y+lghsLiv1YEc+JEhckfAsa8u6yS7JVnxH34HFqXkbeXs9lqhyHLxTBXorAtkjq9qJ+8gXpiONcKDIRVj/CXhtqbVXXFbsl/p9GzSc/PjyS80zY0e8zhyl8W5W5kKCFdLYNZpuD31qQsFtYyxx2Dm4FK6D37Ya2OwvacRnFoRsQygvSqtB5lhhYWvlVD8hafgVdsHCMNZx37xwpN7oi6Rm6yVaRbIhoxnRgc3tT+znJB+fH/rc4Y7/QpdGbRFgcD+yKK8SGqXqINbWP+0qRox5Kbjzs0OBZbfefQ3HJb84N8FMAZPwFoaGvszAqhjZGQ== 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=oVnUOQZTctPOCvef/1cuZAcIJXXEnSR5axExKz1BOLI=; b=NcelSf65gaKAngw+uG/lUQQfbSAtrpp60aXM+WWNiWuUgrMFkekNehvSqpIYj3rK5wZ+ONJ6iaczNCsehw3lnPgcpAd69krUfEmTg3xc7Kc1qrTXquyd4H2nHnz0e4H01IO2qL1J3iaE+/C0KjyvqQhq/r7WgR5Ht+CiZhHGQVNRFHu0iWUfVebBsyl6KFBqOz/q1O/FVSNXrXmSnaTeSRjE+9Q1bi4+48wOW8RMZIb2ptSl25Fusp4nwf3RM/0xC0YGSifQ8T15Gk7qVK0E83b4I59p+9W9vy17xBRWnFDaORpH6x6i/uNKmwriRBu9z5S/ioRXk4lrDB3bK/U9Ew== 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=oVnUOQZTctPOCvef/1cuZAcIJXXEnSR5axExKz1BOLI=; b=pCdwPXLMWVJ+jk+cpWe9QsyFWwB75OHqKV40+mWCn+z5vJMD0uJI9mvd8y95sCsL6i1YR53BU9pzkTM4oirH0p79yaIlIj6WpEtkA3OEWZEPwOhoOqGtiDbuotb9aJkN7wlrEXqtPsrn3atEF6ADZ9ov2WysANAlJlKPm+uO/ulzD+FtX3g0wDEU4ex16IdJJucO0j19S1HSWm87z5Ezd/PksLlt2Kmi5wyZIt6pSJE7VmrcE0+sInPg4+TuSe2g+MLpr33v4cqjzJp753z5CYFCXd+JXosJTLXniY0EfVlpWrlFhN1UNOZSJqXCeOidL8Br5xa9FrGd/Yydt5Akvg== Received: from CO2PR04CA0159.namprd04.prod.outlook.com (2603:10b6:104:4::13) by MW2PR12MB2490.namprd12.prod.outlook.com (2603:10b6:907:9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.22; Fri, 11 Jun 2021 23:11:11 +0000 Received: from CO1NAM11FT064.eop-nam11.prod.protection.outlook.com (2603:10b6:104:4:cafe::7c) by CO2PR04CA0159.outlook.office365.com (2603:10b6:104:4::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:11:11 +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 CO1NAM11FT064.mail.protection.outlook.com (10.13.175.77) 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:11:11 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:11:09 +0000 From: Xueming Li To: Chengwen Feng CC: Luca Boccassi , Min Hu , dpdk stable Date: Sat, 12 Jun 2021 07:02:40 +0800 Message-ID: <20210611230433.8208-66-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.5] 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: 4fc47ed6-bf01-4992-7bad-08d92d2e342d X-MS-TrafficTypeDiagnostic: MW2PR12MB2490: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2887; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: faYW/mTSxZBUtHzJ8ltJ43UxgVfliNuQQUD56iVbsVj0F7IQBEJQYlz9P+j431BVtFZB8LnKh8J9ftyIZqldmaSnHjTrLYD7hMKkbAJ9lGC2bMC4du3cNWG+VQIB2M0LN38vYI7FMSJVlGg1/DLcGgL/BJBEoKN59WjiS5a6Z7wTlYOoY18GtTU9qDswIPpRaz9swSQYZy4NDoZWWhPZTm8JyzbVKqjWciveexYDdPVQ2H4Vhh82RyMkOMIW1vZvFZ5DDatGCWcFvlSWk0hQC01l4Af85XQiDyy3fy58GalPCGHLDdsw3yDuRLAuGD27GLlXi6vorvx6zYPoNA56ZOMOFkYCAo5C7pO88/acQTm/FvIUkN4TVqVZCD0ZBtWetgjqzvtnWPrtI+ExdyXpJqRBRqt8EDc+obWC+RaCHEAVUzA9/SdMnn6OE4edkjXfCdjiNGxgtHCXTkSN3OkcVnsDpft/dr1Gb/Ir5woCkDYjvvYJqtnqIEFE0i69AGgposCaO2auNrMGOKPoyQIgjBdDhK6iNbGlKGwxz+3rst35qIAOXK23VXzZwjVIRQJva/OdPGny5YQmMOirGZEaRftQ50mGutmAolr1tVuMw6kJVe/4LA5M9Jr9HBHnHwB8mQO8Sh1EP0NXRi35TAOBKbJOtoiEVUVsido3pToBzEBKz8c4OzcqtPhvtjVRC3Z6ekC6Mz13ppAswUAQG1vmhC8kRiXVPBX5TpJsiJEYtz5P4XNsCjAabJfAtgDl1CXlgRGWAVzsWJvTGQtyf3K4jquCZoflh8/DzGXyRczFbvEbs9DAa9wNrHHEUIP5mutA 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)(396003)(376002)(39860400002)(346002)(136003)(46966006)(36840700001)(6666004)(336012)(36756003)(4326008)(478600001)(36906005)(7636003)(86362001)(2616005)(356005)(47076005)(53546011)(7696005)(82740400003)(5660300002)(16526019)(316002)(82310400003)(186003)(6916009)(8676002)(55016002)(26005)(54906003)(1076003)(36860700001)(966005)(6286002)(70206006)(2906002)(83380400001)(70586007)(8936002)(426003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:11:11.5548 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4fc47ed6-bf01-4992-7bad-08d92d2e342d 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: CO1NAM11FT064.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR12MB2490 Subject: [dpdk-stable] patch 'net/hns3: increase readability in logs' 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/8e6d9cfe2d140f2bb92412f36777ee308d1bbf01 Thanks. Xueming Li --- >From 8e6d9cfe2d140f2bb92412f36777ee308d1bbf01 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 30 Apr 2021 17:04:04 +0800 Subject: [PATCH] net/hns3: increase readability in logs Cc: Luca Boccassi [ upstream commit b80c527a9ca4b8aa5ed1d8fba4e7882213883485 ] Some logs format u64 variables, mostly using hexadecimal which was not readable. This patch formats most u64 variables in decimal, and add '0x' prefix to the ones that are not adjusted. Fixes: c37ca66f2b27 ("net/hns3: support RSS") Fixes: 2790c6464725 ("net/hns3: support device reset") Fixes: 8839c5e202f3 ("net/hns3: support device stats") Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_flow.c | 2 +- drivers/net/hns3/hns3_intr.c | 20 ++++++++++---------- drivers/net/hns3/hns3_stats.c | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c index 026f376a55..9087268712 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -1572,7 +1572,7 @@ hns3_config_rss_filter(struct rte_eth_dev *dev, hw->rss_info.conf.types; if (flow_types != rss_flow_conf.types) hns3_warn(hw, "modified RSS types based on hardware support, " - "requested:%" PRIx64 " configured:%" PRIx64, + "requested:0x%" PRIx64 " configured:0x%" PRIx64, rss_flow_conf.types, flow_types); /* Update the useful flow types */ rss_flow_conf.types = flow_types; diff --git a/drivers/net/hns3/hns3_intr.c b/drivers/net/hns3/hns3_intr.c index 4da197f940..b133670be0 100644 --- a/drivers/net/hns3/hns3_intr.c +++ b/drivers/net/hns3/hns3_intr.c @@ -1934,7 +1934,7 @@ hns3_clear_reset_level(struct hns3_hw *hw, uint64_t *levels) if (merge_cnt != hw->reset.stats.merge_cnt) hns3_warn(hw, "No need to do low-level reset after %s reset. " - "merge cnt: %" PRIx64 " total merge cnt: %" PRIx64, + "merge cnt: %" PRIu64 " total merge cnt: %" PRIu64, reset_string[hw->reset.level], hw->reset.stats.merge_cnt - merge_cnt, hw->reset.stats.merge_cnt); @@ -1954,7 +1954,7 @@ hns3_reset_err_handle(struct hns3_adapter *hns) hw->reset.attempts = 0; hw->reset.stats.fail_cnt++; hns3_warn(hw, "%s reset fail because new Reset is pending " - "attempts:%" PRIx64, + "attempts:%" PRIu64, reset_string[hw->reset.level], hw->reset.stats.fail_cnt); hw->reset.level = HNS3_NONE_RESET; @@ -1981,10 +1981,10 @@ hns3_reset_err_handle(struct hns3_adapter *hns) reset_fail: hw->reset.attempts = 0; hw->reset.stats.fail_cnt++; - hns3_warn(hw, "%s reset fail fail_cnt:%" PRIx64 " success_cnt:%" PRIx64 - " global_cnt:%" PRIx64 " imp_cnt:%" PRIx64 - " request_cnt:%" PRIx64 " exec_cnt:%" PRIx64 - " merge_cnt:%" PRIx64 "adapter_state:%d", + hns3_warn(hw, "%s reset fail fail_cnt:%" PRIu64 " success_cnt:%" PRIu64 + " global_cnt:%" PRIu64 " imp_cnt:%" PRIu64 + " request_cnt:%" PRIu64 " exec_cnt:%" PRIu64 + " merge_cnt:%" PRIu64 "adapter_state:%d", reset_string[hw->reset.level], hw->reset.stats.fail_cnt, hw->reset.stats.success_cnt, hw->reset.stats.global_cnt, hw->reset.stats.imp_cnt, hw->reset.stats.request_cnt, @@ -2100,10 +2100,10 @@ hns3_reset_post(struct hns3_adapter *hns) rte_spinlock_unlock(&hw->lock); hns3_clock_gettime(&tv); timersub(&tv, &hw->reset.start_time, &tv_delta); - hns3_warn(hw, "%s reset done fail_cnt:%" PRIx64 - " success_cnt:%" PRIx64 " global_cnt:%" PRIx64 - " imp_cnt:%" PRIx64 " request_cnt:%" PRIx64 - " exec_cnt:%" PRIx64 " merge_cnt:%" PRIx64, + hns3_warn(hw, "%s reset done fail_cnt:%" PRIu64 + " success_cnt:%" PRIu64 " global_cnt:%" PRIu64 + " imp_cnt:%" PRIu64 " request_cnt:%" PRIu64 + " exec_cnt:%" PRIu64 " merge_cnt:%" PRIu64, reset_string[hw->reset.level], hw->reset.stats.fail_cnt, hw->reset.stats.success_cnt, hw->reset.stats.global_cnt, hw->reset.stats.imp_cnt, diff --git a/drivers/net/hns3/hns3_stats.c b/drivers/net/hns3/hns3_stats.c index 5b7b0c2f10..7fbdce9a1f 100644 --- a/drivers/net/hns3/hns3_stats.c +++ b/drivers/net/hns3/hns3_stats.c @@ -943,7 +943,7 @@ hns3_dev_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids, len = cnt_stats * sizeof(struct rte_eth_xstat); values_copy = rte_zmalloc("hns3_xstats_values", len, 0); if (values_copy == NULL) { - hns3_err(hw, "Failed to allocate %" PRIx64 " bytes needed " + hns3_err(hw, "Failed to allocate 0x%" PRIx64 " bytes needed " "to store statistics values", len); return -ENOMEM; } @@ -965,7 +965,7 @@ hns3_dev_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids, for (i = 0; i < size; i++) { if (ids[i] >= cnt_stats) { - hns3_err(hw, "ids[%u] (%" PRIx64 ") is invalid, " + hns3_err(hw, "ids[%u] (%" PRIu64 ") is invalid, " "should < %u", i, ids[i], cnt_stats); rte_free(values_copy); return -EINVAL; @@ -1024,7 +1024,7 @@ hns3_dev_xstats_get_names_by_id(struct rte_eth_dev *dev, len = cnt_stats * sizeof(struct rte_eth_xstat_name); names_copy = rte_zmalloc("hns3_xstats_names", len, 0); if (names_copy == NULL) { - hns3_err(hw, "Failed to allocate %" PRIx64 " bytes needed " + hns3_err(hw, "Failed to allocate 0x%" PRIx64 " bytes needed " "to store statistics names", len); return -ENOMEM; } @@ -1033,7 +1033,7 @@ hns3_dev_xstats_get_names_by_id(struct rte_eth_dev *dev, for (i = 0; i < size; i++) { if (ids[i] >= cnt_stats) { - hns3_err(hw, "ids[%u] (%" PRIx64 ") is invalid, " + hns3_err(hw, "ids[%u] (%" PRIu64 ") is invalid, " "should < %u", i, ids[i], cnt_stats); rte_free(names_copy); return -EINVAL; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:58.331476100 +0800 +++ 0066-net-hns3-increase-readability-in-logs.patch 2021-06-12 06:53:56.320000000 +0800 @@ -1 +1 @@ -From b80c527a9ca4b8aa5ed1d8fba4e7882213883485 Mon Sep 17 00:00:00 2001 +From 8e6d9cfe2d140f2bb92412f36777ee308d1bbf01 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit b80c527a9ca4b8aa5ed1d8fba4e7882213883485 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index 49d6568b22..65c7f6ed88 100644 +index 026f376a55..9087268712 100644 @@ -28 +30 @@ -@@ -1556,7 +1556,7 @@ hns3_config_rss_filter(struct rte_eth_dev *dev, +@@ -1572,7 +1572,7 @@ hns3_config_rss_filter(struct rte_eth_dev *dev, @@ -38 +40 @@ -index 62e89a960b..905c6d9513 100644 +index 4da197f940..b133670be0 100644 @@ -41 +43 @@ -@@ -2570,7 +2570,7 @@ hns3_clear_reset_level(struct hns3_hw *hw, uint64_t *levels) +@@ -1934,7 +1934,7 @@ hns3_clear_reset_level(struct hns3_hw *hw, uint64_t *levels) @@ -50 +52 @@ -@@ -2590,7 +2590,7 @@ hns3_reset_err_handle(struct hns3_adapter *hns) +@@ -1954,7 +1954,7 @@ hns3_reset_err_handle(struct hns3_adapter *hns) @@ -59 +61 @@ -@@ -2617,10 +2617,10 @@ hns3_reset_err_handle(struct hns3_adapter *hns) +@@ -1981,10 +1981,10 @@ hns3_reset_err_handle(struct hns3_adapter *hns) @@ -74 +76 @@ -@@ -2736,10 +2736,10 @@ hns3_reset_post(struct hns3_adapter *hns) +@@ -2100,10 +2100,10 @@ hns3_reset_post(struct hns3_adapter *hns) @@ -90 +92 @@ -index 3afef4a04b..e09dc0da80 100644 +index 5b7b0c2f10..7fbdce9a1f 100644 @@ -93 +95 @@ -@@ -1325,7 +1325,7 @@ hns3_dev_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids, +@@ -943,7 +943,7 @@ hns3_dev_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids, @@ -102 +104 @@ -@@ -1347,7 +1347,7 @@ hns3_dev_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids, +@@ -965,7 +965,7 @@ hns3_dev_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids, @@ -111 +113 @@ -@@ -1406,7 +1406,7 @@ hns3_dev_xstats_get_names_by_id(struct rte_eth_dev *dev, +@@ -1024,7 +1024,7 @@ hns3_dev_xstats_get_names_by_id(struct rte_eth_dev *dev, @@ -120 +122 @@ -@@ -1415,7 +1415,7 @@ hns3_dev_xstats_get_names_by_id(struct rte_eth_dev *dev, +@@ -1033,7 +1033,7 @@ hns3_dev_xstats_get_names_by_id(struct rte_eth_dev *dev,