From patchwork Mon May 10 16:17:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiawei Wang X-Patchwork-Id: 93109 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C4322A0A0E; Mon, 10 May 2021 18:17:51 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AD23F40F35; Mon, 10 May 2021 18:17:51 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2053.outbound.protection.outlook.com [40.107.220.53]) by mails.dpdk.org (Postfix) with ESMTP id 6184141103 for ; Mon, 10 May 2021 18:17:50 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EY/9kdw2kbQEHgJ0/RfkBFLqro8oKCvobqzkDxgA45ZTN7w4gSpyyl26yl6VWDKLziRJ72ZG33RHugTjEN/KigaSpVcA4GXKW2G5PCX981viZ4IrsrKwBZO+Nq+MHSUCeMMlgH+p/kigw7ikhjchCvSosZ1xTpv8QatODz6aPg2rmE+zd9PeMec0bivknvYUgIr32ot7CGTye+ToQh2HKb7QzZ+nAkRcqKM/oLagaJdE6TCPADi3FVYJRXelV3ItKtDOF36r3x5xur+8Z/uYKl2OiJgI0Rkg2ol19zsvoNyiL97sPjnQYaLQIozBAPG7aymgsQ8WEj7TSmJiLSGmjw== 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=keNxDvHIvWz9RvS1lZqDvQkzgdsDDjRb+rmniSVyf3c=; b=H6IeSEcSaBjHlSeb07h/lX16WGXWEdxB3f3uEnJGY7eyn2z/dD6QpZId7UHBlHWDc7QpqJL3xJ5EObdnnCZ3txdSVEocDdeVowOVGvxCim0xzXT6XDHu1TPPhGOn/gFFokNKcTjXudz+DYZLP25TSbSgrrIbs8IHt3t/aiTyL6IRvD+tjFJMpdHeKyHCyjh3O7lLmDhuBALrX3My47yGxqqkGHO2Lx9RCWEjXoMNwX4ZVw3bEzODWtWSh/HsfzFRbWEvogjd3/DphNNTJna/xjnfdAv/5AOiUSo6/2blvnThDyIXzyjpzhdMwOz38jXdcAXpbH7Jl0+gFNk2VJbdRw== 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=none sp=none 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=keNxDvHIvWz9RvS1lZqDvQkzgdsDDjRb+rmniSVyf3c=; b=uqTQnOEZx+Sn8GNqx/3JzsDPVwFtb65JDGOg8iYj/dcv4/RhayP+B1bcrna9OHwKGHYcV5rDR4u39YBPYUHW7FbiLmLFMB30MLkufQx/WvCBdej08KG+k8HywHiF1vSYcksVO4Mq2abt9aIsRFY/D70eEilOkvenIhhHvaFcaPFcfUkyPvyyeygIIfzrTnuUOeQ01RIDiD8fBD7L8v7In8MVyvL4uQGwalCIOqhfH/AJ9H59c5vbuTUJ/GYSz0kT4lKenw6Thf+s2Rcbuh81lvg+IuTNmdFupmHhCsp0eAVUi7wSbv12egUz2pq3K1P2ZcowHPf+qPWJ3ddN63webA== Received: from DM5PR11CA0014.namprd11.prod.outlook.com (2603:10b6:3:115::24) by CH2PR12MB4908.namprd12.prod.outlook.com (2603:10b6:610:6b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.26; Mon, 10 May 2021 16:17:48 +0000 Received: from DM6NAM11FT058.eop-nam11.prod.protection.outlook.com (2603:10b6:3:115:cafe::df) by DM5PR11CA0014.outlook.office365.com (2603:10b6:3:115::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Mon, 10 May 2021 16:17:48 +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 DM6NAM11FT058.mail.protection.outlook.com (10.13.172.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:17:48 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:17:46 +0000 From: Jiawei Wang To: , , , "Wisam Jaddo" CC: , Date: Mon, 10 May 2021 19:17:21 +0300 Message-ID: <20210510161723.27432-2-jiaweiw@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20210510161723.27432-1-jiaweiw@nvidia.com> References: <20210510161723.27432-1-jiaweiw@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 80ee3ef2-24cc-4b84-84ce-08d913cf2716 X-MS-TrafficTypeDiagnostic: CH2PR12MB4908: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:37; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M/Rp9/rbtqKKOM/IPegcmfTORYAkATs/NQnsuRBbGTUhdH68c18HbkF3k+aFIB+icTFRz+TeCur+1FnzJRsyBk34TsQe4f1HHe67n6GUtmkaiVdZ/G0rtFb+UDEUf41i+juwJ449NbbisYcAuxSCJBj3/t2GgDT7TjwXSueTBDuhzY/gHogJD2tnz3+qbVBAVVvS3ymg/pihVYDC2uL4p+l6fZP7fmDMmteLzWnmad93haUEgEXwOTxVVjHX8W5NLIIcBURvZY8L3lzJIX5BhPZB5yLrkemDldqv/f5QgVJvyfRmc0VObBnrcMHRDQKdnvU+UdTNhHox52bDC+OfLtbsB3LR4FnV5avmk0QY1h4bPevAwtEVecwq7CrJ+4t5l/m/dT+y6f6M+01P5iePv9RR01rERrSimuJXp68csqQfqSLor9RfOhmPg+HUcbh+f3hebJIrf9JWDKaC4gSVjeaQcfF4YouS49aNqJljtEnu5vTeyjgLOwVJrjsw627lqr2GobMi/G+k1zA0ApFrN2JOKxtA2uOdHRKs4GG23+z34P106adZTQalPe0qFBlQKLVfIX7GFqQO88vABS2WtVNCEHnfWB5bbRhwH9cZSgRgDCBsmIGO8dJtefwEi8eMW6VzKuu4zP/MoncVTqstWg== 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)(1076003)(107886003)(4326008)(83380400001)(47076005)(7636003)(6666004)(8676002)(16526019)(426003)(8936002)(36756003)(36906005)(82310400003)(5660300002)(186003)(498600001)(2906002)(55016002)(36860700001)(26005)(2616005)(356005)(6636002)(70206006)(70586007)(110136005)(54906003)(6286002)(336012)(7696005)(86362001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:17:48.3591 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 80ee3ef2-24cc-4b84-84ce-08d913cf2716 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: DM6NAM11FT058.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4908 Subject: [dpdk-dev] [PATCH 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 same without it. With "policy-mtr", policy is introduced. API create_meter_policy is to create a policy. API create_meter_rule will use it to create meter. Signed-off-by: Haifei Luo Signed-off-by: Jiawei Wang Acked-by: Wisam Jaddo --- app/test-flow-perf/main.c | 87 ++++++++++++++++++++++++++++++++-- doc/guides/tools/flow-perf.rst | 3 ++ 2 files changed, 86 insertions(+), 4 deletions(-) diff --git a/app/test-flow-perf/main.c b/app/test-flow-perf/main.c index 9be8edc31d..7b8b6fb9c4 100644 --- a/app/test-flow-perf/main.c +++ b/app/test-flow-perf/main.c @@ -53,6 +53,7 @@ static uint64_t decap_data; 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 g_policy_id[MAX_PORTS]; static uint8_t items_idx, actions_idx, attrs_idx; static uint64_t ports_mask; @@ -62,6 +63,7 @@ static bool delete_flag; static bool dump_socket_mem_flag; static bool enable_fwd; static bool unique_data; +static bool policy_mtr; static struct rte_mempool *mbuf_mp; static uint32_t nb_lcores; @@ -115,6 +117,13 @@ static struct multi_cores_pool mc_pool = { .cores_count = 1, }; +/* Storage for struct rte_flow_action_rss including external data. */ +struct action_rss_data { + struct rte_flow_action_rss conf; + uint8_t key[40]; + uint16_t queue[128]; +}; + static void usage(char *progname) { @@ -134,6 +143,7 @@ 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: To create meter with policy\n"); printf("To set flow attributes:\n"); printf(" --ingress: set ingress attribute in flows\n"); @@ -573,6 +583,7 @@ args_parse(int argc, char **argv) { "unique-data", 0, 0, 0 }, { "portmask", 1, 0, 0 }, { "cores", 1, 0, 0 }, + { "policy-mtr", 0, 0, 0 }, /* Attributes */ { "ingress", 0, 0, 0 }, { "egress", 0, 0, 0 }, @@ -802,6 +813,8 @@ args_parse(int argc, char **argv) RTE_MAX_LCORE); } } + if (strcmp(lgopts[opt_idx].name, "policy-mtr") == 0) + policy_mtr = true; break; default: usage(argv[0]); @@ -912,6 +925,58 @@ has_meter(void) return 0; } +static void +create_meter_policy(void) +{ + struct rte_mtr_error error; + uint32_t policy_id; + int ret, i, port_id; + struct rte_mtr_meter_policy_params policy; + struct action_rss_data rss_data; + struct rte_flow_action g_actions[2], r_actions[2]; + uint16_t nr_ports; + + memset(&rss_data, 0, sizeof(rss_data)); + memset(&policy, 0, sizeof(policy)); + rss_data.conf.func = RTE_ETH_HASH_FUNCTION_DEFAULT; + rss_data.conf.level = 0; + rss_data.conf.types = GET_RSS_HF(); + rss_data.conf.key_len = 0; + rss_data.conf.key = NULL; + rss_data.conf.queue_num = RXQ_NUM; + uint16_t q_data[RXQ_NUM]; + rss_data.conf.queue = q_data; + + for (i = 0; i < RXQ_NUM; i++) + q_data[i] = i; + for (i = 0; i < RXQ_NUM; i++) + rss_data.queue[i] = i; + + g_actions[0].type = RTE_FLOW_ACTION_TYPE_RSS; + g_actions[0].conf = &(rss_data.conf); + g_actions[1].type = RTE_FLOW_ACTION_TYPE_END; + g_actions[1].conf = NULL; + + r_actions[0].type = RTE_FLOW_ACTION_TYPE_DROP; + r_actions[0].conf = NULL; + r_actions[1].type = RTE_FLOW_ACTION_TYPE_END; + r_actions[1].conf = NULL; + + policy.actions[RTE_COLOR_GREEN] = &g_actions[0]; + policy.actions[RTE_COLOR_YELLOW] = NULL; + policy.actions[RTE_COLOR_RED] = &r_actions[0]; + + nr_ports = rte_eth_dev_count_avail(); + for (port_id = 0; port_id < nr_ports; port_id++) { + policy_id = port_id + 10; + ret = rte_mtr_meter_policy_add(port_id, policy_id, + &policy, &error); + if (ret) + printf("meter add failed port_id %d\n", port_id); + g_policy_id[port_id] = policy_id; + } +} + static void create_meter_rule(int port_id, uint32_t counter) { @@ -928,7 +993,14 @@ create_meter_rule(int port_id, uint32_t counter) /*create meter*/ params.meter_profile_id = default_prof_id; - ret = rte_mtr_create(port_id, counter, ¶ms, 1, &error); + + if (!policy_mtr) { + ret = rte_mtr_create(port_id, counter, ¶ms, 1, &error); + } else { + params.meter_policy_id = g_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, @@ -942,11 +1014,16 @@ destroy_meter_rule(int port_id, uint32_t counter) { struct rte_mtr_error error; - if (rte_mtr_destroy(port_id, counter, &error)) { - printf("Port %u destroy meter(%d) error(%d) message: %s\n", + if (policy_mtr) { + if (rte_mtr_meter_policy_delete(port_id, counter+1, &error)) + printf("erro delete policy %d\n", counter+1); + } else { + 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"); + rte_exit(EXIT_FAILURE, "Error in deleting meter rule"); + } } } @@ -1894,6 +1971,8 @@ main(int argc, char **argv) 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) { diff --git a/doc/guides/tools/flow-perf.rst b/doc/guides/tools/flow-perf.rst index 280bf7e0e0..4c6480d70a 100644 --- a/doc/guides/tools/flow-perf.rst +++ b/doc/guides/tools/flow-perf.rst @@ -354,3 +354,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.