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 2ADF9431D5 for ; Sun, 22 Oct 2023 16:24:27 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1DE76402F1; Sun, 22 Oct 2023 16:24:27 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2046.outbound.protection.outlook.com [40.107.237.46]) by mails.dpdk.org (Postfix) with ESMTP id 49898402E9 for ; Sun, 22 Oct 2023 16:24:25 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F0qY3lGFinofqc2iy3iK1rfQTnWZoBjmWSvZn9c5hu5+76RF9S1+N96F0g/93y4JMDo04A7v/3QfAZDZwhm/dSFS1E+1WlJHPUQMc6dmpImHDi8NRAqIWaE8mF9zVIFLaTP77umA/oy2urf3LfSjQ8nXixR/DX5/d2rY8i4tnsN54NQh7rKRqTlOCPiI+er9VBjInpcXg60T2fPJWxhxHXxRL10N8hmzTYQPxTJi9GHYffyQaVxpCmciXk/895sOS2grqJM6P5GQcjO/3dVGUU48d2TzuDe0H9OkEGXYPqcUc+Q2tNT9DE11d4tT9V7MVZcjWn7uXv6+R5q3fv+S5A== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BTXYGmZMkrSmo92ZK7JxX8jR/FPRlLo8FxxS23vWKIE=; b=nAxISKQvw1dmvUGHzXumUyr1CmfiwVvWHZTtQghgQBT/QglWOKCmCRvgdjYJKIe6NWS8YQ3JJN/YYBctpNY/SxHbBCXYMmVtdH3kqlUnpLpGxAaNOQWe7GfjgfGLVl5lX2HzpjViWtrZST5QG6wihmobjq+HWzc8AlE7XMSHxhQ8VxxTsDauMRYH2jkDNpu/k+sh9Ii1RWtoiBR4Xfknbp4GqHmUZ8TBsNJtmQqhnGWJfgYkgkJmBCZ74RXas8cznZRYK7bbSeBneE3apsCoODh/U/SrPqi2vCuv5jjAfOAZ/zqSyEf/i0Wyf0SCTD59r07qodxUaSVH8XYi7r+aew== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=BTXYGmZMkrSmo92ZK7JxX8jR/FPRlLo8FxxS23vWKIE=; b=sCQYBRyJ5WiRW2erENlq2JfXCrP2HCztcvAApsaFg6f00V1nSdRmHiwZh33vOWXlZ+NEMjrr2dLP3Eb1Iv6SBizwEYUi5KMTlCQtmn7z6s1M80HgnnOZ2DINiigkGaJSTGUVnlsZL/dGwnY/YwZRr390cRByq/png5siZfDi7k9XyESSwkBqhRr7axoW6L+Fjm8p7E2kq192IVlMhCq7jWyB4rCpeu9rwH04PyG2/PqmsoDw9s1hXku/LFYCBQTFLndrzJ6jheuxAztewb9LIAHY/QYNEoFw/IZoUi9i13Q8RGF5ixxygyFh3tmStqIsU5M3+RGrXJbWDgwTL8KTgg== Received: from MW4PR04CA0120.namprd04.prod.outlook.com (2603:10b6:303:83::35) by SJ2PR12MB8157.namprd12.prod.outlook.com (2603:10b6:a03:4fa::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.36; Sun, 22 Oct 2023 14:24:23 +0000 Received: from CO1PEPF000044EF.namprd05.prod.outlook.com (2603:10b6:303:83:cafe::57) by MW4PR04CA0120.outlook.office365.com (2603:10b6:303:83::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33 via Frontend Transport; Sun, 22 Oct 2023 14:24:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1PEPF000044EF.mail.protection.outlook.com (10.167.241.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:24:22 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:24:08 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:24:06 -0700 From: Xueming Li To: Chengwen Feng CC: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix traffic management dump text alignment' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:20:43 +0800 Message-ID: <20231022142250.10324-15-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044EF:EE_|SJ2PR12MB8157:EE_ X-MS-Office365-Filtering-Correlation-Id: 7ef82c75-a4c0-4d65-409d-08dbd30a9653 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SuGgrUepBPzL4jkrhN7P+sXLCKqk2t5zM+3a4x2SvgQVXQOJ7dQarX9PPxVPxfxnVZ6HNMBmS/qHeW4r7D9ks2cLqowzNRqzgkufqypjWpY99Ht6tRBmSMsRt7iLdtUjwYxzxXJDhtUqEAc50B5DynbeAFitDzh0Zr4yYez9pTc38GrUlFc7/ITI3tI5dD7c3Sg6tU1hWQ5pVxUC/EYeozI3hknq4Sk45XSJwDHbElUoXFTsqPCX/oA1dWuVD3abiiyX5LaECQD8DEcTtEFs/bndfFXEoDwYrC04czNZ3ShbE5duzzoSQr/toHUWMoa4yh4ht9uWx/tIytS87VX5XAQ+RdazGEHibtb/NU49ca3B/O22F1ASb+wzOrnXR6THQgcdygaoroHyMvpFGOCY7Lp4DdqJYkev5M/afCp/iaTACT2Kc81DSbvSDHsZEGFceFha0SpSFxPWLmtVhqlz9aO8GRJ1AdDz8HjHAI+noZ2mkA14nffUAh9pYfi6k67ziGkLMAGljakBvtFWz2tzGqqO85eqW3EDxZYBjnPaibTv+IJQFmKdezcXRPVyPAC2azraVKFoHhnB3Ll9XSH7hNwUt0gzTmBRST9+NWMD1PdFHxqyuTrjDVSxpfueUVA6rGIUbCUXRg8Db0ush0dAB2xFbBkzir4qqj/bD44aKBaT37S64gYmxdDARG+vtcoNtoqS8WYI0scLJv0cvJ9bJzvTrfenC2tkEDFV+6IsXUIJvoXROX+C+LnD/mQXEmC514EPo/nXs5da6odc9uWNkWqs4OZoveGOWcGAJFQmobM= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(39860400002)(136003)(396003)(346002)(376002)(230922051799003)(82310400011)(1800799009)(451199024)(64100799003)(186009)(40470700004)(46966006)(36840700001)(356005)(7636003)(82740400003)(40460700003)(8936002)(4326008)(8676002)(55016003)(41300700001)(5660300002)(86362001)(2906002)(4001150100001)(40480700001)(70206006)(7696005)(53546011)(966005)(47076005)(478600001)(6666004)(336012)(426003)(16526019)(36756003)(6286002)(83380400001)(54906003)(26005)(2616005)(70586007)(1076003)(6916009)(36860700001)(316002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:24:22.6822 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7ef82c75-a4c0-4d65-409d-08dbd30a9653 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044EF.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8157 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 Hi, FYI, your patch has been queued to stable release 22.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/15/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=2dec2783a04cdeceaa01c04b85ba73d7f79d46f9 Thanks. Xueming Li --- >From 2dec2783a04cdeceaa01c04b85ba73d7f79d46f9 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Sat, 5 Aug 2023 16:36:27 +0800 Subject: [PATCH] net/hns3: fix traffic management dump text alignment Cc: Xueming Li [ upstream commit a73065bfea87385aa86d8ec2e7b65f68494c4f06 ] Currently the dumped TM info is un-align, which are: - TM config info: -- nb_leaf_nodes_max=64 nb_nodes_max=73 -- nb_shaper_profile=2 nb_tc_node=1 nb_queue_node=1 -- committed=0 shaper_profile: id=800 reference_count=1 peak_rate=4000000Bps id=801 reference_count=1 peak_rate=12000000Bps port_node: ... This patch fix it, the new formatting: - TM config info: -- nb_leaf_nodes_max=256 nb_nodes_max=265 -- nb_shaper_profile=2 nb_tc_node=1 nb_queue_node=1 -- committed=1 -- shaper_profile: id=800 reference_count=0 peak_rate=4000000Bps id=801 reference_count=0 peak_rate=12000000Bps -- port_node: ... Fixes: e4cfe6bb9114 ("net/hns3: dump TM configuration info") Signed-off-by: Chengwen Feng Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_dump.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/net/hns3/hns3_dump.c b/drivers/net/hns3/hns3_dump.c index 4cee779a78..e3dbc5ea27 100644 --- a/drivers/net/hns3/hns3_dump.c +++ b/drivers/net/hns3/hns3_dump.c @@ -660,10 +660,10 @@ hns3_get_tm_conf_shaper_info(FILE *file, struct hns3_tm_conf *conf) if (conf->nb_shaper_profile == 0) return; - fprintf(file, " shaper_profile:\n"); + fprintf(file, "\t -- shaper_profile:\n"); TAILQ_FOREACH(shaper_profile, shaper_profile_list, node) { fprintf(file, - " id=%u reference_count=%u peak_rate=%" PRIu64 "Bps\n", + "\t id=%u reference_count=%u peak_rate=%" PRIu64 "Bps\n", shaper_profile->shaper_profile_id, shaper_profile->reference_count, shaper_profile->profile.peak.rate); @@ -677,8 +677,8 @@ hns3_get_tm_conf_port_node_info(FILE *file, struct hns3_tm_conf *conf) return; fprintf(file, - " port_node:\n" - " node_id=%u reference_count=%u shaper_profile_id=%d\n", + "\t -- port_node:\n" + "\t node_id=%u reference_count=%u shaper_profile_id=%d\n", conf->root->id, conf->root->reference_count, conf->root->shaper_profile ? (int)conf->root->shaper_profile->shaper_profile_id : -1); @@ -695,7 +695,7 @@ hns3_get_tm_conf_tc_node_info(FILE *file, struct hns3_tm_conf *conf) if (conf->nb_tc_node == 0) return; - fprintf(file, " tc_node:\n"); + fprintf(file, "\t -- tc_node:\n"); memset(tc_node, 0, sizeof(tc_node)); TAILQ_FOREACH(tm_node, tc_list, node) { tidx = hns3_tm_calc_node_tc_no(conf, tm_node->id); @@ -708,7 +708,7 @@ hns3_get_tm_conf_tc_node_info(FILE *file, struct hns3_tm_conf *conf) if (tm_node == NULL) continue; fprintf(file, - " id=%u TC%u reference_count=%u parent_id=%d " + "\t id=%u TC%u reference_count=%u parent_id=%d " "shaper_profile_id=%d\n", tm_node->id, hns3_tm_calc_node_tc_no(conf, tm_node->id), tm_node->reference_count, @@ -734,7 +734,7 @@ hns3_get_tm_conf_queue_format_info(FILE *file, struct hns3_tm_node **queue_node, end_queue_id = (i + 1) * HNS3_PERLINE_QUEUES - 1; if (end_queue_id > nb_tx_queues - 1) end_queue_id = nb_tx_queues - 1; - fprintf(file, " %04u - %04u | ", start_queue_id, + fprintf(file, "\t %04u - %04u | ", start_queue_id, end_queue_id); for (j = start_queue_id; j < nb_tx_queues; j++) { if (j >= end_queue_id + 1) @@ -763,8 +763,8 @@ hns3_get_tm_conf_queue_node_info(FILE *file, struct hns3_tm_conf *conf, return; fprintf(file, - " queue_node:\n" - " tx queue id | mapped tc (8 mean node not exist)\n"); + "\t -- queue_node:\n" + "\t tx queue id | mapped tc (8 mean node not exist)\n"); memset(queue_node, 0, sizeof(queue_node)); memset(queue_node_tc, 0, sizeof(queue_node_tc)); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:34.979383700 +0800 +++ 0014-net-hns3-fix-traffic-management-dump-text-alignment.patch 2023-10-22 22:17:34.146723700 +0800 @@ -1 +1 @@ -From a73065bfea87385aa86d8ec2e7b65f68494c4f06 Mon Sep 17 00:00:00 2001 +From 2dec2783a04cdeceaa01c04b85ba73d7f79d46f9 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit a73065bfea87385aa86d8ec2e7b65f68494c4f06 ] @@ -29 +31,0 @@ -Cc: stable@dpdk.org @@ -38 +40 @@ -index 67b45e6dc3..5c21ff0a33 100644 +index 4cee779a78..e3dbc5ea27 100644 @@ -41 +43 @@ -@@ -664,10 +664,10 @@ hns3_get_tm_conf_shaper_info(FILE *file, struct hns3_tm_conf *conf) +@@ -660,10 +660,10 @@ hns3_get_tm_conf_shaper_info(FILE *file, struct hns3_tm_conf *conf) @@ -54 +56 @@ -@@ -681,8 +681,8 @@ hns3_get_tm_conf_port_node_info(FILE *file, struct hns3_tm_conf *conf) +@@ -677,8 +677,8 @@ hns3_get_tm_conf_port_node_info(FILE *file, struct hns3_tm_conf *conf) @@ -65 +67 @@ -@@ -699,7 +699,7 @@ hns3_get_tm_conf_tc_node_info(FILE *file, struct hns3_tm_conf *conf) +@@ -695,7 +695,7 @@ hns3_get_tm_conf_tc_node_info(FILE *file, struct hns3_tm_conf *conf) @@ -74 +76 @@ -@@ -712,7 +712,7 @@ hns3_get_tm_conf_tc_node_info(FILE *file, struct hns3_tm_conf *conf) +@@ -708,7 +708,7 @@ hns3_get_tm_conf_tc_node_info(FILE *file, struct hns3_tm_conf *conf) @@ -83 +85 @@ -@@ -738,7 +738,7 @@ hns3_get_tm_conf_queue_format_info(FILE *file, struct hns3_tm_node **queue_node, +@@ -734,7 +734,7 @@ hns3_get_tm_conf_queue_format_info(FILE *file, struct hns3_tm_node **queue_node, @@ -92 +94 @@ -@@ -767,8 +767,8 @@ hns3_get_tm_conf_queue_node_info(FILE *file, struct hns3_tm_conf *conf, +@@ -763,8 +763,8 @@ hns3_get_tm_conf_queue_node_info(FILE *file, struct hns3_tm_conf *conf,