From patchwork Wed Sep 20 12:52:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomer Shmilovich X-Patchwork-Id: 131726 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 29FB7425F0; Wed, 20 Sep 2023 14:53:37 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D5853427D8; Wed, 20 Sep 2023 14:53:30 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2069.outbound.protection.outlook.com [40.107.212.69]) by mails.dpdk.org (Postfix) with ESMTP id 039C8410D3 for ; Wed, 20 Sep 2023 14:53:29 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GzTMo1Q3CqdjLlCYjuhkvTDE2KDUEkbpYugRqrn/d0cRDcXtK2qY4v51JwaGsoQwwwGFEsJijQCnzWMmQ9NrrmnfaOsxq3ZQ72gQKWLU9gOmx/GtZDZx1/7jQa0Ah5BVAofvjoyss6fnr/qaSpFyIFZaEREhgLFUBjCoEW4SREJOho5O+x1WDGBf6l0dbraMjmAR51xXWmhUQyYWUSWDKId26wG7Va5fgx9hfx8U/Ja/FtZBZAa1GylYotOTBzhZyrvbErgk2Ze0HH05Tg8CwIuqETiCSO94dhX3TG3XB+DsC3Z/b2jqxJwYV+2/+AqL0Jl+1b7+DcwLuWpxpYcPoA== 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=i3DqfKxe6u23E/EQU0RTmSAFFlVK4ULUEDWUXyn6Ido=; b=GM/BLcM/ox6rBG7/9AHWNRNztw3YZxem14HHvcLr/GBdfTrRUUbbZy7enM5yru6XRWwsr9cV4PMejLVMl+VgwfNDdfitRVx7OQKX7pTpO9afT49A3zheQhC75ACUhUAG21VNWry/Rj67EntoSDGV8HNF7620H93o8LOwlJDFSOTxy/XkCn2ZmbLS3uwnGyyT9g8VaMAPHuVKH54wVXvo8kyoG6Pj8y0SdTdGdp3qZ3hULW4tSUs8Qy7mHNQGX8KB/t3bkIAgpZ6GS4tJ+1+qjadFXqanTVdfiKpfyEzzxUpV25KWzlwAfXk/nKvK0LBnmZgdGOxFOwYnDxKAee1u6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=i3DqfKxe6u23E/EQU0RTmSAFFlVK4ULUEDWUXyn6Ido=; b=I8Iq1f7YNi2wgCxGWRNZA4dM+8VqKTG/VHZeJ/Gotqb8voMUWzNsizfJ9EW728+yuWZpQLnd1hItE+hibeRlNb3Kjok6yQSfUibAzZcjcG70UlbXElUNQ45ztDp9coMceoMrgSox6xVxGF/IsyyZPNC5kPdBxPWpPbPmZLjrLfB8AiFeD4/8SvaLXkogLAwFp+ZeEmOl2OvScUXzh8h+W3NiKf7rcLZegRmBXKSuYGlfRmTR8/P7rO2RcnhQlIqlzoz8fgYAq9F4fs6FU6k+R2fBZwNhzgBSiQBjg+xIGyw9IGLfLo2o8NNwgdC7DQxEabvz9t90+JZlJnidf1Nvrg== Received: from BL0PR02CA0135.namprd02.prod.outlook.com (2603:10b6:208:35::40) by DM4PR12MB5359.namprd12.prod.outlook.com (2603:10b6:5:39e::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Wed, 20 Sep 2023 12:53:26 +0000 Received: from BL6PEPF0001AB4E.namprd04.prod.outlook.com (2603:10b6:208:35:cafe::6f) by BL0PR02CA0135.outlook.office365.com (2603:10b6:208:35::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.30 via Frontend Transport; Wed, 20 Sep 2023 12:53:26 +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 BL6PEPF0001AB4E.mail.protection.outlook.com (10.167.242.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19 via Frontend Transport; Wed, 20 Sep 2023 12:53:25 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) 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, 20 Sep 2023 05:53:14 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Wed, 20 Sep 2023 05:53:12 -0700 From: Tomer Shmilovich To: Ori Kam , Aman Singh , "Yuying Zhang" CC: Subject: [PATCH 2/2] app/testpmd: add group set miss actions CLI commands Date: Wed, 20 Sep 2023 12:52:49 +0000 Message-ID: <20230920125250.804055-3-tshmilovich@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230920125250.804055-1-tshmilovich@nvidia.com> References: <20230920125250.804055-1-tshmilovich@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail202.nvidia.com (10.129.68.7) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB4E:EE_|DM4PR12MB5359:EE_ X-MS-Office365-Filtering-Correlation-Id: 3b6ba7dc-6746-4c94-5908-08dbb9d8946d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qudafzn0T3CbL/PeLHWxUr/VdFEv3VdqAbTjZizf3oskhItKz2ZQ7f4OGiDavT2MVtW/lGRKpi66PhWBAsXg/GBLAWxOU9vjfPDHy1ObAjzDYxKBlHKWcZEz4SqrlUKKbxJXLQ82xJWJZzWw6mc98UP6Yx+XqPF++8n+q4Ob2IBhFqRiDbti7XecscbdMymnYn6rnVhhouk7qWIEnhmRCG3V5W0+XiTWFbmuk1E8uNicXpMGw0gcGBcj3sAtIbVxpYf9lAYLplWKW4FxYMesUn+eTQJZVFFmrBashH0jsVLMOJUu6wlzdqU8DrnmVkCMnkcXx5oaYOlqn7mqeFHMWqLE5z1e87XtHKYj4ScaH3M4Q5QI4jSWX6H6mWFiy3DUto8qdpeXudizHCRwc1Z7FZpPy8yWkjEExY+uLtHGW4x6mSu1jy6EQdy2g9ebU+82GmJGF6oydpsCL9YjsL2EP4cw2dXrw98mUYF2Rew2z8awplg+GYkkc2EyjXuG2auN4CS5yo3TEyllUNcSAXB3E4c4kE1Lftqx8ryswSXDiYKhE3Rg2TEwdBFjHZvwRsWEzyEp9rFBD81bWJtWIH5L1YuiccGw5kEjc8LnmNCQmAh/qZu/1dd4wCohCbouNh5b130Cbf5rTZnWckRvzmxiznxOwujhIuEBW0N3N82n2UAGJJb/ZwxP2UI1JH7ezZg2yQom/UWS4LDClOo0oFSNL5OyMCJk/VxZuTUO+Gf6B1Fz/2vSIUxat3GjxJr657Ca 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)(396003)(346002)(376002)(136003)(39860400002)(186009)(1800799009)(451199024)(82310400011)(46966006)(40470700004)(36840700001)(8936002)(8676002)(2906002)(316002)(41300700001)(16526019)(6286002)(55016003)(336012)(26005)(40480700001)(426003)(1076003)(110136005)(478600001)(70206006)(70586007)(4326008)(5660300002)(36860700001)(7696005)(40460700003)(47076005)(2616005)(36756003)(6666004)(83380400001)(86362001)(356005)(7636003)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2023 12:53:25.5450 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3b6ba7dc-6746-4c94-5908-08dbb9d8946d 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: BL6PEPF0001AB4E.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5359 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 the group set miss actions API: flow group 0 group_id 1 ingress set_miss_actions jump group 3 / end flow group 0 group_id 1 ingress set_miss_actions end Signed-off-by: Tomer Shmilovich Acked-by: Ori Kam --- app/test-pmd/cmdline_flow.c | 112 ++++++++++++++++++++++++++++++++++++ app/test-pmd/config.c | 27 +++++++++ app/test-pmd/testpmd.h | 2 + 3 files changed, 141 insertions(+) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 94827bcc4a..b3b8893e37 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -86,6 +86,7 @@ enum index { PATTERN_TEMPLATE, ACTIONS_TEMPLATE, TABLE, + FLOW_GROUP, INDIRECT_ACTION, VALIDATE, CREATE, @@ -206,6 +207,13 @@ enum index { TABLE_PATTERN_TEMPLATE, TABLE_ACTIONS_TEMPLATE, + /* Group arguments */ + GROUP_ID, + GROUP_INGRESS, + GROUP_EGRESS, + GROUP_TRANSFER, + GROUP_SET_MISS_ACTIONS, + /* Tunnel arguments. */ TUNNEL_CREATE, TUNNEL_CREATE_TYPE, @@ -1293,6 +1301,14 @@ static const enum index next_at_destroy_attr[] = { ZERO, }; +static const enum index next_group_attr[] = { + GROUP_INGRESS, + GROUP_EGRESS, + GROUP_TRANSFER, + GROUP_SET_MISS_ACTIONS, + ZERO, +}; + static const enum index next_table_subcmd[] = { TABLE_CREATE, TABLE_DESTROY, @@ -2678,6 +2694,9 @@ static int parse_push(struct context *, const struct token *, static int parse_pull(struct context *, const struct token *, const char *, unsigned int, void *, unsigned int); +static int parse_group(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); @@ -3021,6 +3040,7 @@ static const struct token token_list[] = { PATTERN_TEMPLATE, ACTIONS_TEMPLATE, TABLE, + FLOW_GROUP, INDIRECT_ACTION, VALIDATE, CREATE, @@ -3411,6 +3431,46 @@ static const struct token token_list[] = { .call = parse_table, }, /* Top-level command. */ + [FLOW_GROUP] = { + .name = "group", + .help = "manage flow groups", + .next = NEXT(NEXT_ENTRY(GROUP_ID), NEXT_ENTRY(COMMON_PORT_ID)), + .args = ARGS(ARGS_ENTRY(struct buffer, port)), + .call = parse_group, + }, + /* Sub-level commands. */ + [GROUP_SET_MISS_ACTIONS] = { + .name = "set_miss_actions", + .help = "set group miss actions", + .next = NEXT(next_action), + .call = parse_group, + }, + /* Group arguments */ + [GROUP_ID] = { + .name = "group_id", + .help = "group id", + .next = NEXT(next_group_attr, NEXT_ENTRY(COMMON_GROUP_ID)), + .args = ARGS(ARGS_ENTRY(struct buffer, args.vc.attr.group)), + }, + [GROUP_INGRESS] = { + .name = "ingress", + .help = "group ingress attr", + .next = NEXT(next_group_attr), + .call = parse_group, + }, + [GROUP_EGRESS] = { + .name = "egress", + .help = "group egress attr", + .next = NEXT(next_group_attr), + .call = parse_group, + }, + [GROUP_TRANSFER] = { + .name = "transfer", + .help = "group transfer attr", + .next = NEXT(next_group_attr), + .call = parse_group, + }, + /* Top-level command. */ [QUEUE] = { .name = "queue", .help = "queue a flow rule operation", @@ -10449,6 +10509,54 @@ parse_pull(struct context *ctx, const struct token *token, return len; } +static int +parse_group(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 != FLOW_GROUP) + return -1; + if (sizeof(*out) > size) + return -1; + out->command = ctx->curr; + ctx->objdata = 0; + ctx->object = out; + ctx->objmask = NULL; + out->args.vc.data = (uint8_t *)out + size; + return len; + } + switch (ctx->curr) { + case GROUP_INGRESS: + out->args.vc.attr.ingress = 1; + return len; + case GROUP_EGRESS: + out->args.vc.attr.egress = 1; + return len; + case GROUP_TRANSFER: + out->args.vc.attr.transfer = 1; + return len; + case GROUP_SET_MISS_ACTIONS: + out->command = ctx->curr; + ctx->objdata = 0; + ctx->object = out; + ctx->objmask = NULL; + out->args.vc.actions = (void *)RTE_ALIGN_CEIL((uintptr_t)(out + 1), + sizeof(double)); + return len; + default: + return -1; + } +} + static int parse_flex(struct context *ctx, const struct token *token, const char *str, unsigned int len, @@ -12329,6 +12437,10 @@ cmd_flow_parsed(const struct buffer *in) in->args.table_destroy.table_id_n, in->args.table_destroy.table_id); break; + case GROUP_SET_MISS_ACTIONS: + port_queue_group_set_miss_actions(in->port, &in->args.vc.attr, + in->args.vc.actions); + break; case QUEUE_CREATE: port_queue_flow_create(in->port, in->queue, in->postpone, in->args.vc.table_id, in->args.vc.rule_id, diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 3d1da99307..709864bb44 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -3514,6 +3514,33 @@ port_queue_flow_pull(portid_t port_id, queueid_t queue_id) return ret; } +/* Set group miss actions */ +int +port_queue_group_set_miss_actions(portid_t port_id, const struct rte_flow_attr *attr, + const struct rte_flow_action *actions) +{ + struct rte_flow_group_attr gattr = { + .ingress = attr->ingress, + .egress = attr->egress, + .transfer = attr->transfer, + }; + struct rte_flow_error error; + int ret = 0; + + if (port_id_is_invalid(port_id, ENABLED_WARN) || + port_id == (portid_t)RTE_PORT_ALL) + return -EINVAL; + + memset(&error, 0x66, sizeof(error)); + ret = rte_flow_group_set_miss_actions(port_id, attr->group, &gattr, actions, &error); + + if (ret < 0) + return port_flow_complain(&error); + + printf("Group #%u set miss actions succeeded\n", attr->group); + return ret; +} + /** Create flow rule. */ int port_flow_create(portid_t port_id, diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index f1df6a8faf..e69b76f380 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -979,6 +979,8 @@ int port_flow_template_table_create(portid_t port_id, uint32_t id, int port_flow_template_table_destroy(portid_t port_id, uint32_t n, const uint32_t *table); int port_flow_template_table_flush(portid_t port_id); +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, bool postpone, uint32_t table_id, uint32_t rule_idx, uint32_t pattern_idx, uint32_t actions_idx,