From patchwork Tue May 11 09:28:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haifei Luo X-Patchwork-Id: 93150 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 54BE1A0A0E; Tue, 11 May 2021 11:28:43 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 18CB540140; Tue, 11 May 2021 11:28:43 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam08on2060.outbound.protection.outlook.com [40.107.100.60]) by mails.dpdk.org (Postfix) with ESMTP id 891604003E for ; Tue, 11 May 2021 11:28:41 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jdUdYcRlzcvBt3MvP/qZl+y3O5pSOsrhpAqhFMOau8n2Czxs53FP5aSArklhQ84p+iqbnjLGig5vJqY2GZdbH1sjuWfNe3whSObKoJHFPjfR0pLuBXVoGd9o0D6eyB6kkodjYVHKjMPOXTFFdZQGCzWIzWJfOS4KLC/OAhEaxjrB83/8BBJmZ/ap9RIFR3LjfvKVif9QRPu30U+m/MYy1WkgcGrstw/DlYjBWINZblkqmhODEp/a0UEL+OI/73NvMfsQdeQaM/Qe/UlMFbgDdoBMzD5qoHuUmSkCBBBMrM79tRCuMNMNZKYd0pIeguU4n7fs1NUZaR8wffS7djVgfQ== 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-SenderADCheck; bh=MJ8yAwK141hDNecyrO7Q5jFUmmXpRnX7z+6erUYLc6E=; b=TUDUDrUHF8y+JZLG1CSxRtJoHQWXmGqR+MRsvVQqRxRz7vgFWlFfdm73ZJQArbwIYDsFAPE46gt05gehoggqyjsi3e1wWCWa8LeiB8caU7qDmZYNNRTtVNmCOBdaiPLxohimiAr6oPJVfKnSDhpiZqbPjvQ6hWUwLd14415YOqZjt5N96tM1VLoK/MTeEuXY8TJleT3sjUOGsbXEyP8E/Tx73Fn16xHIv8aufgCeohloQu/HbsK8gqc/MAjJNpMnZ4f2c/8PAJKdMoZDRRXhkUosochfkDD6r6n/B+KdjVkKiNXP7gwvDzrT9OMvpgZi5/+ZZwUtgXQKEPSizv1F7Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none 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=MJ8yAwK141hDNecyrO7Q5jFUmmXpRnX7z+6erUYLc6E=; b=okFOHiZYZtEATDIt2qQM8x7L8ihXK2MiNrUF7j+t+x2iZabHWQA1EcETPz/RVZG6UoMderNLqow5Pb9vG48zFIi4RaHol4vevjX8FRwkn2N2QPwFhf0MgnokRd+oL3i6pwGTcYjcNtVrBa4AhhD+JGOx3IhWr0+uNEhEqEvBVwciDHwgSzVKg6YSSc++DhXyLAAti6py4qnCn4rWiOhyva+SBV+jFUwGmHB3pr/UidTFPf9CUhWkGTBzptMgWvBYVjYfNfW//7NfBWYDjR5KktNiYAGEDhVzBBLvqTkr4o9DtaZH5kFGCOjfWQ8NZwsJBcM8aOF+scFfAJtR959zoQ== Received: from MWHPR1701CA0021.namprd17.prod.outlook.com (2603:10b6:301:14::31) by BYAPR12MB2728.namprd12.prod.outlook.com (2603:10b6:a03:61::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.31; Tue, 11 May 2021 09:28:34 +0000 Received: from CO1NAM11FT057.eop-nam11.prod.protection.outlook.com (2603:10b6:301:14:cafe::9d) by MWHPR1701CA0021.outlook.office365.com (2603:10b6:301:14::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Tue, 11 May 2021 09:28:34 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT057.mail.protection.outlook.com (10.13.174.205) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Tue, 11 May 2021 09:28:34 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 11 May 2021 09:28:31 +0000 From: Haifei Luo To: , , , , Xiaoyun Li CC: , , Date: Tue, 11 May 2021 12:28:10 +0300 Message-ID: <20210511092810.22801-1-haifeil@nvidia.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20210428141015.25728-1-haifeil@nvidia.com> References: <20210428141015.25728-1-haifeil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2425bf5f-b9e1-423b-cd60-08d9145f261a X-MS-TrafficTypeDiagnostic: BYAPR12MB2728: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1443; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZpQZ7jMFzbY/L/+5FsRHaDrTjwWzyLSKSTQh5UpNSDV7uOWQM1w8bQw7d1TgBrK1PS8ZAhz3CXx46MUFSACeez0vOp+a/SihUsT6yH1CsF+VYhPgC6CdyfWafUgfOcOTku6ZfEOX6C+xMvXXdLbW32yBn24uwi8a1+SDUT3XWvPvl/w09Nl0kkt5MC7qg5AGPaXIDHy4RrBPhPtbdykaE9oym7i4eERTZJHbfarYA2rikZzNIqRFBAEiK/6rJ8cB3NDoD7G+uuAJ5WC9QKtnSJGueDaiZfTaiVjsr2NBMVjDee5PXp2mMQ/bYdvDGtj7pwzlndNw0z3NxBovYzDQYwyf6uQWUwhyLOkS1JFmLNfyjLy2svN6LxA8qexQPZBgCEyWE2eVpBU7tvEo/lC25kSn/y99A3qMW8Azr8i78AYE9yZLQ6hPbXDaIP9IL8uDWD3rbpc1r1Y1ssGk6mqdAG84wlHMKCd6ivJlp+1vk2PCyqF/mQfpt1ycXJiVMm25wvzomVGFOtxIB80ARDFIm95/MIiv+PsYpszOio0oHS/hsu+79nDVfkNIekNl+EARDAlCGZMbPU+JeOOtM8UGxTnB/Hi0nLT0gY/CkLlY58gcR4tBjPaVXCnQOf0HW2cYDIZFITzEcNR2AyBYMnOVcA== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(39860400002)(346002)(396003)(376002)(136003)(36840700001)(46966006)(6286002)(82310400003)(26005)(55016002)(186003)(16526019)(36756003)(86362001)(2906002)(82740400003)(6666004)(356005)(7636003)(36906005)(7696005)(5660300002)(110136005)(54906003)(47076005)(107886003)(426003)(4326008)(478600001)(8676002)(70206006)(8936002)(1076003)(336012)(70586007)(2616005)(36860700001)(316002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2021 09:28:34.2345 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2425bf5f-b9e1-423b-cd60-08d9145f261a X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT057.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB2728 Subject: [dpdk-dev] [PATCH v2] app/testpmd: add CLI for action meter color 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 Sender: "dev" Currently action RTE_FLOW_ACTION_TYPE_METER_COLOR is defined. Add the CLI for this action in meter policy: color type (types) There are three types: green, yellow and red. Example for the new policy meter CLIs: add port meter policy 0 1 g_actions color type green / end y_actions color type yellow / end r_actions color type red / end In the above command, the action type is RTE_FLOW_ACTION_TYPE_METER_COLOR, the meter policy action list: green -> green, yellow -> yellow, red -> red. V2: rebase the latest code. Signed-off-by: Haifei Luo Acked-by: Ori Kam Acked-by: Cristian Dumitrescu --- app/test-pmd/cmdline_flow.c | 85 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 5947341..1c587bb 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -348,6 +348,11 @@ enum index { ACTION_PORT_ID_ORIGINAL, ACTION_PORT_ID_ID, ACTION_METER, + ACTION_METER_COLOR, + ACTION_METER_COLOR_TYPE, + ACTION_METER_COLOR_GREEN, + ACTION_METER_COLOR_YELLOW, + ACTION_METER_COLOR_RED, ACTION_METER_ID, ACTION_OF_SET_MPLS_TTL, ACTION_OF_SET_MPLS_TTL_MPLS_TTL, @@ -1377,6 +1382,7 @@ struct parse_action_priv { ACTION_PHY_PORT, ACTION_PORT_ID, ACTION_METER, + ACTION_METER_COLOR, ACTION_OF_SET_MPLS_TTL, ACTION_OF_DEC_MPLS_TTL, ACTION_OF_SET_NW_TTL, @@ -1486,6 +1492,12 @@ struct parse_action_priv { ZERO, }; +static const enum index action_meter_color[] = { + ACTION_METER_COLOR_TYPE, + ACTION_NEXT, + ZERO, +}; + static const enum index action_of_set_mpls_ttl[] = { ACTION_OF_SET_MPLS_TTL_MPLS_TTL, ACTION_NEXT, @@ -1723,6 +1735,10 @@ static int parse_vc_conf(struct context *, const struct token *, static int parse_vc_item_ecpri_type(struct context *, const struct token *, const char *, unsigned int, void *, unsigned int); +static int parse_vc_action_meter_color_type(struct context *, + const struct token *, + const char *, unsigned int, void *, + unsigned int); static int parse_vc_action_rss(struct context *, const struct token *, const char *, unsigned int, void *, unsigned int); @@ -3801,6 +3817,37 @@ static int comp_set_modify_field_id(struct context *, const struct token *, .next = NEXT(action_meter), .call = parse_vc, }, + [ACTION_METER_COLOR] = { + .name = "color", + .help = "meter color for the packets", + .priv = PRIV_ACTION(METER_COLOR, + sizeof(struct rte_flow_action_meter_color)), + .next = NEXT(action_meter_color), + .call = parse_vc, + }, + [ACTION_METER_COLOR_TYPE] = { + .name = "type", + .help = "specific meter color", + .next = NEXT(NEXT_ENTRY(ACTION_NEXT), + NEXT_ENTRY(ACTION_METER_COLOR_GREEN, + ACTION_METER_COLOR_YELLOW, + ACTION_METER_COLOR_RED)), + }, + [ACTION_METER_COLOR_GREEN] = { + .name = "green", + .help = "meter color green", + .call = parse_vc_action_meter_color_type, + }, + [ACTION_METER_COLOR_YELLOW] = { + .name = "yellow", + .help = "meter color yellow", + .call = parse_vc_action_meter_color_type, + }, + [ACTION_METER_COLOR_RED] = { + .name = "red", + .help = "meter color red", + .call = parse_vc_action_meter_color_type, + }, [ACTION_METER_ID] = { .name = "mtr_id", .help = "meter id to use", @@ -5318,6 +5365,44 @@ static int comp_set_modify_field_id(struct context *, const struct token *, return len; } +/** Parse meter color action type. */ +static int +parse_vc_action_meter_color_type(struct context *ctx, const struct token *token, + const char *str, unsigned int len, + void *buf, unsigned int size) +{ + struct rte_flow_action *action_data; + struct rte_flow_action_meter_color *conf; + enum rte_color color; + + (void)buf; + (void)size; + /* Token name must match. */ + if (parse_default(ctx, token, str, len, NULL, 0) < 0) + return -1; + switch (ctx->curr) { + case ACTION_METER_COLOR_GREEN: + color = RTE_COLOR_GREEN; + break; + case ACTION_METER_COLOR_YELLOW: + color = RTE_COLOR_YELLOW; + break; + case ACTION_METER_COLOR_RED: + color = RTE_COLOR_RED; + break; + default: + return -1; + } + + if (!ctx->object) + return len; + action_data = ctx->object; + conf = (struct rte_flow_action_meter_color *) + (uintptr_t)(action_data->conf); + conf->color = color; + return len; +} + /** Parse RSS action. */ static int parse_vc_action_rss(struct context *ctx, const struct token *token,