From patchwork Thu Apr 30 10:33:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wisam Jaddo X-Patchwork-Id: 69596 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 F18ADA00C5; Thu, 30 Apr 2020 12:34:43 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 407BC1DB55; Thu, 30 Apr 2020 12:34:33 +0200 (CEST) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30045.outbound.protection.outlook.com [40.107.3.45]) by dpdk.org (Postfix) with ESMTP id 169A61DB37 for ; Thu, 30 Apr 2020 12:34:22 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y6ujgxpo2wr29NLvdl/ScNOpYMZYAAoC8XI9WuFBQSX6PLTQlg421r0poA7WAdlnpHLK2O70QKfJuihwpacTx4NoQZWeaccGQeYGpH7PG+YGh7vl7v56DfMm54/MNwlnGEAR7Dwsf0hH7UU9EdX16qIE7elqOoerKl54ZLEMGWfP9eD22/zTP5fXOqFOHCYTXuSpFeoQCV2n17TwaLtjJz1U7cGPY30aocAMVssPN6Fd+5o1m3YvYj63kNzz/2xyg37z9nFKVL7MAZjBeHYF+PYP3xdl1lZ/7+fj9Qil9dLlkEAQ/VSvzLiykiPKFvxtRAOUfw9TqUZ4td1XYF9tZw== 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=/JPS9nBFecP3i7j+LBVqNPEi4Zw5EzfYImU+GN1vMzg=; b=m3rX/z3tZvJrkr64BNKpQLfKia1B3jmN+eFYHHNWsm5fkEHwawsjF9D3nBHv4ALmNsiYJTS0qqdH8A2oBOJ4xTgmCgY47Yjrf1wpBXmpSo1UFAE+6OKjer83XUwOsNr7XYKc/Uaay1pJh52t7tz2UVuHo4yOlTcRlUXrIrcQXpw2atI31Pm61dHJ6cLey7mHvNx4gUoEDurMvKBZVFmBeePqiuK3Q1Nb8AUxnSJ4WWdHIY0Z90CYJeeo430wqC+xyQiBycJmPWvophj6xYUAriGYMfrRzo4LqGRpbRcmQZ6jP37rChufxhM4C1wWIQlN0YoVwbDSzpLR0VIVufrhGg== 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=/JPS9nBFecP3i7j+LBVqNPEi4Zw5EzfYImU+GN1vMzg=; b=q1XrmZNhWZALNnFbeiX+RFh/VwC0g67w4h0m8jEl7FEFBuk7mffRjpGFOE0eekjrOa+k4tU4LZG5rb+ew7nm8E4S8njvSYQo84kigtK+qsmrWQ0niQPKKBgqk9RRirNltTvkWd2byML8tXbTfkKvvUqOsGb3XdgHZmPWclHA1qw= 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 AM0PR05MB5204.eurprd05.prod.outlook.com (2603:10a6:208:ef::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13; Thu, 30 Apr 2020 10:34:19 +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.2937.028; Thu, 30 Apr 2020 10:34:19 +0000 From: Wisam Jaddo To: dev@dpdk.org, jackmin@mellanox.com, thomas@monjalon.net, jerinjacobk@gmail.com, gerlitz.or@gmail.com, l.yan@epfl.ch Date: Thu, 30 Apr 2020 10:33:39 +0000 Message-Id: <20200430103341.1845-4-wisamm@mellanox.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200430103341.1845-1-wisamm@mellanox.com> References: <20200430093249.6772-2-wisamm@mellanox.com> <20200430103341.1845-1-wisamm@mellanox.com> X-ClientProxiedBy: PR0P264CA0116.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::32) 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 PR0P264CA0116.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.19 via Frontend Transport; Thu, 30 Apr 2020 10:34:14 +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: 504be87a-13f0-4d92-c301-08d7ecf20770 X-MS-TrafficTypeDiagnostic: AM0PR05MB5204:|AM0PR05MB5204: 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:2000; X-Forefront-PRVS: 0389EDA07F 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)(396003)(376002)(136003)(346002)(366004)(39860400002)(316002)(8676002)(52116002)(7696005)(478600001)(8936002)(186003)(5660300002)(55016002)(16526019)(6666004)(26005)(36756003)(956004)(8886007)(2616005)(66556008)(2906002)(66476007)(66946007)(86362001)(1076003); DIR:OUT; SFP:1101; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0iCjOzuTKrj/ZegCbda+XRbr4k5+6MqpFQOqlvZ1v9zsKrY5n6a7C0C7ANlNpNJvgXQw72IGSrI4WdMDwwBcrADa199vV9Jp95zNLX54on4EFk/KKMyv2DdEO0L+Z3fRpfvjK4ZA5IA9CdJva8I2/UsnHgHINClOfJCxfbrPKB22HaIsqIq7ObX/8papZAfRr4zCsIX6fEIpfXRWfB4t3W/YpzUVJ6JiiwGd3VPU5hd15h/6w4BBfw4SBWP8A3FSnWeLTiSOQ0dS0ybnoWPQr8TKAkrGXtjhk0rm/zf64oFk/p8kPoa0YJg5GXZksK1ImVe8uHlalk24D8sr09QDEtxpPaucnVipMoRuMGTocQ8+B7dhzv4H/ayV9YSS/bSi4tNJLRxkArdELdPP6v3XuzPDT/jiEQvEygMaDgnYpG3Eg4lrfq/q8eKovF5z+u9r X-MS-Exchange-AntiSpam-MessageData: UZysQANvBGZ9cG4gsZaosamt+p/0UEtiDMcCCstrQqZXX/sToNeGo+oOILsPZz3NTnBmTtuCKvjo2Qx36bAbgx89bzY1f1zT6qmX8rLTqPOtD8FfVWA+MTNYTIpl354qc4eg62jhpYm84TpEejUEEbLDTBNIbBkHdO5QutX9MvfPcCd8B1Mg6geI1qQge2ukEmFGKYd+npjl8AsNqVbk54GsNCZYeE5h/Xr7o7Zoj98ZlBxI8q4tFTZQEMnchZSJieacJWAK0rXo6wivdZxLQMcd2FM7JvNpeQYLjrbvqPc1N7MDDWIjz8j2gWXA2gH8m4JjsaLhMr4Rj3FlnL3Lp1GW0vvL6p32VYVAaEoYRAUZF8piagwMiLwNJTAhJGWDRfL3qZE306EnMTBt8OSaus+ftTHrdsgTOEroW9kjF8DCImT4pMMJCz+cwTcUCiebTjSTFw0LlycjFTR6MZ+fymmzq3VrFMjpQjuS15ZTlY+WAuc4eDVd/fPlyzsuxj51MSvgl4tqoxvR1+ROsBVzNAfE1AOgSdJK+hqcgbsJFuHF3ZcK9XAJ8MaHhKKS2DAZKp3W1WbZJCSy/jU2gYFwCT5scG5d3D5j0iJn0KQ6jyop3FlpE8vwCYrmrQOG31ZuLQSusP4EjJTRtEA0puzkVGGp7xrVwNZt0iguJE1jKwSkfz9P32J1edRb++Ent15AANPaZPSwAhuE0+x8zVg+sBqXw1yieAfk51cIT/0KEg8tRWexxJ2o/u3XWRJOFbU2HX2iSKgm9zaW+fHgUUajHlNFj2ygKUCwDrPeSDAKzGw= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 504be87a-13f0-4d92-c301-08d7ecf20770 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2020 10:34:14.9864 (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: sP18XGmxhgKkGy+Gqjx/MK9qzigaLBNThc8ZBfPgcFMEiw6Ao6mYVM7vPQ6YhXeZNaIcrA27f9hh739A3ToHmw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB5204 Subject: [dpdk-dev] [PATCH v4 3/5] app/test-flow-perf: add deletion rate calculation 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" Add the ability to test deletion rate for flow performance application. This feature is disabled by default, and can be enabled by add "--deletion-rate" in the application command line options. Signed-off-by: Wisam Jaddo Acked-by: Xiaoyu Min --- app/test-flow-perf/main.c | 86 ++++++++++++++++++++++++++++++++++ doc/guides/tools/flow-perf.rst | 4 ++ 2 files changed, 90 insertions(+) diff --git a/app/test-flow-perf/main.c b/app/test-flow-perf/main.c index 115af4f302..7c11c0b577 100644 --- a/app/test-flow-perf/main.c +++ b/app/test-flow-perf/main.c @@ -62,6 +62,7 @@ static uint16_t flow_actions; static uint8_t flow_attrs; static volatile bool force_quit; static volatile bool dump_iterations; +static volatile bool delete_flag; static struct rte_mempool *mbuf_mp; static uint32_t nb_lcores; static uint32_t flows_count; @@ -75,6 +76,8 @@ static void usage(char *progname) " flows to insert, default is 4,000,000\n"); printf(" --dump-iterations: To print rates for each" " iteration\n"); + printf(" --deletion-rate: Enable deletion rate" + " calculations\n"); printf("To set flow attributes:\n"); printf(" --ingress: set ingress attribute in flows\n"); @@ -123,6 +126,7 @@ args_parse(int argc, char **argv) { "help", 0, 0, 0 }, { "flows-count", 1, 0, 0 }, { "dump-iterations", 0, 0, 0 }, + { "deletion-rate", 0, 0, 0 }, /* Attributes */ { "ingress", 0, 0, 0 }, { "egress", 0, 0, 0 }, @@ -304,6 +308,8 @@ args_parse(int argc, char **argv) } if (!strcmp(lgopts[opt_idx].name, "dump-iterations")) dump_iterations = true; + if (!strcmp(lgopts[opt_idx].name, "deletion-rate")) + delete_flag = true; break; default: usage(argv[0]); @@ -323,9 +329,75 @@ print_flow_error(struct rte_flow_error error) error.message ? error.message : "(no stated reason)"); } +static inline void +destroy_flows(int port_id, struct rte_flow **flow_list) +{ + struct rte_flow_error error; + clock_t start_iter, end_iter; + double cpu_time_used = 0; + double flows_rate; + double cpu_time_per_iter[MAX_ITERATIONS]; + double delta; + uint32_t i; + int iter_id; + + for (i = 0; i < MAX_ITERATIONS; i++) + cpu_time_per_iter[i] = -1; + + if (iterations_number > flows_count) + iterations_number = flows_count; + + /* Deletion Rate */ + printf("Flows Deletion on port = %d\n", port_id); + start_iter = clock(); + for (i = 0; i < flows_count; i++) { + if (!flow_list[i]) + break; + + memset(&error, 0x33, sizeof(error)); + if (rte_flow_destroy(port_id, flow_list[i], &error)) { + print_flow_error(error); + rte_exit(EXIT_FAILURE, "Error in deleting flow"); + } + + if (i && !((i + 1) % iterations_number)) { + /* Save the deletion rate of each iter */ + end_iter = clock(); + delta = (double) (end_iter - start_iter); + iter_id = ((i + 1) / iterations_number) - 1; + cpu_time_per_iter[iter_id] = + delta / CLOCKS_PER_SEC; + cpu_time_used += cpu_time_per_iter[iter_id]; + start_iter = clock(); + } + } + + /* Deletion rate per iteration */ + if (dump_iterations) + for (i = 0; i < MAX_ITERATIONS; i++) { + if (cpu_time_per_iter[i] == -1) + continue; + delta = (double)(iterations_number / + cpu_time_per_iter[i]); + flows_rate = delta / 1000; + printf(":: Iteration #%d: %d flows " + "in %f sec[ Rate = %f K/Sec ]\n", + i, iterations_number, + cpu_time_per_iter[i], flows_rate); + } + + /* Deletion rate for all flows */ + flows_rate = ((double) (flows_count / cpu_time_used) / 1000); + printf("\n:: Total flow deletion rate -> %f K/Sec\n", + flows_rate); + printf(":: The time for deleting %d in flows %f seconds\n", + flows_count, cpu_time_used); +} + static inline void flows_handler(void) { + struct rte_flow **flow_list; struct rte_flow_error error; clock_t start_iter, end_iter; double cpu_time_used; @@ -337,6 +409,7 @@ flows_handler(void) int port_id; int iter_id; uint32_t eagain_counter = 0; + uint32_t flow_index; nr_ports = rte_eth_dev_count_avail(); @@ -348,8 +421,14 @@ flows_handler(void) printf(":: Flows Count per port: %d\n", flows_count); + flow_list = rte_zmalloc("flow_list", + (sizeof(struct rte_flow *) * flows_count) + 1, 0); + if (flow_list == NULL) + rte_exit(EXIT_FAILURE, "No Memory available!"); + for (port_id = 0; port_id < nr_ports; port_id++) { cpu_time_used = 0; + flow_index = 0; if (flow_group > 0) { /* * Create global rule to jumo into flow_group @@ -366,6 +445,7 @@ flows_handler(void) print_flow_error(error); rte_exit(EXIT_FAILURE, "error in creating flow"); } + flow_list[flow_index++] = flow; } /* Insertion Rate */ @@ -389,6 +469,8 @@ flows_handler(void) rte_exit(EXIT_FAILURE, "error in creating flow"); } + flow_list[flow_index++] = flow; + if (i && !((i + 1) % iterations_number)) { /* Save the insertion rate of each iter */ end_iter = clock(); @@ -422,6 +504,9 @@ flows_handler(void) printf(":: The time for creating %d in flows %f seconds\n", flows_count, cpu_time_used); printf(":: EAGAIN counter = %d\n", eagain_counter); + + if (delete_flag) + destroy_flows(port_id, flow_list); } } @@ -580,6 +665,7 @@ main(int argc, char **argv) force_quit = false; dump_iterations = false; + delete_flag = false; flows_count = 4000000; iterations_number = 100000; flow_group = 0; diff --git a/doc/guides/tools/flow-perf.rst b/doc/guides/tools/flow-perf.rst index 62e038c430..e07e659df5 100644 --- a/doc/guides/tools/flow-perf.rst +++ b/doc/guides/tools/flow-perf.rst @@ -18,6 +18,8 @@ give different flow each time, and all other items will have open masks. The current design have single core insertion rate. In the future we may have a multi core insertion rate measurement support in the app. +The application also provide the ability to measure rte flow deletion rate. + Compiling the Application ========================= @@ -89,6 +91,8 @@ The command line options are: Print rates for each iteration of flows. Default iteration is 1,00,000. +* ``--deletion-rate`` + Enable deletion rate calculations. Attributes: