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 A691343B06; Thu, 15 Feb 2024 07:13:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4A9D04338A; Thu, 15 Feb 2024 07:13:53 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2084.outbound.protection.outlook.com [40.107.244.84]) by mails.dpdk.org (Postfix) with ESMTP id 4C73040276 for ; Thu, 15 Feb 2024 07:13:50 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Uv8HI9J+kafrWHneZmhBbCeXka42YYRfN36YMMySx7KH/mkrkNvNCo4wgEGysVfMZC30YE/5LgS/be2AnXFvbmwcerk1lukoP7YMebth5wMutQ0O+Chdn9qqeYdwRRyZ4ZUHgHEpSaLiAXAfEyHSPG0CdJrGRgWJA2lcfnxgABPw4inRfE4NJYdCywgHHw4quqhH9JVA/srKMfcrOsgrlb86DflM+PrhH9/7y/W37RwhRa/Kf3+r6dAZhU+MwSVqdoUo+sin4nuDq8I/tqkAqLeFgPLuMH/u4lr97SWpbN3AfKP5/csgFZQPjR19aWaUmGXWW3wym+Xdr6yAcUl5sg== 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=65raDeJvOxy6+5TbHVlzFVla2NUh61sXCLVhuGn+J6c=; b=Jrez1sq2FTh9v+8Fyo3XuZ9wJupvjtc/FD1fiYDsw2dkOLi7hhoPO0mSzT3TZqROoR5VwFEfxFMZzA8113hABkOHJh0W5sgxt7V/U5TWM0ifthDhUXLb9+u65SuX7Ph/as3aUdUY93RTyhKZs8xuvnG3hiDVw+7ncrPRr4ixQ2rzWkssZK1a1Ic84g1mLwFcmTiNoWe6Wz04n3tLphcW3W0Tx8GizlrV3wsKPisq6uXSBwhtmNum+04kDd3ZCYH8DF5WG5RvEmkhpw5pAyzxu4jMkx3o4jfLw8CO34unEF5S+Kn6+hNEe+qrqduSHiEAl/4+LX2seG4KfmuS3XZelw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=dpdk.org 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 (0) 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=65raDeJvOxy6+5TbHVlzFVla2NUh61sXCLVhuGn+J6c=; b=hMbVDEKOlvnweg/1cvvWk+FLYQAWTVv08GiNPrK9iRD3HD74DMxRHioWbM87OXOAjy425wWRNxrAFkbscrSxlfSzecp0Fs0hQXARXaZs4h6G867QxLdRODvVvBKihZYhnguudLPqI82BlR7fROJk/0T+VHdnSmuLfqV4TV/h+gnl5Y6WJtrSdQr5ZMkRBYmdFN2zu+MRJBFH/R8mgCgC8wgZXGMD3iPv9BQB4OkZoBepuNZyhrvlwi/UENQ9v/nbYC3OCyi3Use1pE2+LVT2KxuU6pcJlNP2YM80Ss1BqCfmuyhy5J58kfzNGNyM3N0hwWbkBNvZmfwJ4eVpAxB60g== Received: from BN6PR17CA0040.namprd17.prod.outlook.com (2603:10b6:405:75::29) by PH8PR12MB6891.namprd12.prod.outlook.com (2603:10b6:510:1cb::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.26; Thu, 15 Feb 2024 06:13:47 +0000 Received: from BN2PEPF000044AC.namprd04.prod.outlook.com (2603:10b6:405:75:cafe::ab) by BN6PR17CA0040.outlook.office365.com (2603:10b6:405:75::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.26 via Frontend Transport; Thu, 15 Feb 2024 06:13:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BN2PEPF000044AC.mail.protection.outlook.com (10.167.243.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.25 via Frontend Transport; Thu, 15 Feb 2024 06:13:46 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Wed, 14 Feb 2024 22:13:33 -0800 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_GCM_SHA384) id 15.2.1258.12; Wed, 14 Feb 2024 22:13:29 -0800 From: Gregory Etelson To: CC: , , Ori Kam , Ferruh Yigit , Thomas Monjalon , Aman Singh , Yuying Zhang , Andrew Rybchenko Subject: [PATCH v8] ethdev: add template table resize API Date: Thu, 15 Feb 2024 08:13:08 +0200 Message-ID: <20240215061308.136836-1-getelson@nvidia.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231217093205.321082-1-getelson@nvidia.com> References: <20231217093205.321082-1-getelson@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF000044AC:EE_|PH8PR12MB6891:EE_ X-MS-Office365-Filtering-Correlation-Id: 897a4111-7095-4e3f-08e1-08dc2ded452c X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4SjWCxK/Nect9lcjbcxetA+fUbotrurVX8dd7hYh0xWTZ7ZJroTrFpy2XDrThhhqRXUQZXhqU0XhA2BuVHS5f3AkNepzH5oMvKz4suGPwzVOq5AUCmTTILA4IpKwYH5kkrW20anw/n38+xeAi7LyrkkSY7w3Yq6NzH86fICOEq2kMO/SS1MQ+pP7FwOTK5+ionQtxVaxYBsLmwWYR+lV7SOMbi38yVOGOLUYtNUj55fWSwMXk1E/l7uCLlj4SzTMuphJFb4Jlzb6QiYHVpWDHwXxJsOkX5lm37kAFooi6m99xa0D+hL35PA+vSpDXisEDOHMJFvMUG6woYAjBaMoBMvG1HH2tb4nleItr5wP7PpKWkmP5Q2itrKGwV4VZlKojwg3GsW7izBiUbUfZ6iSlNx5PUJ0T3zuYIkRymeDzEOwlao2AOe6+MjlbDf8C+rIOxOcvggr8+wnjhbiEgss+3HirV2IeI9ufgCB5jtxLblHLqz4VrGARw7eH5K1IRsjhP7XLHBRBa+Zl4qgn7PXuninBqdW5bdzzeg26ub8Tqx4I8qjDy6dOPhlEGceOJRq0te7Q5AvwGFGMBXemRYjb4v5RwCQOY7xFEQhrPYkyFctxBThWLSvitU+6KMbxffA3yazN8VUwPm0htFkJlaRHEqWhK9U1DlF3DlTwLfL1EE= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(346002)(376002)(39860400002)(136003)(396003)(230922051799003)(230273577357003)(36860700004)(1800799012)(186009)(64100799003)(82310400011)(451199024)(46966006)(40470700004)(5660300002)(30864003)(2906002)(16526019)(336012)(478600001)(6286002)(7696005)(26005)(2616005)(41300700001)(1076003)(70586007)(70206006)(54906003)(6916009)(8936002)(8676002)(6666004)(426003)(4326008)(316002)(83380400001)(86362001)(356005)(7636003)(36756003)(55016003)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2024 06:13:46.8905 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 897a4111-7095-4e3f-08e1-08dc2ded452c X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN2PEPF000044AC.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6891 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 Template table creation API sets table flows capacity. If application needs more flows then the table was designed for, the following procedures must be completed: 1. Create a new template table with larger flows capacity. 2. Re-create existing flows in the new table and delete flows from the original table. 3. Destroy original table. Application cannot always execute that procedure: * Port may not have sufficient resources to allocate a new table while maintaining original table. * Application may not have existing flows "recipes" to re-create flows in a new table. The patch defines a new API that allows application to resize existing template table: * Resizable template table must be created with the RTE_FLOW_TABLE_SPECIALIZE_RESIZABLE_TABLE bit set. * Application resizes existing table with the `rte_flow_template_table_resize()` function call. The table resize procedure updates the table maximal flow number only. Other table attributes are not affected by the table resize. ** The table resize procedure must not interrupt existing table flows operations in hardware. ** The table resize procedure must not alter flow handles held by application. * After `rte_flow_template_table_resize()` returned, application must update table flow rules by calling `rte_flow_async_update_resized()`. The call reconfigures internal flow resources for the new table configuration. The flow update must not interrupt hardware flow operations. * After table flows were updated, application must call `rte_flow_template_table_resize_complete()`. The function releases PMD resources related to the original table. Application can start new table resize after `rte_flow_template_table_resize_complete()` returned. Testpmd commands: * Create resizable template table flow template_table create table_id resizable \ [transfer|ingress|egres] group \ rules_number \ pattern_template [ pattern_template [ ... ]] \ actions_template [ actions_template [ ... ]] * Resize table: flow template_table resize table_resize_id \ table_resize_rules_num * Queue a flow update: flow queue update_resized rule * Complete table resize: flow template_table resize_complete table Signed-off-by: Gregory Etelson Acked-by: Ori Kam Acked-by: Ferruh Yigit Acked-by: Thomas Monjalon --- v2: Update the patch comment. Add table resize commands to testpmd user guide. v3: Rename RTE_FLOW_TABLE_SPECIALIZE_RESIZABLE macro. v4: Remove inline. Add use case to rte_flow.rst. v5: Update API guide in the rte_flow.rst. v6: Update docs. v7: More API doc updates. v8: resize_complete returns EBUSY. --- app/test-pmd/cmdline_flow.c | 86 +++++++++++++- app/test-pmd/config.c | 102 +++++++++++++++++ app/test-pmd/testpmd.h | 6 + doc/guides/howto/rte_flow.rst | 91 +++++++++++++++ doc/guides/rel_notes/release_24_03.rst | 12 ++ doc/guides/testpmd_app_ug/testpmd_funcs.rst | 15 ++- lib/ethdev/ethdev_trace.h | 33 ++++++ lib/ethdev/ethdev_trace_points.c | 9 ++ lib/ethdev/rte_flow.c | 77 +++++++++++++ lib/ethdev/rte_flow.h | 118 ++++++++++++++++++++ lib/ethdev/rte_flow_driver.h | 15 +++ lib/ethdev/version.map | 4 + 12 files changed, 562 insertions(+), 6 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 7370d5f224..8e5eb41d71 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -134,6 +134,7 @@ enum index { /* Queue arguments. */ QUEUE_CREATE, QUEUE_DESTROY, + QUEUE_FLOW_UPDATE_RESIZED, QUEUE_UPDATE, QUEUE_AGED, QUEUE_INDIRECT_ACTION, @@ -191,8 +192,12 @@ enum index { /* Table arguments. */ TABLE_CREATE, TABLE_DESTROY, + TABLE_RESIZE, + TABLE_RESIZE_COMPLETE, TABLE_CREATE_ID, TABLE_DESTROY_ID, + TABLE_RESIZE_ID, + TABLE_RESIZE_RULES_NUMBER, TABLE_INSERTION_TYPE, TABLE_INSERTION_TYPE_NAME, TABLE_HASH_FUNC, @@ -204,6 +209,7 @@ enum index { TABLE_TRANSFER, TABLE_TRANSFER_WIRE_ORIG, TABLE_TRANSFER_VPORT_ORIG, + TABLE_RESIZABLE, TABLE_RULES_NUMBER, TABLE_PATTERN_TEMPLATE, TABLE_ACTIONS_TEMPLATE, @@ -1361,6 +1367,8 @@ static const enum index next_group_attr[] = { static const enum index next_table_subcmd[] = { TABLE_CREATE, TABLE_DESTROY, + TABLE_RESIZE, + TABLE_RESIZE_COMPLETE, ZERO, }; @@ -1375,6 +1383,7 @@ static const enum index next_table_attr[] = { TABLE_TRANSFER, TABLE_TRANSFER_WIRE_ORIG, TABLE_TRANSFER_VPORT_ORIG, + TABLE_RESIZABLE, TABLE_RULES_NUMBER, TABLE_PATTERN_TEMPLATE, TABLE_ACTIONS_TEMPLATE, @@ -1391,6 +1400,7 @@ static const enum index next_table_destroy_attr[] = { static const enum index next_queue_subcmd[] = { QUEUE_CREATE, QUEUE_DESTROY, + QUEUE_FLOW_UPDATE_RESIZED, QUEUE_UPDATE, QUEUE_AGED, QUEUE_INDIRECT_ACTION, @@ -3460,6 +3470,19 @@ static const struct token token_list[] = { .args = ARGS(ARGS_ENTRY(struct buffer, port)), .call = parse_table_destroy, }, + [TABLE_RESIZE] = { + .name = "resize", + .help = "resize template table", + .next = NEXT(NEXT_ENTRY(TABLE_RESIZE_ID)), + .call = parse_table + }, + [TABLE_RESIZE_COMPLETE] = { + .name = "resize_complete", + .help = "complete table resize", + .next = NEXT(NEXT_ENTRY(TABLE_DESTROY_ID)), + .args = ARGS(ARGS_ENTRY(struct buffer, port)), + .call = parse_table_destroy, + }, /* Table arguments. */ [TABLE_CREATE_ID] = { .name = "table_id", @@ -3470,13 +3493,29 @@ static const struct token token_list[] = { }, [TABLE_DESTROY_ID] = { .name = "table", - .help = "specify table id to destroy", + .help = "table id", .next = NEXT(next_table_destroy_attr, NEXT_ENTRY(COMMON_TABLE_ID)), .args = ARGS(ARGS_ENTRY_PTR(struct buffer, args.table_destroy.table_id)), .call = parse_table_destroy, }, + [TABLE_RESIZE_ID] = { + .name = "table_resize_id", + .help = "table resize id", + .next = NEXT(NEXT_ENTRY(TABLE_RESIZE_RULES_NUMBER), + NEXT_ENTRY(COMMON_TABLE_ID)), + .args = ARGS(ARGS_ENTRY(struct buffer, args.table.id)), + .call = parse_table + }, + [TABLE_RESIZE_RULES_NUMBER] = { + .name = "table_resize_rules_num", + .help = "table resize rules number", + .next = NEXT(NEXT_ENTRY(END), NEXT_ENTRY(COMMON_UNSIGNED)), + .args = ARGS(ARGS_ENTRY(struct buffer, + args.table.attr.nb_flows)), + .call = parse_table + }, [TABLE_INSERTION_TYPE] = { .name = "insertion_type", .help = "specify insertion type", @@ -3549,6 +3588,12 @@ static const struct token token_list[] = { .next = NEXT(next_table_attr), .call = parse_table, }, + [TABLE_RESIZABLE] = { + .name = "resizable", + .help = "set resizable attribute", + .next = NEXT(next_table_attr), + .call = parse_table, + }, [TABLE_RULES_NUMBER] = { .name = "rules_number", .help = "number of rules in table", @@ -3641,6 +3686,14 @@ static const struct token token_list[] = { .args = ARGS(ARGS_ENTRY(struct buffer, queue)), .call = parse_qo_destroy, }, + [QUEUE_FLOW_UPDATE_RESIZED] = { + .name = "update_resized", + .help = "update a flow after table resize", + .next = NEXT(NEXT_ENTRY(QUEUE_DESTROY_ID), + NEXT_ENTRY(COMMON_QUEUE_ID)), + .args = ARGS(ARGS_ENTRY(struct buffer, queue)), + .call = parse_qo_destroy, + }, [QUEUE_UPDATE] = { .name = "update", .help = "update a flow rule", @@ -10780,6 +10833,7 @@ parse_table(struct context *ctx, const struct token *token, } switch (ctx->curr) { case TABLE_CREATE: + case TABLE_RESIZE: out->command = ctx->curr; ctx->objdata = 0; ctx->object = out; @@ -10824,18 +10878,25 @@ parse_table(struct context *ctx, const struct token *token, case TABLE_TRANSFER_WIRE_ORIG: if (!out->args.table.attr.flow_attr.transfer) return -1; - out->args.table.attr.specialize = RTE_FLOW_TABLE_SPECIALIZE_TRANSFER_WIRE_ORIG; + out->args.table.attr.specialize |= RTE_FLOW_TABLE_SPECIALIZE_TRANSFER_WIRE_ORIG; return len; case TABLE_TRANSFER_VPORT_ORIG: if (!out->args.table.attr.flow_attr.transfer) return -1; - out->args.table.attr.specialize = RTE_FLOW_TABLE_SPECIALIZE_TRANSFER_VPORT_ORIG; + out->args.table.attr.specialize |= RTE_FLOW_TABLE_SPECIALIZE_TRANSFER_VPORT_ORIG; + return len; + case TABLE_RESIZABLE: + out->args.table.attr.specialize |= + RTE_FLOW_TABLE_SPECIALIZE_RESIZABLE; return len; case TABLE_RULES_NUMBER: ctx->objdata = 0; ctx->object = out; ctx->objmask = NULL; return len; + case TABLE_RESIZE_ID: + case TABLE_RESIZE_RULES_NUMBER: + return len; default: return -1; } @@ -10857,7 +10918,8 @@ parse_table_destroy(struct context *ctx, const struct token *token, if (!out) return len; if (!out->command || out->command == TABLE) { - if (ctx->curr != TABLE_DESTROY) + if (ctx->curr != TABLE_DESTROY && + ctx->curr != TABLE_RESIZE_COMPLETE) return -1; if (sizeof(*out) > size) return -1; @@ -10959,7 +11021,8 @@ parse_qo_destroy(struct context *ctx, const struct token *token, if (!out) return len; if (!out->command || out->command == QUEUE) { - if (ctx->curr != QUEUE_DESTROY) + if (ctx->curr != QUEUE_DESTROY && + ctx->curr != QUEUE_FLOW_UPDATE_RESIZED) return -1; if (sizeof(*out) > size) return -1; @@ -13057,10 +13120,18 @@ cmd_flow_parsed(const struct buffer *in) in->args.table_destroy.table_id_n, in->args.table_destroy.table_id); break; + case TABLE_RESIZE_COMPLETE: + port_flow_template_table_resize_complete + (in->port, in->args.table_destroy.table_id[0]); + break; case GROUP_SET_MISS_ACTIONS: port_queue_group_set_miss_actions(in->port, &in->args.vc.attr, in->args.vc.actions); break; + case TABLE_RESIZE: + port_flow_template_table_resize(in->port, in->args.table.id, + in->args.table.attr.nb_flows); + break; case QUEUE_CREATE: port_queue_flow_create(in->port, in->queue, in->postpone, in->args.vc.table_id, in->args.vc.rule_id, @@ -13072,6 +13143,11 @@ cmd_flow_parsed(const struct buffer *in) in->args.destroy.rule_n, in->args.destroy.rule); break; + case QUEUE_FLOW_UPDATE_RESIZED: + port_queue_flow_update_resized(in->port, in->queue, + in->postpone, + in->args.destroy.rule[0]); + break; case QUEUE_UPDATE: port_queue_flow_update(in->port, in->queue, in->postpone, in->args.vc.rule_id, in->args.vc.act_templ_id, diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 9732cb2e0c..08d7d0e2f8 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -1404,6 +1404,19 @@ port_flow_new(const struct rte_flow_attr *attr, return NULL; } +static struct port_flow * +port_flow_locate(struct port_flow *flows_list, uint32_t flow_id) +{ + struct port_flow *pf = flows_list; + + while (pf) { + if (pf->id == flow_id) + break; + pf = pf->next; + } + return pf; +} + /** Print a message out of a flow error. */ static int port_flow_complain(struct rte_flow_error *error) @@ -1694,6 +1707,19 @@ table_alloc(uint32_t id, struct port_table **table, return 0; } +static struct port_table * +port_table_locate(struct port_table *tables_list, uint32_t table_id) +{ + struct port_table *pt = tables_list; + + while (pt) { + if (pt->id == table_id) + break; + pt = pt->next; + } + return pt; +} + /** Get info about flow management resources. */ int port_flow_get_info(portid_t port_id) @@ -2666,6 +2692,46 @@ port_flow_template_table_destroy(portid_t port_id, return ret; } +int +port_flow_template_table_resize_complete(portid_t port_id, uint32_t table_id) +{ + struct rte_port *port; + struct port_table *pt; + struct rte_flow_error error = { 0, }; + int ret; + + if (port_id_is_invalid(port_id, ENABLED_WARN)) + return -EINVAL; + port = &ports[port_id]; + pt = port_table_locate(port->table_list, table_id); + if (!pt) + return -EINVAL; + ret = rte_flow_template_table_resize_complete(port_id, + pt->table, &error); + return !ret ? 0 : port_flow_complain(&error); +} + +int +port_flow_template_table_resize(portid_t port_id, + uint32_t table_id, uint32_t flows_num) +{ + struct rte_port *port; + struct port_table *pt; + struct rte_flow_error error = { 0, }; + int ret; + + if (port_id_is_invalid(port_id, ENABLED_WARN)) + return -EINVAL; + port = &ports[port_id]; + pt = port_table_locate(port->table_list, table_id); + if (!pt) + return -EINVAL; + ret = rte_flow_template_table_resize(port_id, pt->table, flows_num, &error); + if (ret) + return port_flow_complain(&error); + return 0; +} + /** Flush table */ int port_flow_template_table_flush(portid_t port_id) @@ -2806,6 +2872,42 @@ port_queue_flow_create(portid_t port_id, queueid_t queue_id, return 0; } +int +port_queue_flow_update_resized(portid_t port_id, queueid_t queue_id, + bool postpone, uint32_t flow_id) +{ + const struct rte_flow_op_attr op_attr = { .postpone = postpone }; + struct rte_flow_error error = { 0, }; + struct port_flow *pf; + struct rte_port *port; + struct queue_job *job; + int ret; + + if (port_id_is_invalid(port_id, ENABLED_WARN) || + port_id == (portid_t)RTE_PORT_ALL) + return -EINVAL; + port = &ports[port_id]; + if (queue_id >= port->queue_nb) { + printf("Queue #%u is invalid\n", queue_id); + return -EINVAL; + } + pf = port_flow_locate(port->flow_list, flow_id); + if (!pf) + return -EINVAL; + job = calloc(1, sizeof(*job)); + if (!job) + return -ENOMEM; + job->type = QUEUE_JOB_TYPE_FLOW_TRANSFER; + job->pf = pf; + ret = rte_flow_async_update_resized(port_id, queue_id, &op_attr, + pf->flow, job, &error); + if (ret) { + free(job); + return port_flow_complain(&error); + } + return 0; +} + /** Enqueue number of destroy flow rules operations. */ int port_queue_flow_destroy(portid_t port_id, queueid_t queue_id, diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index e18546c46e..467ef3a8ab 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -110,6 +110,7 @@ enum { enum { QUEUE_JOB_TYPE_FLOW_CREATE, QUEUE_JOB_TYPE_FLOW_DESTROY, + QUEUE_JOB_TYPE_FLOW_TRANSFER, QUEUE_JOB_TYPE_FLOW_UPDATE, QUEUE_JOB_TYPE_ACTION_CREATE, QUEUE_JOB_TYPE_ACTION_DESTROY, @@ -981,7 +982,12 @@ int port_flow_template_table_create(portid_t port_id, uint32_t id, uint32_t nb_actions_templates, uint32_t *actions_templates); int port_flow_template_table_destroy(portid_t port_id, uint32_t n, const uint32_t *table); +int port_queue_flow_update_resized(portid_t port_id, queueid_t queue_id, + bool postpone, uint32_t flow_id); int port_flow_template_table_flush(portid_t port_id); +int port_flow_template_table_resize_complete(portid_t port_id, uint32_t table_id); +int port_flow_template_table_resize(portid_t port_id, + uint32_t table_id, uint32_t flows_num); int port_queue_group_set_miss_actions(portid_t port_id, const struct rte_flow_attr *attr, const struct rte_flow_action *actions); int port_queue_flow_create(portid_t port_id, queueid_t queue_id, diff --git a/doc/guides/howto/rte_flow.rst b/doc/guides/howto/rte_flow.rst index 27d4f28f77..2b84728054 100644 --- a/doc/guides/howto/rte_flow.rst +++ b/doc/guides/howto/rte_flow.rst @@ -303,3 +303,94 @@ Terminal 1: output log:: received packet with src ip = 176.80.50.4 sent to queue 3 received packet with src ip = 176.80.50.5 sent to queue 1 received packet with src ip = 176.80.50.6 sent to queue 3 + +Template API resizable table +---------------------------- + +Description +~~~~~~~~~~~ + +The resizable template table API enables applications to dynamically adjust +capacity of template tables without disrupting the existing flow rules +operation. The resizable template table API allows applications to optimize the +memory usage and performance of template tables according to the traffic +conditions and requirements. + +A typical use case for the resizable template table API: + + #. Create a resizable table with the initial capacity. + #. Change the table flow rules capacity. + #. Update table flow objects. + #. Complete the table resize. + +A resizable table can be either in normal or resizable state. +When application begins to resize the table, its state is changed to resizable. +The table stays in resizable state until the application finishes resize +procedure. +The application can resize a table in the normal state only. + +The application needs to set the ``RTE_FLOW_TABLE_SPECIALIZE_RESIZABLE`` bit in +the table attributes when creating a template table that can be resized, +and the bit cannot be set or cleared later. + +The application triggers the table resize by calling +the ``rte_flow_template_table_resize()`` function. The resize process updates +the table configuration to fit the new flow rules capacity. +Table resize does not change existing flow objects configuration. +The application can create new flow rules and modify or delete existing flow +rules while the table is resizing, but the table performance might be +slower than usual. + +Flow rules that existed before table resize are fully functional after +table resize. However, the application must update flow objects to match +the new table configuration. +The application calls ``rte_flow_async_update_resized()`` to update flow object +for the new table configuration. +Should be called for flow rules created before table resize. If called for +flow rules crated after table resize, the call should return success. +The application is free to call this API for all table flow rules. + +The application calls ``rte_flow_template_table_resize_complete()`` to return a +table to normal state after it completed flow objects update. + +Testpmd commands (wrapped for clarity):: + + # 1. Create resizable template table for 1 flow. + testpmd> flow pattern_template 0 create ingress pattern_template_id 3 + template eth / ipv4 / udp src mask 0xffff / end + testpmd> flow actions_template 0 create ingress actions_template_id 7 + template count / rss / end + testpmd> flow template_table 0 create table_id 101 resizable ingress + group 1 priority 0 rules_number 1 + pattern_template 3 actions_template 7 + + # 2. Queue a flow rule. + testpmd> flow queue 0 create 0 template_table 101 + pattern_template 0 actions_template 0 postpone no + pattern eth / ipv4 / udp src spec 1 / end actions count / rss / end + + # 3. Resize the template table + # The new table capacity is 32 rules + testpmd> flow template_table 0 resize table_resize_id 101 + table_resize_rules_num 32 + + # 4. Queue more flow rules. + testpmd> flow queue 0 create 0 template_table 101 + pattern_template 0 actions_template 0 postpone no + pattern eth / ipv4 / udp src spec 2 / end actions count / rss / end + testpmd> flow queue 0 create 0 template_table 101 + pattern_template 0 actions_template 0 postpone no + pattern eth / ipv4 / udp src spec 3 / end actions count / rss / end + testpmd> flow queue 0 create 0 template_table 101 + pattern_template 0 actions_template 0 postpone no + pattern eth / ipv4 / udp src spec 4 / end actions count / rss / end + + # 5. Queue flow rules updates. + # Rule 0 was created before table resize - must be updated. + testpmd> flow queue 0 update_resized 0 rule 0 + # Rule 1 was created after table resize - flow pull returns success. + testpmd> flow queue 0 update_resized 0 rule 1 + + + # 6. Complete the table resize. + testpmd> flow template_table 0 resize_complete table 101 diff --git a/doc/guides/rel_notes/release_24_03.rst b/doc/guides/rel_notes/release_24_03.rst index bd9b4b3b76..b2c9dcaefc 100644 --- a/doc/guides/rel_notes/release_24_03.rst +++ b/doc/guides/rel_notes/release_24_03.rst @@ -89,6 +89,18 @@ New Features * Added support for comparing result between packet fields or value. +* **Added API to change template table flows capacity.** + + * ``RTE_FLOW_TABLE_SPECIALIZE_RESIZABLE_TABLE`` table configuration bit. + Set when template must be created with the resizable property. + * ``rte_flow_template_table_resizable()``. + Query whether template table can be resized. + * ``rte_flow_template_table_resize()``. + Reconfigure template table for new flows capacity. + * ``rte_flow_async_update_resized()``. + Reconfigure flows for the updated table configuration. + * ``rte_flow_template_table_resize_complete()``. + Complete table resize. Removed Items ------------- diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 7a42f21ee6..e972b6dc8b 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -2995,12 +2995,21 @@ following sections. - Create a table:: flow table {port_id} create - [table_id {id}] + [table_id {id}] [resizable] [group {group_id}] [priority {level}] [ingress] [egress] [transfer] rules_number {number} pattern_template {pattern_template_id} actions_template {actions_template_id} +- Resize a table:: + + flow template_table {port_id} resize + table_resize_id {id} table_resize_rules_num {number} + +- Complete table resize:: + + flow template_table {port_id} resize_complete table {table_id} + - Destroy a table:: flow table {port_id} destroy table {id} [...] @@ -3021,6 +3030,10 @@ following sections. pattern {item} [/ {item} [...]] / end actions {action} [/ {action} [...]] / end +- Enqueue flow update following table resize:: + + flow queue {port_id} update_resized {table_id} rule {rule_id} + - Enqueue destruction of specific flow rules:: flow queue {port_id} destroy {queue_id} diff --git a/lib/ethdev/ethdev_trace.h b/lib/ethdev/ethdev_trace.h index 1b1ae0cfe8..cd3327a619 100644 --- a/lib/ethdev/ethdev_trace.h +++ b/lib/ethdev/ethdev_trace.h @@ -2572,6 +2572,39 @@ RTE_TRACE_POINT_FP( rte_trace_point_emit_ptr(user_data); rte_trace_point_emit_int(ret); ) + +RTE_TRACE_POINT_FP( + rte_flow_trace_template_table_resize, + RTE_TRACE_POINT_ARGS(uint16_t port_id, + struct rte_flow_template_table *table, + uint32_t nb_rules, int ret), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_ptr(table); + rte_trace_point_emit_u32(nb_rules); + rte_trace_point_emit_int(ret); +) + +RTE_TRACE_POINT_FP( + rte_flow_trace_async_update_resized, + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t queue, + const struct rte_flow_op_attr *attr, + struct rte_flow *rule, void *user_data, int ret), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_u32(queue); + rte_trace_point_emit_ptr(attr); + rte_trace_point_emit_ptr(rule); + rte_trace_point_emit_ptr(user_data); + rte_trace_point_emit_int(ret); +) + +RTE_TRACE_POINT_FP( + rte_flow_trace_table_resize_complete, + RTE_TRACE_POINT_ARGS(uint16_t port_id, + struct rte_flow_template_table *table, int ret), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_ptr(table); + rte_trace_point_emit_int(ret); +) #ifdef __cplusplus } #endif diff --git a/lib/ethdev/ethdev_trace_points.c b/lib/ethdev/ethdev_trace_points.c index bd6dd4e78a..99e04f5893 100644 --- a/lib/ethdev/ethdev_trace_points.c +++ b/lib/ethdev/ethdev_trace_points.c @@ -777,3 +777,12 @@ RTE_TRACE_POINT_REGISTER(rte_flow_trace_async_action_list_handle_destroy, RTE_TRACE_POINT_REGISTER(rte_flow_trace_async_action_list_handle_query_update, lib.ethdev.flow.async_action_list_handle_query_update) + +RTE_TRACE_POINT_REGISTER(rte_flow_trace_template_table_resize, + lib.ethdev.flow.template_table_resize) + +RTE_TRACE_POINT_REGISTER(rte_flow_trace_async_update_resized, + lib.ethdev.flow.async_update_resized) + +RTE_TRACE_POINT_REGISTER(rte_flow_trace_table_resize_complete, + lib.ethdev.flow.table_resize_complete) diff --git a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c index fb6ffe94dc..b752d05049 100644 --- a/lib/ethdev/rte_flow.c +++ b/lib/ethdev/rte_flow.c @@ -2590,6 +2590,83 @@ rte_flow_calc_encap_hash(uint16_t port_id, const struct rte_flow_item pattern[], return flow_err(port_id, ret, error); } +bool +rte_flow_template_table_resizable(__rte_unused uint16_t port_id, + const struct rte_flow_template_table_attr *tbl_attr) +{ + return (tbl_attr->specialize & + RTE_FLOW_TABLE_SPECIALIZE_RESIZABLE) != 0; +} + +int +rte_flow_template_table_resize(uint16_t port_id, + struct rte_flow_template_table *table, + uint32_t nb_rules, + struct rte_flow_error *error) +{ + int ret; + struct rte_eth_dev *dev; + const struct rte_flow_ops *ops; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + ops = rte_flow_ops_get(port_id, error); + if (!ops || !ops->flow_template_table_resize) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, + "flow_template_table_resize not supported"); + dev = &rte_eth_devices[port_id]; + ret = ops->flow_template_table_resize(dev, table, nb_rules, error); + ret = flow_err(port_id, ret, error); + rte_flow_trace_template_table_resize(port_id, table, nb_rules, ret); + return ret; +} + +int +rte_flow_async_update_resized(uint16_t port_id, uint32_t queue, + const struct rte_flow_op_attr *attr, + struct rte_flow *rule, void *user_data, + struct rte_flow_error *error) +{ + int ret; + struct rte_eth_dev *dev; + const struct rte_flow_ops *ops; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + ops = rte_flow_ops_get(port_id, error); + if (!ops || !ops->flow_update_resized) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, + "async_flow_async_transfer not supported"); + dev = &rte_eth_devices[port_id]; + ret = ops->flow_update_resized(dev, queue, attr, rule, user_data, error); + ret = flow_err(port_id, ret, error); + rte_flow_trace_async_update_resized(port_id, queue, attr, + rule, user_data, ret); + return ret; +} + +int +rte_flow_template_table_resize_complete(uint16_t port_id, + struct rte_flow_template_table *table, + struct rte_flow_error *error) +{ + int ret; + struct rte_eth_dev *dev; + const struct rte_flow_ops *ops; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + ops = rte_flow_ops_get(port_id, error); + if (!ops || !ops->flow_template_table_resize_complete) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, + "flow_template_table_transfer_complete not supported"); + dev = &rte_eth_devices[port_id]; + ret = ops->flow_template_table_resize_complete(dev, table, error); + ret = flow_err(port_id, ret, error); + rte_flow_trace_table_resize_complete(port_id, table, ret); + return ret; +} + static struct rte_flow * rte_flow_dummy_async_create(struct rte_eth_dev *dev __rte_unused, uint32_t queue __rte_unused, diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index 48e4f47844..b5b58dcaa0 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -5842,6 +5842,10 @@ struct rte_flow_template_table; * if the hint is supported. */ #define RTE_FLOW_TABLE_SPECIALIZE_TRANSFER_VPORT_ORIG RTE_BIT32(1) +/** + * Specialize table for resize. + */ +#define RTE_FLOW_TABLE_SPECIALIZE_RESIZABLE RTE_BIT32(2) /**@}*/ /** @@ -5920,6 +5924,25 @@ struct rte_flow_template_table_attr { enum rte_flow_table_hash_func hash_func; }; +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Query whether a table can be resized. + * + * @param port_id + * Port identifier of Ethernet device. + * @param tbl_attr + * Template table. + * + * @return + * True if the table can be resized. + */ +__rte_experimental +bool +rte_flow_template_table_resizable(__rte_unused uint16_t port_id, + const struct rte_flow_template_table_attr *tbl_attr); + /** * @warning * @b EXPERIMENTAL: this API may change without prior notice. @@ -6899,6 +6922,101 @@ rte_flow_calc_encap_hash(uint16_t port_id, const struct rte_flow_item pattern[], enum rte_flow_encap_hash_field dest_field, uint8_t hash_len, uint8_t *hash, struct rte_flow_error *error); +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Update template table for new flow rules capacity. + * + * @param port_id + * Port identifier of Ethernet device. + * @param table + * Template table to modify. + * @param nb_rules + * New flow rules capacity. + * @param error + * Perform verbose error reporting if not NULL. + * PMDs initialize this structure in case of error only. + * + * @return + * - (0) if success. + * - (-ENODEV) if *port_id* invalid. + * - (-ENOTSUP) if underlying device does not support this functionality. + * - (-EINVAL) if *table* is not resizable or + * *table* resize to *nb_rules* is not supported or + * unrecoverable *table* error. + */ +__rte_experimental +int +rte_flow_template_table_resize(uint16_t port_id, + struct rte_flow_template_table *table, + uint32_t nb_rules, + struct rte_flow_error *error); +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Update *rule* for the new *table* configuration after table resize. + * Must be called for each *rule* created before *table* resize. + * If called for *rule* created after *table* resize returns success. + * + * @param port_id + * Port identifier of Ethernet device. + * @param queue + * Flow queue for async operation. + * @param attr + * Async operation attributes. + * @param rule + * Flow rule to update. + * @param user_data + * The user data that will be returned on async completion event. + * @param error + * Perform verbose error reporting if not NULL. + * PMDs initialize this structure in case of error only. + * + * @return + * - (0) if success. + * - (-ENODEV) if *port_id* invalid. + * - (-ENOTSUP) if underlying device does not support this functionality. + * - (-EINVAL) if *table* was not resized. + * If *rule* cannot be updated after *table* resize, + * unrecoverable *table* error. + */ +__rte_experimental +int +rte_flow_async_update_resized(uint16_t port_id, uint32_t queue, + const struct rte_flow_op_attr *attr, + struct rte_flow *rule, void *user_data, + struct rte_flow_error *error); + +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Resume normal operational mode after table was resized and + * table rules were updated for the new table configuration. + * + * @param port_id + * Port identifier of Ethernet device. + * @param table + * Template table that undergoing resize operation. + * @param error + * Perform verbose error reporting if not NULL. + * PMDs initialize this structure in case of error only. + * + * @return + * - (0) if success. + * - (-ENODEV) if *port_id* invalid. + * - (-ENOTSUP) if underlying device does not support this functionality. + * - (-EBUSY) if not all *table* rules were updated. + * - (-EINVAL) if *table* cannot complete table resize, + * unrecoverable error. + */ +__rte_experimental +int +rte_flow_template_table_resize_complete(uint16_t port_id, + struct rte_flow_template_table *table, + struct rte_flow_error *error); #ifdef __cplusplus } #endif diff --git a/lib/ethdev/rte_flow_driver.h b/lib/ethdev/rte_flow_driver.h index ac55b762a0..3c702e30b4 100644 --- a/lib/ethdev/rte_flow_driver.h +++ b/lib/ethdev/rte_flow_driver.h @@ -257,6 +257,21 @@ struct rte_flow_ops { (struct rte_eth_dev *dev, const struct rte_flow_item pattern[], enum rte_flow_encap_hash_field dest_field, uint8_t *hash, struct rte_flow_error *error); + /** @see rte_flow_template_table_resize() */ + int (*flow_template_table_resize)(struct rte_eth_dev *dev, + struct rte_flow_template_table *table, + uint32_t nb_rules, + struct rte_flow_error *error); + /** @see rte_flow_async_update_resized() */ + int (*flow_update_resized)(struct rte_eth_dev *dev, uint32_t queue, + const struct rte_flow_op_attr *attr, + struct rte_flow *rule, void *user_data, + struct rte_flow_error *error); + /** @see rte_flow_template_table_resize_complete() */ + int (*flow_template_table_resize_complete) + (struct rte_eth_dev *dev, + struct rte_flow_template_table *table, + struct rte_flow_error *error); }; /** diff --git a/lib/ethdev/version.map b/lib/ethdev/version.map index 748dba899f..019eca209d 100644 --- a/lib/ethdev/version.map +++ b/lib/ethdev/version.map @@ -321,6 +321,10 @@ EXPERIMENTAL { __rte_eth_trace_tx_queue_count; rte_eth_find_rss_algo; rte_flow_calc_encap_hash; + rte_flow_async_update_resized; + rte_flow_template_table_resizable; + rte_flow_template_table_resize; + rte_flow_template_table_resize_complete; }; INTERNAL { -- 2.39.2