From patchwork Tue Jan 18 15:30:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kozyrev X-Patchwork-Id: 106032 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 89644A034C; Tue, 18 Jan 2022 16:31:22 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 08D4F42779; Tue, 18 Jan 2022 16:31:07 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2073.outbound.protection.outlook.com [40.107.93.73]) by mails.dpdk.org (Postfix) with ESMTP id C83C742741 for ; Tue, 18 Jan 2022 16:31:04 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MERcIZ4yLdzWT8U70EbM1T1o7nxBkQe48IqTidktKL09Ty5ZNw6MgdULNa0Nl8vHvj0oZpr1+uaCf1P1KwWIznBvKcZld3TO07m3/S7gsJpxLZgao/3sGzD9BkAs6BizYhiEaXfx0HAdbzYTyx5QukrSJw6vPgdZMQpdPnZyWH7CSa9uwebWfhEM3DlBhOteuY6fhgTAqg3ECGLB0TWpvB5g7e32ksuM52a2fQDmpwS3qoquqPncKMs96rG5aiFhQwU5GsYhlRQves/3XV4Qr18syRTW5NmahgiWWOh1cV6pm9QgT3PhEirKeA1ldZVckN08D/mjac9GFbDHAwjaWA== 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=uOH7d1j6yX9kMUyeKIl+eFx8/NCACHWUPGVI3BjFti0=; b=kmmFHBTviCl4MUUBaGZtTpPLm1w+jDeoMXS4NqD/tTmWpCSQ+jSG7428OwwrRkICpjBHPX9lYUely7+ej1OFo44WqDUvnZEVqPh/vEyitOtKbyrjG8qcKORevW2xvaLugewrzXwfgm+OhVFUg95KlNfCpGFhiNZ2R2kzGsgMAqMU598hyUKDKIIEjuA6+WJb7Q9B212QXMPSgDav2VHTmVuC1ixYHFfi/tlunpDZOiNCVGRwXWwwoN0+ersJIzyDmFlkZZJdvfNJ8G0Le3KGVr42oVzNHqBELSZIoyWxC3KsI9Q1i8Gq9rcneaVRRO1oLtryEAKkdqij5C5GyXiKJw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.236) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=uOH7d1j6yX9kMUyeKIl+eFx8/NCACHWUPGVI3BjFti0=; b=bxfje0aEwe8EhYb0V5zm6SuhVkrDYgr7INa39nil5OtwEqVqjFVji0nDONM4/t0cil6firz+eD03P7c2Zvmsgm9JGwv/TyXCDqXVq6yzCtI6pSh6+qNMPUONMtz14Rq7UySVhwrerHob2U2GvObSm07BU5ICDcWptLKFtRXryisjY3suFH6VI3QvLISDhFS4I/kWanmOVJDZVVuRYLkInC01DOU6J7XgNtl9Mrn7Jnh79AdLMLoVazEcdU0zTcE55qS2zHijxsP9T2l8wJInifzAmwpI5Wi8MOT+HFqk4x5D6Vliw7ytQcq3eHSOjpiebGPCV7C1DFP4P4LoQp2PPw== Received: from CY4PR12MB1414.namprd12.prod.outlook.com (2603:10b6:903:3a::23) by DM6PR12MB4434.namprd12.prod.outlook.com (2603:10b6:5:2ad::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.10; Tue, 18 Jan 2022 15:31:03 +0000 Received: from MWHPR21CA0055.namprd21.prod.outlook.com (2603:10b6:300:db::17) by CY4PR12MB1414.namprd12.prod.outlook.com (2603:10b6:903:3a::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.11; Tue, 18 Jan 2022 15:31:01 +0000 Received: from CO1NAM11FT051.eop-nam11.prod.protection.outlook.com (2603:10b6:300:db:cafe::60) by MWHPR21CA0055.outlook.office365.com (2603:10b6:300:db::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.3 via Frontend Transport; Tue, 18 Jan 2022 15:31:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.236) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.236 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.236; helo=mail.nvidia.com; Received: from mail.nvidia.com (12.22.5.236) by CO1NAM11FT051.mail.protection.outlook.com (10.13.174.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4888.9 via Frontend Transport; Tue, 18 Jan 2022 15:31:01 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL109.nvidia.com (10.27.9.19) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 18 Jan 2022 15:31:00 +0000 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.986.9; Tue, 18 Jan 2022 07:30:57 -0800 From: Alexander Kozyrev To: CC: , , , , , , , , Subject: [PATCH v2 04/10] app/testpmd: implement rte flow configure Date: Tue, 18 Jan 2022 17:30:21 +0200 Message-ID: <20220118153027.3947448-5-akozyrev@nvidia.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20220118153027.3947448-1-akozyrev@nvidia.com> References: <20211006044835.3936226-1-akozyrev@nvidia.com> <20220118153027.3947448-1-akozyrev@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 52891de9-cfd7-4fa8-df85-08d9da978848 X-MS-TrafficTypeDiagnostic: CY4PR12MB1414:EE_|DM6PR12MB4434:EE_ X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nAUMpzZsrt3I1jX7DLvx8QzgkjDsmyLoj0KPCuho0Zfra9XmKIW1kkES48CdoRdS/TSgZtcANb++21aA4kUIoNqVkM+mas940lJfA3eqij887Ww/35Atx2cgBUbd0Xe5U8GhGAJLZMd6ZxXhJfv9fm2xpCH7sU5njd46OAE5kcdwQXBCIZRICDVjlGWSXeTXdfk4RU2wQ0vHH9h3bci3NspOXLwsPQYLkRoNVOM79eYPcugoLnVOSjbeKB4LOfB0mcgIxKy/cckxqhpOXAO0QEpBihtrlWcbOt8ej/UV88E05LZ8CtDta0k/b9CRAb+6Ba3gG+XqHkNaG8iG2SsEi+q9WuKVAaKVi+e9qoUyCsjPPYyi2EWK0glxfpzu/i0RfcQDb+JNkdHAYH6Kpl/tkEhyhiHHcL2ofjIWZfqll23pLqvfh6mqgTXNTP6GzjEuIjj4/Dowf/gvZKGB1hCQEensoAWeZzUrAWzThcd2y+tbdNrsiKN966M0p1CWkOY0wZLy0Nto29id6A+OVILY/66cnnuv0vVNnfeqto/tjJz+9dJgpY4MLFe+M821lQIIMNpnLAqNWsyB4VqyGDWfq7pvUX1ozLw+to2zilfEM31HnMW7lchCXgZ2MstR9CrRGP62G+xBE2Zr7yCOkFnchuc4iO9wC3gYc6BNV+KDF/9wZbKhXLYHiPn00cH7gZi8ubEm4GrMqeuXuVXp5mOCNNlgmVmKgRk/8xY8e/cPBco9vSAMh2iiy8qPAW+7bT9fXk+5YDK00Emrn0PB6OMbuBwbi9ay/M8XMoZGUsKFn2k= X-Forefront-Antispam-Report: CIP:12.22.5.236; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(4636009)(46966006)(40470700002)(36840700001)(5660300002)(70206006)(40460700001)(2616005)(426003)(6916009)(7696005)(86362001)(81166007)(70586007)(26005)(6666004)(356005)(16526019)(8676002)(36860700001)(8936002)(186003)(36756003)(316002)(54906003)(6286002)(336012)(55016003)(82310400004)(83380400001)(2906002)(1076003)(508600001)(4326008)(47076005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2022 15:31:01.0404 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 52891de9-cfd7-4fa8-df85-08d9da978848 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.236]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT051.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4434 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 Add testpmd support for the rte_flow_configure API. Provide the command line interface for the Flow management. Usage example: flow configure 0 queues_number 8 queues_size 256 Signed-off-by: Alexander Kozyrev --- app/test-pmd/cmdline_flow.c | 109 +++++++++++++++++++- app/test-pmd/config.c | 29 ++++++ app/test-pmd/testpmd.h | 5 + doc/guides/testpmd_app_ug/testpmd_funcs.rst | 34 +++++- 4 files changed, 174 insertions(+), 3 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 5c2bba48ad..ea4af8dd45 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -72,6 +72,7 @@ enum index { /* Top-level command. */ FLOW, /* Sub-level commands. */ + CONFIGURE, INDIRECT_ACTION, VALIDATE, CREATE, @@ -122,6 +123,13 @@ enum index { DUMP_ALL, DUMP_ONE, + /* Configure arguments */ + CONFIG_QUEUES_NUMBER, + CONFIG_QUEUES_SIZE, + CONFIG_COUNTERS_NUMBER, + CONFIG_AGING_COUNTERS_NUMBER, + CONFIG_METERS_NUMBER, + /* Indirect action arguments */ INDIRECT_ACTION_CREATE, INDIRECT_ACTION_UPDATE, @@ -846,6 +854,10 @@ struct buffer { enum index command; /**< Flow command. */ portid_t port; /**< Affected port ID. */ union { + struct { + struct rte_flow_port_attr port_attr; + struct rte_flow_queue_attr queue_attr; + } configure; /**< Configuration arguments. */ struct { uint32_t *action_id; uint32_t action_id_n; @@ -927,6 +939,16 @@ static const enum index next_flex_item[] = { ZERO, }; +static const enum index next_config_attr[] = { + CONFIG_QUEUES_NUMBER, + CONFIG_QUEUES_SIZE, + CONFIG_COUNTERS_NUMBER, + CONFIG_AGING_COUNTERS_NUMBER, + CONFIG_METERS_NUMBER, + END, + ZERO, +}; + static const enum index next_ia_create_attr[] = { INDIRECT_ACTION_CREATE_ID, INDIRECT_ACTION_INGRESS, @@ -1962,6 +1984,9 @@ static int parse_aged(struct context *, const struct token *, static int parse_isolate(struct context *, const struct token *, const char *, unsigned int, void *, unsigned int); +static int parse_configure(struct context *, const struct token *, + const char *, unsigned int, + void *, unsigned int); static int parse_tunnel(struct context *, const struct token *, const char *, unsigned int, void *, unsigned int); @@ -2187,7 +2212,8 @@ static const struct token token_list[] = { .type = "{command} {port_id} [{arg} [...]]", .help = "manage ingress/egress flow rules", .next = NEXT(NEXT_ENTRY - (INDIRECT_ACTION, + (CONFIGURE, + INDIRECT_ACTION, VALIDATE, CREATE, DESTROY, @@ -2202,6 +2228,56 @@ static const struct token token_list[] = { .call = parse_init, }, /* Top-level command. */ + [CONFIGURE] = { + .name = "configure", + .help = "configure flow rules", + .next = NEXT(next_config_attr, + NEXT_ENTRY(COMMON_PORT_ID)), + .args = ARGS(ARGS_ENTRY(struct buffer, port)), + .call = parse_configure, + }, + /* Configure arguments. */ + [CONFIG_QUEUES_NUMBER] = { + .name = "queues_number", + .help = "number of queues", + .next = NEXT(next_config_attr, + NEXT_ENTRY(COMMON_UNSIGNED)), + .args = ARGS(ARGS_ENTRY(struct buffer, + args.configure.port_attr.nb_queues)), + }, + [CONFIG_QUEUES_SIZE] = { + .name = "queues_size", + .help = "number of elements in queues", + .next = NEXT(next_config_attr, + NEXT_ENTRY(COMMON_UNSIGNED)), + .args = ARGS(ARGS_ENTRY(struct buffer, + args.configure.queue_attr.size)), + }, + [CONFIG_COUNTERS_NUMBER] = { + .name = "counters_number", + .help = "number of counters", + .next = NEXT(next_config_attr, + NEXT_ENTRY(COMMON_UNSIGNED)), + .args = ARGS(ARGS_ENTRY(struct buffer, + args.configure.port_attr.nb_counters)), + }, + [CONFIG_AGING_COUNTERS_NUMBER] = { + .name = "aging_counters_number", + .help = "number of aging counters", + .next = NEXT(next_config_attr, + NEXT_ENTRY(COMMON_UNSIGNED)), + .args = ARGS(ARGS_ENTRY(struct buffer, + args.configure.port_attr.nb_aging)), + }, + [CONFIG_METERS_NUMBER] = { + .name = "meters_number", + .help = "number of meters", + .next = NEXT(next_config_attr, + NEXT_ENTRY(COMMON_UNSIGNED)), + .args = ARGS(ARGS_ENTRY(struct buffer, + args.configure.port_attr.nb_meters)), + }, + /* Top-level command. */ [INDIRECT_ACTION] = { .name = "indirect_action", .type = "{command} {port_id} [{arg} [...]]", @@ -7465,6 +7541,33 @@ parse_isolate(struct context *ctx, const struct token *token, return len; } +/** Parse tokens for configure command. */ +static int +parse_configure(struct context *ctx, const struct token *token, + const char *str, unsigned int len, + void *buf, unsigned int size) +{ + struct buffer *out = buf; + + /* Token name must match. */ + if (parse_default(ctx, token, str, len, NULL, 0) < 0) + return -1; + /* Nothing else to do if there is no buffer. */ + if (!out) + return len; + if (!out->command) { + if (ctx->curr != CONFIGURE) + return -1; + if (sizeof(*out) > size) + return -1; + out->command = ctx->curr; + ctx->objdata = 0; + ctx->object = out; + ctx->objmask = NULL; + } + return len; +} + static int parse_flex(struct context *ctx, const struct token *token, const char *str, unsigned int len, @@ -8691,6 +8794,10 @@ static void cmd_flow_parsed(const struct buffer *in) { switch (in->command) { + case CONFIGURE: + port_flow_configure(in->port, &in->args.configure.port_attr, + &in->args.configure.queue_attr); + break; case INDIRECT_ACTION_CREATE: port_action_handle_create( in->port, in->args.vc.attr.group, diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 1722d6c8f8..85d31de7f7 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -1595,6 +1595,35 @@ action_alloc(portid_t port_id, uint32_t id, return 0; } +/** Configure flow management resources. */ +int +port_flow_configure(portid_t port_id, + const struct rte_flow_port_attr *port_attr, + const struct rte_flow_queue_attr *queue_attr) +{ + struct rte_port *port; + struct rte_flow_error error; + const struct rte_flow_queue_attr *attr_list[port_attr->nb_queues]; + int std_queue; + + if (port_id_is_invalid(port_id, ENABLED_WARN) || + port_id == (portid_t)RTE_PORT_ALL) + return -EINVAL; + port = &ports[port_id]; + port->queue_nb = port_attr->nb_queues; + port->queue_sz = queue_attr->size; + for (std_queue = 0; std_queue < port_attr->nb_queues; std_queue++) + attr_list[std_queue] = queue_attr; + /* Poisoning to make sure PMDs update it in case of error. */ + memset(&error, 0x66, sizeof(error)); + if (rte_flow_configure(port_id, port_attr, attr_list, &error)) + return port_flow_complain(&error); + printf("Configure flows on port %u: " + "number of queues %d with %d elements\n", + port_id, port_attr->nb_queues, queue_attr->size); + return 0; +} + /** Create indirect action */ int port_action_handle_create(portid_t port_id, uint32_t id, diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 9967825044..ce80a00193 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -243,6 +243,8 @@ struct rte_port { struct rte_eth_txconf tx_conf[RTE_MAX_QUEUES_PER_PORT+1]; /**< per queue tx configuration */ struct rte_ether_addr *mc_addr_pool; /**< pool of multicast addrs */ uint32_t mc_addr_nb; /**< nb. of addr. in mc_addr_pool */ + queueid_t queue_nb; /**< nb. of queues for flow rules */ + uint32_t queue_sz; /**< size of a queue for flow rules */ uint8_t slave_flag; /**< bonding slave port */ struct port_flow *flow_list; /**< Associated flows. */ struct port_indirect_action *actions_list; @@ -885,6 +887,9 @@ struct rte_flow_action_handle *port_action_handle_get_by_id(portid_t port_id, uint32_t id); int port_action_handle_update(portid_t port_id, uint32_t id, const struct rte_flow_action *action); +int port_flow_configure(portid_t port_id, + const struct rte_flow_port_attr *port_attr, + const struct rte_flow_queue_attr *queue_attr); int port_flow_validate(portid_t port_id, const struct rte_flow_attr *attr, const struct rte_flow_item *pattern, diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 94792d88cc..8af28bd3b3 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -3285,8 +3285,8 @@ Flow rules management --------------------- Control of the generic flow API (*rte_flow*) is fully exposed through the -``flow`` command (validation, creation, destruction, queries and operation -modes). +``flow`` command (configuration, validation, creation, destruction, queries +and operation modes). Considering *rte_flow* overlaps with all `Filter Functions`_, using both features simultaneously may cause undefined side-effects and is therefore @@ -3309,6 +3309,14 @@ The first parameter stands for the operation mode. Possible operations and their general syntax are described below. They are covered in detail in the following sections. +- Configure flow management:: + + flow configure {port_id} + [queues_number {number}] [queues_size {size}] + [counters_number {number}] + [aging_counters_number {number}] + [meters_number {number}] + - Check whether a flow rule can be created:: flow validate {port_id} @@ -3368,6 +3376,28 @@ following sections. flow tunnel list {port_id} +Configuring flow management library +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +``flow configure`` pre-allocates all the needed resources in the underlying +device to be used later at the flow creation. Flow queues are allocated as well +for asynchronous flow creation/destruction operations. It is bound to +``rte_flow_configure()``:: + + flow configure {port_id} + [queues_number {number}] [queues_size {size}] + [counters_number {number}] + [aging_counters_number {number}] + [meters_number {number}] + +If successful, it will show:: + + Configure flows on port #[...]: number of queues #[...] with #[...] elements + +Otherwise it will show an error message of the form:: + + Caught error type [...] ([...]): [...] + Creating a tunnel stub for offload ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~