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 6CCF7A0093; Tue, 14 Jun 2022 14:50:46 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 131FD40A81; Tue, 14 Jun 2022 14:50:46 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 1BD0B4069C for ; Tue, 14 Jun 2022 14:50:43 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25E5G7hB015998; Tue, 14 Jun 2022 05:50:43 -0700 Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2175.outbound.protection.outlook.com [104.47.59.175]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3gpb1n3nv1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Jun 2022 05:50:42 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L6lAhXvVLKk2XICBKEQfsMbdb2eMSC3KE0ri+mjHIr0e2uQwUECbFWh4BXqAjq+6nQlVklBduhpK8ZDVmXwsJyM6ZV9QGsgbT1jQWXUKB1O1T/iTm7UX/uExiXOxYqluiKzFiUjvtIbQr0ejYZB+iqr48g2nyppdu7ZgObFrSJrA5qm9AsTHtmoveHAO14hUD2oLlMG9hQiY7NAM8nnRH1TYMTORP0WmPJAPlFQfFspcNTt3iaryGNppECRc+69gwGsw3E5Tj5l2+i733ZuQ4CocfG0bAt+JIvkr3K9KUaFsawTBTZLh00tHnKE/0l+Ix19oaP3ncK8AHaVROkRWXw== 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=HQqET8lKMikn8wG2Kp6bIEBX+EHTqwOcUY70P6GvSAg=; b=d9ZgPN1igRSgcc5w3cv/XyS+E/l6Z+QP7TiODVbM/7h39tz/73tkMRyE0IyKUfNqVLLiN2nlymnOVVukGvDTN93+4nnmXbWhxehYzPRw4cWYt/DRp5wbdZkN010sKZjGAp05ZUs5/h96PfYQ/1drfmpDv7zWGWux3B5mM/RBM2A0S20XUKPnG5pdAMzX0qSQMcPxuLSoEICVYqINRpMu0f3FtjuKoa/q5e7JwvBbzb33Bpkmc5Sbxvx1Hvq175Csild5sffgMdqTN7VgIOckvQEb3fxduIa9+3rsBGu0H8ohpSzG5x8i7bZgIZvQvLnv9Wd4qpHaqCeUKQS/CXTCtw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=marvell.com; dmarc=pass action=none header.from=marvell.com; dkim=pass header.d=marvell.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.onmicrosoft.com; s=selector1-marvell-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HQqET8lKMikn8wG2Kp6bIEBX+EHTqwOcUY70P6GvSAg=; b=jAJivF3j63cAORlVl+FPTf7dA7XpDf3qpvqO/zPs0qbslRPffobse7vY6DM/kwrIskxgB623/zj6yLTl9iF/VTvYitFpJYmoR5htUC75a+p3omJQp0Qy9uwGZf/1Jr+kNzByCiFz3lRlRkXczoDdQva96GqMj/5FZs+oBX0dtr0= Received: from SJ0PR18MB5161.namprd18.prod.outlook.com (2603:10b6:a03:438::6) by CY4PR18MB1543.namprd18.prod.outlook.com (2603:10b6:903:145::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.22; Tue, 14 Jun 2022 12:50:40 +0000 Received: from SJ0PR18MB5161.namprd18.prod.outlook.com ([fe80::a1dd:374e:4965:780c]) by SJ0PR18MB5161.namprd18.prod.outlook.com ([fe80::a1dd:374e:4965:780c%7]) with mapi id 15.20.5332.021; Tue, 14 Jun 2022 12:50:40 +0000 From: Amit Prakash Shukla To: Amit Prakash Shukla , Anatoly Burakov CC: "dev@dpdk.org" , Jerin Jacob Kollanukkaran , "bruce.richardson@intel.com" Subject: RE: [PATCH v4 1/2] mem: telemetry support for memseg and element information Thread-Topic: [PATCH v4 1/2] mem: telemetry support for memseg and element information Thread-Index: AQHYcCL8vGgRzBvCo0WblTGzoVZTC61O+hGg Date: Tue, 14 Jun 2022 12:50:40 +0000 Message-ID: References: <20220519063038.637836-1-amitprakashs@marvell.com> <20220525103352.1806937-1-amitprakashs@marvell.com> In-Reply-To: <20220525103352.1806937-1-amitprakashs@marvell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 3d301188-793e-4f24-df92-08da4e047c7f x-ms-traffictypediagnostic: CY4PR18MB1543:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: gKQ90HJiofGd/QgrqJCJv4/yIz1ABUfJhI58okJ9FPUQNK7qGlrIhXstcryee2LN8lVAJ0ms4N+vdGLg8RrRoMDK4aeoXtC5SR2V0ezNV2KUkb8N2Q5qya4CdxeJ4KvP0tW3KTx+h9vNVgNlmjw/XiM8TazWLyNjrMPPuPCsvSfT6bgbgtb02AdCrcoyn4y6atMx22HoG+ZRFGaRrbQqo4cSGGLjiW9lYwawelEK5tpnKP7DIH08yDQjeK2TYOetUTyYUdU9oP6Jv1d1SkHIGz14Ifduy0454azkYbq7ojPbUSlbFMo5P2l59yuyHCHn48RrAenUErTPE7Az1xDB2hXauM34EOiM4MJSDNziGoD+UtyqD7Mji/U6ns1mtxEuC++g8nN3Abp+5LGfZsYone6H5fJ5rTi70ZNugnwdpWfU17SHySc6iDGjoS2NFDLlGOZMONFX1p1laFgjcyTMGpgl5ghNH8UfDpgmrXNPbMkKwPVtLFhfbo3GrHm9k5tcYHPETeXRgfTrdZMoCE42aEq/ABAqceQVnKhlH7MU0MQ7vgRqaZo5AndCrnlkKWAfObx43QbgefNpBv68Pe1DYZLpiA1sMh4KBnBRJhPuvgpBYQ+EdAYr1pFds9Hwly6l+MlPKMjvJgCDyUUgg24TNhYgqsf3rmQQ45y5vxKwi/jyxYKnoqlEq0LivVzhDLLSE8Kt2Isx8pwbdYOeuEHfLg== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR18MB5161.namprd18.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(366004)(33656002)(66946007)(508600001)(76116006)(122000001)(38070700005)(186003)(83380400001)(30864003)(2906002)(55016003)(64756008)(66556008)(316002)(8936002)(86362001)(52536014)(8676002)(4326008)(110136005)(54906003)(5660300002)(7696005)(71200400001)(6506007)(38100700002)(53546011)(66476007)(26005)(66446008)(9686003)(579004); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?eFTSBfAxwxm83T77l9aXEZVKlEJt7qfZhXMK7uQKA6QJo++94e2e2ECinjp9?= =?us-ascii?Q?DRL/p6J9JCYNT04OP+/BvrAQFUv6+Nu6Bv9TMKolikYkNxR1pTWquDkapT/f?= =?us-ascii?Q?I20GF2NwJ857AhzENqeI24OmMDBmI2qRJXnxTnQB3wHYyGAqJyWNCt/Q0+xT?= =?us-ascii?Q?WO12qQQP1SDbD6bppzqao17sJNm76fmnUgyEWdlru3z1bk3H2QIDJjGlI4g/?= =?us-ascii?Q?a5Fm0CUIxE+eg5XoovIq70ntxELnBnp4nCykDsN4ZVcJDdUSoD2FcmG7zt5y?= =?us-ascii?Q?w5bzLMe8uOx6eGBLwClk4UfpfXXdySk1nWLkA/iS2KoIhpx336KEXs6bj6hr?= =?us-ascii?Q?11aYTt9OLhe/NRkuI9Z8OA3VgQWOwZ6Lu2SDivbSoSzdF/dznOPNPRpJtMap?= =?us-ascii?Q?O7sKfv67uVykmEboZIi0fDks82N18Ad5hXmGcmcZMfTvQl0Un36XDfRyw2CA?= =?us-ascii?Q?9YYw+KOixPVVzWznudWPYZw4UFzFCSTiPrxcruYzdKOC0IazF8q9QKut/fq7?= =?us-ascii?Q?jVkPl4eG8mGuqZWS0bR+yXzW1T/rBhVNINz8rzjWivwYNOqfc99x7zaRnyKU?= =?us-ascii?Q?dlmulFyUyiHWEVye5nDNOFwat9IA7MvklwQLHaaP6GOM7CBDGGTeMJi31Qqn?= =?us-ascii?Q?Ii/etb5bJ+jenbhjlSPCvdsLoVbz1zzeq5xwOaFjdXOhCko2/7TrANkh5b0a?= =?us-ascii?Q?Z4/suDgL8Uz9h0VeNlahMr8fMSHsOMRGmWQ8mjiA2UkCCIsde2p5Cql1iC7j?= =?us-ascii?Q?UoIUppnpuvVpzwZGU+FW9HKIVECdlzHbOhK7Rrx0Twi/ycGuculeK3hQI0Q2?= =?us-ascii?Q?DYqY96L5MM8Mpn1TL9lKPS1EDJnIgG96vaupI7P4i7zkExKXqB4yIG3mm4Km?= =?us-ascii?Q?6Eoi3HlchEsykITX9/myvh7AZFT8veNWelh6zTWwMxW+IsuK07aGQZ4iYvEd?= =?us-ascii?Q?MHdatd8zwY2wQhf3/MC/8ViGhYcTRf3w3veeiaaE+M33l+OGlEbp6ZgvBQ1E?= =?us-ascii?Q?GjVIiUD2WoQhkFRuIIUEUdDLtdha8vKj8RdN2vlKxofBbyveYHb2m15YX8XQ?= =?us-ascii?Q?1+ptC9Hu8bVfqh4UnFbOjDXnL9j8OnNlNnz0GF4wlERjNJyNF8e19olqrnLo?= =?us-ascii?Q?1VJ7zD4l63vapmU/rAQfz62mrFvLf/t+i24M9+xMF/KmNwVfT1VLn9WH8bSY?= =?us-ascii?Q?GbZQpC0leia134lLcHgxwAl20IXv8bW8EDuSrEQ6gf0Xmcm0BPkFiLPC90gI?= =?us-ascii?Q?hsGIbw8TDUS7uO/Wz/1ei/ZNP507vv0ObDQI1VF7i7NmMF3lVro+MU9AVZUi?= =?us-ascii?Q?eMPs7GnA3A9ZAZSR6t7UgKNDREY0uJxgeap/KjaIjMMMScu7VULWPlKaS1WG?= =?us-ascii?Q?zLRxr4QyfSXvA7PLNXiUrkilCto5jB/RO3sYhacQup0qpPI1oChHykkNdMoi?= =?us-ascii?Q?0yA83BzRM9MYgaiH+qjCopkDY7HRUt20EwKhZUYpOIYz7YL+y3Dsmb/7obmJ?= =?us-ascii?Q?7wlv6WOc/y13w3d0hBUBHfxPzrPqKiAjY/fuubZeW4Aefwn7fWG9et1hfAme?= =?us-ascii?Q?G8gk4739Io2iY8MGkONQop6UrXj/FwhPy3Qa5qew6eao1wy+SNYr/Gjmkn47?= =?us-ascii?Q?7RTA5tN1hEohLUuTq1ky0lefmxQMi2sN3euuNyb2eJ5Fad2TL2oGKhywebmA?= =?us-ascii?Q?+U6ZwUoU75Y46uejShFXJ1iHB47LWoN2Ob0ItLkE5jVsUMXbo9vFmoEVbhzx?= =?us-ascii?Q?YbZiXuoVEA=3D=3D?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: marvell.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR18MB5161.namprd18.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d301188-793e-4f24-df92-08da4e047c7f X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Jun 2022 12:50:40.1781 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: GJgAZYyqYfeN3p2h69Yo8SaYMaWCCRWnwOurng2kloxmbq5HDssYgP6Yn5pCdnZpkKDRIxHAzs2EByNKqulR90bWse6EqpCpvC+K00W8ut0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR18MB1543 X-Proofpoint-ORIG-GUID: EmTdIuCsQBErb-efysOtrWX_WmoUDdNF X-Proofpoint-GUID: EmTdIuCsQBErb-efysOtrWX_WmoUDdNF X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.874,Hydra:6.0.517,FMLib:17.11.64.514 definitions=2022-06-14_04,2022-06-13_01,2022-02-23_01 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Ping. > -----Original Message----- > From: Amit Prakash Shukla > Sent: Wednesday, May 25, 2022 4:04 PM > To: Anatoly Burakov > Cc: dev@dpdk.org; Jerin Jacob Kollanukkaran ; > bruce.richardson@intel.com; Amit Prakash Shukla > > Subject: [PATCH v4 1/2] mem: telemetry support for memseg and element > information >=20 > Changes adds telemetry support to display memory occupancy in memseg > and the information of the elements allocated from a memseg based on > arguments provided by user. This patch adds following endpoints: >=20 > 1. /eal/memseg_list_array > The command displays the memseg list from which the memory has been > allocated. > Example: > --> /eal/memseg_list_array > {"/eal/memseg_list_array": [0, 1]} >=20 > 2. /eal/memseg_list_info, > The command outputs the memsegs, from which the memory is allocated, > for the memseg_list given as input. Command also supports help. > Example: > --> /eal/memseg_list_info,help > {"/eal/memseg_list_info": "/eal/memseg_list_info,"} >=20 > --> /eal/memseg_list_info,1 > {"/eal/memseg_list_info": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, \ 12, 1= 3, 14, 15]} >=20 > 3. /eal/memseg_info,, > The command outputs the memseg information based on the memseg-list > and the memseg-id given as input. Command also supports help. > Example: > --> /eal/memseg_info,help > {"/eal/memseg_info": "/eal/memseg_info,, \ id>"} >=20 > --> /eal/memseg_info,0,10 > {"/eal/memseg_info": {"Memseg_list_index": 0, \ > "Memseg_index": 10, "Memseg_list_len": 64, \ > "Start_addr": "0x260000000", "End_addr": "0x280000000", \ > "Size": 536870912}} >=20 > --> /eal/memseg_info,1,15 > {"/eal/memseg_info": {"Memseg_list_index": 1, \ > "Memseg_index": 15, "Memseg_list_len": 64, \ > "Start_addr": "0xb20000000", "End_addr": "0xb40000000", \ > "Size": 536870912}} >=20 > 4. /eal/element_list,,, > The command outputs number of elements in a memseg based on the heap- > id, memseg-list-id and memseg-id given as input. > Command also supports help. > Example: > --> /eal/element_list,help > {"/eal/element_list": "/eal/element_list,, \ id>,"} >=20 > --> /eal/element_list,0,0,63 > {"/eal/element_list": {"Element_count": 52}} >=20 > --> /eal/element_list,0,1,15 > {"/eal/element_list": {"Element_count": 52}} >=20 > 5. /eal/element_info,,,, \ > , > The command outputs element information like element start address, end > address, to which memseg it belongs, element state, element size. User ca= n > give a range of elements to be printed. Command also supports help. > Example: > --> /eal/element_info,help > {"/eal/element_info": "/eal/element_info,, \ id>,,,"} >=20 > --> /eal/element_info,0,1,15,1,2 > {"/eal/element_info": {"element.1": {"msl_id": 1, \ > "ms_id": 15, "memseg_start_addr": "0xb20000000", \ > "memseg_end_addr": "0xb40000000", \ > "element_start_addr": "0xb201fe680", \ > "element_end_addr": "0xb20bfe700", \ > "element_size": 10485888, "element_state": "Busy"}, \ > "element.2": {"msl_id": 1, "ms_id": 15, \ > "memseg_start_addr": "0xb20000000", \ > "memseg_end_addr": "0xb40000000", \ > "element_start_addr": "0xb20bfe700", \ > "element_end_addr": "0xb215fe780", "element_size": 10485888, \ > "element_state": "Busy"}, "Element_count": 2}} >=20 > Signed-off-by: Amit Prakash Shukla > --- > v2: > - Fixed compilation error related int-to-pointer-cast > - Changes for code review suggestions >=20 > v3: > - Commit message changes > - Renaming end-points > - Changing input parameters to comma-seperated > - Reverting telemetry output buffer size >=20 > v4: > - Patch-2 adds telemetry support to display system memory >=20 > lib/eal/common/eal_common_memory.c | 482 > ++++++++++++++++++++++++++++- > 1 file changed, 477 insertions(+), 5 deletions(-) >=20 > diff --git a/lib/eal/common/eal_common_memory.c > b/lib/eal/common/eal_common_memory.c > index 688dc615d7..e66de6a872 100644 > --- a/lib/eal/common/eal_common_memory.c > +++ b/lib/eal/common/eal_common_memory.c > @@ -26,6 +26,7 @@ > #include "eal_memcfg.h" > #include "eal_options.h" > #include "malloc_heap.h" > +#include "malloc_elem.h" >=20 > /* > * Try to mmap *size bytes in /dev/zero. If it is successful, return the= @@ - > 1113,11 +1114,17 @@ rte_eal_memory_init(void) } >=20 > #ifndef RTE_EXEC_ENV_WINDOWS > -#define EAL_MEMZONE_LIST_REQ "/eal/memzone_list" > -#define EAL_MEMZONE_INFO_REQ "/eal/memzone_info" > -#define EAL_HEAP_LIST_REQ "/eal/heap_list" > -#define EAL_HEAP_INFO_REQ "/eal/heap_info" > -#define ADDR_STR 15 > +#define EAL_MEMZONE_LIST_REQ "/eal/memzone_list" > +#define EAL_MEMZONE_INFO_REQ "/eal/memzone_info" > +#define EAL_HEAP_LIST_REQ "/eal/heap_list" > +#define EAL_HEAP_INFO_REQ "/eal/heap_info" > +#define EAL_MEMSEG_LIST_ARR_REQ > "/eal/memseg_list_array" > +#define EAL_MEMSEG_LIST_INFO_REQ "/eal/memseg_list_info" > +#define EAL_MEMSEG_INFO_REQ "/eal/memseg_info" > +#define EAL_ELEMENT_LIST_REQ "/eal/element_list" > +#define EAL_ELEMENT_INFO_REQ "/eal/element_info" > +#define ADDR_STR 15 > + >=20 > /* Telemetry callback handler to return heap stats for requested heap id= . */ > static int @@ -1265,6 +1272,454 @@ > handle_eal_memzone_list_request(const char *cmd __rte_unused, > return 0; > } >=20 > +static int > +handle_eal_memseg_list_array_request(const char *cmd __rte_unused, > + const char *params __rte_unused, > + struct rte_tel_data *d) > +{ > + struct rte_mem_config *mcfg; > + int i; > + > + rte_tel_data_start_array(d, RTE_TEL_INT_VAL); > + > + rte_mcfg_mem_read_lock(); > + mcfg =3D rte_eal_get_configuration()->mem_config; > + > + for (i =3D 0; i < RTE_MAX_MEMSEG_LISTS; i++) { > + struct rte_memseg_list *msl =3D &mcfg->memsegs[i]; > + if (msl->memseg_arr.count =3D=3D 0) > + continue; > + > + rte_tel_data_add_array_int(d, i); > + } > + rte_mcfg_mem_read_unlock(); > + > + return 0; > +} > + > +static int > +handle_eal_memseg_list_info_request(const char *cmd __rte_unused, > + const char *params, struct rte_tel_data *d) > { > + struct rte_mem_config *mcfg; > + struct rte_memseg_list *msl; > + struct rte_fbarray *arr; > + uint32_t ms_list_idx; > + int ms_idx; > + > + if (params =3D=3D NULL || strlen(params) =3D=3D 0) > + return -1; > + > + if (strncasecmp(params, "help", strlen(params)) =3D=3D 0) { > + char buff[RTE_TEL_MAX_SINGLE_STRING_LEN]; > + snprintf(buff, RTE_TEL_MAX_SINGLE_STRING_LEN, > + "%s,", > EAL_MEMSEG_LIST_INFO_REQ); > + rte_tel_data_string(d, buff); > + return 0; > + } > + > + if (!isdigit(*params)) > + return -1; > + > + ms_list_idx =3D strtoul(params, NULL, 10); > + if (ms_list_idx >=3D RTE_MAX_MEMSEG_LISTS) > + return -1; > + > + rte_tel_data_start_array(d, RTE_TEL_INT_VAL); > + > + rte_mcfg_mem_read_lock(); > + mcfg =3D rte_eal_get_configuration()->mem_config; > + msl =3D &mcfg->memsegs[ms_list_idx]; > + if (msl->memseg_arr.count =3D=3D 0) > + goto done; > + > + arr =3D &msl->memseg_arr; > + > + ms_idx =3D rte_fbarray_find_next_used(arr, 0); > + while (ms_idx >=3D 0) { > + rte_tel_data_add_array_int(d, ms_idx); > + ms_idx =3D rte_fbarray_find_next_used(arr, ms_idx + 1); > + } > + > +done: > + rte_mcfg_mem_read_unlock(); > + > + return 0; > +} > + > +static int > +handle_eal_memseg_info_request(const char *cmd __rte_unused, > + const char *params, struct rte_tel_data *d) { > + struct rte_mem_config *mcfg; > + uint64_t ms_start_addr, ms_end_addr, ms_size; > + struct rte_memseg_list *msl; > + const struct rte_memseg *ms; > + struct rte_fbarray *arr; > + char addr[ADDR_STR]; > + uint32_t ms_list_idx =3D 0; > + uint32_t ms_idx =3D 0; > + uint32_t msl_len; > + char dlim[2] =3D ","; > + char *token; > + char *params_args; > + > + if (params =3D=3D NULL || strlen(params) =3D=3D 0) > + return -1; > + > + if (strncasecmp(params, "help", strlen(params)) =3D=3D 0) { > + char buff[RTE_TEL_MAX_SINGLE_STRING_LEN]; > + snprintf(buff, RTE_TEL_MAX_SINGLE_STRING_LEN, > + "%s,,", > + EAL_MEMSEG_INFO_REQ); > + rte_tel_data_string(d, buff); > + return 0; > + } > + > + /* strtok expects char * and param is const char *. Hence on using > + * params as "const char *" compiler throws warning. > + */ > + params_args =3D strdup(params); > + token =3D strtok(params_args, dlim); > + if (token =3D=3D NULL || !isdigit(*token)) { > + free(params_args); > + return -1; > + } > + > + ms_list_idx =3D strtoul(token, NULL, 10); > + if (ms_list_idx >=3D RTE_MAX_MEMSEG_LISTS) { > + free(params_args); > + return -1; > + } > + > + token =3D strtok(NULL, dlim); > + if (token =3D=3D NULL || !isdigit(*token)) { > + free(params_args); > + return -1; > + } > + ms_idx =3D strtoul(token, NULL, 10); > + > + free(params_args); > + > + rte_mcfg_mem_read_lock(); > + > + mcfg =3D rte_eal_get_configuration()->mem_config; > + msl =3D &mcfg->memsegs[ms_list_idx]; > + if (msl->memseg_arr.count =3D=3D 0) { > + rte_mcfg_mem_read_unlock(); > + return -1; > + } > + > + arr =3D &msl->memseg_arr; > + msl_len =3D arr->len; > + > + ms =3D rte_fbarray_get(arr, ms_idx); > + if (ms =3D=3D NULL) { > + rte_mcfg_mem_read_unlock(); > + RTE_LOG(DEBUG, EAL, "Error fetching requested > memseg.\n"); > + return -1; > + } > + > + ms_start_addr =3D ms->addr_64; > + ms_end_addr =3D (uint64_t)RTE_PTR_ADD(ms_start_addr, ms->len); > + ms_size =3D ms->hugepage_sz; > + > + rte_mcfg_mem_read_unlock(); > + > + rte_tel_data_start_dict(d); > + rte_tel_data_add_dict_int(d, "Memseg_list_index", ms_list_idx); > + rte_tel_data_add_dict_int(d, "Memseg_index", ms_idx); > + rte_tel_data_add_dict_int(d, "Memseg_list_len", msl_len); > + snprintf(addr, ADDR_STR, "0x%"PRIx64, ms_start_addr); > + rte_tel_data_add_dict_string(d, "Start_addr", addr); > + snprintf(addr, ADDR_STR, "0x%"PRIx64, ms_end_addr); > + rte_tel_data_add_dict_string(d, "End_addr", addr); > + rte_tel_data_add_dict_int(d, "Size", ms_size); > + > + return 0; > +} > + > +static int > +handle_eal_element_list_request(const char *cmd __rte_unused, > + const char *params, struct rte_tel_data *d) { > + struct rte_mem_config *mcfg; > + struct rte_memseg_list *msl; > + const struct rte_memseg *ms; > + struct malloc_elem *elem; > + struct malloc_heap *heap; > + uint64_t ms_start_addr, ms_end_addr; > + uint64_t elem_start_addr, elem_end_addr; > + uint32_t ms_list_idx =3D 0; > + uint32_t heap_id =3D 0; > + uint32_t ms_idx =3D 0; > + char dlim[2] =3D ","; > + int elem_count =3D 0; > + char *token; > + char *params_args; > + > + if (params =3D=3D NULL || strlen(params) =3D=3D 0) > + return -1; > + > + if (strncasecmp(params, "help", strlen(params)) =3D=3D 0) { > + char buff[RTE_TEL_MAX_SINGLE_STRING_LEN]; > + snprintf(buff, RTE_TEL_MAX_SINGLE_STRING_LEN, > + "%s,,,", > + EAL_ELEMENT_LIST_REQ); > + rte_tel_data_string(d, buff); > + return 0; > + } > + > + /* strtok expects char * and param is const char *. Hence on using > + * params as "const char *" compiler throws warning. > + */ > + params_args =3D strdup(params); > + token =3D strtok(params_args, dlim); > + if (token =3D=3D NULL || !isdigit(*token)) { > + free(params_args); > + return -1; > + } > + > + heap_id =3D strtoul(token, NULL, 10); > + if (heap_id >=3D RTE_MAX_HEAPS) { > + free(params_args); > + return -1; > + } > + > + token =3D strtok(NULL, dlim); > + if (token =3D=3D NULL || !isdigit(*token)) { > + free(params_args); > + return -1; > + } > + > + ms_list_idx =3D strtoul(token, NULL, 10); > + if (ms_list_idx >=3D RTE_MAX_MEMSEG_LISTS) { > + free(params_args); > + return -1; > + } > + > + token =3D strtok(NULL, dlim); > + if (token =3D=3D NULL || !isdigit(*token)) { > + free(params_args); > + return -1; > + } > + > + ms_idx =3D strtoul(token, NULL, 10); > + > + free(params_args); > + > + rte_mcfg_mem_read_lock(); > + > + mcfg =3D rte_eal_get_configuration()->mem_config; > + msl =3D &mcfg->memsegs[ms_list_idx]; > + ms =3D rte_fbarray_get(&msl->memseg_arr, ms_idx); > + if (ms =3D=3D NULL) { > + rte_mcfg_mem_read_unlock(); > + RTE_LOG(DEBUG, EAL, "Error fetching requested > memseg.\n"); > + return -1; > + } > + > + ms_start_addr =3D ms->addr_64; > + ms_end_addr =3D (uint64_t)RTE_PTR_ADD(ms_start_addr, ms->len); > + rte_mcfg_mem_read_unlock(); > + > + rte_tel_data_start_dict(d); > + > + heap =3D &mcfg->malloc_heaps[heap_id]; > + rte_spinlock_lock(&heap->lock); > + > + elem =3D heap->first; > + while (elem) { > + elem_start_addr =3D (uint64_t)elem; > + elem_end_addr =3D > + (uint64_t)RTE_PTR_ADD(elem_start_addr, elem- > >size); > + > + if ((uint64_t)elem_start_addr >=3D ms_start_addr && > + (uint64_t)elem_end_addr <=3D ms_end_addr) > + elem_count++; > + elem =3D elem->next; > + } > + > + rte_spinlock_unlock(&heap->lock); > + > + rte_tel_data_add_dict_int(d, "Element_count", elem_count); > + > + return 0; > +} > + > +static int > +handle_eal_element_info_request(const char *cmd __rte_unused, > + const char *params, struct rte_tel_data *d) { > + struct rte_mem_config *mcfg; > + struct rte_memseg_list *msl; > + const struct rte_memseg *ms; > + struct malloc_elem *elem; > + struct malloc_heap *heap; > + struct rte_tel_data *c; > + uint64_t ms_start_addr, ms_end_addr; > + uint64_t elem_start_addr, elem_end_addr; > + uint32_t ms_list_idx =3D 0; > + uint32_t heap_id =3D 0; > + uint32_t ms_idx =3D 0; > + uint32_t start_elem =3D 0, end_elem =3D 0; > + uint32_t count =3D 0, elem_count =3D 0; > + char dlim[2] =3D ","; > + char str[ADDR_STR]; > + char *params_args; > + char *token; > + > + if (params =3D=3D NULL || strlen(params) =3D=3D 0) > + return -1; > + > + if (strncasecmp(params, "help", strlen(params)) =3D=3D 0) { > + char buff[RTE_TEL_MAX_SINGLE_STRING_LEN]; > + snprintf(buff, RTE_TEL_MAX_SINGLE_STRING_LEN, > + "%s,,,," > + ",", > + EAL_ELEMENT_INFO_REQ); > + rte_tel_data_string(d, buff); > + return 0; > + } > + > + /* strtok expects char * and param is const char *. Hence on using > + * params as "const char *" compiler throws warning. > + */ > + params_args =3D strdup(params); > + token =3D strtok(params_args, dlim); > + if (token =3D=3D NULL || !isdigit(*token)) { > + free(params_args); > + return -1; > + } > + > + heap_id =3D strtoul(token, NULL, 10); > + if (heap_id >=3D RTE_MAX_HEAPS) { > + free(params_args); > + return -1; > + } > + > + token =3D strtok(NULL, dlim); > + if (token =3D=3D NULL || !isdigit(*token)) { > + free(params_args); > + return -1; > + } > + > + ms_list_idx =3D strtoul(token, NULL, 10); > + if (ms_list_idx >=3D RTE_MAX_MEMSEG_LISTS) { > + free(params_args); > + return -1; > + } > + > + token =3D strtok(NULL, dlim); > + if (token =3D=3D NULL || !isdigit(*token)) { > + free(params_args); > + return -1; > + } > + > + ms_idx =3D strtoul(token, NULL, 10); > + > + token =3D strtok(NULL, dlim); > + if (token =3D=3D NULL || !isdigit(*token)) { > + free(params_args); > + return -1; > + } > + > + start_elem =3D strtoul(token, NULL, 10); > + > + token =3D strtok(NULL, dlim); > + if (token =3D=3D NULL || !isdigit(*token)) { > + free(params_args); > + return -1; > + } > + > + end_elem =3D strtoul(token, NULL, 10); > + > + free(params_args); > + > + if (end_elem < start_elem) > + return -1; > + > + rte_mcfg_mem_read_lock(); > + > + mcfg =3D rte_eal_get_configuration()->mem_config; > + msl =3D &mcfg->memsegs[ms_list_idx]; > + ms =3D rte_fbarray_get(&msl->memseg_arr, ms_idx); > + if (ms =3D=3D NULL) { > + rte_mcfg_mem_read_unlock(); > + RTE_LOG(DEBUG, EAL, "Error fetching requested > memseg.\n"); > + return -1; > + } > + > + ms_start_addr =3D ms->addr_64; > + ms_end_addr =3D (uint64_t)RTE_PTR_ADD(ms_start_addr, ms->len); > + > + rte_mcfg_mem_read_unlock(); > + > + rte_tel_data_start_dict(d); > + > + heap =3D &mcfg->malloc_heaps[heap_id]; > + rte_spinlock_lock(&heap->lock); > + > + elem =3D heap->first; > + while (elem) { > + elem_start_addr =3D (uint64_t)elem; > + elem_end_addr =3D > + (uint64_t)RTE_PTR_ADD(elem_start_addr, elem- > >size); > + > + if (elem_start_addr < ms_start_addr || > + elem_end_addr > ms_end_addr) { > + elem =3D elem->next; > + continue; > + } > + > + if (count < start_elem) { > + elem =3D elem->next; > + count++; > + continue; > + } > + > + c =3D rte_tel_data_alloc(); > + if (c =3D=3D NULL) > + break; > + > + rte_tel_data_start_dict(c); > + rte_tel_data_add_dict_int(c, "msl_id", ms_list_idx); > + rte_tel_data_add_dict_int(c, "ms_id", ms_idx); > + snprintf(str, ADDR_STR, "0x%"PRIx64, ms_start_addr); > + rte_tel_data_add_dict_string(c, "memseg_start_addr", str); > + snprintf(str, ADDR_STR, "0x%"PRIx64, ms_end_addr); > + rte_tel_data_add_dict_string(c, "memseg_end_addr", str); > + snprintf(str, ADDR_STR, "0x%"PRIx64, elem_start_addr); > + rte_tel_data_add_dict_string(c, "element_start_addr", str); > + snprintf(str, ADDR_STR, "0x%"PRIx64, elem_end_addr); > + rte_tel_data_add_dict_string(c, "element_end_addr", str); > + rte_tel_data_add_dict_int(c, "element_size", elem->size); > + snprintf(str, ADDR_STR, "%s", elem->state =3D=3D 0 ? "Free" : > + elem->state =3D=3D 1 ? "Busy" : elem->state =3D=3D 2 ? > + "Pad" : "Error"); > + rte_tel_data_add_dict_string(c, "element_state", str); > + > + snprintf(str, ADDR_STR, "%s.%u", "element", count); > + if (rte_tel_data_add_dict_container(d, str, c, 0) !=3D 0) { > + rte_tel_data_free(c); > + break; > + } > + > + elem_count++; > + count++; > + if (count > end_elem) > + break; > + > + elem =3D elem->next; > + } > + > + rte_spinlock_unlock(&heap->lock); > + > + rte_tel_data_add_dict_int(d, "Element_count", elem_count); > + > + return 0; > +} > + > RTE_INIT(memory_telemetry) > { > rte_telemetry_register_cmd( > @@ -1279,5 +1734,22 @@ RTE_INIT(memory_telemetry) > rte_telemetry_register_cmd( > EAL_HEAP_INFO_REQ, > handle_eal_heap_info_request, > "Returns malloc heap stats. Parameters: int > heap_id"); > + rte_telemetry_register_cmd( > + EAL_MEMSEG_LIST_ARR_REQ, > + handle_eal_memseg_list_array_request, > + "Returns hugepage list. Takes no parameters"); > + rte_telemetry_register_cmd( > + EAL_MEMSEG_LIST_INFO_REQ, > + handle_eal_memseg_list_info_request, > + "Returns memseg list. Parameters: int > memseg_list_id"); > + rte_telemetry_register_cmd( > + EAL_MEMSEG_INFO_REQ, > handle_eal_memseg_info_request, > + "Returns memseg info. Parameter: int > memseg_list_id,int memseg_id"); > + rte_telemetry_register_cmd(EAL_ELEMENT_LIST_REQ, > + handle_eal_element_list_request, > + "Returns element info. Parameters: int heap_id, int > memseg_list_id, int memseg_id"); > + rte_telemetry_register_cmd(EAL_ELEMENT_INFO_REQ, > + handle_eal_element_info_request, > + "Returns element info. Parameters: int heap_id, > memseg_list_id, > +memseg_id, start_elem_id, end_elem_id"); > } > #endif > -- > 2.25.1