From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
	by inbox.dpdk.org (Postfix) with ESMTP id 8FB56A00C5;
	Mon, 11 May 2020 13:10:44 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
	by dpdk.org (Postfix) with ESMTP id 1FB621C2F6;
	Mon, 11 May 2020 13:09:37 +0200 (CEST)
Received: from EUR05-VI1-obe.outbound.protection.outlook.com
 (mail-vi1eur05on2072.outbound.protection.outlook.com [40.107.21.72])
 by dpdk.org (Postfix) with ESMTP id 5ECCB1C43E
 for <dev@dpdk.org>; Mon, 11 May 2020 13:09:33 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
 b=WFsfowNqhuEk0L04Y41m3xn/kkav9FsF4d3QuR436pstRnkhACsGNQk/NkqKTdan4VQ7T11Nh3tB41VPfeErK251hwT3NabG2lt7sGnCtlDwS32GLPaqIsxuNXztfW+MAKm3mapcYcEMhzbI4mp7zozdTqrdRW7zgLYwHCQBIfdUCpy/FMZyixTnSYVf2EdbVc2FKDMFk8tcdq8no7ACoTs2VV1/6P5+oeC6dqERwYg5OAMktoFun8NZjx3Y04WTJw3Au1XwSQYXi6FR+a7BWXVETgay1DWuRMOshJJ8FUECWzizBI1iM2dbOgwvOZJUojJYnSuS+TUwSmgHg6Le3w==
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=LVoddsExgJluQtnT0d+Klwyre2vejkcQz54MUosVMFY=;
 b=jJ7sXntj0rYcZHEPadO7qsaN3GxJK3XYOaBlvweQ+T8h7dVjdy7G0DzPucqhlkKmc1U8uOB9vlRoSIRHfm29JVWlxkA4OTwRvb5AEus0l4t7epjIU6tGZUDiQ1uUiviSfAUtiGhfeOLvdnNp4qK+j383W3Q/gkI9Nk/BXcc8n1JK+ZG+ctlYOECHsjKHYMPcDfv7ml7FAd/cd5qhTBMTk0znyHJGt1ZxT2ze17ziiVl0OU6J16N4y2wqTlysHvIthuoqOy5OcJK1SEZnP4HKkWasg/0Qq2KN04EM06OydONLNepcmuvwY5RYOzWHBlGupiXhuiF2gaijSEnm+U1EpA==
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=LVoddsExgJluQtnT0d+Klwyre2vejkcQz54MUosVMFY=;
 b=XkBdr3D/K/VhKq+9W3ChOkfAygseKC/P/lQNkcEG2W8A54X9aft6kIbDr0Szt/RQp8jWoJUgXoTtUwu8J634koQZ1olDX5egk7rKXNJ5mCHplP/SRJZe5KMX7QADIGau4BzqjPW/Key/Jtdq7wrRTXmkK22Kpdc4h611CjyEXXI=
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 AM0PR05MB5891.eurprd05.prod.outlook.com (2603:10a6:208:133::28)
 with Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.33; Mon, 11 May
 2020 11:09:32 +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:09:32 +0000
From: Wisam Jaddo <wisamm@mellanox.com>
To: dev@dpdk.org, jackmin@mellanox.com, thomas@monjalon.net,
 jerinjacobk@gmail.com, ajit.khaparde@broadcom.com,
 arybchenko@solarflare.com
Date: Mon, 11 May 2020 11:09:10 +0000
Message-Id: <20200511110912.11535-4-wisamm@mellanox.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <20200511110912.11535-1-wisamm@mellanox.com>
References: <20200506123627.22340-2-wisamm@mellanox.com>
 <20200511110912.11535-1-wisamm@mellanox.com>
Content-Type: text/plain
X-ClientProxiedBy: PR3P192CA0058.EURP192.PROD.OUTLOOK.COM
 (2603:10a6:102:57::33) 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
 PR3P192CA0058.EURP192.PROD.OUTLOOK.COM (2603:10a6:102:57::33) with Microsoft
 SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 15.20.2979.29 via Frontend Transport; Mon, 11 May 2020 11:09:31 +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: 5185bd7c-b6ed-4241-3cf6-08d7f59bc829
X-MS-TrafficTypeDiagnostic: AM0PR05MB5891:|AM0PR05MB5891:
X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <AM0PR05MB589176A293BB67B7B1733D7AA9A10@AM0PR05MB5891.eurprd05.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:1388;
X-Forefront-PRVS: 04004D94E2
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: eY0GXgjThRngSasiyORK5GBxol/c2hvEQuZrJTZYd3x7AU7/Lm5VRKRcRFmYnONcJgop42/IAwM+zV0QFDz8ZHExS/+xby1vX2Hv4mVyC3YBizQ0wNCoGO8/0IjuW9GkDVrP9baZ6QY/QT9eCfcW0sSWeJ7r6aALisJ6fk3utLOJKuy/4Z+vYEG0rX1ZJ2cMERvQlsel1mLS53/R3fYVuCoO1xU/dXR0XuJTNb5vMTiy7dNhdDccVbBjlDBCtwZsgWcn+kwaUlFo49vuzxy9T1+hf1wdJeAA2RI+9k12R2dKvWRHBzYG1CNdIZtklpfvx72z1+5DmWvaohaR5glAVLgxFd69YcEDyFQgZFLU1iVyOiCsN+Uskbhw+UO9UA+252zagmZJ8nQ4LorxELscfA/iLMHSFlAWyHAy7BZQMtsWbYRK6YvBNDCWKSFYBjEADrGWcjZ6SjwpY6jiO+Qmw/OhcNUOUkBYqX1cdjBrdYXtcVy+COARFojGPdaYAEEeNOM+QWpjkIDHbZ9mvD4THQ==
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)(376002)(136003)(39860400002)(396003)(366004)(346002)(33430700001)(66556008)(36756003)(478600001)(5660300002)(1076003)(33440700001)(316002)(6666004)(8886007)(2906002)(8936002)(55016002)(86362001)(66476007)(8676002)(66946007)(52116002)(26005)(2616005)(956004)(16526019)(186003)(7696005);
 DIR:OUT; SFP:1101; 
X-MS-Exchange-AntiSpam-MessageData: qi8H/wEoVBIcVJjCAzBTyRvfpLytUvJUfppjSyLjBs/fF+LiWJqpUURFGP2MY6VL/P4hn/NhOQgs60B3c226szL2F21ssqzaXQc9jOefltNt5h/Umq4zoVTTwAGmAlC06LqUgjo583KMZ7aFNPVxYm0AOMaRA1AN2qmWwKJb1FVc0TH00d6GxNIAeveUls5UIQXeanxanZmqLzhqzRURVB5FPX2sYas9ZXJrrYJyh7y/5NU0GxkNc8yJ0Aae6wG7o055w0ehikyg1Vl1AZz7awz0nBy4p5NPWRBZLQXSlnOwe9CB5Eg6VFPUY54jg5ZF3qXEOUbDgT4pArRxAqkNSNJodKSjSXbm8lIePAzPEoV20eqJkrRmljGDBkEM30v6GSaFAxQ3QBWmcUE0Mw7cjT9VJxYVE7ZX38sEFycksZiyW9aJTpJ9CeRARAWZsWtk0Dnzl5oACOeFfps6etCHeCt6ZYORHDF07wz6+pDG+P8=
X-OriginatorOrg: Mellanox.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5185bd7c-b6ed-4241-3cf6-08d7f59bc829
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2020 11:09:32.5045 (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: 9FizYK1Fe6ZZ4n0qcx1FrleZxVdBZKBCSU/fyVBd83gIEHgHX+dQlwwou2sDZBVgFNsz2mm9IHSJQj0qfQI+7g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB5891
Subject: [dpdk-dev] [PATCH v6 3/5] app/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 <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

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 <wisamm@mellanox.com>
---
 app/test-flow-perf/main.c              | 87 ++++++++++++++++++++++++++
 doc/guides/rel_notes/release_20_05.rst |  1 +
 doc/guides/tools/flow-perf.rst         |  4 ++
 3 files changed, 92 insertions(+)

diff --git a/app/test-flow-perf/main.c b/app/test-flow-perf/main.c
index 1feb73e6f..b177025fa 100644
--- a/app/test-flow-perf/main.c
+++ b/app/test-flow-perf/main.c
@@ -49,6 +49,7 @@ static uint32_t flow_actions;
 static uint32_t flow_attrs;
 static volatile bool force_quit;
 static bool dump_iterations;
+static  bool delete_flag;
 static struct rte_mempool *mbuf_mp;
 static uint32_t nb_lcores;
 static uint32_t flows_count;
@@ -64,6 +65,8 @@ 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");
@@ -246,6 +249,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 },
@@ -353,6 +357,9 @@ args_parse(int argc, char **argv)
 			if (strcmp(lgopts[opt_idx].name,
 					"dump-iterations") == 0)
 				dump_iterations = true;
+			if (strcmp(lgopts[opt_idx].name,
+					"deletion-rate") == 0)
+				delete_flag = true;
 			break;
 		default:
 			fprintf(stderr, "Invalid option: %s\n", argv[optind]);
@@ -372,9 +379,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] == 0)
+			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;
@@ -386,6 +459,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();
 
@@ -397,8 +471,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 jump into flow_group,
@@ -417,6 +497,7 @@ flows_handler(void)
 				print_flow_error(error);
 				rte_exit(EXIT_FAILURE, "error in creating flow");
 			}
+			flow_list[flow_index++] = flow;
 		}
 
 		/* Insertion Rate */
@@ -440,6 +521,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();
@@ -473,6 +556,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);
 	}
 }
 
@@ -631,6 +717,7 @@ main(int argc, char **argv)
 	dump_iterations = false;
 	flows_count = DEFAULT_RULES_COUNT;
 	iterations_number = DEFAULT_ITERATION;
+	delete_flag = false;
 	flow_group = 0;
 
 	signal(SIGINT, signal_handler);
diff --git a/doc/guides/rel_notes/release_20_05.rst b/doc/guides/rel_notes/release_20_05.rst
index 0e4dcf1ad..e511e9c1a 100644
--- a/doc/guides/rel_notes/release_20_05.rst
+++ b/doc/guides/rel_notes/release_20_05.rst
@@ -218,6 +218,7 @@ New Features
 
   Application features:
   * Measure rte_flow insertion rate.
+  * Measure rte_flow deletion rate.
 
 
 Removed Items
diff --git a/doc/guides/tools/flow-perf.rst b/doc/guides/tools/flow-perf.rst
index 6f3f7dafb..1f8b1fa15 100644
--- a/doc/guides/tools/flow-perf.rst
+++ b/doc/guides/tools/flow-perf.rst
@@ -25,6 +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.
+
 
 Compiling the Application
 =========================
@@ -71,6 +73,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:
 
-- 
2.17.1