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 DC732A00C2; Thu, 6 Oct 2022 09:07:42 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 766374280E; Thu, 6 Oct 2022 09:07:42 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 2BB8E4280E for ; Thu, 6 Oct 2022 09:07:39 +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 295LNJMX020404; Thu, 6 Oct 2022 00:07:39 -0700 Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam07lp2046.outbound.protection.outlook.com [104.47.51.46]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3k17uhbwph-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 06 Oct 2022 00:07:38 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BqZ9SRUwwq4pkWKn7mjEDtCtOA7CSMAKbq+zs9K4+Fyx7rVPnyrk6WEM7qc/ERbbmeXMwV/y0uWtZGBx3zwhAVEU9JA7lREcgUcRJr1KDCeNYaLv79lmV44M7vxp9rQ/0rP73v21dQyjcUFwDvSWraF3gv5qrxUcsoeUo6TbDfzI+9aePPp3RrywwR9ATEBYenspxj3p4h+8spH6mxgbJ2z0U35oM49G5ra1RBR2+7Bjy91TjSmFHq4c8INfNtajb41kNGopCBGp0ixns1o6ua21RDF462idJH8ZpcfCqeCkaH9tyCBrlI1bpb/+Of9/cLXdQhI0LLh1Lli44iqjZA== 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=Rscqe0pJKRh5gKMinOVu9JnEqXOejMfajvcSLnH4eP0=; b=BU6ZYSfcPY1FgYpVyb7/JdGn7Y25VlnJPuJP1TWCVI6fnq3RC+/1hLK8EU74XOMAo81stVT3ecFArDDQ+dtA8s4PUVHf0IwFquDB94l4xOtE+mRB+D61+RLVOn7Xu2D9JdBw2S4tnDxkgHmngDwv58f0tu9q9GKyeb/qHm5vYT/eNtwyw+hPSB9nk0dN2B4QlpHeIMbyz/crXs97zqh0UBQX9sY3IZwI72o8W2LTw3wBy51DpeuEtd/J5gRM2j10gP2FhTGEmJDS6mB0zZdNpkgZQ4CCDWgt+XKAhgAxYXQqJgohfMdL57Fk1s9P4Nr1NJRQeJiDj/2DWikaMNPX9A== 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=Rscqe0pJKRh5gKMinOVu9JnEqXOejMfajvcSLnH4eP0=; b=PA/3AJQLFH1tcQZsTD+DKlD9gUhXZ90xSY68AFkiDSRwfjA5t9Eg2DgcgHM4LbhrsADUrNJU0L0UJO4mWGRw+XEK0CPm+S9blXxp3VZLZ3kAKrmq+SsLdKQjFCAM6YRKSJhyE/MFh2auJ25VR8LnsMiTeFtXGSEi7tJGr8dzE6E= Received: from PH0PR18MB5167.namprd18.prod.outlook.com (2603:10b6:510:168::7) by BY3PR18MB4564.namprd18.prod.outlook.com (2603:10b6:a03:3b7::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.32; Thu, 6 Oct 2022 07:07:36 +0000 Received: from PH0PR18MB5167.namprd18.prod.outlook.com ([fe80::39e7:fb99:16b:c1a6]) by PH0PR18MB5167.namprd18.prod.outlook.com ([fe80::39e7:fb99:16b:c1a6%3]) with mapi id 15.20.5676.030; Thu, 6 Oct 2022 07:07:36 +0000 From: Amit Prakash Shukla To: David Marchand CC: "dev@dpdk.org" , Jerin Jacob Kollanukkaran , Anatoly Burakov , "bruce.richardson@intel.com" , "ciara.power@intel.com" , "dmitry.kozliuk@gmail.com" Subject: RE: [PATCH v5 1/2] mem: telemetry support for memseg and element information Thread-Topic: [PATCH v5 1/2] mem: telemetry support for memseg and element information Thread-Index: AQHY0/i09WhvvvieGEa9Y8zxwl1gYK4A79Cg Date: Thu, 6 Oct 2022 07:07:36 +0000 Message-ID: References: <20220525103352.1806937-1-amitprakashs@marvell.com> <20220929114313.1346972-1-amitprakashs@marvell.com> In-Reply-To: <20220929114313.1346972-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-traffictypediagnostic: PH0PR18MB5167:EE_|BY3PR18MB4564:EE_ x-ms-office365-filtering-correlation-id: addccd29-af7e-4522-23ac-08daa76972a8 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: WrZBdbOW0LHQcJ5myvE8lfp985cDZpfY80w9LDxEx0jMLHH4Q90XG9YImAsT+HPc6wonSE1jU7CmYPW2kFwHvAGmIE/zNP+XbR5J5gMH4tuFlZfmgDUDTNmvlmvEk7aNWVNldXVezxKdwNDPzyDjkS+U4C/V1P5ARoX10myeKg7Md28TpVyOBC5EoQtaG6II2BEIFyj+4ruqmedG0p0mzFdLrPDmAF4qypNwp43v89owcHJn+ooQ1OEIq42DVItr15FNWYP3IT6y661FZEhCIMDTD1Fd2LePoFlJasChvxuWEVHli9DnQC8VLMw5cnEZ8nDRmqPcmwlsfRhC6DrC8zafpaMCJQmMDZZWf+RSh3XR7sUriWerpmirG2c3/XPADrdkQ9JyCEtLt/E6bKoaVYtmwBxzZfnHabw8HAFIdH5qss/Q+b6njZiqw+4dYt7knmYHTYzJi5RYV1Q7pIAykPTsayDFM+I5mxPfwtw50fDGHxlt0RqRn23woGULY8tc68NY5yjQN9AWVJIInbNpI6z+V3onJiWh1iMs9Cd2mTn2nP1Y0XqRAZNZUjqQWPGnNPqCE1WlS31hsZmU1ilLKKKSYGQ9ox80e3zTYeLOFUB+fzNZvzf4WwP3JASen9c6mBQ3o6er0GJi1I0jI4hzKnQkQ6ZG2dwQbvebrSEXdwucB6GQYB1k62p9KXye1rGrogFAaWPTB6/q40cQ3ACOJv0jvGsj46oAIdyT9GH7CF93Gb4RSSHoIr5E/SXXi3o9U/efFfwH5zpxEqGh4jw7pw== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR18MB5167.namprd18.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(376002)(346002)(39860400002)(366004)(136003)(396003)(451199015)(86362001)(33656002)(5660300002)(30864003)(122000001)(38070700005)(186003)(83380400001)(38100700002)(2906002)(26005)(9686003)(6506007)(478600001)(7696005)(53546011)(66446008)(54906003)(4326008)(316002)(66946007)(66556008)(64756008)(76116006)(71200400001)(66476007)(52536014)(8936002)(41300700001)(55016003)(8676002)(6916009)(579004); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?m+Qg1NpyVieB3joWZVZxOLt7I2GGKGuSpOz2Nutw4NyjZ99ZT3TedLSKbJcY?= =?us-ascii?Q?GVT0yzBuYaGqqB7tLUBHWFlrpa6M7cPuWqYfmvd8oSMXS1z1tP4ji2N3V7xG?= =?us-ascii?Q?ZR7AzBb1lLpAIk1qB8P99LkDmdutP9xYgOy6rgLyZrbcOEygd+x0NpmfT8sE?= =?us-ascii?Q?IwUvABQkAKhVag7QLDAm3UJRqBNK2Yg/thh48XQL8AIyUsDS4FxKHSwXC6SS?= =?us-ascii?Q?ZPAwTNdbsiNv4ZZun3PoQQCFm560vWlMu3pQmXf8je00IMINK+fZn+lDdNpD?= =?us-ascii?Q?kNT7YkssKl14E5GU7diALfz1alkMi6W2ezPzko3DTBde28XEhmHYth1W5JYb?= =?us-ascii?Q?vVgpexM02lxzeChIZTY0nwvmfOFHBXBe/RtRWWYdA7iYvrnblhZHvlbPSdXG?= =?us-ascii?Q?7kfjkTAMFP9wRRAZWiY60PcZkRddOZIMlwuBcJ7rLNFQsNnZZtPYvmW5n2aq?= =?us-ascii?Q?wC2MdLeFRNaHMhEvC3UBkEt/kPVaCyCFsxEg0YaPpzujn7D8qFGpBcTvIRF8?= =?us-ascii?Q?R99f3t0xgW03CkXVFUBaNjLcOcNvuoaS2Qa/3/jFlkNm6Mbre/qzhJPg7Ob4?= =?us-ascii?Q?hEfZn2IOSdhb1WukLYNHz2S5WC4frnk9w+5ZP3b1TE8SjiGJr8104nNC3mko?= =?us-ascii?Q?EMbMYlTraWF1CLDCSV1hst6Dbobj2wfGs987aMiMMkPQdRVIqJQbg2Lf3m5d?= =?us-ascii?Q?NKEKvGr2J8BGYplxnWah5NUktCtiGPz4e0fsbQaJiGkqrcZLNwE8NucR2F2U?= =?us-ascii?Q?hqrDNwtL4dkBdNo4rF1iv7wBmAFCjC8UtWCIFUNHkryBLI0K7aXiOCbgvpKF?= =?us-ascii?Q?yAa3d+TP9ye96H2ET9e2AkKFp29s2WRHsKMII4cBXJ7GsNAmE3l5hgDkGeEt?= =?us-ascii?Q?4BzXp0cFP13P5SLfbI9SmStThLrdTfonF1mvuTUQ/Dbvvh4t2PCuu8g88poY?= =?us-ascii?Q?jdHEBPxK5p1VTwWP3k3mwHbAvz1QYKSECCqlI6kDtJ1oZf70oZyjpagI/qF6?= =?us-ascii?Q?ot8IudAcGvaeR5teNwbTFacj0E7toKabw+BN+pvWYykg9RCaaiDk/Ja24YEK?= =?us-ascii?Q?SluelA3WO42U9HdB7CYlw6JImBNBGTi6yPpfmIv/lDuQgIOQljeonnurDszi?= =?us-ascii?Q?C/8yO6etJ5q5PrwhL/b2HxdzaNWSzlxYnFQxhobeatCVNBd9ULH8RAqrq0Qu?= =?us-ascii?Q?mwwZlryileE4KxEgQG88sTW8tNyBD0niL9xyw8W59Z3WNyo/pUOb2Ezw9XIj?= =?us-ascii?Q?ODJzOqdKDOzFBzXB7yxXJy9vMUe5/c8Sj7sRGhBc3MHW8tVADZkEMER+iMV1?= =?us-ascii?Q?PSNFr67VzTePtVGHAkZCCFb6PZINW/i7DOoJPwnV1z6tqYpYVjxSoA+SORhl?= =?us-ascii?Q?FZc/fd8oCa43k6ygxzg7fJiep5dcd0+V2oq02ghC5ycdh+rNhyI+aSiVik3V?= =?us-ascii?Q?NQbSNpsErAXUdydl6L5atF7VXpzozY3Wx/vb3uGIUp0WOcOjfyvw6ML03OYg?= =?us-ascii?Q?68Rq5GgKoyyqVfLPCz/KEnKf4YIUavSOOI5n5/LeAAngRVNLuAIUJqELM8O9?= =?us-ascii?Q?cAq60PSROIZAso+M3V9sDV2PLNTWdN5r1Z11DGlH?= 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: PH0PR18MB5167.namprd18.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: addccd29-af7e-4522-23ac-08daa76972a8 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Oct 2022 07:07:36.2904 (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: a5jJEGupsoBne9DpDcxxp1XMMMlQKkjSCFpotRsxkPaAumdvFeZtkgctiCvxuxoEyCENnivGdb4yeMZ35Jdimt7LfVErlDM9iQh6qDIHMvc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY3PR18MB4564 X-Proofpoint-GUID: 8422NN5eJYZlDkyUS62BqDLGgUFcIoD0 X-Proofpoint-ORIG-GUID: 8422NN5eJYZlDkyUS62BqDLGgUFcIoD0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1 definitions=2022-10-05_05,2022-10-05_01,2022-06-22_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 Hi David, If no other review comments, could you please pick this series for 22.11 rc= 1 ? Thanks, Amit Shukla > -----Original Message----- > From: Amit Prakash Shukla > Sent: Thursday, September 29, 2022 5:13 PM > To: Anatoly Burakov > Cc: dev@dpdk.org; Jerin Jacob Kollanukkaran ; > david.marchand@redhat.com; bruce.richardson@intel.com; > ciara.power@intel.com; dmitry.kozliuk@gmail.com; Amit Prakash Shukla > > Subject: [PATCH v5 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. > Example: > --> /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. > Example: > --> /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. > Example: > --> /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. > Example: > --> /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 > v5: > - Removed command help related changes >=20 > lib/eal/common/eal_common_memory.c | 447 > ++++++++++++++++++++++++++++- > 1 file changed, 442 insertions(+), 5 deletions(-) >=20 > diff --git a/lib/eal/common/eal_common_memory.c > b/lib/eal/common/eal_common_memory.c > index 688dc615d7..6b863979e9 100644 > --- a/lib/eal/common/eal_common_memory.c > +++ b/lib/eal/common/eal_common_memory.c > @@ -3,6 +3,7 @@ > */ >=20 > #include > +#include > #include > #include > #include > @@ -26,6 +27,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 +1115,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 +1273,418 @@ > 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 (!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; > + > + /* 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; > + > + /* 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; > + > + /* 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 +1699,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