From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 1C77F42498;
Fri, 27 Jan 2023 00:28:53 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 9CFAB42D54;
Fri, 27 Jan 2023 00:28:44 +0100 (CET)
Received: from NAM11-CO1-obe.outbound.protection.outlook.com
(mail-co1nam11on2044.outbound.protection.outlook.com [40.107.220.44])
by mails.dpdk.org (Postfix) with ESMTP id 1D0F242D52
for <dev@dpdk.org>; Fri, 27 Jan 2023 00:28:43 +0100 (CET)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=CGGsS6cfoGO+SLLqLUsq0jB8Xgro3h17SIEGPqQu8iYlOqC7x0GmjTQAUJG2DerF1OgziyHX3dDHFmfzrkXoeR0qmlWtY18btuUr/MJw/G1M0zF2tP5xDGneYTFlWImIVwhptlkJ5RnPLlrCMe1I7d8Ffk+h8GzA5uwOS3xGSpprKo2cfdQ26FLTU4Zo1CsWUuvpyzwu4pOunFeCOUcTO2TMYA68jQn7NbqBXOXLvYv2o4z8qkQUWgB2JL6XDVNO4JJZyDh4HGggXzdy4Y02aj/JdttZ13wInOt1yNbHG5mBroXOb5M1qHdbEmCrCDaI31zdeR3XvQoGDh8A+P9/8A==
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=RN3NRyCYeT398DWl9sw3BlsL1jew6HoQ5cYQI7MJqxDVI1Ud3pqIQCMI4WVDJ9nalowDpMOVXPwyycgiQIkVgwKLeK6ANhOtSf3G864t0mZGeCcEC0pQjwdsEt3hJNjG2ouocZ/X8aRsRHOzwCdVQUaFEpHa5W4N2qmuZsT01JQvejPlHmpQkbrFUjx1mK5MbawXtN63N8frQy25yW07rf7eYp3gwYrnTdoLNf7ra9HuF8XphvZKtq0NsRlEhN4W726y/JzlvEuvwzQBNuXnspNk2hUsHLBrMQDWUGZQ1UC+b9eDd9piZ5DNJBmlSF5MpjlMGhsGHLhakuT7QuqQyQ==
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=YK3jZf2UGzdMwurOujkTdpPC/a535DC3b48+bwGIQcdJKVWiRJbrHloCxoHfZK1xx5gG4GVxj4qpcImjg6ESBxGjM/NIigmmYABShpItvNk5iwDH+JXEUchhxWBxBtiWnYjS1EsaZU2ayksAivElHzVQC6xgXFAjn6I/YMAETiViqbWscmBroIWM/2a/d1VA5t45Fy/mOTGniyQSCSZ/yL1T5kRbUuUwR4UTvZUu6i99ZGQf3I4smQMVTj2xT2k049K5QDSw06BZB6SlGtZtEQ+sd6dg+JYGXFyO1aksll6OuGZHaLQtNT4DwtFkRX/ATq3gQJymn/2owgzIMxfJBA==
Received: from BN9PR03CA0249.namprd03.prod.outlook.com (2603:10b6:408:ff::14)
by PH7PR12MB5654.namprd12.prod.outlook.com (2603:10b6:510:137::21)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.22; Thu, 26 Jan
2023 23:28:41 +0000
Received: from BN8NAM11FT049.eop-nam11.prod.protection.outlook.com
(2603:10b6:408:ff::4) by BN9PR03CA0249.outlook.office365.com
(2603:10b6:408:ff::14) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.22 via Frontend
Transport; Thu, 26 Jan 2023 23:28:40 +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
BN8NAM11FT049.mail.protection.outlook.com (10.13.177.157) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.20.6043.21 via Frontend Transport; Thu, 26 Jan 2023 23:28:40 +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; Thu, 26 Jan
2023 15:28:32 -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; Thu, 26 Jan 2023 15:28:30 -0800
From: Alexander Kozyrev <akozyrev@nvidia.com>
To: <dev@dpdk.org>
CC: <thomas@monjalon.net>, <ferruh.yigit@amd.com>,
<andrew.rybchenko@oktetlabs.ru>, <orika@nvidia.com>
Subject: [PATCH v2 4/4] app/testpmd: add template table hash calculation
function
Date: Fri, 27 Jan 2023 01:28:02 +0200
Message-ID: <20230126232802.3960109-5-akozyrev@nvidia.com>
X-Mailer: git-send-email 2.18.2
In-Reply-To: <20230126232802.3960109-1-akozyrev@nvidia.com>
References: <20230121052158.2928238-1-akozyrev@nvidia.com>
<20230126232802.3960109-1-akozyrev@nvidia.com>
MIME-Version: 1.0
Content-Type: text/plain
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: BN8NAM11FT049:EE_|PH7PR12MB5654:EE_
X-MS-Office365-Filtering-Correlation-Id: 1a0f1026-b5f8-4184-b193-08dafff50ef0
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: 63MQziSqI6qX3snKHClrsxfdSUPjp0wbYGMpb5Lnn5qXYuM9HDZfSxZ78qfNlDyrDfeHM6AQtPBeyRFhhiTE+m5vC6mWjOOwyTq/gWijjyvS71a+ymtc5U7P65y93/gaWlu4aq+S3iwJuWw8IH+Bu5V5XFo11Zx5dc67X/g6rndtQNBNE2RWiJP441hkVGGnB4fQ4GvsP3cf/5lMCac6QJTkysoU9U0TVfIHLPdvWCi2AmuHCRfuBDRmoKWy3oxP+VN9zA8uBFd34TdmwktuLzNUqDX3rl5MC6m1hWNtpEhg7J4UbaZaQsZCv9TjyQ3YHfqvgnmbtsqwe8zecfqAujIOqyVqW+IG9ge77SSzOTP99G46ANbdWpaD6nE836PUFHhLTFGoyG0DnTuZ0ZXcv0IrhSP70COV0V47AYTCZq1sVk2j6nF6PfueIlVy/OBr9TbqGbo555S3R9V1CMAXWSuzjIKeasjOGgfmXu98kayX8fHbTrTs9rPTpdX1CgaKNV/y4czQOdtE4crBowdOjDaprVOoeFgGkVi1+6PwtHW2wVoKmwQhEEr8T1Wi7fdLLUy7823T/MfYTpulRGRNgZAUtg0aONNPXtEWdolYPMqRM0SSsICFDA4kne3fzn5xDCGQ/LEHiLeDBbpD5inK9MmQY4tWOz6elz6xi/r5rA9rTRw1RpKuJwLiixPpYMMfTVp6AoTiDwWCZ9Xfg4ZvGg==
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:(13230025)(4636009)(396003)(376002)(346002)(136003)(39860400002)(451199018)(40470700004)(46966006)(36840700001)(36756003)(70586007)(4326008)(54906003)(316002)(8676002)(6916009)(8936002)(41300700001)(70206006)(36860700001)(356005)(86362001)(82740400003)(7636003)(6666004)(1076003)(107886003)(16526019)(26005)(186003)(40480700001)(5660300002)(336012)(83380400001)(2906002)(426003)(82310400005)(40460700003)(47076005)(478600001)(2616005);
DIR:OUT; SFP:1101;
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2023 23:28:40.7040 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 1a0f1026-b5f8-4184-b193-08dafff50ef0
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: BN8NAM11FT049.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5654
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=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 <akozyrev@nvidia.com>
---
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;
--
2.18.2