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 89002A00C5;
	Thu, 30 Apr 2020 09:09:15 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
	by dpdk.org (Postfix) with ESMTP id BE4181D94B;
	Thu, 30 Apr 2020 09:09:04 +0200 (CEST)
Received: from EUR04-DB3-obe.outbound.protection.outlook.com
 (mail-eopbgr60063.outbound.protection.outlook.com [40.107.6.63])
 by dpdk.org (Postfix) with ESMTP id 94E431D921
 for <dev@dpdk.org>; Thu, 30 Apr 2020 09:08:41 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
 b=JrQToXpki/6sLjhd4JY6R3us1e/d+iq8mlrTUkePPlIJDboW06rlkrr1HMrF6+RYmHaeTuQyllguHq0LLJRF61fBIilZndmpIjI24jlhrrTqhbaQQff2bQyQCEEvY7hvzgoCDkrzEGnwUcea9oyORm5T+ma+UpORiZElaoAIXPzZ/EvZeXenciGUKlIK0usYw3BrMCqgXHirt4Q4cgBxvgWGl3TKwQqMmR8sWb3vkQlhtMLwY/GKSrVVXP8MBPW0uzINMYKe0X4jNmuZfrE5+nghvICz0tsB0jdoSQjB0YQ7It169kcIi86GObK3ksIpK7SY+WQ3sF8HcpkHKm0IKA==
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=ATS6gJDSDmokI1J8wml7144/zG9kwdOweYeQ8q7JpuGglBiCAS2QSLILYdT1ukU+mXW1cXmAHRHdUeboNVlCzNS2ovBxJMbBmvicyBHTgPKuMSRz9m86acqEXCheMnT69D/f7mi4Ai0pkGIfSwaAlycP2QwEsa8elBmhv/UQke7McI7MFtXY1sxcOrdR5D2cImsm4xeDiAY4CTwgRepu8jEihJAy7v9yOBdba7b6ynm7k+gjA5tsi8pqL6J1J0q2rvUyb6itNM9Hq1YXpIKIGlmBlVCyRH0apKKmYLgWGkbkVY58uBp5uTXEGBZv76ujrg8FAK5Y3l1qA2Ecr0/bSw==
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=E2OQXbEUkuuf7QnOcNr3VzhYTtDPj26gq6IBeUnXiwn6Nlm3GY7RqkdwDIy9z4LKrSdAf+j4Y+Yj86HLF6QyRfICU3xiO7yBHNb+1/COiJbPqWuLDJhlvI9h+pFENLze7aOby/xwfPsQ9T9w+414Fq3DxMobii3Iyu10eIGgGMQ=
Authentication-Results: mellanox.com; dkim=none (message not signed)
 header.d=none;mellanox.com; dmarc=none action=none header.from=mellanox.com;
Received: from AM0PR05MB6610.eurprd05.prod.outlook.com (2603:10a6:208:12f::18)
 by AM0PR05MB6707.eurprd05.prod.outlook.com (2603:10a6:20b:15b::17)
 with Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20; Thu, 30 Apr
 2020 07:08:40 +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
 07:08:40 +0000
From: Wisam Jaddo <wisamm@mellanox.com>
To: jackmin@mellanox.com, thomas@monjalon.net, jerinjacobk@gmail.com,
 gerlitz.or@gmail.com, l.yan@epfl.ch, dev@dpdk.org
Date: Thu, 30 Apr 2020 07:08:21 +0000
Message-Id: <20200430070823.24046-4-wisamm@mellanox.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <20200430070823.24046-1-wisamm@mellanox.com>
References: <20200409154257.11539-1-wisamm@mellanox.com>
 <20200430070823.24046-1-wisamm@mellanox.com>
Content-Type: text/plain
X-ClientProxiedBy: PR3P191CA0051.EURP191.PROD.OUTLOOK.COM
 (2603:10a6:102:55::26) 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
 PR3P191CA0051.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::26) with Microsoft
 SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 15.20.2958.20 via Frontend Transport; Thu, 30 Apr 2020 07:08:39 +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: b832f903-e815-46d2-69cd-08d7ecd54fa5
X-MS-TrafficTypeDiagnostic: AM0PR05MB6707:|AM0PR05MB6707:
X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <AM0PR05MB6707BD507C0BCCE11A8E0E51A9AA0@AM0PR05MB6707.eurprd05.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:2000;
X-Forefront-PRVS: 0389EDA07F
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: n/ozFThL6Nu+xpjOAEwZ+j28lJLvK6V7bnfiuQ46QvuR99Ixm1j38b9TFqd1OSvgItxyWOg6ooWdudyO/WTL5bX6ZGfi0dVucxa9uiz5ZPqmzfU/qf0QXXdTZ3OXg/VkjMTIBok7VMIPAzxO2JpT7SWLd/z5cPnK2ELnK91VdVpaGCnUpU7swJ8ZCvUPFiLI3RlVkaJUBcGh48SHTj5DB9c1y5SsAVucqSRN1kkvi/FA7Tua/tJyzhMl5NGqd2q+zvgLsU2KBpoJ5bZRq2HtfZyeImdtN31VH+xyrnSMjXIS+QTw4dwfGJMHVV5/eehZmtQJ+MmvHvvHxA1yIXGGl7c/dUfvQ1HtoIz2X+paDWZwcllh14EO5RpY0L+Tnt+BvNLNeONNBEaWxaWPs+6W6NY7rcsYpMN1/gTb0Jjo4DNbBq0aoQaMdhmBNoPfIt1C
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)(39860400002)(136003)(366004)(346002)(376002)(396003)(66556008)(1076003)(26005)(186003)(55016002)(66946007)(8886007)(16526019)(2906002)(2616005)(956004)(66476007)(36756003)(6666004)(8936002)(316002)(86362001)(8676002)(52116002)(5660300002)(478600001)(7696005);
 DIR:OUT; SFP:1101; 
X-MS-Exchange-AntiSpam-MessageData: 7nUKKe0wf2DBwg9Qb8tnWKjeM1Ie8kinlsJuXDQRDW3jnYHSvLAiRKXIfK2/5oXhU4iFzQoLZbmnKkqWRmjhS+qpNWF5N+I1Sud9W3XCQSA0JCHQM1lnHXZmGL7l9putYJNTpRSKIHDYasTIrm1Qvbj3HEM5eJ5w4Zqx+gkwXN9OnjqLfmoiW9A2NSXxSH7nAaZlgIUXFtpOjoy/MnRZ12vPjaUKhf/LdD2zUqUXLxgj83g18hjIvWQm9Ih7cD0rPlFkUQqBPRVMYLsJktLQm8qLnt8rvc4VRZtu2on2CcrqGqxw6a0x+FuPD8W6aWR374+W8QoW7We1C5z0OPcv7ZaR4KPgxH7sjhiAui+UMHp1evV8nJBxiAhi3j7tfKd8qLUnwkDvZdk3X/aXc3OntZLY47+Ph4BP5/WLgSr+EDs+KBCmcMwXPSLFdrxCKTGDHwA5LXrmndpoxSXvpdwNi6Xm6S9w6zxDZUGmhAXDf3F81FviS6EJH8xFLuxuH8tv1Kp1lbhWgF4sv4lsVmVqWXjnz6ylbu1/JUAjEgQOs58IunTOiJpogYBpx0S4o3JHUFYdKYMYuqUmrsznwGP2dJhohkU+lR3h6IrxGyA4aj+zzunayB0/zFX4rN6evhDDSCHTKBF5knEA4+jRYsc7plGImfYtptHMmZGZlF5YdgIWdoPNChoyzqWKFhT/VOmmq95Np9LYWezm31fGZvvqX4pgpzl2EIqC11FZ87M9zG2WxgmZ1R9ieRAK9JsJ1W/dMEA7qOT2+nktuBhEbmmJHjysi4n4eopvbFsG4IPNL4g=
X-OriginatorOrg: Mellanox.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b832f903-e815-46d2-69cd-08d7ecd54fa5
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2020 07:08:40.6783 (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: vw1QW2/VZg/kHJR+Hfsg1dE52jeLuuw4yHNibcgQ19pXqFKKJFJfFPHvILaZLugBRi3ycZCkRxENcbYm8CG8kQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB6707
Subject: [dpdk-dev] [PATCH v2 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 <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      | 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:
 
-- 
2.17.1