From patchwork Thu Jun 4 13:35:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wisam Jaddo X-Patchwork-Id: 70855 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0A165A00C4; Thu, 4 Jun 2020 15:36:08 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 508BA1D613; Thu, 4 Jun 2020 15:35:30 +0200 (CEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2080.outbound.protection.outlook.com [40.107.20.80]) by dpdk.org (Postfix) with ESMTP id 12E521D5F7 for ; Thu, 4 Jun 2020 15:35:27 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T77GuQw9dBET80u3ZniPmff1YHW8qlBRCV7vEIyOOiCh5J1P8Z82OZSjVCcYFzzmUERp5Mrj5ck++oPy5VrG+hcWRLnV8eoQAWJFJXhZUNB2Tr95cV11vwDwOrXhzoGZOd+pst8B8xGZYtDr1piEaFhKnVMNp/lccu66PnMFnUWb0J0+wyYM1XQJvXse9QsuziaLVvlFfP91Aoe1IIDBxoDBzogHyKS8UUId2t6Z8W2tqhEIFDHK+b3JUzI5qsOCiLHNjjdMFTvTY1GOGI3iWhs6i5mLu0jmTlzx801FUqttIPxU6RI7av6bzJONG5sV+Cu3XyYPGtJteteUNInjCA== 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=kyttfv4xhYqVKrftPpMa39dHv/1GcUWdIKVEm1p/OY0=; b=MJcEqHsFID0x0UBDeHP93LzdDMBmkctc/53o3RTtex5GK1gMiFio+3QFbNbv7N4BEj6eKaibZbXO3W79ueOwsdkiJauPJyaZpJqfoadL9RU/AOMD+ZqVJqrjxep6ODpNt+t2LqN8pcD1s0T9oYT4gCu49eMqGVLgHrbReWmJpv2Z8AYy2Xffc6w3DeqoskT5O595VPhb5GOekGoIrD0CCSh546oOBYWgKbrLm1afaUfjUx1N3guWhFB7FroADU6afdDLbczMLAJ9qV4iBFz6XHy9Paw6s5ru4A9k84LgQZ3EoED84ijkoM0cYm6j7z+VSsMDYGPitBGZjMsAcyZGbg== 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=kyttfv4xhYqVKrftPpMa39dHv/1GcUWdIKVEm1p/OY0=; b=qKRyje+yPFg4JuCubAVgJGuRkekt/d7XY8z3QwQgnUyN/AfLzUbLRj6jiWw5keSqsJbn268K4Gp/JFbupK/2FeE5NqtlZJ9C2+5lf0B+OruLM0nmkx/EOxW44fc8U3D3/AKNQEYcdYcNmvWDD0sbL68avlRYAmWkHe61kSkQ3Aw= Authentication-Results: solarflare.com; dkim=none (message not signed) header.d=none;solarflare.com; dmarc=none action=none header.from=mellanox.com; Received: from AM0PR05MB6610.eurprd05.prod.outlook.com (2603:10a6:208:12f::18) by AM0PR05MB4577.eurprd05.prod.outlook.com (2603:10a6:208:b7::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3045.25; Thu, 4 Jun 2020 13:35:26 +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.3045.024; Thu, 4 Jun 2020 13:35:26 +0000 From: Wisam Jaddo To: arybchenko@solarflare.com, jackmin@mellanox.com, thomas@monjalon.net, jerinjacobk@gmail.com, ajit.khaparde@broadcom.com Cc: dev@dpdk.org, Suanming Mou Date: Thu, 4 Jun 2020 13:35:01 +0000 Message-Id: <20200604133502.28491-5-wisamm@mellanox.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200604133502.28491-1-wisamm@mellanox.com> References: <20200511110811.11474-2-wisamm@mellanox.com> <20200604133502.28491-1-wisamm@mellanox.com> X-ClientProxiedBy: AM0PR01CA0117.eurprd01.prod.exchangelabs.com (2603:10a6:208:168::22) 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 AM0PR01CA0117.eurprd01.prod.exchangelabs.com (2603:10a6:208:168::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3066.18 via Frontend Transport; Thu, 4 Jun 2020 13:35:25 +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: 65de1608-e726-42e9-37da-08d8088c23a1 X-MS-TrafficTypeDiagnostic: AM0PR05MB4577: 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: 04244E0DC5 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R49vyAjZwXFZEbSCrHpN4ZNu5+pK/w0VZPC63E2gCWYvXnMhdPe5NgZ3Yx5qrCqu+Ih3vAfMNCTltpvQkbdbbnMX71F343ntBdOaE5/tta/DVW8ZXarLtFPAKJIBl5gruBTWyLviwk6clOSjTb3MDCYMi22YmjgLYLxEKXiedlueAREj9SUSZomTrUwmFclMlk+jHqj+Jc0uxlycvII4c0S+hKfHRnXLZPkj1Kz1+taBZgaZVZMODJCAOkUM8D5/iXkYvGQuaoJKPJfiogq7Wkr3oyueT5766NO9uflSYgKmJaQJ11o/UN/4Qz4ElcAw 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)(136003)(396003)(376002)(346002)(366004)(39860400002)(1076003)(316002)(107886003)(4326008)(2906002)(26005)(956004)(52116002)(2616005)(66556008)(55016002)(66946007)(86362001)(36756003)(8936002)(7696005)(83380400001)(6666004)(8886007)(186003)(5660300002)(8676002)(478600001)(16526019)(66476007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: /pepZ1axBKNoH5DH/PbprB81M4FD6/vNyJ4VM63F+q37MDyUv31k0qNaIJk7+WRpD0tEdRqLp/r2NHuYulagvmpeL/Ms0ecte4Xcp/Bft9LxRpZWTB4UqPG6Bh9s5OBxiw7NvZLSNG7NYrN8G5dHYLaYZY1k/NBc30d8F/EDdhiodJyCdcj1zFplhZ+Y+zmxnBg2mxprOh2ZaForlQhec7HS9GrhZ/A+hWJ9hNUX0YHjtZErZm/zmc2yL0QRVVOcFZZ32b71rtp0TwdkQx1wDhgT8IIm65BRUqkeowvMNFOXzZOzn92JZ6b9OYs/9b4bSEzPHVyI/jmjZmS9AaFZ6zNmm+hn17+OEDmekSOW/BQaxGqclH6k7G7e5EVd9vvt7vQFoXwrL/VBrQeS2qyGZsjL+8i0lRISWgU1hSp2ZrAa8WQHmib487qKURzu21HK+lmmJrDqJBr9uRikgWLxE/AU5XluKKugAkHGeTZMYvc= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 65de1608-e726-42e9-37da-08d8088c23a1 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2020 13:35:26.1985 (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: qeq7JBta/ibv+WiNyn0AdVi8z9pgPi3/91gZLdoHAi56dEErzrJDn5lNGPHIXVcwIWesxwCf+GZVfQHRIBOqKw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB4577 Subject: [dpdk-dev] [PATCH v7 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 Acked-by: Xiaoyu Min --- app/test-flow-perf/main.c | 72 +++++++++++++++++++++++++- doc/guides/rel_notes/release_20_08.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 bb7c3f6b5..e458f4853 100644 --- a/app/test-flow-perf/main.c +++ b/app/test-flow-perf/main.c @@ -49,7 +49,8 @@ static uint64_t flow_actions; static uint64_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) { @@ -701,6 +763,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) @@ -711,6 +774,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); @@ -727,7 +791,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_08.rst b/doc/guides/rel_notes/release_20_08.rst index 05bef91c3..170086d1c 100644 --- a/doc/guides/rel_notes/release_20_08.rst +++ b/doc/guides/rel_notes/release_20_08.rst @@ -63,6 +63,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 79a3013d5..5dbd6eb3b 100644 --- a/doc/guides/tools/flow-perf.rst +++ b/doc/guides/tools/flow-perf.rst @@ -26,7 +26,8 @@ The current version has limitations which can be removed in future: * Single core insertion only. * Only one instance of same action can be added in one rule. -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 @@ -77,6 +78,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``