From patchwork Sat Jan 21 05:21:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kozyrev X-Patchwork-Id: 122438 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 31B5C42436; Sat, 21 Jan 2023 06:22:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2686642DC3; Sat, 21 Jan 2023 06:22:47 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by mails.dpdk.org (Postfix) with ESMTP id 91F92410EC for ; Sat, 21 Jan 2023 06:22:45 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EwRuP879d0TYBDgi9WZUWvUE84SabPwMLincRVC6EpuaXWCaga7NbAzzcViHSFy7GK9uHDUkFlJOcNERXAa0wL5loGPVE0Qw/c/cMhl3nvudjJd6izlD/jZ+lQ8tGAqfdB/NmvFG8BXn1VvxuHAPjpr73iMiBv12k7EAEIIVYhejjgckvOz30kQFBdsBij+Cb3YnJR6dBk+FJL5xdHGUKxIG7G0Pg1ZyYYoZTJ7etDWpgCCCaykya1vbkeu8whXvbw9NPZ8akgElPdilJ8sRDRNhNW+JtCqgk5u2jX7hBCTWyFKiNJYqhshfUppUf71QsCdJbEaH+K7N49pLiEkW/w== 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=iYZMtTDg56l+/XXxXlQ0dmmRZhKgO2DmYs3VJ4Q+6/4=; b=jei6AV2sbgbB7VZqDwkQzJIEzJnUnB2IDoeSQE1KpgwS6O+5xciO6Y0pgh01Y1J+1hijLZGDLoxQqvOHWORnfyp6Kt3cKaxFL104FxGw+a+2TMY1wmMwln1htL8vWr2LcxBGA59U8XdH24zEhG9H9eJN6Uts3EeD7GOi5FJplsZAbo6q0zGFplP2fwRELKpND7zmq3gRSGx2wxnqHFaECKV5DylIvUxTwD4cFt5SthYA44ASqAyAYe0IAWhiVI1JFlCKB/l7p3hrtYSc+8At8NiydSWAIOvVhAJ8k9lPUXXvmUFEop9aHgyk/BtJjhSYQDlxn5jR0ta0+mG9SnAGpw== 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 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=iYZMtTDg56l+/XXxXlQ0dmmRZhKgO2DmYs3VJ4Q+6/4=; b=ncvVn5SsZ9YxK0dv85gMmLcpO7CZQOfhFh+xqNEIcjj2X4UYZ22SeKpSY4cvdHtx+RWyvtWSrG8qB1TtQdktYvvCzStPWIOP8xTHOX65VwEfuh/dBfhJCslgk4GqfWEwCJuGNoEsfiutpZO5ymf8zUMdQMw9ChS/PNs37HmkukFjJZmgQKISVxS3JgHCENXqm0H5Vh7Y6v6xxghLVh95GG0KUjUmEAYbCnx42p6jH5zOYlkB87ATQFlG7PQzrBF7Hhvf9NeUK0PknDRYVHeVZ0a7heZgAm4Nxct5vOC4rG0r0aUa4bJ2N8VLb3ZGRqXTjNbwllt0/N7SMWLM+k3Ftw== Received: from MW4PR02CA0014.namprd02.prod.outlook.com (2603:10b6:303:16d::29) by SA1PR12MB7127.namprd12.prod.outlook.com (2603:10b6:806:29e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.24; Sat, 21 Jan 2023 05:22:44 +0000 Received: from CO1NAM11FT080.eop-nam11.prod.protection.outlook.com (2603:10b6:303:16d:cafe::72) by MW4PR02CA0014.outlook.office365.com (2603:10b6:303:16d::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.27 via Frontend Transport; Sat, 21 Jan 2023 05:22:43 +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 CO1NAM11FT080.mail.protection.outlook.com (10.13.174.99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6023.16 via Frontend Transport; Sat, 21 Jan 2023 05:22:43 +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.36; Fri, 20 Jan 2023 21:22:30 -0800 Received: from pegasus01.mtr.labs.mlnx (10.126.230.37) 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.986.36; Fri, 20 Jan 2023 21:22:27 -0800 From: Alexander Kozyrev To: CC: , , , Subject: [PATCH 4/4] app/testpmd: add template table hash calculation function Date: Sat, 21 Jan 2023 07:21:58 +0200 Message-ID: <20230121052158.2928238-5-akozyrev@nvidia.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20230121052158.2928238-1-akozyrev@nvidia.com> References: <20221214022110.393410-1-akozyrev@nvidia.com> <20230121052158.2928238-1-akozyrev@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT080:EE_|SA1PR12MB7127:EE_ X-MS-Office365-Filtering-Correlation-Id: 80f689a9-005b-4a6b-8c6a-08dafb6f860d 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: bMmejC+I42XF0mQdIQTqZ1rmhoKdrz60KkKtwQmI3EdsIKCf6k5cj0GfQN0BqRyFr7u/griTpRzvm+wRWx0eAN6AyijoQlzamlkcnW1hx0TjzZ+nJrQ11v3E4tLZimFUHzO4U6MMpwTboX8HM0DgZIY2bESAa44T3xzYzBGjQcWlxbkKkQo5vvU8pkkGqkhmnxQIADGGwRfOcXaCGVlTbeYt6929GljzZz5XJ9J0RDSlyqLcgOkMFqLqLloUjTmWz/ud1e6G0SID6oyd1wE8R8oqxtr5Si7hZ+9BamyjWiBckAU4LiUZ7Kf5RF4EwKla2VqjzarZKQXBJwep0Yq8JhlpwL1yH0FX6HKS0XdFQh9/1RACaV5hYl5j3h0mZQGp1s5t6wFhuNOJ3U3d60xgwLViuz6kvCG0Exq4CbJdB39Mgb5C54Q2wclUtif4FTuFfWe+uXP4cQIeMsSQqLa/UT9ubK9U1bNL+IIYAtKPDULbzG7tA6/gsbUYvNDmI6qsgF7IQCKZtpM0qOULdLai4o3AU42qydbKxEafxr4QgTyUaZJmxnAghdH+1RzTwgGOB0xOlgos6zHG4O8xbJpypQd4V6+/81jZaxm40IpN0lt+Toasau2QJ7HfER98u0HEjd4hBt/QCyduqxesuJ8DpHdhGwyjXorcxk02hR5XP92RYFdMolJE9NO9rm480q1Pc8x7Rw/11sRQUAsDyP7hMA== 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:(13230022)(4636009)(346002)(39860400002)(396003)(136003)(376002)(451199015)(36840700001)(46966006)(40470700004)(82310400005)(86362001)(356005)(36756003)(40480700001)(7636003)(82740400003)(107886003)(2616005)(6666004)(186003)(26005)(40460700003)(478600001)(16526019)(36860700001)(336012)(5660300002)(2906002)(70206006)(6916009)(70586007)(8676002)(4326008)(1076003)(8936002)(41300700001)(316002)(54906003)(47076005)(426003)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jan 2023 05:22:43.4385 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 80f689a9-005b-4a6b-8c6a-08dafb6f860d 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: CO1NAM11FT080.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7127 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 CLI interface for a template table hash function. Available types are: default, linear, crc32 and crc16. flow template_table 0 create table_id 0 hash_func linear ... Signed-off-by: Alexander Kozyrev --- app/test-pmd/cmdline_flow.c | 69 ++++++++++++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index f1d6813baa..007d31c5cf 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -180,6 +180,8 @@ enum index { TABLE_DESTROY_ID, TABLE_INSERTION_TYPE, TABLE_INSERTION_TYPE_NAME, + TABLE_HASH_FUNC, + TABLE_HASH_FUNC_NAME, TABLE_GROUP, TABLE_PRIORITY, TABLE_INGRESS, @@ -808,7 +810,8 @@ static const char *const modify_field_ids[] = { "udp_port_src", "udp_port_dst", "vxlan_vni", "geneve_vni", "gtp_teid", "tag", "mark", "meta", "pointer", "value", - "ipv4_ecn", "ipv6_ecn", "gtp_psc_qfi", "meter_color", NULL + "ipv4_ecn", "ipv6_ecn", "gtp_psc_qfi", "meter_color", + "hash_result", NULL }; static const char *const meter_colors[] = { @@ -819,6 +822,10 @@ static const char *const table_insertion_types[] = { "pattern", "index", NULL }; +static const char *const table_hash_funcs[] = { + "default", "linear", "crc32", "crc16", NULL +}; + #define RAW_IPSEC_CONFS_MAX_NUM 8 /** Maximum number of subsequent tokens and arguments on the stack. */ @@ -1163,6 +1170,7 @@ static const enum index next_table_attr[] = { TABLE_CREATE_ID, TABLE_GROUP, TABLE_INSERTION_TYPE, + TABLE_HASH_FUNC, TABLE_PRIORITY, TABLE_INGRESS, TABLE_EGRESS, @@ -2417,6 +2425,9 @@ static int parse_meter_color(struct context *ctx, const struct token *token, static int parse_insertion_table_type(struct context *ctx, const struct token *token, const char *str, unsigned int len, void *buf, unsigned int size); +static int parse_hash_table_type(struct context *ctx, const struct token *token, + const char *str, unsigned int len, void *buf, + unsigned int size); static int comp_none(struct context *, const struct token *, unsigned int, char *, unsigned int); static int comp_boolean(struct context *, const struct token *, @@ -2451,6 +2462,8 @@ static int comp_meter_color(struct context *, const struct token *, unsigned int, char *, unsigned int); static int comp_insertion_table_type(struct context *, const struct token *, unsigned int, char *, unsigned int); +static int comp_hash_table_type(struct context *, const struct token *, + unsigned int, char *, unsigned int); /** Token definitions. */ static const struct token token_list[] = { @@ -2935,6 +2948,20 @@ static const struct token token_list[] = { .call = parse_insertion_table_type, .comp = comp_insertion_table_type, }, + [TABLE_HASH_FUNC] = { + .name = "hash_func", + .help = "specify hash calculation function", + .next = NEXT(next_table_attr, + NEXT_ENTRY(TABLE_HASH_FUNC_NAME)), + .args = ARGS(ARGS_ENTRY(struct buffer, + args.table.attr.hash_func)), + }, + [TABLE_HASH_FUNC_NAME] = { + .name = "hash_func_name", + .help = "hash calculation function name", + .call = parse_hash_table_type, + .comp = comp_hash_table_type, + }, [TABLE_GROUP] = { .name = "group", .help = "specify a group", @@ -10123,6 +10150,32 @@ parse_insertion_table_type(struct context *ctx, const struct token *token, return ret > 0 ? (int)len : ret; } +/** Parse Hash Calculation Table Type name */ +static int +parse_hash_table_type(struct context *ctx, const struct token *token, + const char *str, unsigned int len, void *buf, + unsigned int size) +{ + const struct arg *arg = pop_args(ctx); + unsigned int i; + char tmp[2]; + int ret; + + (void)size; + /* Argument is expected. */ + if (!arg) + return -1; + for (i = 0; table_hash_funcs[i]; ++i) + if (!strcmp_partial(table_hash_funcs[i], str, len)) + break; + if (!table_hash_funcs[i]) + return -1; + push_args(ctx, arg); + snprintf(tmp, sizeof(tmp), "%u", i); + ret = parse_int(ctx, token, tmp, strlen(tmp), buf, sizeof(i)); + return ret > 0 ? (int)len : ret; +} + /** No completion. */ static int comp_none(struct context *ctx, const struct token *token, @@ -10442,6 +10495,20 @@ comp_insertion_table_type(struct context *ctx, const struct token *token, return -1; } +/** Complete available Hash Calculation Table types. */ +static int +comp_hash_table_type(struct context *ctx, const struct token *token, + unsigned int ent, char *buf, unsigned int size) +{ + RTE_SET_USED(ctx); + RTE_SET_USED(token); + if (!buf) + return RTE_DIM(table_hash_funcs); + if (ent < RTE_DIM(table_hash_funcs) - 1) + return rte_strscpy(buf, table_hash_funcs[ent], size); + return -1; +} + /** Internal context. */ static struct context cmd_flow_context;