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 65E9D41D8D for ; Mon, 27 Feb 2023 08:05:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6213340A84; Mon, 27 Feb 2023 08:05:37 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2047.outbound.protection.outlook.com [40.107.244.47]) by mails.dpdk.org (Postfix) with ESMTP id 30DF840A7D for ; Mon, 27 Feb 2023 08:05:36 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nwnKlQNCXQy3yWq+/q9m/MZTjQG3HCB3BjG7eV+TRDIo8i4JdmZFN4TBsAKfWcuHaibjB3WeFX4aOhOnANTHNZLiAT36tPxkK9viZNneiicXSc84x3s/qp0z7uhMQVAx+4uduwW+3RZ+7e8wdL+XRCiQtjcCLVHTYxkX7CgIJbCWVvhQN8nxJmWRucP1qUuuXa2n75LTaQrBdDiwkfOxgc1iOCH1DjMrWOKzAFeY/vE7yZHNMgg8+YI1WzdTV4u3/g5qZARNmRjXnV1opPH+Ma1T8cwU/XdEOW4Napf+LVf/EPpu2iy2f560wy+O1rbExTpxKJuI9lbl7INwrty8Vg== 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=zvyzyyJ9bDCkOczXCjTs5zef8x2vmECXfQjC0SiFjRY=; b=TlLNaqqezddaYMIpdSYUW72kKs8zXjM2u0UJrdqNExxDi1LlgX5XJH6Iq13bfhmuYpw3rxh7rmxeCUhxassXT4JEX67Uaa0vXcySgu37m+Nb3dYtJgGFZaYNB+nhmse0au22NiXwiPrBgVfsTKf1eDENE01TVqptVG5QUBpwd0JWGETnGKNs6HD4QuwE8kRLDao8VIrJh02lq9PZoOA9gWkf7WAnbhTMOlVi0HDl5DT1XUlzrJLVeJSfHtYuK54fRliY+5mC6bEGdzH44UDvZwofIDt0/wYRes70w9g/gFjg4QeChjT5Pcw2TahG53stl7wbXtrnRdXnwUU5gOMe/w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=zvyzyyJ9bDCkOczXCjTs5zef8x2vmECXfQjC0SiFjRY=; b=ESBn0/IBpaBC/CFR+NCw+tIWnfNYDUpIj4IRi775/NGeY1wNpAN62fdPeeaCXZ4zgB83PW9lEI2Sxefr7EhWXFVumrZxFM7k76tQ1WAi+bKMD1YnduDF9arEn+tf8aU/NJldG4hPzQu/dLN8GIxqfa8sy9iRGvg8CJVMchvYrTK6idnNoYSiIUtfxyfuF6LQC+P2E/WpGLaC9W1oZ0A1JmU2BmR0O5boCximPhVlGtP9SCn2lCVLInit3lkus5+r/zEeqhFBHSLt7pItLrRjpub+SZw2rsQ0LpqgMClZ+UpFEs7y8VgchWPzGNbhG39TKVdkOtsst/VITJs9hgJVjQ== Received: from MWH0EPF00056D02.namprd21.prod.outlook.com (2603:10b6:30f:fff2:0:1:0:f) by IA1PR12MB8334.namprd12.prod.outlook.com (2603:10b6:208:3ff::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.25; Mon, 27 Feb 2023 07:05:33 +0000 Received: from CO1NAM11FT003.eop-nam11.prod.protection.outlook.com (2a01:111:f400:7eab::201) by MWH0EPF00056D02.outlook.office365.com (2603:1036:d20::b) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.5 via Frontend Transport; Mon, 27 Feb 2023 07:05:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1NAM11FT003.mail.protection.outlook.com (10.13.175.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.16 via Frontend Transport; Mon, 27 Feb 2023 07:05:31 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 26 Feb 2023 23:05:14 -0800 Received: from nvidia.com (10.126.231.37) 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.37; Sun, 26 Feb 2023 23:05:10 -0800 From: Xueming Li To: Huisong Li CC: =?UTF-8?q?Morten=20Br=C3=B8rup?= , Chengwen Feng , dpdk stable Subject: patch 'mem: fix telemetry data truncation' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 14:59:04 +0800 Message-ID: <20230227070107.15664-36-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT003:EE_|IA1PR12MB8334:EE_ X-MS-Office365-Filtering-Correlation-Id: cf69108e-4409-4b8d-72a7-08db1891041d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Zggu1F3IkdYoR/tCPcrFmqPpTQEOW3b2Ro13GSaAqpetiThuGEwMsqxLoD8soo9+iqZZ1aKsAlgN0dbiwqlZjXFkTYGPfa3WQs1grRZfXVLfxOiZbf12wd0HSAZdw5nH+CcoX8UvpCNLpL/aYbyezVsv6Phirw/2fNNlb8hR6rMGrT/J9NlklCjHk64Oi0Xd8nmBQ2W2A+uTUPuEQTv5tAIr/NQGp7VY/EZxihDjA4yFy1ePCEZAAZLjGHbu4CSUAwcT9pgzX6mAidu+MYM8/oss7IoBCpVrgHH+7mLP2KgmU+5/Arm1jxMQpQEsOX2ZXohnFVqVVQ25G8TH7GXmSKNiKsfvWYLZCa8fE01wxehUwLvVWVec8pbPFArnG97/CmsmzX+IoPprLudKZ66nrWMaRIKnqh5twMdCTjgMEuO+fNOFOBe0k/6qBXTx0L6VhfXF3sRtIVOcXHiz7X1+MkSpOjcxjhQ0VOle5upfbpJ6lIqSA2BaAhcF5olqLCJCDRJ7YeBqMRlwaLmkSJTdO9Yw+89pZ+dztc+uhxKJkhq/AcJXP0miRsJj5++W0nHPgoJMvSnp1kLWCB0qiXLxr/xItLKa+JD0l7tJcq9y5jlbgyBsvjFQqYp+euQUGmMaudsdsCom5Q9Cj3c4RCxfAq7VqN/CreJePBQTuaohAOgmlDzBJroeryJFBsS2+u/xwXsQVuxxjPTwNSqOirbFZY0EOiDumqb/DuU/iR4rRoyXh4UwjxBdmY4vVuB+uB1Q+H4sgXK4NEqeRhChPuT94Yk6HZdi/ncJhumcwbR7aR+BPz0wpkYlwcWfH1BIpCla X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(136003)(396003)(39860400002)(376002)(346002)(451199018)(36840700001)(46966006)(40470700004)(40460700003)(16526019)(6286002)(478600001)(82740400003)(7636003)(356005)(70206006)(6916009)(8676002)(4326008)(70586007)(2906002)(34020700004)(41300700001)(5660300002)(40480700001)(186003)(26005)(7696005)(336012)(55016003)(2616005)(426003)(1076003)(66574015)(6666004)(53546011)(47076005)(8936002)(36860700001)(966005)(83380400001)(36756003)(82310400005)(86362001)(316002)(54906003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:05:31.9701 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cf69108e-4409-4b8d-72a7-08db1891041d 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT003.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8334 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.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 03/01/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=0e846591b5028863a505897da4423d75a7edb609 Thanks. Xueming Li --- >From 0e846591b5028863a505897da4423d75a7edb609 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Mon, 19 Dec 2022 15:06:45 +0800 Subject: [PATCH] mem: fix telemetry data truncation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 6243e36b837b754c33017718cf79f7574a52b09c ] The 'u32' and 'u64' data can not assigned to 'int' type variable. They need to use the 'u64' APIs to add. Fixes: e6732d0d6e26 ("mem: add telemetry infos") Signed-off-by: Huisong Li Acked-by: Morten Brørup Acked-by: Chengwen Feng --- lib/eal/common/eal_common_memory.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/eal/common/eal_common_memory.c b/lib/eal/common/eal_common_memory.c index 688dc615d7..8e427bf4b4 100644 --- a/lib/eal/common/eal_common_memory.c +++ b/lib/eal/common/eal_common_memory.c @@ -1139,7 +1139,7 @@ handle_eal_heap_info_request(const char *cmd __rte_unused, const char *params, malloc_heap_get_stats(heap, &sock_stats); rte_tel_data_start_dict(d); - rte_tel_data_add_dict_int(d, "Head id", heap_id); + rte_tel_data_add_dict_u64(d, "Head id", heap_id); rte_tel_data_add_dict_string(d, "Name", heap->name); rte_tel_data_add_dict_u64(d, "Heap_size", sock_stats.heap_totalsz_bytes); @@ -1201,13 +1201,13 @@ handle_eal_memzone_info_request(const char *cmd __rte_unused, mz = rte_fbarray_get(&mcfg->memzones, mz_idx); rte_tel_data_start_dict(d); - rte_tel_data_add_dict_int(d, "Zone", mz_idx); + rte_tel_data_add_dict_u64(d, "Zone", mz_idx); rte_tel_data_add_dict_string(d, "Name", mz->name); - rte_tel_data_add_dict_int(d, "Length", mz->len); + rte_tel_data_add_dict_u64(d, "Length", mz->len); snprintf(addr, ADDR_STR, "%p", mz->addr); rte_tel_data_add_dict_string(d, "Address", addr); rte_tel_data_add_dict_int(d, "Socket", mz->socket_id); - rte_tel_data_add_dict_int(d, "Flags", mz->flags); + rte_tel_data_add_dict_u64(d, "Flags", mz->flags); /* go through each page occupied by this memzone */ msl = rte_mem_virt2memseg_list(mz->addr); @@ -1222,7 +1222,7 @@ handle_eal_memzone_info_request(const char *cmd __rte_unused, ms_idx = RTE_PTR_DIFF(mz->addr, msl->base_va) / page_sz; ms = rte_fbarray_get(&msl->memseg_arr, ms_idx); - rte_tel_data_add_dict_int(d, "Hugepage_size", page_sz); + rte_tel_data_add_dict_u64(d, "Hugepage_size", page_sz); snprintf(addr, ADDR_STR, "%p", ms->addr); rte_tel_data_add_dict_string(d, "Hugepage_base", addr); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:42.103342200 +0800 +++ 0037-mem-fix-telemetry-data-truncation.patch 2023-02-27 14:08:40.749237000 +0800 @@ -1 +1 @@ -From 6243e36b837b754c33017718cf79f7574a52b09c Mon Sep 17 00:00:00 2001 +From 0e846591b5028863a505897da4423d75a7edb609 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 6243e36b837b754c33017718cf79f7574a52b09c ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org