From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 03A05A00C5; Mon, 11 May 2020 13:09:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E52231BFF0; Mon, 11 May 2020 13:08:44 +0200 (CEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2084.outbound.protection.outlook.com [40.107.20.84]) by dpdk.org (Postfix) with ESMTP id D8AB81C202 for ; Mon, 11 May 2020 13:08:40 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZI6gZRH5z8+4P4yD/cg0Vh5Ho7rWm5BIGnmpVNyb4Yy1ejOIw/by6FAT8PuX2Mo1djzSfQwy/BJOogY5ZYA5cYLA4oe/Onp0D+GPBiam4WPLkTWOIrg/QeJOoGXaLrf2JOYddZUZ6dQGS1gFzjyAbi6cnDSJc65eW8oxxiJXs8xHPt/HVvRMIPqCGgQPqhEfG7YFpedyt9QofMooPn+f4Mm4+EgaFImY+FdStFE2seuzYvuFWK+8KVWiBo15/Ue3G0JSGJcurR5uaVFJB6NraWc/kZSX+FWPKjmx0U+Yo+YzzWtkBs/rbtUeNypGFcIouj/G6lR0Pm8goHcP1LHb3A== 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=BqjpVC0uEMDDz9VqacPj3Gegqb60Vpq0T3WlHEn7JYw=; b=eY4k/olcyahYqOpy68npzOpQ2AmIyyMp50ubIdF+Yfe7Zma7wodEIFEQWiQOwkDNWoHJ+i63DYt+dDyF+PNPEThQKA60U07RK7KNAGtE//yNhSZVOx4/gvmvYBs6RiAUicuSWWNHsL6UeVh2LUwV9feyZ3CcJvEIfeqJjgv1BF8wOUuc32Q3MYYDlYzkPbAVOZic6yuG/RwhGVNgmyGd5Q41ta1EfcxlZ/JQzk8bkbdnaIbcBIYG+lD7l7Un6b525s7iTYyU1KccJJahdolMk0iQvkcBrNi0py3zZoZ5h+fWfwKYkJzwM4pg8jrtosa3I4/0FwTFO338ScHumvATLA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BqjpVC0uEMDDz9VqacPj3Gegqb60Vpq0T3WlHEn7JYw=; b=WwjAp0K/AHa+/0MN9Nyi4Z8XorXdp/SwR8E0q7eXKk1lzTULNGVatpIvalhnI/cTGMEdj9yEj63V3MsdIn+DdYYlwK0oie7um+eEVW63ewEQcOQpDDWk5yLDEaJ2jrSTHqnSagID0h2dsiD3769Z7TnceeUvDcQvnldUfqQREDU= Authentication-Results: dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=none action=none header.from=mellanox.com; Received: from AM0PR05MB6610.eurprd05.prod.outlook.com (2603:10a6:208:12f::18) by AM0PR05MB4996.eurprd05.prod.outlook.com (2603:10a6:208:c6::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.28; Mon, 11 May 2020 11:08:39 +0000 Received: from AM0PR05MB6610.eurprd05.prod.outlook.com ([fe80::900:c0ac:78bd:18fc]) by AM0PR05MB6610.eurprd05.prod.outlook.com ([fe80::900:c0ac:78bd:18fc%6]) with mapi id 15.20.2958.035; Mon, 11 May 2020 11:08:39 +0000 From: Wisam Jaddo To: dev@dpdk.org, jackmin@mellanox.com, thomas@monjalon.net, jerinjacobk@gmail.com, ajit.khaparde@broadcom.com, arybchenko@solarflare.com Cc: Suanming Mou Date: Mon, 11 May 2020 11:08:10 +0000 Message-Id: <20200511110811.11474-5-wisamm@mellanox.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200511110811.11474-1-wisamm@mellanox.com> References: <20200506123627.22340-2-wisamm@mellanox.com> <20200511110811.11474-1-wisamm@mellanox.com> Content-Type: text/plain X-ClientProxiedBy: PR0P264CA0122.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1a::14) To AM0PR05MB6610.eurprd05.prod.outlook.com (2603:10a6:208:12f::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from mellanox.com (37.142.13.130) by PR0P264CA0122.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.27 via Frontend Transport; Mon, 11 May 2020 11:08:38 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [37.142.13.130] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 99a0ff8b-9d9b-44c0-f238-08d7f59ba8c0 X-MS-TrafficTypeDiagnostic: AM0PR05MB4996:|AM0PR05MB4996: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2512; X-Forefront-PRVS: 04004D94E2 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Au6AjU6piFwAuENGiibhB28gRCt9QmE0IK6ZR4ns2k3+9N2XYATWuQ0sN3Ul82PAoLtsR0rdoFXmQq1gS67e2brLdM4B1eNGqgoRCTJDYukmFfVUbkWqjDf6IttXk9zu3l3ueB3FIckr4XcfjvZI1y6mIZqwK13FvtcHYCaWnpEaqmueFUg6GR+RwTcnz4849/Af29fLmI6+/Xx2OpVPRtpsprad7bISgl/+riuDou1vdfsyNZh6NqAuhbsj88wvOKimraIZrhtz/BjUYXMKIjZz8id3sbgoOcSdxowjtYExn0fqZjp/qFc1LwE9Z8okZq/+c0grLmhtxr73Ip8lH+lsgaGW/tTb0QjzVgCKtwWGet/WgD8Q7fjQwM8tJfsfRmtMhqkaw9W33D8SAjVx81FZHmhZZnH+W1OO5ryHj5TUmgHwjat8HMYdqhoilLYBHqdzNB7ozGpGFqaDdHOrg7XsUDB90xLofOpxR4W4HLBHifaM8Qd6FbO/iE9t2zzmrBvTnwGdI8RvG2xpWQpmEQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR05MB6610.eurprd05.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(366004)(39860400002)(376002)(346002)(136003)(396003)(33430700001)(6666004)(107886003)(316002)(86362001)(66476007)(66556008)(52116002)(7696005)(956004)(55016002)(66946007)(33440700001)(2616005)(1076003)(36756003)(8676002)(2906002)(8936002)(5660300002)(8886007)(26005)(16526019)(186003)(4326008)(478600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 4+90/HsTOSX5DJFxT9kUrE31WLqAn0JHgnzQO3dehOnmuYIWKbH4l9412xLmmvQZ9Dm/OE801kJTuqbWJPg7kGMj9V1dgISPqPBzIJK3HfXn8Q4vS+kRM5zsqX57aUszxWmQfmR5ABftaaMXjEitsOMjRRLVqDmJeGpLvsim9PWIDbRqbfU54eReAdpYYsRWjgx4Dzrs2593AujpccWg+a9KV6Edn4L9pwlAQVPiA9tpKBSdy3Mc51o5Y9bOp5aYmB8AuZ4lr0/oA1UpJm5Na0kh7hChUE+W3KUUZvVoFGgqOU8CDVKUc2LwSKBhNTtPvN3nFDlSzU8brekoO92qDviI58q1D8fpEfus0O+L/iT+JYvhgXZt4XICOa70UQ+6FAC41h1z0TbEAQzdBwJOBjXjhkKpSjUctm0KEFiZYIS5Dkik298qQ1jcG8oPoqjVlQReNdY3nGmR0qObr4nMeHvBpzDJlDygwPkPK4jzvrE= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 99a0ff8b-9d9b-44c0-f238-08d7f59ba8c0 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2020 11:08:39.8516 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: BUzP0JH4mVCYxjtTJaxsK4h4JZoncg114ox9saTtjp76OoHj8nwj2dgKIloa6AULEM9e5kD6RvcIv7MG1awWgg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB4996 Subject: [dpdk-dev] [PATCH v6 4/5] app/flow-perf: add memory dump to app X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Introduce new feature to dump memory statistics of each socket and a total for all before and after the creation. This will give two main advantage: 1- Check the memory consumption for large number of flows "insertion rate scenario alone" 2- Check that no memory leackage after doing insertion then deletion. Signed-off-by: Suanming Mou Signed-off-by: Wisam Jaddo --- app/test-flow-perf/main.c | 72 +++++++++++++++++++++++++- doc/guides/rel_notes/release_20_05.rst | 1 + doc/guides/tools/flow-perf.rst | 6 ++- 3 files changed, 77 insertions(+), 2 deletions(-) diff --git a/app/test-flow-perf/main.c b/app/test-flow-perf/main.c index b177025fa..da54bbdef 100644 --- a/app/test-flow-perf/main.c +++ b/app/test-flow-perf/main.c @@ -49,7 +49,8 @@ static uint32_t flow_actions; static uint32_t flow_attrs; static volatile bool force_quit; static bool dump_iterations; -static bool delete_flag; +static bool delete_flag; +static bool dump_socket_mem_flag; static struct rte_mempool *mbuf_mp; static uint32_t nb_lcores; static uint32_t flows_count; @@ -67,6 +68,7 @@ usage(char *progname) " iteration\n"); printf(" --deletion-rate: Enable deletion rate" " calculations\n"); + printf(" --dump-socket-mem: To dump all socket memory\n"); printf("To set flow attributes:\n"); printf(" --ingress: set ingress attribute in flows\n"); @@ -250,6 +252,7 @@ args_parse(int argc, char **argv) { "flows-count", 1, 0, 0 }, { "dump-iterations", 0, 0, 0 }, { "deletion-rate", 0, 0, 0 }, + { "dump-socket-mem", 0, 0, 0 }, /* Attributes */ { "ingress", 0, 0, 0 }, { "egress", 0, 0, 0 }, @@ -360,6 +363,9 @@ args_parse(int argc, char **argv) if (strcmp(lgopts[opt_idx].name, "deletion-rate") == 0) delete_flag = true; + if (strcmp(lgopts[opt_idx].name, + "dump-socket-mem") == 0) + dump_socket_mem_flag = true; break; default: fprintf(stderr, "Invalid option: %s\n", argv[optind]); @@ -371,6 +377,62 @@ args_parse(int argc, char **argv) printf("end_flow\n"); } +/* Dump the socket memory statistics on console */ +static size_t +dump_socket_mem(FILE *f) +{ + struct rte_malloc_socket_stats socket_stats; + unsigned int i = 0; + size_t total = 0; + size_t alloc = 0; + size_t free = 0; + unsigned int n_alloc = 0; + unsigned int n_free = 0; + bool active_nodes = false; + + + for (i = 0; i < RTE_MAX_NUMA_NODES; i++) { + if (rte_malloc_get_socket_stats(i, &socket_stats) || + !socket_stats.heap_totalsz_bytes) + continue; + active_nodes = true; + total += socket_stats.heap_totalsz_bytes; + alloc += socket_stats.heap_allocsz_bytes; + free += socket_stats.heap_freesz_bytes; + n_alloc += socket_stats.alloc_count; + n_free += socket_stats.free_count; + if (dump_socket_mem_flag) { + fprintf(f, "::::::::::::::::::::::::::::::::::::::::"); + fprintf(f, + "\nSocket %u:\nsize(M) total: %.6lf\nalloc:" + " %.6lf(%.3lf%%)\nfree: %.6lf" + "\nmax: %.6lf" + "\ncount alloc: %u\nfree: %u\n", + i, + socket_stats.heap_totalsz_bytes / 1.0e6, + socket_stats.heap_allocsz_bytes / 1.0e6, + (double)socket_stats.heap_allocsz_bytes * 100 / + (double)socket_stats.heap_totalsz_bytes, + socket_stats.heap_freesz_bytes / 1.0e6, + socket_stats.greatest_free_size / 1.0e6, + socket_stats.alloc_count, + socket_stats.free_count); + fprintf(f, "::::::::::::::::::::::::::::::::::::::::"); + } + } + if (dump_socket_mem_flag && active_nodes) { + fprintf(f, + "\nTotal: size(M)\ntotal: %.6lf" + "\nalloc: %.6lf(%.3lf%%)\nfree: %.6lf" + "\ncount alloc: %u\nfree: %u\n", + total / 1.0e6, alloc / 1.0e6, + (double)alloc * 100 / (double)total, free / 1.0e6, + n_alloc, n_free); + fprintf(f, "::::::::::::::::::::::::::::::::::::::::\n"); + } + return alloc; +} + static void print_flow_error(struct rte_flow_error error) { @@ -708,6 +770,7 @@ main(int argc, char **argv) int ret; uint16_t port; struct rte_flow_error error; + int64_t alloc, last_alloc; ret = rte_eal_init(argc, argv); if (ret < 0) @@ -718,6 +781,7 @@ main(int argc, char **argv) flows_count = DEFAULT_RULES_COUNT; iterations_number = DEFAULT_ITERATION; delete_flag = false; + dump_socket_mem_flag = false; flow_group = 0; signal(SIGINT, signal_handler); @@ -734,7 +798,13 @@ main(int argc, char **argv) if (nb_lcores <= 1) rte_exit(EXIT_FAILURE, "This app needs at least two cores\n"); + last_alloc = (int64_t)dump_socket_mem(stdout); flows_handler(); + alloc = (int64_t)dump_socket_mem(stdout); + + if (last_alloc) + fprintf(stdout, ":: Memory allocation change(M): %.6lf\n", + (alloc - last_alloc) / 1.0e6); RTE_ETH_FOREACH_DEV(port) { rte_flow_flush(port, &error); diff --git a/doc/guides/rel_notes/release_20_05.rst b/doc/guides/rel_notes/release_20_05.rst index e511e9c1a..aae1c5492 100644 --- a/doc/guides/rel_notes/release_20_05.rst +++ b/doc/guides/rel_notes/release_20_05.rst @@ -219,6 +219,7 @@ New Features Application features: * Measure rte_flow insertion rate. * Measure rte_flow deletion rate. + * Dump rte_flow memory consumption. Removed Items diff --git a/doc/guides/tools/flow-perf.rst b/doc/guides/tools/flow-perf.rst index 1f8b1fa15..c8cce187e 100644 --- a/doc/guides/tools/flow-perf.rst +++ b/doc/guides/tools/flow-perf.rst @@ -25,7 +25,8 @@ The current version has limitations which can be removed in future: * Support outer items up to tunnel layer only. * Single core insertion only. -The application also provide the ability to measure rte flow deletion rate. +The application also provide the ability to measure rte flow deletion rate, +in addition to memory consumption before and after the flows creation. Compiling the Application @@ -76,6 +77,9 @@ The command line options are: * ``--deletion-rate`` Enable deletion rate calculations. +* ``--dump-socket-mem`` + Dump the memory stats for each socket before the insertion and after. + Attributes: * ``--ingress`` -- 2.17.1