Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/121159/?format=api
{ "id": 121159, "url": "http://patches.dpdk.org/api/patches/121159/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20221221073547.988-2-getelson@nvidia.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20221221073547.988-2-getelson@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20221221073547.988-2-getelson@nvidia.com", "date": "2022-12-21T07:35:47", "name": "[2/2] ethdev: add quota flow action and item", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "a558e82de78724e2f65a9f6a40448a8ba5aeed33", "submitter": { "id": 1882, "url": "http://patches.dpdk.org/api/people/1882/?format=api", "name": "Gregory Etelson", "email": "getelson@nvidia.com" }, "delegate": { "id": 3961, "url": "http://patches.dpdk.org/api/users/3961/?format=api", "username": "arybchenko", "first_name": "Andrew", "last_name": "Rybchenko", "email": "andrew.rybchenko@oktetlabs.ru" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20221221073547.988-2-getelson@nvidia.com/mbox/", "series": [ { "id": 26209, "url": "http://patches.dpdk.org/api/series/26209/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=26209", "date": "2022-12-21T07:35:46", "name": "[1/2] ethdev: add query_update sync and async function calls", "version": 1, "mbox": "http://patches.dpdk.org/series/26209/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/121159/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/121159/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id D7FD2A034C;\n\tWed, 21 Dec 2022 08:36:33 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 4AFD542D14;\n\tWed, 21 Dec 2022 08:36:30 +0100 (CET)", "from NAM11-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam11on2057.outbound.protection.outlook.com [40.107.223.57])\n by mails.dpdk.org (Postfix) with ESMTP id DE1D442D12\n for <dev@dpdk.org>; Wed, 21 Dec 2022 08:36:26 +0100 (CET)", "from BN1PR13CA0013.namprd13.prod.outlook.com (2603:10b6:408:e2::18)\n by PH7PR12MB6564.namprd12.prod.outlook.com (2603:10b6:510:210::22)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Wed, 21 Dec\n 2022 07:36:23 +0000", "from BN8NAM11FT108.eop-nam11.prod.protection.outlook.com\n (2603:10b6:408:e2:cafe::98) by BN1PR13CA0013.outlook.office365.com\n (2603:10b6:408:e2::18) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.10 via Frontend\n Transport; Wed, 21 Dec 2022 07:36:23 +0000", "from mail.nvidia.com (216.228.117.160) by\n BN8NAM11FT108.mail.protection.outlook.com (10.13.176.155) with Microsoft SMTP\n Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.20.5944.10 via Frontend Transport; Wed, 21 Dec 2022 07:36:22 +0000", "from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com\n (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec\n 2022 23:36:09 -0800", "from nvidia.com (10.126.231.37) by rnnvmail201.nvidia.com\n (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec\n 2022 23:36:05 -0800" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=TFQ5b2zR5l/BbRFCVcmNlfraKj4xpj1yl0ntMCkTzI6OlI0gjfbB94GRffAr1e9ZIYBFdbKhVKJfGkZEV78dZfe6eXQQ4F8svzCrUH0dwhA8xe5QsyANCfTUzQGMa7G1886ynNHjZtyn4z0WwVeB/1VeyUxtebyjMleES9KcfBYE0ibPonURZYxKRrF9igZpYZkBdIsCvysxQ/tnjOu1immIBv8l8MigEO5WWWL0kTJTcTI+jR1WG4aw8/SMBTWV/uBz7D0SiK//9Wb3/MHMipZgccn67WjFusa2RiDs1mOoRPFCSV/fcT/hDY7UKSJxueGmmHOExGKtHHnvHdzTcA==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n 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;\n bh=G6bKRuRNJ1fuYAkNEVG4+7FWt/nB0dM3fNvaQxEEXlQ=;\n b=NddL/cR0YDdwLTRrFzOmw0JzksgFrIrUyW34c0NZG0jiRmFJiAEvTumsZsbNqyMbDbxBDHNGtLD/uWXipWlKHYup0TO/GU868UgtV4M2c1t1U4M4e7zgoDvUlyQDgTYcHE4OwMRYDbqDUmokDgMJIVvEWDNAe7Iz7rQ2RRe13Msjkeo8LIeMW8ExFfiTmeDqot5fk1hxsy5rSO6MHcI8lBWVTJNVCT8eE7BSnp3z5ISHXzqGLu2GLRJzWQQQV2MbrxF4PN1fbgBF9xJ86x7E3csWh606qgewbbdh5/DpWUGW+xUPPXxIoPRKD8JsYa8ONKBOfa0aHugNZ0xXLCdwTA==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass (sender ip is\n 216.228.117.160) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com;\n dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com;\n dkim=none (message not signed); arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com;\n s=selector2;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=G6bKRuRNJ1fuYAkNEVG4+7FWt/nB0dM3fNvaQxEEXlQ=;\n b=JHIPlCw3Fla0LgIXqCkwuB0XE89kF+A8flLduZG5gqCbNpcK+qPktED2G4zcrYsvo8GeR49uCGipvaEDcKx9SyWZfTgSt38ieFeHD2FBfF3tJHXM2DMCrMQvhTMBk1WkLWv4dCg2ifVXZcDA/9JuS/SSOdBOFCiMjJCgevO32SFz1XS0viNQQmmIl9ey59ouAeuTYOhYDmXtzjuHq9H5hUNcpg2sruq1HRtYUTKTnL6LrsDy02hDptLJhcBrUQbH0V1VJ4w7q8nxrhfeXEJWwoClg5dLaVlSWA+nR786Tm3rtXV0MGeJLeTJXLNe1duTJBrS/6Nm9vDwqVphuC1spA==", "X-MS-Exchange-Authentication-Results": "spf=pass (sender IP is 216.228.117.160)\n smtp.mailfrom=nvidia.com;\n dkim=none (message not signed)\n header.d=none;dmarc=pass action=none header.from=nvidia.com;", "Received-SPF": "Pass (protection.outlook.com: domain of nvidia.com designates\n 216.228.117.160 as permitted sender) receiver=protection.outlook.com;\n client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C", "From": "Gregory Etelson <getelson@nvidia.com>", "To": "<dev@dpdk.org>", "CC": "<getelson@nvidia.com>, <matan@nvidia.com>, <rasland@nvidia.com>, Ori Kam\n <orika@nvidia.com>, Aman Singh <aman.deep.singh@intel.com>, Yuying Zhang\n <yuying.zhang@intel.com>, Ferruh Yigit <ferruh.yigit@amd.com>, \"Viacheslav\n Ovsiienko\" <viacheslavo@nvidia.com>, Thomas Monjalon <thomas@monjalon.net>,\n Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>", "Subject": "[PATCH 2/2] ethdev: add quota flow action and item", "Date": "Wed, 21 Dec 2022 09:35:47 +0200", "Message-ID": "<20221221073547.988-2-getelson@nvidia.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20221221073547.988-1-getelson@nvidia.com>", "References": "<20221221073547.988-1-getelson@nvidia.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"UTF-8\"", "Content-Transfer-Encoding": "8bit", "X-Originating-IP": "[10.126.231.37]", "X-ClientProxiedBy": "rnnvmail202.nvidia.com (10.129.68.7) To\n rnnvmail201.nvidia.com (10.129.68.8)", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "BN8NAM11FT108:EE_|PH7PR12MB6564:EE_", "X-MS-Office365-Filtering-Correlation-Id": "b8632cf5-41f1-4539-6c09-08dae3260f3a", "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": "\n 8h68LSlBWW4oceUb7oc71o/oyphURC3fRDoOQXIbaB7uuH77hLeCjgNasfN9TSGLCvXVgPzoLqiMJgz/2DPnVC8nJ07c69xSkyKBY69bFhqPl8oy+sxt/ils0h/g/fVOxTRE0MaAvM7voU1OBROciFAosKPn/mUUJQRNKsnRffo8mpA5cq6LCgmfDLZmchSJADDsjXsMf9VXhaZUwiScaM3/BO0BHOjBGl3zZ0amILyXe+7C40A2EnBub2+vjI4SdloVqSonEkGLz1Lx6qY7oYQccKgpRN87CWjDEHONHkFiY6z0ZZY2OS0bcQUoDAvu0TTUa7s/He5exQFsE2+fJ6HWZcH4e3v6uDdPwWZzM/F6/0j17iI5erVE9OMWwlahaX74UipP7IgdS/EhG+PogABfYy3QyTs1E7G9LAfAZOz/HrkjP8NPjBzwB04upqQYs066smLeVuDwjeZSUedqtRL9p7xWrAsQwlFSrcJqlmLNJC+OG/YuS/hL3YwM8/6eXQTHuy0Wf38R42BPZq4NEluZMRsZ9W4cz14xgdZ0KhkTpARQVkwC+6KpdTQTvwbJNIa56bBZlBTRFOCGmvTNBGTNQ935BdXg1+c7wW4B4SPMQ3A/it6EDcfwrPNrwAAFGM5MvD6qq0qHxk6rm+PAzEOdn5NtFEuJXZgUs2qiRrGPs3ZePvf7OPEztvUzZYA/fvAKcAeLMHHgG5vv0UOx7A==", "X-Forefront-Antispam-Report": "CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1;\n SRV:;\n IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE;\n SFS:(13230022)(4636009)(39860400002)(376002)(136003)(396003)(346002)(451199015)(40470700004)(46966006)(36840700001)(8676002)(40480700001)(2906002)(54906003)(86362001)(55016003)(4326008)(16526019)(41300700001)(26005)(186003)(336012)(30864003)(1076003)(2616005)(478600001)(34290500002)(426003)(15650500001)(316002)(6666004)(36860700001)(7696005)(356005)(7636003)(40460700003)(82740400003)(5660300002)(8936002)(83380400001)(47076005)(6916009)(6286002)(70206006)(82310400005)(36756003)(70586007);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "21 Dec 2022 07:36:22.8064 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n b8632cf5-41f1-4539-6c09-08dae3260f3a", "X-MS-Exchange-CrossTenant-Id": "43083d15-7273-40c1-b7db-39efd9ccc17a", "X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp": "\n TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160];\n Helo=[mail.nvidia.com]", "X-MS-Exchange-CrossTenant-AuthSource": "\n BN8NAM11FT108.eop-nam11.prod.protection.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "PH7PR12MB6564", "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>,\n <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>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Quota action limits traffic according to pre-defined configuration.\nQuota reflects overall traffic usage regardless bandwidth.\nQuota flow action initialized with signed tokens number value.\nQuota flow action updates tokens number according to\nthese rules:\n1. if quota was configured to count packet length, for each packet\n of size S, tokens number reduced by S.\n2. If quota was configured to count packets, each packet decrements\n tokens number.\nquota action sets packet metadata according to a number of remaining\ntokens number:\n PASS - remaining tokens number is non-negative.\n BLOCK - remaining tokens number is negative.\n\nQuota flow item matches on that data\n\nApplication updates tokens number in quota flow action\nwith SET or ADD calls:\n SET(QUOTA, val) - arm quota with new tokens number set to val\n ADD(QUOTA, val) - increase existing quota tokens number by val\n\nBoth SET and ADD return to application number of tokens stored in port\nbefore update.\n\nApplication must create a rule with quota action to mark flow and\nmatch on the mark with quota item in following flow rule.\n\nSigned-off-by: Gregory Etelson <getelson@nvidia.com>\n---\n app/test-pmd/cmdline_flow.c | 395 ++++++++++++++++++++++++++-\n app/test-pmd/config.c | 82 +++++-\n app/test-pmd/testpmd.h | 11 +\n doc/guides/nics/features/default.ini | 2 +\n doc/guides/nics/features/mlx5.ini | 2 +\n doc/guides/nics/mlx5.rst | 12 +\n doc/guides/prog_guide/rte_flow.rst | 41 +++\n lib/ethdev/rte_flow.c | 2 +\n lib/ethdev/rte_flow.h | 123 +++++++++\n 9 files changed, 660 insertions(+), 10 deletions(-)", "diff": "diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c\nindex 88108498e0..5407a72ee2 100644\n--- a/app/test-pmd/cmdline_flow.c\n+++ b/app/test-pmd/cmdline_flow.c\n@@ -149,6 +149,7 @@ enum index {\n \tQUEUE_INDIRECT_ACTION_UPDATE,\n \tQUEUE_INDIRECT_ACTION_DESTROY,\n \tQUEUE_INDIRECT_ACTION_QUERY,\n+\tQUEUE_INDIRECT_ACTION_QUERY_UPDATE,\n \n \t/* Queue indirect action create arguments */\n \tQUEUE_INDIRECT_ACTION_CREATE_ID,\n@@ -168,6 +169,9 @@ enum index {\n \t/* Queue indirect action query arguments */\n \tQUEUE_INDIRECT_ACTION_QUERY_POSTPONE,\n \n+\t/* Queue indirect action query_update arguments */\n+\tQUEUE_INDIRECT_ACTION_QU_MODE,\n+\n \t/* Push arguments. */\n \tPUSH_QUEUE,\n \n@@ -227,6 +231,7 @@ enum index {\n \tCONFIG_AGING_OBJECTS_NUMBER,\n \tCONFIG_METERS_NUMBER,\n \tCONFIG_CONN_TRACK_NUMBER,\n+\tCONFIG_QUOTAS_NUMBER,\n \tCONFIG_FLAGS,\n \n \t/* Indirect action arguments */\n@@ -234,6 +239,7 @@ enum index {\n \tINDIRECT_ACTION_UPDATE,\n \tINDIRECT_ACTION_DESTROY,\n \tINDIRECT_ACTION_QUERY,\n+\tINDIRECT_ACTION_QUERY_UPDATE,\n \n \t/* Indirect action create arguments */\n \tINDIRECT_ACTION_CREATE_ID,\n@@ -245,6 +251,10 @@ enum index {\n \t/* Indirect action destroy arguments */\n \tINDIRECT_ACTION_DESTROY_ID,\n \n+\t/* Indirect action query-and-update arguments */\n+\tINDIRECT_ACTION_QU_MODE,\n+\tINDIRECT_ACTION_QU_MODE_NAME,\n+\n \t/* Validate/create pattern. */\n \tITEM_PATTERN,\n \tITEM_PARAM_IS,\n@@ -465,6 +475,9 @@ enum index {\n \tITEM_METER,\n \tITEM_METER_COLOR,\n \tITEM_METER_COLOR_NAME,\n+\tITEM_QUOTA,\n+\tITEM_QUOTA_STATE,\n+\tITEM_QUOTA_STATE_NAME,\n \n \t/* Validate/create actions. */\n \tACTIONS,\n@@ -621,6 +634,14 @@ enum index {\n \tACTION_REPRESENTED_PORT,\n \tACTION_REPRESENTED_PORT_ETHDEV_PORT_ID,\n \tACTION_SEND_TO_KERNEL,\n+\tACTION_QUOTA_CREATE,\n+\tACTION_QUOTA_CREATE_LIMIT,\n+\tACTION_QUOTA_CREATE_MODE,\n+\tACTION_QUOTA_CREATE_MODE_NAME,\n+\tACTION_QUOTA_QU,\n+\tACTION_QUOTA_QU_LIMIT,\n+\tACTION_QUOTA_QU_UPDATE_OP,\n+\tACTION_QUOTA_QU_UPDATE_OP_NAME,\n };\n \n /** Maximum size for pattern in struct rte_flow_item_raw. */\n@@ -1011,6 +1032,7 @@ struct buffer {\n \t\t} ia_destroy; /**< Indirect action destroy arguments. */\n \t\tstruct {\n \t\t\tuint32_t action_id;\n+\t\t\tenum rte_flow_query_update_mode qu_mode;\n \t\t} ia; /* Indirect action query arguments */\n \t\tstruct {\n \t\t\tuint32_t table_id;\n@@ -1097,6 +1119,7 @@ static const enum index next_config_attr[] = {\n \tCONFIG_AGING_OBJECTS_NUMBER,\n \tCONFIG_METERS_NUMBER,\n \tCONFIG_CONN_TRACK_NUMBER,\n+\tCONFIG_QUOTAS_NUMBER,\n \tCONFIG_FLAGS,\n \tEND,\n \tZERO,\n@@ -1190,6 +1213,7 @@ static const enum index next_qia_subcmd[] = {\n \tQUEUE_INDIRECT_ACTION_UPDATE,\n \tQUEUE_INDIRECT_ACTION_DESTROY,\n \tQUEUE_INDIRECT_ACTION_QUERY,\n+\tQUEUE_INDIRECT_ACTION_QUERY_UPDATE,\n \tZERO,\n };\n \n@@ -1231,6 +1255,25 @@ static const enum index next_ia_create_attr[] = {\n \tZERO,\n };\n \n+static const enum index next_ia[] = {\n+\tINDIRECT_ACTION_ID2PTR,\n+\tACTION_NEXT,\n+\tZERO\n+};\n+\n+static const enum index next_qia_qu_attr[] = {\n+\tQUEUE_INDIRECT_ACTION_QU_MODE,\n+\tQUEUE_INDIRECT_ACTION_UPDATE_POSTPONE,\n+\tINDIRECT_ACTION_SPEC,\n+\tZERO\n+};\n+\n+static const enum index next_ia_qu_attr[] = {\n+\tINDIRECT_ACTION_QU_MODE,\n+\tINDIRECT_ACTION_SPEC,\n+\tZERO\n+};\n+\n static const enum index next_dump_subcmd[] = {\n \tDUMP_ALL,\n \tDUMP_ONE,\n@@ -1242,6 +1285,7 @@ static const enum index next_ia_subcmd[] = {\n \tINDIRECT_ACTION_UPDATE,\n \tINDIRECT_ACTION_DESTROY,\n \tINDIRECT_ACTION_QUERY,\n+\tINDIRECT_ACTION_QUERY_UPDATE,\n \tZERO,\n };\n \n@@ -1355,6 +1399,7 @@ static const enum index next_item[] = {\n \tITEM_L2TPV2,\n \tITEM_PPP,\n \tITEM_METER,\n+\tITEM_QUOTA,\n \tEND_SET,\n \tZERO,\n };\n@@ -1821,6 +1866,12 @@ static const enum index item_meter[] = {\n \tZERO,\n };\n \n+static const enum index item_quota[] = {\n+\tITEM_QUOTA_STATE,\n+\tITEM_NEXT,\n+\tZERO,\n+};\n+\n static const enum index next_action[] = {\n \tACTION_END,\n \tACTION_VOID,\n@@ -1886,9 +1937,25 @@ static const enum index next_action[] = {\n \tACTION_PORT_REPRESENTOR,\n \tACTION_REPRESENTED_PORT,\n \tACTION_SEND_TO_KERNEL,\n+\tACTION_QUOTA_CREATE,\n+\tACTION_QUOTA_QU,\n \tZERO,\n };\n \n+static const enum index action_quota_create[] = {\n+\tACTION_QUOTA_CREATE_LIMIT,\n+\tACTION_QUOTA_CREATE_MODE,\n+\tACTION_NEXT,\n+\tZERO\n+};\n+\n+static const enum index action_quota_update[] = {\n+\tACTION_QUOTA_QU_LIMIT,\n+\tACTION_QUOTA_QU_UPDATE_OP,\n+\tACTION_NEXT,\n+\tZERO\n+};\n+\n static const enum index action_mark[] = {\n \tACTION_MARK_ID,\n \tACTION_NEXT,\n@@ -2399,6 +2466,22 @@ static int parse_meter_policy_id2ptr(struct context *ctx,\n static int parse_meter_color(struct context *ctx, const struct token *token,\n \t\t\t const char *str, unsigned int len, void *buf,\n \t\t\t unsigned int size);\n+static int\n+parse_quota_state_name(struct context *ctx, const struct token *token,\n+\t\t const char *str, unsigned int len, void *buf,\n+\t\t unsigned int size);\n+static int\n+parse_quota_mode_name(struct context *ctx, const struct token *token,\n+\t\t const char *str, unsigned int len, void *buf,\n+\t\t unsigned int size);\n+static int\n+parse_quota_update_name(struct context *ctx, const struct token *token,\n+\t\t\tconst char *str, unsigned int len, void *buf,\n+\t\t\tunsigned int size);\n+static int\n+parse_qu_mode_name(struct context *ctx, const struct token *token,\n+\t\t const char *str, unsigned int len, void *buf,\n+\t\t unsigned int size);\n static int comp_none(struct context *, const struct token *,\n \t\t unsigned int, char *, unsigned int);\n static int comp_boolean(struct context *, const struct token *,\n@@ -2431,6 +2514,18 @@ static int comp_queue_id(struct context *, const struct token *,\n \t\t\t unsigned int, char *, unsigned int);\n static int comp_meter_color(struct context *, const struct token *,\n \t\t\t unsigned int, char *, unsigned int);\n+static int\n+comp_quota_state_name(struct context *ctx, const struct token *token,\n+\t\t unsigned int ent, char *buf, unsigned int size);\n+static int\n+comp_quota_mode_name(struct context *ctx, const struct token *token,\n+\t\t unsigned int ent, char *buf, unsigned int size);\n+static int\n+comp_quota_update_name(struct context *ctx, const struct token *token,\n+\t\t unsigned int ent, char *buf, unsigned int size);\n+static int\n+comp_qu_mode_name(struct context *ctx, const struct token *token,\n+\t\t unsigned int ent, char *buf, unsigned int size);\n \n /** Token definitions. */\n static const struct token token_list[] = {\n@@ -2695,6 +2790,14 @@ static const struct token token_list[] = {\n \t\t.args = ARGS(ARGS_ENTRY(struct buffer,\n \t\t\t\t\targs.configure.port_attr.nb_aging_objects)),\n \t},\n+\t[CONFIG_QUOTAS_NUMBER] = {\n+\t\t.name = \"quotas_number\",\n+\t\t.help = \"number of quotas\",\n+\t\t.next = NEXT(next_config_attr,\n+\t\t\t NEXT_ENTRY(COMMON_UNSIGNED)),\n+\t\t.args = ARGS(ARGS_ENTRY(struct buffer,\n+\t\t\t\t args.configure.port_attr.nb_quotas)),\n+\t},\n \t[CONFIG_METERS_NUMBER] = {\n \t\t.name = \"meters_number\",\n \t\t.help = \"number of meters\",\n@@ -3077,7 +3180,7 @@ static const struct token token_list[] = {\n \t\t.help = \"query indirect action\",\n \t\t.next = NEXT(next_qia_query_attr,\n \t\t\t NEXT_ENTRY(COMMON_INDIRECT_ACTION_ID)),\n-\t\t.args = ARGS(ARGS_ENTRY(struct buffer, args.vc.attr.group)),\n+\t\t.args = ARGS(ARGS_ENTRY(struct buffer, args.ia.action_id)),\n \t\t.call = parse_qia,\n \t},\n \t/* Indirect action destroy arguments. */\n@@ -3097,6 +3200,21 @@ static const struct token token_list[] = {\n \t\t\t\t\t args.ia_destroy.action_id)),\n \t\t.call = parse_qia_destroy,\n \t},\n+\t[QUEUE_INDIRECT_ACTION_QUERY_UPDATE] = {\n+\t\t.name = \"query_update\",\n+\t\t.help = \"indirect query [and|or] update action\",\n+\t\t.next = NEXT(next_qia_qu_attr, NEXT_ENTRY(COMMON_INDIRECT_ACTION_ID)),\n+\t\t.args = ARGS(ARGS_ENTRY(struct buffer, args.ia.action_id)),\n+\t\t.call = parse_qia\n+\t},\n+\t[QUEUE_INDIRECT_ACTION_QU_MODE] = {\n+\t\t.name = \"mode\",\n+\t\t.help = \"indirect query [and|or] update action\",\n+\t\t.next = NEXT(next_qia_qu_attr,\n+\t\t\t NEXT_ENTRY(INDIRECT_ACTION_QU_MODE_NAME)),\n+\t\t.args = ARGS(ARGS_ENTRY(struct buffer, args.ia.qu_mode)),\n+\t\t.call = parse_qia\n+\t},\n \t/* Indirect action update arguments. */\n \t[QUEUE_INDIRECT_ACTION_UPDATE_POSTPONE] = {\n \t\t.name = \"postpone\",\n@@ -3220,6 +3338,27 @@ static const struct token token_list[] = {\n \t\t.args = ARGS(ARGS_ENTRY(struct buffer, args.ia.action_id)),\n \t\t.call = parse_ia,\n \t},\n+\t[INDIRECT_ACTION_QUERY_UPDATE] = {\n+\t\t.name = \"query_update\",\n+\t\t.help = \"query [and|or] update\",\n+\t\t.next = NEXT(next_ia_qu_attr, NEXT_ENTRY(COMMON_INDIRECT_ACTION_ID)),\n+\t\t.args = ARGS(ARGS_ENTRY(struct buffer, args.ia.action_id)),\n+\t\t.call = parse_ia\n+\t},\n+\t[INDIRECT_ACTION_QU_MODE] = {\n+\t\t.name = \"mode\",\n+\t\t.help = \"query_update mode\",\n+\t\t.next = NEXT(next_ia_qu_attr,\n+\t\t\t NEXT_ENTRY(INDIRECT_ACTION_QU_MODE_NAME)),\n+\t\t.args = ARGS(ARGS_ENTRY(struct buffer, args.ia.qu_mode)),\n+\t\t.call = parse_ia,\n+\t},\n+\t[INDIRECT_ACTION_QU_MODE_NAME] = {\n+\t\t.name = \"mode_name\",\n+\t\t.help = \"query-update mode name\",\n+\t\t.call = parse_qu_mode_name,\n+\t\t.comp = comp_qu_mode_name,\n+\t},\n \t[VALIDATE] = {\n \t\t.name = \"validate\",\n \t\t.help = \"check whether a flow rule can be created\",\n@@ -5127,6 +5266,26 @@ static const struct token token_list[] = {\n \t\t.call = parse_meter_color,\n \t\t.comp = comp_meter_color,\n \t},\n+\t[ITEM_QUOTA] = {\n+\t\t.name = \"quota\",\n+\t\t.help = \"match quota\",\n+\t\t.priv = PRIV_ITEM(QUOTA, sizeof(struct rte_flow_item_quota)),\n+\t\t.next = NEXT(item_quota),\n+\t\t.call = parse_vc\n+\t},\n+\t[ITEM_QUOTA_STATE] = {\n+\t\t.name = \"quota_state\",\n+\t\t.help = \"quota state\",\n+\t\t.next = NEXT(item_quota, NEXT_ENTRY(ITEM_QUOTA_STATE_NAME),\n+\t\t\t NEXT_ENTRY(ITEM_PARAM_SPEC, ITEM_PARAM_MASK)),\n+\t\t.args = ARGS(ARGS_ENTRY(struct rte_flow_item_quota, state))\n+\t},\n+\t[ITEM_QUOTA_STATE_NAME] = {\n+\t\t.name = \"state_name\",\n+\t\t.help = \"quota state name\",\n+\t\t.call = parse_quota_state_name,\n+\t\t.comp = comp_quota_state_name\n+\t},\n \t/* Validate/create actions. */\n \t[ACTIONS] = {\n \t\t.name = \"actions\",\n@@ -6360,7 +6519,7 @@ static const struct token token_list[] = {\n \t\t.name = \"indirect\",\n \t\t.help = \"apply indirect action by id\",\n \t\t.priv = PRIV_ACTION(INDIRECT, 0),\n-\t\t.next = NEXT(NEXT_ENTRY(INDIRECT_ACTION_ID2PTR)),\n+\t\t.next = NEXT(next_ia),\n \t\t.args = ARGS(ARGS_ENTRY_ARB(0, sizeof(uint32_t))),\n \t\t.call = parse_vc,\n \t},\n@@ -6411,6 +6570,64 @@ static const struct token token_list[] = {\n \t\t.help = \"submit a list of associated actions for red\",\n \t\t.next = NEXT(next_action),\n \t},\n+\t[ACTION_QUOTA_CREATE] = {\n+\t\t.name = \"quota_create\",\n+\t\t.help = \"create quota action\",\n+\t\t.priv = PRIV_ACTION(QUOTA,\n+\t\t\t\t sizeof(struct rte_flow_action_quota)),\n+\t\t.next = NEXT(action_quota_create),\n+\t\t.call = parse_vc\n+\t},\n+\t[ACTION_QUOTA_CREATE_LIMIT] = {\n+\t\t.name = \"limit\",\n+\t\t.help = \"quota limit\",\n+\t\t.next = NEXT(action_quota_create, NEXT_ENTRY(COMMON_UNSIGNED)),\n+\t\t.args = ARGS(ARGS_ENTRY(struct rte_flow_action_quota, quota)),\n+\t\t.call = parse_vc_conf\n+\t},\n+\t[ACTION_QUOTA_CREATE_MODE] = {\n+\t\t.name = \"mode\",\n+\t\t.help = \"quota mode\",\n+\t\t.next = NEXT(action_quota_create,\n+\t\t\t NEXT_ENTRY(ACTION_QUOTA_CREATE_MODE_NAME)),\n+\t\t.args = ARGS(ARGS_ENTRY(struct rte_flow_action_quota, mode)),\n+\t\t.call = parse_vc_conf\n+\t},\n+\t[ACTION_QUOTA_CREATE_MODE_NAME] = {\n+\t\t.name = \"mode_name\",\n+\t\t.help = \"quota mode name\",\n+\t\t.call = parse_quota_mode_name,\n+\t\t.comp = comp_quota_mode_name\n+\t},\n+\t[ACTION_QUOTA_QU] = {\n+\t\t.name = \"quota_update\",\n+\t\t.help = \"update quota action\",\n+\t\t.priv = PRIV_ACTION(QUOTA,\n+\t\t\t\t sizeof(struct rte_flow_update_quota)),\n+\t\t.next = NEXT(action_quota_update),\n+\t\t.call = parse_vc\n+\t},\n+\t[ACTION_QUOTA_QU_LIMIT] = {\n+\t\t.name = \"limit\",\n+\t\t.help = \"quota limit\",\n+\t\t.next = NEXT(action_quota_update, NEXT_ENTRY(COMMON_UNSIGNED)),\n+\t\t.args = ARGS(ARGS_ENTRY(struct rte_flow_update_quota, quota)),\n+\t\t.call = parse_vc_conf\n+\t},\n+\t[ACTION_QUOTA_QU_UPDATE_OP] = {\n+\t\t.name = \"update_op\",\n+\t\t.help = \"query update op SET|ADD\",\n+\t\t.next = NEXT(action_quota_update,\n+\t\t\t NEXT_ENTRY(ACTION_QUOTA_QU_UPDATE_OP_NAME)),\n+\t\t.args = ARGS(ARGS_ENTRY(struct rte_flow_update_quota, op)),\n+\t\t.call = parse_vc_conf\n+\t},\n+\t[ACTION_QUOTA_QU_UPDATE_OP_NAME] = {\n+\t\t.name = \"update_op_name\",\n+\t\t.help = \"quota update op name\",\n+\t\t.call = parse_quota_update_name,\n+\t\t.comp = comp_quota_update_name\n+\t},\n \n \t/* Top-level command. */\n \t[ADD] = {\n@@ -6656,6 +6873,7 @@ parse_ia(struct context *ctx, const struct token *token,\n \tswitch (ctx->curr) {\n \tcase INDIRECT_ACTION_CREATE:\n \tcase INDIRECT_ACTION_UPDATE:\n+\tcase INDIRECT_ACTION_QUERY_UPDATE:\n \t\tout->args.vc.actions =\n \t\t\t(void *)RTE_ALIGN_CEIL((uintptr_t)(out + 1),\n \t\t\t\t\t sizeof(double));\n@@ -6676,6 +6894,8 @@ parse_ia(struct context *ctx, const struct token *token,\n \tcase INDIRECT_ACTION_TRANSFER:\n \t\tout->args.vc.attr.transfer = 1;\n \t\treturn len;\n+\tcase INDIRECT_ACTION_QU_MODE:\n+\t\treturn len;\n \tdefault:\n \t\treturn -1;\n \t}\n@@ -6748,6 +6968,7 @@ parse_qia(struct context *ctx, const struct token *token,\n \t\treturn len;\n \tcase QUEUE_INDIRECT_ACTION_CREATE:\n \tcase QUEUE_INDIRECT_ACTION_UPDATE:\n+\tcase QUEUE_INDIRECT_ACTION_QUERY_UPDATE:\n \t\tout->args.vc.actions =\n \t\t\t(void *)RTE_ALIGN_CEIL((uintptr_t)(out + 1),\n \t\t\t\t\t sizeof(double));\n@@ -6770,6 +6991,8 @@ parse_qia(struct context *ctx, const struct token *token,\n \t\treturn len;\n \tcase QUEUE_INDIRECT_ACTION_CREATE_POSTPONE:\n \t\treturn len;\n+\tcase QUEUE_INDIRECT_ACTION_QU_MODE:\n+\t\treturn len;\n \tdefault:\n \t\treturn -1;\n \t}\n@@ -10052,6 +10275,108 @@ parse_meter_color(struct context *ctx, const struct token *token,\n \treturn len;\n }\n \n+static int\n+parse_name_to_index(struct context *ctx, const struct token *token,\n+\t\t const char *str, unsigned int len, void *buf,\n+\t\t unsigned int size,\n+\t\t const char *const names[], size_t names_size, uint32_t *dst)\n+{\n+\tint ret;\n+\tuint32_t i;\n+\n+\tRTE_SET_USED(token);\n+\tRTE_SET_USED(buf);\n+\tRTE_SET_USED(size);\n+\tif (!ctx->object)\n+\t\treturn len;\n+\tfor (i = 0; i < names_size; i++) {\n+\t\tif (!names[i])\n+\t\t\tcontinue;\n+\t\tret = strcmp_partial(names[i], str,\n+\t\t\t\t RTE_MIN(len, strlen(names[i])));\n+\t\tif (!ret) {\n+\t\t\t*dst = i;\n+\t\t\treturn len;\n+\t\t}\n+\t}\n+\treturn -1;\n+}\n+\n+static const char *const quota_mode_names[] = {\n+\tNULL,\n+\t[RTE_FLOW_QUOTA_MODE_PACKET] = \"packet\",\n+\t[RTE_FLOW_QUOTA_MODE_L2] = \"l2\",\n+\t[RTE_FLOW_QUOTA_MODE_L3] = \"l3\"\n+};\n+\n+static const char *const quota_state_names[] = {\n+\t[RTE_FLOW_QUOTA_STATE_PASS] = \"pass\",\n+\t[RTE_FLOW_QUOTA_STATE_BLOCK] = \"block\"\n+};\n+\n+static const char *const quota_update_names[] = {\n+\t[RTE_FLOW_UPDATE_QUOTA_SET] = \"set\",\n+\t[RTE_FLOW_UPDATE_QUOTA_ADD] = \"add\"\n+};\n+\n+static const char *const query_update_mode_names[] = {\n+\t[RTE_FLOW_QU_DEFAULT] = \"default\",\n+\t[RTE_FLOW_QU_QUERY_FIRST] = \"query_first\",\n+\t[RTE_FLOW_QU_UPDATE_FIRST] = \"update_first\"\n+};\n+\n+static int\n+parse_quota_state_name(struct context *ctx, const struct token *token,\n+\t\t const char *str, unsigned int len, void *buf,\n+\t\t unsigned int size)\n+{\n+\tstruct rte_flow_item_quota *quota = ctx->object;\n+\n+\treturn parse_name_to_index(ctx, token, str, len, buf, size,\n+\t\t\t\t quota_state_names,\n+\t\t\t\t RTE_DIM(quota_state_names),\n+\t\t\t\t (uint32_t *)"a->state);\n+}\n+\n+static int\n+parse_quota_mode_name(struct context *ctx, const struct token *token,\n+\t\t const char *str, unsigned int len, void *buf,\n+\t\t unsigned int size)\n+{\n+\tstruct rte_flow_action_quota *quota = ctx->object;\n+\n+\treturn parse_name_to_index(ctx, token, str, len, buf, size,\n+\t\t\t\t quota_mode_names,\n+\t\t\t\t RTE_DIM(quota_mode_names),\n+\t\t\t\t (uint32_t *)"a->mode);\n+}\n+\n+static int\n+parse_quota_update_name(struct context *ctx, const struct token *token,\n+\t\t\tconst char *str, unsigned int len, void *buf,\n+\t\t\tunsigned int size)\n+{\n+\tstruct rte_flow_update_quota *update = ctx->object;\n+\n+\treturn parse_name_to_index(ctx, token, str, len, buf, size,\n+\t\t\t\t quota_update_names,\n+\t\t\t\t RTE_DIM(quota_update_names),\n+\t\t\t\t (uint32_t *)&update->op);\n+}\n+\n+static int\n+parse_qu_mode_name(struct context *ctx, const struct token *token,\n+\t\t const char *str, unsigned int len, void *buf,\n+\t\t unsigned int size)\n+{\n+\tstruct buffer *out = ctx->object;\n+\n+\treturn parse_name_to_index(ctx, token, str, len, buf, size,\n+\t\t\t\t query_update_mode_names,\n+\t\t\t\t RTE_DIM(query_update_mode_names),\n+\t\t\t\t (uint32_t *)&out->args.ia.qu_mode);\n+}\n+\n /** No completion. */\n static int\n comp_none(struct context *ctx, const struct token *token,\n@@ -10343,6 +10668,21 @@ comp_queue_id(struct context *ctx, const struct token *token,\n \treturn i;\n }\n \n+static int\n+comp_names_to_index(struct context *ctx, const struct token *token,\n+\t\t unsigned int ent, char *buf, unsigned int size,\n+\t\t const char *const names[], size_t names_size)\n+{\n+\tRTE_SET_USED(ctx);\n+\tRTE_SET_USED(token);\n+\tif (!buf)\n+\t\treturn names_size;\n+\tif (names[ent] && ent < names_size)\n+\t\treturn rte_strscpy(buf, names[ent], size);\n+\treturn -1;\n+\n+}\n+\n /** Complete available Meter colors. */\n static int\n comp_meter_color(struct context *ctx, const struct token *token,\n@@ -10357,6 +10697,42 @@ comp_meter_color(struct context *ctx, const struct token *token,\n \treturn -1;\n }\n \n+static int\n+comp_quota_state_name(struct context *ctx, const struct token *token,\n+\t\t unsigned int ent, char *buf, unsigned int size)\n+{\n+\treturn comp_names_to_index(ctx, token, ent, buf, size,\n+\t\t\t\t quota_state_names,\n+\t\t\t\t RTE_DIM(quota_state_names));\n+}\n+\n+static int\n+comp_quota_mode_name(struct context *ctx, const struct token *token,\n+\t\t unsigned int ent, char *buf, unsigned int size)\n+{\n+\treturn comp_names_to_index(ctx, token, ent, buf, size,\n+\t\t\t\t quota_mode_names,\n+\t\t\t\t RTE_DIM(quota_mode_names));\n+}\n+\n+static int\n+comp_quota_update_name(struct context *ctx, const struct token *token,\n+\t\t unsigned int ent, char *buf, unsigned int size)\n+{\n+\treturn comp_names_to_index(ctx, token, ent, buf, size,\n+\t\t\t\t quota_update_names,\n+\t\t\t\t RTE_DIM(quota_update_names));\n+}\n+\n+static int\n+comp_qu_mode_name(struct context *ctx, const struct token *token,\n+\t\t unsigned int ent, char *buf, unsigned int size)\n+{\n+\treturn comp_names_to_index(ctx, token, ent, buf, size,\n+\t\t\t\t query_update_mode_names,\n+\t\t\t\t RTE_DIM(query_update_mode_names));\n+}\n+\n /** Internal context. */\n static struct context cmd_flow_context;\n \n@@ -10715,7 +11091,14 @@ cmd_flow_parsed(const struct buffer *in)\n \tcase QUEUE_INDIRECT_ACTION_QUERY:\n \t\tport_queue_action_handle_query(in->port,\n \t\t\t\t\t in->queue, in->postpone,\n-\t\t\t\t\t in->args.vc.attr.group);\n+\t\t\t\t\t in->args.ia.action_id);\n+\t\tbreak;\n+\tcase QUEUE_INDIRECT_ACTION_QUERY_UPDATE:\n+\t\tport_queue_action_handle_query_update(in->port, in->queue,\n+\t\t\t\t\t\t in->postpone,\n+\t\t\t\t\t\t in->args.ia.action_id,\n+\t\t\t\t\t\t in->args.ia.qu_mode,\n+\t\t\t\t\t\t in->args.vc.actions);\n \t\tbreak;\n \tcase INDIRECT_ACTION_CREATE:\n \t\tport_action_handle_create(\n@@ -10739,6 +11122,12 @@ cmd_flow_parsed(const struct buffer *in)\n \tcase INDIRECT_ACTION_QUERY:\n \t\tport_action_handle_query(in->port, in->args.ia.action_id);\n \t\tbreak;\n+\tcase INDIRECT_ACTION_QUERY_UPDATE:\n+\t\tport_action_handle_query_update(in->port,\n+\t\t\t\t\t\tin->args.ia.action_id,\n+\t\t\t\t\t\tin->args.ia.qu_mode,\n+\t\t\t\t\t\tin->args.vc.actions);\n+\t\tbreak;\n \tcase VALIDATE:\n \t\tport_flow_validate(in->port, &in->args.vc.attr,\n \t\t\t\t in->args.vc.pattern, in->args.vc.actions,\ndiff --git a/app/test-pmd/config.c b/app/test-pmd/config.c\nindex acccb6b035..820ede5501 100644\n--- a/app/test-pmd/config.c\n+++ b/app/test-pmd/config.c\n@@ -1901,9 +1901,13 @@ port_action_handle_update(portid_t port_id, uint32_t id,\n }\n \n static void\n-port_action_handle_query_dump(uint32_t type, union port_action_query *query)\n+port_action_handle_query_dump(portid_t port_id,\n+\t\t\t const struct port_indirect_action *pia,\n+\t\t\t union port_action_query *query)\n {\n-\tswitch (type) {\n+\tif (!pia || !query)\n+\t\treturn;\n+\tswitch (pia->type) {\n \tcase RTE_FLOW_ACTION_TYPE_AGE:\n \t\tprintf(\"Indirect AGE action:\\n\"\n \t\t \" aged: %u\\n\"\n@@ -1967,15 +1971,41 @@ port_action_handle_query_dump(uint32_t type, union port_action_query *query)\n \t\t query->ct.reply_dir.max_win,\n \t\t query->ct.reply_dir.max_ack);\n \t\tbreak;\n+\tcase RTE_FLOW_ACTION_TYPE_QUOTA:\n+\t\tprintf(\"Indirect QUOTA action %u\\n\"\n+\t\t \" unused quota: %\" PRId64 \"\\n\",\n+\t\t pia->id, query->quota.quota);\n+\t\tbreak;\n \tdefault:\n-\t\tfprintf(stderr,\n-\t\t\t\"Indirect action (type: %d) doesn't support query\\n\",\n-\t\t\ttype);\n+\t\tprintf(\"port-%u: indirect action %u (type: %d) doesn't support query\\n\",\n+\t\t pia->type, pia->id, port_id);\n \t\tbreak;\n \t}\n \n }\n \n+void\n+port_action_handle_query_update(portid_t port_id, uint32_t id,\n+\t\t\t\tenum rte_flow_query_update_mode qu_mode,\n+\t\t\t\tconst struct rte_flow_action *action)\n+{\n+\tint ret;\n+\tstruct rte_flow_error error;\n+\tstruct port_indirect_action *pia;\n+\tunion port_action_query query;\n+\n+\tpia = action_get_by_id(port_id, id);\n+\tif (!pia || !pia->handle)\n+\t\treturn;\n+\tret = rte_flow_action_handle_query_update(port_id, pia->handle, action,\n+\t\t\t\t\t\t &query, qu_mode, &error);\n+\tif (ret)\n+\t\tport_flow_complain(&error);\n+\telse\n+\t\tport_action_handle_query_dump(port_id, pia, &query);\n+\n+}\n+\n int\n port_action_handle_query(portid_t port_id, uint32_t id)\n {\n@@ -1989,6 +2019,7 @@ port_action_handle_query(portid_t port_id, uint32_t id)\n \tswitch (pia->type) {\n \tcase RTE_FLOW_ACTION_TYPE_AGE:\n \tcase RTE_FLOW_ACTION_TYPE_COUNT:\n+\tcase RTE_FLOW_ACTION_TYPE_QUOTA:\n \t\tbreak;\n \tdefault:\n \t\tfprintf(stderr,\n@@ -2001,7 +2032,7 @@ port_action_handle_query(portid_t port_id, uint32_t id)\n \tmemset(&query, 0, sizeof(query));\n \tif (rte_flow_action_handle_query(port_id, pia->handle, &query, &error))\n \t\treturn port_flow_complain(&error);\n-\tport_action_handle_query_dump(pia->type, &query);\n+\tport_action_handle_query_dump(port_id, pia, &query);\n \treturn 0;\n }\n \n@@ -2945,6 +2976,42 @@ port_queue_action_handle_update(portid_t port_id,\n \treturn 0;\n }\n \n+void\n+port_queue_action_handle_query_update(portid_t port_id,\n+\t\t\t\t uint32_t queue_id, bool postpone,\n+\t\t\t\t uint32_t id,\n+\t\t\t\t enum rte_flow_query_update_mode qu_mode,\n+\t\t\t\t const struct rte_flow_action *action)\n+{\n+\tint ret;\n+\tstruct rte_flow_error error;\n+\tstruct port_indirect_action *pia = action_get_by_id(port_id, id);\n+\tconst struct rte_flow_op_attr attr = { .postpone = postpone};\n+\tstruct queue_job *job;\n+\n+\tif (!pia || !pia->handle)\n+\t\treturn;\n+\tjob = calloc(1, sizeof(*job));\n+\tif (!job)\n+\t\treturn;\n+\tjob->type = QUEUE_JOB_TYPE_ACTION_QUERY;\n+\tjob->pia = pia;\n+\n+\tret = rte_flow_async_action_handle_query_update(port_id, queue_id,\n+\t\t\t\t\t\t\t&attr, pia->handle,\n+\t\t\t\t\t\t\taction,\n+\t\t\t\t\t\t\t&job->query,\n+\t\t\t\t\t\t\tqu_mode, job,\n+\t\t\t\t\t\t\t&error);\n+\tif (ret) {\n+\t\tport_flow_complain(&error);\n+\t\tfree(job);\n+\t} else {\n+\t\tprintf(\"port-%u: indirect action #%u update-and-query queued\\n\",\n+\t\t port_id, id);\n+\t}\n+}\n+\n /** Enqueue indirect action query operation. */\n int\n port_queue_action_handle_query(portid_t port_id,\n@@ -3215,7 +3282,8 @@ port_queue_flow_pull(portid_t port_id, queueid_t queue_id)\n \t\telse if (job->type == QUEUE_JOB_TYPE_ACTION_DESTROY)\n \t\t\tfree(job->pia);\n \t\telse if (job->type == QUEUE_JOB_TYPE_ACTION_QUERY)\n-\t\t\tport_action_handle_query_dump(job->pia->type, &job->query);\n+\t\t\tport_action_handle_query_dump(port_id, job->pia,\n+\t\t\t\t\t\t &job->query);\n \t\tfree(job);\n \t}\n \tprintf(\"Queue #%u pulled %u operations (%u failed, %u succeeded)\\n\",\ndiff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h\nindex 7d24d25970..babc94246f 100644\n--- a/app/test-pmd/testpmd.h\n+++ b/app/test-pmd/testpmd.h\n@@ -236,6 +236,7 @@ union port_action_query {\n \tstruct rte_flow_query_count count;\n \tstruct rte_flow_query_age age;\n \tstruct rte_flow_action_conntrack ct;\n+\tstruct rte_flow_query_quota quota;\n };\n \n /* Descriptor for queue job. */\n@@ -904,6 +905,10 @@ struct rte_flow_action_handle *port_action_handle_get_by_id(portid_t port_id,\n \t\t\t\t\t\t\t uint32_t id);\n int port_action_handle_update(portid_t port_id, uint32_t id,\n \t\t\t const struct rte_flow_action *action);\n+void\n+port_action_handle_query_update(portid_t port_id, uint32_t id,\n+\t\t\t\tenum rte_flow_query_update_mode qu_mode,\n+\t\t\t\tconst struct rte_flow_action *action);\n int port_flow_get_info(portid_t port_id);\n int port_flow_configure(portid_t port_id,\n \t\t\tconst struct rte_flow_port_attr *port_attr,\n@@ -948,6 +953,12 @@ int port_queue_action_handle_update(portid_t port_id, uint32_t queue_id,\n \t\t\t\t const struct rte_flow_action *action);\n int port_queue_action_handle_query(portid_t port_id, uint32_t queue_id,\n \t\t\t\t bool postpone, uint32_t id);\n+void\n+port_queue_action_handle_query_update(portid_t port_id,\n+\t\t\t\t uint32_t queue_id, bool postpone,\n+\t\t\t\t uint32_t id,\n+\t\t\t\t enum rte_flow_query_update_mode qu_mode,\n+\t\t\t\t const struct rte_flow_action *action);\n int port_queue_flow_push(portid_t port_id, queueid_t queue_id);\n int port_queue_flow_pull(portid_t port_id, queueid_t queue_id);\n void port_queue_flow_aged(portid_t port_id, uint32_t queue_id, uint8_t destroy);\ndiff --git a/doc/guides/nics/features/default.ini b/doc/guides/nics/features/default.ini\nindex 510cc6679d..92d8765fd5 100644\n--- a/doc/guides/nics/features/default.ini\n+++ b/doc/guides/nics/features/default.ini\n@@ -132,6 +132,7 @@ ppp =\n pppoed =\n pppoes =\n pppoe_proto_id =\n+quota =\n raw =\n represented_port =\n sctp =\n@@ -178,6 +179,7 @@ pf =\n port_id =\n port_representor =\n queue =\n+quota =\n raw_decap =\n raw_encap =\n represented_port =\ndiff --git a/doc/guides/nics/features/mlx5.ini b/doc/guides/nics/features/mlx5.ini\nindex 62fd330e2b..ff9ea0cb43 100644\n--- a/doc/guides/nics/features/mlx5.ini\n+++ b/doc/guides/nics/features/mlx5.ini\n@@ -80,6 +80,7 @@ mpls = Y\n nvgre = Y\n port_id = Y\n port_representor = Y\n+quota = Y\n tag = Y\n tcp = Y\n udp = Y\n@@ -112,6 +113,7 @@ of_set_vlan_pcp = Y\n of_set_vlan_vid = Y\n port_id = Y\n queue = Y\n+quota = Y\n raw_decap = Y\n raw_encap = Y\n represented_port = Y\ndiff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst\nindex 51f51259e3..1aac8becf2 100644\n--- a/doc/guides/nics/mlx5.rst\n+++ b/doc/guides/nics/mlx5.rst\n@@ -291,6 +291,18 @@ Limitations\n - No Tx metadata go to the E-Switch steering domain for the Flow group 0.\n The flows within group 0 and set metadata action are rejected by hardware.\n \n+- Quota:\n+\n+ - Template API only (HWS).\n+ - Quota flow action and item supported in non-root HWS tables – flow group must be > 0.\n+ - Quota implemented as indirect flow action only.\n+ - Maximal value for quota SET and ADD operations in INT32_MAX (2G)\n+ - Application cannot use 2 consecutive ADD updates.\n+ Next tokens update after ADD must always be SET.\n+ - HW can reduce non-negative quota to negative value.\n+ - Quota flow action cannot be used with Meter or CT flow actions in the same rule.\n+ - Maximal number of HW quota and HW meter objects <= 16e6.\n+\n .. note::\n \n MAC addresses not already present in the bridge table of the associated\ndiff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst\nindex 3e6242803d..7a3868638c 100644\n--- a/doc/guides/prog_guide/rte_flow.rst\n+++ b/doc/guides/prog_guide/rte_flow.rst\n@@ -1544,6 +1544,13 @@ Matches Color Marker set by a Meter.\n \n - ``color``: Metering color marker.\n \n+Item: ``QUOTA``\n+^^^^^^^^^^^^^^^\n+\n+Matches flow quota state set by quota action.\n+\n+- ``state``: Flow quota state\n+\n Actions\n ~~~~~~~\n \n@@ -3227,6 +3234,40 @@ and rte_mtr_policy_get() API respectively.\n | ``policy`` | Meter policy object |\n +------------------+----------------------+\n \n+Action: ``QUOTA``\n+^^^^^^^^^^^^^^^^^\n+\n+Update ``quota`` value and set packet quota state.\n+If the ``quota`` value after update is non-negative packet quota state set to\n+``RTE_FLOW_QUOTA_STATE_PASS``. Otherwise, packet quota state set to ``RTE_FLOW_QUOTA_STATE_BLOCK``.\n+The ``quota`` value is reduced according to ``mode`` setting.\n+\n+.. _table_rte_flow_action_quota:\n+\n+.. table:: QUOTA\n+\n+ +------------------+------------------------+\n+ | Field | Value |\n+ +==================+========================+\n+ | ``mode`` | Quota operational mode |\n+ +------------------+------------------------+\n+ | ``quota`` | Quota value |\n+ +------------------+------------------------+\n+\n+.. _rte_flow_quota_mode:\n+\n+.. table:: Quota update modes\n+\n+ +---------------------------------+-------------------------------------+\n+ | Value | Description |\n+ +=================================+=====================================+\n+ | ``RTE_FLOW_QUOTA_MODE_PACKET`` | Count packets |\n+ +---------------------------------+-------------------------------------+\n+ | ``RTE_FLOW_QUOTA_MODE_L2`` | Count packet bytes starting from L2 |\n+ +------------------+----------------------------------------------------+\n+ | ``RTE_FLOW_QUOTA_MODE_L3`` | Count packet bytes starting from L3 |\n+ +------------------+----------------------------------------------------+\n+\n Negative types\n ~~~~~~~~~~~~~~\n \ndiff --git a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c\nindex 8b8aa940be..6439de3c1d 100644\n--- a/lib/ethdev/rte_flow.c\n+++ b/lib/ethdev/rte_flow.c\n@@ -157,6 +157,7 @@ static const struct rte_flow_desc_data rte_flow_desc_item[] = {\n \tMK_FLOW_ITEM(L2TPV2, sizeof(struct rte_flow_item_l2tpv2)),\n \tMK_FLOW_ITEM(PPP, sizeof(struct rte_flow_item_ppp)),\n \tMK_FLOW_ITEM(METER_COLOR, sizeof(struct rte_flow_item_meter_color)),\n+\tMK_FLOW_ITEM(QUOTA, sizeof(struct rte_flow_item_quota)),\n };\n \n /** Generate flow_action[] entry. */\n@@ -251,6 +252,7 @@ static const struct rte_flow_desc_data rte_flow_desc_action[] = {\n \tMK_FLOW_ACTION(REPRESENTED_PORT, sizeof(struct rte_flow_action_ethdev)),\n \tMK_FLOW_ACTION(METER_MARK, sizeof(struct rte_flow_action_meter_mark)),\n \tMK_FLOW_ACTION(SEND_TO_KERNEL, 0),\n+\tMK_FLOW_ACTION(QUOTA, sizeof(struct rte_flow_action_quota)),\n };\n \n int\ndiff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h\nindex f9e919bb80..c67f7c0203 100644\n--- a/lib/ethdev/rte_flow.h\n+++ b/lib/ethdev/rte_flow.h\n@@ -624,7 +624,45 @@ enum rte_flow_item_type {\n \t * See struct rte_flow_item_meter_color.\n \t */\n \tRTE_FLOW_ITEM_TYPE_METER_COLOR,\n+\n+\t/**\n+\t * Match Quota state\n+\t *\n+\t * @see struct rte_flow_item_quota\n+\t */\n+\t RTE_FLOW_ITEM_TYPE_QUOTA,\n+};\n+\n+/**\n+ * @warning\n+ * @b EXPERIMENTAL: this API may change without prior notice.\n+ *\n+ * QUOTA state.\n+ *\n+ * @see struct rte_flow_item_quota\n+ */\n+enum rte_flow_quota_state {\n+\tRTE_FLOW_QUOTA_STATE_PASS, /** PASS quota state */\n+\tRTE_FLOW_QUOTA_STATE_BLOCK /** BLOCK quota state */\n+};\n+\n+/**\n+ * RTE_FLOW_ITEM_TYPE_QUOTA\n+ *\n+ * Matches QUOTA state\n+ */\n+struct rte_flow_item_quota {\n+\tenum rte_flow_quota_state state;\n+};\n+\n+/**\n+ * Default mask for RTE_FLOW_ITEM_TYPE_QUOTA\n+ */\n+#ifndef __cplusplus\n+static const struct rte_flow_item_quota rte_flow_item_quota_mask = {\n+\t.state = (enum rte_flow_quota_state)0xff\n };\n+#endif\n \n /**\n *\n@@ -2736,6 +2774,81 @@ enum rte_flow_action_type {\n \t * No associated configuration structure.\n \t */\n \tRTE_FLOW_ACTION_TYPE_SEND_TO_KERNEL,\n+\n+\t/**\n+\t * Apply quota verdict - PASS or BLOCK to a flow.\n+\t *\n+\t * @see struct rte_flow_action_quota\n+\t * @see struct rte_flow_query_quota\n+\t * @see struct rte_flow_update_quota\n+\t */\n+\t RTE_FLOW_ACTION_TYPE_QUOTA,\n+};\n+\n+/**\n+ * @warning\n+ * @b EXPERIMENTAL: this API may change without prior notice.\n+ *\n+ * QUOTA operational mode.\n+ *\n+ * @see struct rte_flow_action_quota\n+ */\n+enum rte_flow_quota_mode {\n+\tRTE_FLOW_QUOTA_MODE_PACKET = 1, /** Count packets */\n+\tRTE_FLOW_QUOTA_MODE_L2 = 2, /** Count packet bytes starting from L2 */\n+\tRTE_FLOW_QUOTA_MODE_L3 = 3, /** Count packet bytes starting from L3 */\n+};\n+\n+/**\n+ * @warning\n+ * @b EXPERIMENTAL: this API may change without prior notice.\n+ *\n+ * Create QUOTA action.\n+ *\n+ * @see RTE_FLOW_ACTION_TYPE_QUOTA\n+ */\n+struct rte_flow_action_quota {\n+\tenum rte_flow_quota_mode mode; /** quota operational mode */\n+\tint64_t quota; /** quota value */\n+};\n+\n+/**\n+ * @warning\n+ * @b EXPERIMENTAL: this API may change without prior notice.\n+ *\n+ * Query indirect QUOTA action.\n+ *\n+ * @see RTE_FLOW_ACTION_TYPE_QUOTA\n+ *\n+ */\n+struct rte_flow_query_quota {\n+\tint64_t quota; /** quota value */\n+};\n+\n+/**\n+ * @warning\n+ * @b EXPERIMENTAL: this API may change without prior notice.\n+ *\n+ * Indirect QUOTA update operations.\n+ *\n+ * @see struct rte_flow_update_quota\n+ */\n+enum rte_flow_update_quota_op {\n+\tRTE_FLOW_UPDATE_QUOTA_SET, /** set new quota value */\n+\tRTE_FLOW_UPDATE_QUOTA_ADD, /** increase existing quota with new value */\n+};\n+\n+/**\n+ * @warning\n+ * @b EXPERIMENTAL: this API may change without prior notice.\n+ *\n+ * @see RTE_FLOW_ACTION_TYPE_QUOTA\n+ *\n+ * Update indirect QUOTA action.\n+ */\n+struct rte_flow_update_quota {\n+\tenum rte_flow_update_quota_op op; /** update operation */\n+\tint64_t quota; /** quota value */\n };\n \n /**\n@@ -4854,6 +4967,11 @@ struct rte_flow_port_info {\n \t * @see RTE_FLOW_ACTION_TYPE_CONNTRACK\n \t */\n \tuint32_t max_nb_conn_tracks;\n+\t/**\n+\t * Maximum number of quota actions.\n+\t * @see RTE_FLOW_ACTION_TYPE_QUOTA\n+\t */\n+\tuint32_t max_nb_quotas;\n \t/**\n \t * Port supported flags (RTE_FLOW_PORT_FLAG_*).\n \t */\n@@ -4932,6 +5050,11 @@ struct rte_flow_port_attr {\n \t * @see RTE_FLOW_ACTION_TYPE_CONNTRACK\n \t */\n \tuint32_t nb_conn_tracks;\n+\t/**\n+\t * Maximum number of quota actions.\n+\t * @see RTE_FLOW_ACTION_TYPE_QUOTA\n+\t */\n+\tuint32_t nb_quotas;\n \t/**\n \t * Port flags (RTE_FLOW_PORT_FLAG_*).\n \t */\n", "prefixes": [ "2/2" ] }