From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D73EAA0C47; Thu, 28 Oct 2021 05:26:26 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C2405410F5; Thu, 28 Oct 2021 05:26:23 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2078.outbound.protection.outlook.com [40.107.237.78]) by mails.dpdk.org (Postfix) with ESMTP id 0EE07410F4 for ; Thu, 28 Oct 2021 05:26:22 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OgUcaLSu44FYWJ/if1gp64/uiNOk87Ppf79mej4+cjjQSFeHlM1IQJpMvyvhtJBKVXtty/UeX+ZWlKUOmEdBkO07zE4mcSpQ86Lr76Fa4Qk987peD9KnDYhJUdnFVnVKGn1P3kRjh3Le81tY8LmriwSj/+cmZj4hjRnOoJu3lDp5CiTfNfnkV+0VBYjiEo4sMLCo6wvLIx1u11R/YF/7oteQhfkoIfzmFTGzK+T56MIbrBMV0PoE0X3echKmPfhr2cWKLT+KHTlCq9xGKAIGRllVm3zAUQpg2rCQ+HsCFlMeEhZiMWhBkncXHvb4iHYvcxdWQxJyhcCMQbdB/DnfOQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=0hQLUHu8WZWHr00mNyWIZILywRhxq9sT1BiQZa/9rk8=; b=JwReKcU2OkzT2Cj9gb4wcozeED3Imj0ZrGuszwarNb08k5tE51rENf4li5CTtgXgWbp5KTMGDagNUuoOzBlCdPRx83w2tSLpMyNNTciUYGuLmGgko4uCG5ook7KMXVWsI7mKbM5vApkEmP1ieZ+s5/y6I8K8w2H0YVRQNsA0rimko4cTPZZF4wfbc2T+CrejhTT7UBeGNv6hJhMZUC+hKYEK7+onc849aRWngI+5ZXF1Yp/xpnwhF6tPK4LDcjQUxyXQs1XnWtdPWL9ithhCVsjXY38k1YPFkejtzYxqRNX5BL4Xv9at1/cnLjIehh3ol0b5jQ+m2uALuITevwRovA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0hQLUHu8WZWHr00mNyWIZILywRhxq9sT1BiQZa/9rk8=; b=uEBKLF3fcqecDGomOS10tFNM17AiuhTuF3JwVJyL8pU09on9BXnOhUBN/XSjsP8aQeiM8O0cMpQvVDa29AJZgYkzXwpss39MCbyIlTg3MNBdUVL3Sm3hJjjQ02sDBjr4zf/8Oqm5nzF3i31wG+/jJmDUFdV80448zIu1zZWmB1GTItLuPAY4kX2BsR8X7GaBVpMXKv6fKkYIcprOm0kaWpco+t/14pi9jn9IG1EApQDr8YC4BWtGTx45ddllDx1tLAdqomP2QwLtxaFPyzyYypa3HZPsnjbiJPIc3RBjoPtDYna4rwJWiDND55djZX2Dthu2upSuY11Eywd79eJm/g== Received: from DM5PR16CA0020.namprd16.prod.outlook.com (2603:10b6:3:c0::30) by DM6PR12MB2876.namprd12.prod.outlook.com (2603:10b6:5:15d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.18; Thu, 28 Oct 2021 03:26:19 +0000 Received: from DM6NAM11FT035.eop-nam11.prod.protection.outlook.com (2603:10b6:3:c0:cafe::be) by DM5PR16CA0020.outlook.office365.com (2603:10b6:3:c0::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.14 via Frontend Transport; Thu, 28 Oct 2021 03:26:19 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT035.mail.protection.outlook.com (10.13.172.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4649.14 via Frontend Transport; Thu, 28 Oct 2021 03:26:19 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 28 Oct 2021 03:26:16 +0000 From: Rongwei Liu To: , , , , Wisam Jaddo CC: , , Haifei Luo , Jiawei Wang Date: Thu, 28 Oct 2021 06:25:58 +0300 Message-ID: <20211028032600.638212-2-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20211028032600.638212-1-rongweil@nvidia.com> References: <20211028032600.638212-1-rongweil@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c021fda5-d96e-4749-6cad-08d999c2b535 X-MS-TrafficTypeDiagnostic: DM6PR12MB2876: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:170; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BtzRZqru7IJWYQ+y6us7/au98oiqTPGiI2AOvY1+LpwoX3LS2Fu/Jqkiyu1HWa7Jo1PtOp2HeB0O6J5aGYFQwG0r5ZlftR9HC0JKDFsORNgvme9gM2oDeDm5Ji7r7HmWcNLLceSnUwjhinTAHtHlXDiEMw3UuHMq9NE9vjBFvfaSzquBBeYbetS1zhh3xv4AZ3ARkhutMdV7ruzwZ8009ttPQLlWa95Y04QXSptCkAAVCib2Q4azb4zHEBvhpJKeJdcxJWWXf62oU1KBBWc2LDN98f0CQsySzqClvdoldigNE5WAeANrkHE1rS5eoWZdocK0KgR9h7mNm5qZuaOVpSIqtkhRA51pRtEIT9lkqkLsK0kH3NFkTswIOBPfJ58bvZPlwaux905nQ9V1/TWP7KTFVkauAvkLqvUjQERL+4h8grPZPrtEgpdVneoZY9NkyA64qwumCSzzEg5nL+QY+uh1j7/yp7fGLqicTbU9WF1z32MihSGftk8JnFISTObvq3Gs8lwvI+7FQTWXTTbRLyfm02Fo/J7liFKRMpr8X45J6Qu0jZ8A7tDhR57CXyod0GWvcSn4n5AGOw6n6xOZozcUbbggQfFDkRMZH/MAImsOLmJcKLmaJwaZejpKykyN9I+vNfsUVE1KWRlVGlsMwE6QCsfeTaUICYYdEbEO/+f0+h+DqZ8eNzdmY22MKIwtI/qyrnEBtzoELgFX2j237Q== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(107886003)(336012)(186003)(8936002)(6286002)(26005)(508600001)(110136005)(16526019)(1076003)(36756003)(86362001)(5660300002)(83380400001)(2906002)(70586007)(7636003)(70206006)(356005)(426003)(47076005)(316002)(7696005)(54906003)(82310400003)(4326008)(2616005)(6636002)(8676002)(36860700001)(55016002)(6666004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2021 03:26:19.0959 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c021fda5-d96e-4749-6cad-08d999c2b535 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT035.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB2876 Subject: [dpdk-dev] [PATCH v3 1/3] app/flow-perf: support meter policy API X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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 option "policy-mtr" to indicate if meter creation will include policy or not. Meter creation will keep the same without it. With "policy-mtr", the policy is introduced. API create_meter_policy is to create a policy. API create_meter_rule will use it to create a meter. The value of it is used to specify meter policy green color actions. Signed-off-by: Haifei Luo Signed-off-by: Jiawei Wang Signed-off-by: Rongwei Liu Acked-by: Wisam Monther --- app/test-flow-perf/main.c | 147 ++++++++++++++++++++++++++++++--- doc/guides/tools/flow-perf.rst | 3 + 2 files changed, 137 insertions(+), 13 deletions(-) diff --git a/app/test-flow-perf/main.c b/app/test-flow-perf/main.c index 3ebc025fb2..40e15d5f9a 100644 --- a/app/test-flow-perf/main.c +++ b/app/test-flow-perf/main.c @@ -37,6 +37,7 @@ #include #include "config.h" +#include "actions_gen.h" #include "flow_gen.h" #define MAX_BATCHES_COUNT 100 @@ -49,10 +50,13 @@ static uint8_t flow_group; static uint64_t encap_data; static uint64_t decap_data; +static uint64_t all_actions[RTE_COLORS][MAX_ACTIONS_NUM]; +static char *actions_str[RTE_COLORS]; static uint64_t flow_items[MAX_ITEMS_NUM]; static uint64_t flow_actions[MAX_ACTIONS_NUM]; static uint64_t flow_attrs[MAX_ATTRS_NUM]; +static uint32_t policy_id[MAX_PORTS]; static uint8_t items_idx, actions_idx, attrs_idx; static uint64_t ports_mask; @@ -62,6 +66,7 @@ static bool delete_flag; static bool dump_socket_mem_flag; static bool enable_fwd; static bool unique_data; +static bool policy_mtr; static uint8_t rx_queues_count; static uint8_t tx_queues_count; @@ -142,7 +147,8 @@ usage(char *progname) printf(" --portmask=N: hexadecimal bitmask of ports used\n"); printf(" --unique-data: flag to set using unique data for all" " actions that support data, such as header modify and encap actions\n"); - + printf(" --policy-mtr=\"g1,g2:y1:r1\": To create meter with specified " + "color actions\n"); printf("To set flow attributes:\n"); printf(" --ingress: set ingress attribute in flows\n"); printf(" --egress: set egress attribute in flows\n"); @@ -242,9 +248,10 @@ args_parse(int argc, char **argv) char **argvopt; char *token; char *end; + char *arg; int n, opt; int opt_idx; - size_t i; + size_t i, j, k; static const struct option_dict { const char *str; @@ -652,6 +659,7 @@ args_parse(int argc, char **argv) { "raw-decap", 1, 0, 0 }, { "vxlan-encap", 0, 0, 0 }, { "vxlan-decap", 0, 0, 0 }, + { "policy-mtr", 1, 0, 0 }, }; RTE_ETH_FOREACH_DEV(i) @@ -854,6 +862,46 @@ args_parse(int argc, char **argv) RTE_MAX_LCORE); } } + if (strcmp(lgopts[opt_idx].name, "policy-mtr") == 0) { + j = 0; + k = 0; + arg = optarg; + policy_mtr = true; + token = strsep(&arg, ":\0"); + while (token != NULL && j < RTE_COLORS) { + actions_str[j++] = token; + token = strsep(&arg, ":\0"); + } + j = 0; + token = strtok(actions_str[0], ",\0"); + while (token == NULL && j < RTE_COLORS - 1) + token = strtok(actions_str[++j], ",\0"); + while (j < RTE_COLORS && token != NULL) { + for (i = 0; + i < RTE_DIM(flow_options); i++) { + if (!strcmp(token, + flow_options[i].str)) { + all_actions[j][k++] = + flow_options[i].mask; + break; + } + } + /* Reached last item with no match */ + if (i >= RTE_DIM(flow_options)) { + fprintf(stderr, + "Invalid actions " + "item: %s\n", token); + usage(argv[0]); + rte_exit(EXIT_SUCCESS, "Invalid actions item\n"); + } + token = strtok(NULL, ",\0"); + while (!token && j < RTE_COLORS - 1) { + token = strtok(actions_str[++j], + ",\0"); + k = 0; + } + } + } break; default: usage(argv[0]); @@ -964,12 +1012,68 @@ has_meter(void) return 0; } +static void +create_meter_policy(void) +{ + struct rte_mtr_error error; + int ret, port_id; + struct rte_mtr_meter_policy_params policy; + uint16_t nr_ports; + struct rte_flow_action actions[RTE_COLORS][MAX_ACTIONS_NUM]; + int i; + + memset(actions, 0, sizeof(actions)); + memset(&policy, 0, sizeof(policy)); + for (i = 0; i < RTE_COLORS; i++) + fill_actions(actions[i], all_actions[i], 0, 0, 0, + 0, 0, 0, unique_data, rx_queues_count); + + policy.actions[RTE_COLOR_GREEN] = actions[RTE_COLOR_GREEN]; + policy.actions[RTE_COLOR_YELLOW] = actions[RTE_COLOR_YELLOW]; + policy.actions[RTE_COLOR_RED] = actions[RTE_COLOR_RED]; + + nr_ports = rte_eth_dev_count_avail(); + for (port_id = 0; port_id < nr_ports; port_id++) { + policy_id[port_id] = port_id + 10; + ret = rte_mtr_meter_policy_add(port_id, policy_id[port_id], + &policy, &error); + if (ret) { + fprintf(stderr, "meter policy add failed port_id %d\n", + port_id); + policy_id[port_id] = UINT32_MAX; + } + } +} + + +static void +destroy_meter_policy(void) +{ + struct rte_mtr_error error; + uint16_t nr_ports; + int port_id; + + nr_ports = rte_eth_dev_count_avail(); + for (port_id = 0; port_id < nr_ports; port_id++) { + /* If port outside portmask */ + if (!((ports_mask >> port_id) & 0x1)) + continue; + + if (rte_mtr_meter_policy_delete + (port_id, policy_id[port_id], &error)) { + fprintf(stderr, "Port %u del policy error(%d) message: %s\n", + port_id, error.type, + error.message ? error.message : "(no stated reason)"); + rte_exit(EXIT_FAILURE, "Error: Destroy meter policy Failed!\n"); + } + } +} + static void create_meter_rule(int port_id, uint32_t counter) { int ret; struct rte_mtr_params params; - uint32_t default_prof_id = 100; struct rte_mtr_error error; memset(¶ms, 0, sizeof(struct rte_mtr_params)); @@ -979,8 +1083,15 @@ create_meter_rule(int port_id, uint32_t counter) params.dscp_table = NULL; /*create meter*/ - params.meter_profile_id = default_prof_id; - ret = rte_mtr_create(port_id, counter, ¶ms, 1, &error); + params.meter_profile_id = DEFAULT_METER_PROF_ID; + + if (!policy_mtr) { + ret = rte_mtr_create(port_id, counter, ¶ms, 1, &error); + } else { + params.meter_policy_id = policy_id[port_id]; + ret = rte_mtr_create(port_id, counter, ¶ms, 0, &error); + } + if (ret != 0) { printf("Port %u create meter idx(%d) error(%d) message: %s\n", port_id, counter, error.type, @@ -994,11 +1105,17 @@ destroy_meter_rule(int port_id, uint32_t counter) { struct rte_mtr_error error; + if (policy_mtr && policy_id[port_id] != UINT32_MAX) { + if (rte_mtr_meter_policy_delete(port_id, policy_id[port_id], + &error)) + fprintf(stderr, "error delete policy %d\n", counter+1); + policy_id[port_id] = UINT32_MAX; + } if (rte_mtr_destroy(port_id, counter, &error)) { - printf("Port %u destroy meter(%d) error(%d) message: %s\n", - port_id, counter, error.type, - error.message ? error.message : "(no stated reason)"); - rte_exit(EXIT_FAILURE, "Error in deleting meter rule\n"); + fprintf(stderr, "Port %u destroy meter(%d) error(%d) message: %s\n", + port_id, counter, error.type, + error.message ? error.message : "(no stated reason)"); + rte_exit(EXIT_FAILURE, "Error in deleting meter rule"); } } @@ -1103,12 +1220,10 @@ create_meter_profile(void) /* If port outside portmask */ if (!((ports_mask >> port_id) & 0x1)) continue; - mp.alg = RTE_MTR_SRTCM_RFC2697; mp.srtcm_rfc2697.cir = METER_CIR; mp.srtcm_rfc2697.cbs = METER_CIR / 8; mp.srtcm_rfc2697.ebs = 0; - ret = rte_mtr_meter_profile_add (port_id, DEFAULT_METER_PROF_ID, &mp, &error); if (ret != 0) { @@ -1975,16 +2090,22 @@ main(int argc, char **argv) printf(":: Flows Count per port: %d\n\n", rules_count); - if (has_meter()) + if (has_meter()) { create_meter_profile(); + if (policy_mtr) + create_meter_policy(); + } rte_eal_mp_remote_launch(run_rte_flow_handler_cores, NULL, CALL_MAIN); if (enable_fwd) { init_lcore_info(); rte_eal_mp_remote_launch(start_forwarding, NULL, CALL_MAIN); } - if (has_meter() && delete_flag) + if (has_meter() && delete_flag) { destroy_meter_profile(); + if (policy_mtr) + destroy_meter_policy(); + } RTE_ETH_FOREACH_DEV(port) { rte_flow_flush(port, &error); diff --git a/doc/guides/tools/flow-perf.rst b/doc/guides/tools/flow-perf.rst index 0855f88689..bf70682379 100644 --- a/doc/guides/tools/flow-perf.rst +++ b/doc/guides/tools/flow-perf.rst @@ -379,3 +379,6 @@ Actions: * ``--meter`` Add meter action to all flows actions. Currently, 1 meter profile -> N meter rules -> N rte flows. + +* ``--policy-mtr=`` + Add policy-mtr to create meter with policy and specify policy actions. -- 2.27.0