Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/116764/?format=api
{ "id": 116764, "url": "https://patches.dpdk.org/api/patches/116764/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20220923144334.27736-28-suanmingm@nvidia.com/", "project": { "id": 1, "url": "https://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": "<20220923144334.27736-28-suanmingm@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220923144334.27736-28-suanmingm@nvidia.com", "date": "2022-09-23T14:43:34", "name": "[27/27] net/mlx5: implement METER MARK indirect action for HWS", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "1c9f97f44f97a6901bcd4502ea726c904a5d915c", "submitter": { "id": 1887, "url": "https://patches.dpdk.org/api/people/1887/?format=api", "name": "Suanming Mou", "email": "suanmingm@nvidia.com" }, "delegate": { "id": 1, "url": "https://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20220923144334.27736-28-suanmingm@nvidia.com/mbox/", "series": [ { "id": 24805, "url": "https://patches.dpdk.org/api/series/24805/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=24805", "date": "2022-09-23T14:43:07", "name": "net/mlx5: HW steering PMD update", "version": 1, "mbox": "https://patches.dpdk.org/series/24805/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/116764/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/116764/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 D3E7AA054A;\n\tFri, 23 Sep 2022 16:47:41 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 1AB4E42C55;\n\tFri, 23 Sep 2022 16:44:58 +0200 (CEST)", "from NAM04-BN8-obe.outbound.protection.outlook.com\n (mail-bn8nam04on2070.outbound.protection.outlook.com [40.107.100.70])\n by mails.dpdk.org (Postfix) with ESMTP id A290C42C54\n for <dev@dpdk.org>; Fri, 23 Sep 2022 16:44:56 +0200 (CEST)", "from DM5PR08CA0041.namprd08.prod.outlook.com (2603:10b6:4:60::30) by\n CH0PR12MB5372.namprd12.prod.outlook.com (2603:10b6:610:d7::10) with\n Microsoft\n SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.20.5654.20; Fri, 23 Sep 2022 14:44:54 +0000", "from DM6NAM11FT109.eop-nam11.prod.protection.outlook.com\n (2603:10b6:4:60:cafe::56) by DM5PR08CA0041.outlook.office365.com\n (2603:10b6:4:60::30) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.20 via Frontend\n Transport; Fri, 23 Sep 2022 14:44:54 +0000", "from mail.nvidia.com (216.228.117.160) by\n DM6NAM11FT109.mail.protection.outlook.com (10.13.173.178) with Microsoft SMTP\n Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.20.5654.14 via Frontend Transport; Fri, 23 Sep 2022 14:44:54 +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.26; Fri, 23 Sep\n 2022 07:44:37 -0700", "from nvidia.com (10.126.231.35) 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.29; Fri, 23 Sep\n 2022 07:44:36 -0700" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=J5y6swIhLeTzSMl2cO4Em2t2NDh7+tvrN/j1UuJU1vYFXmVqxpTzY+vPvUECrYY7Bh41iahJEJ9wB+PqrpPzjVYLXQF3RQ5a6jITNd2VQYMhA6n/77ADIZmMkIx2UU5dekrUNCbjCpRQxu2acAQEuVQIdjGN7NA+V5yn56aIYovPraJGi4zaBgUp/HeH5qJdvsE2ZKnU/MAdPbrokoPxKMaa3fxFUbAEscYQet510rIUD8guqP0CtaaWh/YT4APnDPmbl3/UVsDgW9G3Gg1KioM23V2VasV9PpuJUZERkEAMxIQFLKYKNwxOvqVdK0+I8VxnPQ1fA6ovwsKKJBGuxQ==", "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=mBGS+Nx4yn/SINUOc5IgLzPOHpPrDjqCtVBNhkFBfCg=;\n b=ilt2e4+JnvCUwmoiqqW2ByQYR6y6yZZX9wHB/VB7xhHOLD5ncU8KFqaBphAY+5K3a2nj3OVn5Ge0mc+X/v8gOb7rW78M/myt2L1sqhxR/1FZq321BQ4kIfmHa8I9javz9+U2Y1iatxLO1iq/n5kZoa78E7t4bbEqbxVVAibo/wJ5bF+ro+lRLpQHt4JlmMX636yRm0mTBYK1rnpUaKZZyEdtJywGmrHTPF7dVHwQ8KHLnfukGtnTqEe7QuccYZTiqgLa2yuVqzmhbc7/Rm2IiCQ50cnI8e+ZZPXgA+xfZHpDXad+qjFt21xaxkSrqFmt6B+EWUAoZtWZg9ZXxdVMDA==", "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=mBGS+Nx4yn/SINUOc5IgLzPOHpPrDjqCtVBNhkFBfCg=;\n b=purS91gPLv9w1uk9k1MbI9SvA8shX9g/rEvEnmQUzW09grNxFRMZutEIzn7NiGTGcVNRmQ0EVYB4ktlCkg0a6OCwN62TQ//qfiJxVPlzItcYi4k0890h3N9B6yBVoc+dkWnaPMlxVNIyUY+UM1vSRDoHukt2RtB6FXPWORU7hi1dieyR3R7HtQhnypdXc4i6xLahuzJfJ0iyemzwerPjf0St7fujIc3JEl34LMBjOn7ri0VmMyjCEdXVXeyzj9wLWCiXd2I5PpS2kruZydtoKpNwL42OvwxoD5rTmfhNLCN2R0UlSSVyMsJQbUXFp3cWSHz/RrQlbOBr+ak9uNPeAw==", "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": "Suanming Mou <suanmingm@nvidia.com>", "To": "Matan Azrad <matan@nvidia.com>, Viacheslav Ovsiienko\n <viacheslavo@nvidia.com>", "CC": "<dev@dpdk.org>, Alexander Kozyrev <akozyrev@nvidia.com>", "Subject": "[PATCH 27/27] net/mlx5: implement METER MARK indirect action for HWS", "Date": "Fri, 23 Sep 2022 17:43:34 +0300", "Message-ID": "<20220923144334.27736-28-suanmingm@nvidia.com>", "X-Mailer": "git-send-email 2.18.1", "In-Reply-To": "<20220923144334.27736-1-suanmingm@nvidia.com>", "References": "<20220923144334.27736-1-suanmingm@nvidia.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[10.126.231.35]", "X-ClientProxiedBy": "rnnvmail201.nvidia.com (10.129.68.8) To\n rnnvmail201.nvidia.com (10.129.68.8)", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "DM6NAM11FT109:EE_|CH0PR12MB5372:EE_", "X-MS-Office365-Filtering-Correlation-Id": "1d964180-05fd-4c24-5882-08da9d722deb", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n 4V6IlNtUajPXYVa3Ip2zVmydkJ8uqGzseyqni+7vmSRi+9NmexeU95rlABjDeualNVX7A2/a4MLXiRecRkrOMb+snEyau18xPnV0o3dNFrkbX1kBjNX/O5LcTcyftz3R5TKEadqgllieJvKHsKxdKSOz0kMBsqHlD59slhuZUQuR2W/VqDe99G2VIreVvmkpvsZO7uKqyEkN4Gtveb/+88iRNfKYOTsSDcDN7FceF5wk6yM+BaqzEws0CiGiNdZvkgJ+YK9yOAZav3wMwdNXyjkJpq9XWdZ4Pqb7Ce+yyNQaCYvyMTg8M4TJV/ud/jEQAuZ4iTGuLaTqgoOqfWcHqhz2ohLNDwbmhbdMenjL3SXka6nLXLP2SQJ3eGUJq4SzpIUMYkf11kMzw0FmJJvt6rPkwLM0K6gSGUDuqNVI7CE1wsoqd8HxpsMhIwhoqoUzhq32QTTmyeFW6cxF6uqh4gR+I5eQ5f6S4aPusMTO0rmg0Jw0D6+CChpZsOywdp/e2lvUmP2HCGHsUwTjOCP8MXKPnoTRPOf0PFlrpvJ73ODXm+Y5cZ/C7A2YU4TqZ9XgtaXjjz93e/9EdHN59PMmXquPEy3iL6aYUSZMruJsGweImPd+n/iih3VaYdVsl8HQM23speb2TLMSSZAx/XpxAMB0hoABz5Fahhg4nMQJwFYSaO1uVUHOf3Qe8d13y+wbye6fNh1TXUevFoOCpspAOcTXNMzWr1iPwFPN1uRKRPipkOaIANCxUnqmsMfNzUpOJ9oL1ogtMh4XsMfXtkQDZw==", "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)(396003)(346002)(136003)(451199015)(46966006)(40470700004)(36840700001)(36860700001)(82740400003)(82310400005)(8676002)(4326008)(70586007)(70206006)(6636002)(110136005)(316002)(54906003)(2906002)(8936002)(41300700001)(186003)(2616005)(16526019)(1076003)(30864003)(6286002)(83380400001)(336012)(47076005)(426003)(7696005)(478600001)(5660300002)(107886003)(26005)(40460700003)(7636003)(356005)(55016003)(40480700001)(86362001)(36756003);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "23 Sep 2022 14:44:54.7171 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 1d964180-05fd-4c24-5882-08da9d722deb", "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 DM6NAM11FT109.eop-nam11.prod.protection.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "CH0PR12MB5372", "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": "From: Alexander Kozyrev <akozyrev@nvidia.com>\n\nAdd ability to create an indirect action handle for METER_MARK.\nIt allows to share one Meter between several different actions.\n\nSigned-off-by: Alexander Kozyrev <akozyrev@nvidia.com>\n---\n drivers/net/mlx5/mlx5_flow.c | 6 ++\n drivers/net/mlx5/mlx5_flow.h | 25 ++++-\n drivers/net/mlx5/mlx5_flow_hw.c | 160 +++++++++++++++++++++++++++++++-\n 3 files changed, 183 insertions(+), 8 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c\nindex cbf9c31984..9627ffc979 100644\n--- a/drivers/net/mlx5/mlx5_flow.c\n+++ b/drivers/net/mlx5/mlx5_flow.c\n@@ -4221,6 +4221,12 @@ flow_action_handles_translate(struct rte_eth_dev *dev,\n \t\t\t\t\t\tMLX5_RTE_FLOW_ACTION_TYPE_COUNT;\n \t\t\ttranslated[handle->index].conf = (void *)(uintptr_t)idx;\n \t\t\tbreak;\n+\t\tcase MLX5_INDIRECT_ACTION_TYPE_METER_MARK:\n+\t\t\ttranslated[handle->index].type =\n+\t\t\t\t\t\t(enum rte_flow_action_type)\n+\t\t\t\t\t\tMLX5_RTE_FLOW_ACTION_TYPE_METER_MARK;\n+\t\t\ttranslated[handle->index].conf = (void *)(uintptr_t)idx;\n+\t\t\tbreak;\n \t\tcase MLX5_INDIRECT_ACTION_TYPE_AGE:\n \t\t\tif (priv->sh->flow_hit_aso_en) {\n \t\t\t\ttranslated[handle->index].type =\ndiff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h\nindex e1eb0ab697..30b8e1df99 100644\n--- a/drivers/net/mlx5/mlx5_flow.h\n+++ b/drivers/net/mlx5/mlx5_flow.h\n@@ -47,6 +47,7 @@ enum mlx5_rte_flow_action_type {\n \tMLX5_RTE_FLOW_ACTION_TYPE_COUNT,\n \tMLX5_RTE_FLOW_ACTION_TYPE_JUMP,\n \tMLX5_RTE_FLOW_ACTION_TYPE_RSS,\n+\tMLX5_RTE_FLOW_ACTION_TYPE_METER_MARK,\n };\n \n /* Private (internal) Field IDs for MODIFY_FIELD action. */\n@@ -55,22 +56,35 @@ enum mlx5_rte_flow_field_id {\n \t\t\tMLX5_RTE_FLOW_FIELD_META_REG,\n };\n \n-#define MLX5_INDIRECT_ACTION_TYPE_OFFSET 30\n+#define MLX5_INDIRECT_ACTION_TYPE_OFFSET 29\n \n enum {\n \tMLX5_INDIRECT_ACTION_TYPE_RSS,\n \tMLX5_INDIRECT_ACTION_TYPE_AGE,\n \tMLX5_INDIRECT_ACTION_TYPE_COUNT,\n \tMLX5_INDIRECT_ACTION_TYPE_CT,\n+\tMLX5_INDIRECT_ACTION_TYPE_METER_MARK,\n };\n \n-/* Now, the maximal ports will be supported is 256, action number is 4M. */\n-#define MLX5_INDIRECT_ACT_CT_MAX_PORT 0x100\n+enum MLX5_SET_MATCHER {\n+\tMLX5_SET_MATCHER_SW_V = 1 << 0,\n+\tMLX5_SET_MATCHER_SW_M = 1 << 1,\n+\tMLX5_SET_MATCHER_HS_V = 1 << 2,\n+\tMLX5_SET_MATCHER_HS_M = 1 << 3,\n+};\n+\n+#define MLX5_SET_MATCHER_SW (MLX5_SET_MATCHER_SW_V | MLX5_SET_MATCHER_SW_M)\n+#define MLX5_SET_MATCHER_HS (MLX5_SET_MATCHER_HS_V | MLX5_SET_MATCHER_HS_M)\n+#define MLX5_SET_MATCHER_V (MLX5_SET_MATCHER_SW_V | MLX5_SET_MATCHER_HS_V)\n+#define MLX5_SET_MATCHER_M (MLX5_SET_MATCHER_SW_M | MLX5_SET_MATCHER_HS_M)\n+\n+/* Now, the maximal ports will be supported is 16, action number is 32M. */\n+#define MLX5_ACTION_CTX_CT_MAX_PORT 0x10\n \n #define MLX5_INDIRECT_ACT_CT_OWNER_SHIFT 22\n #define MLX5_INDIRECT_ACT_CT_OWNER_MASK (MLX5_INDIRECT_ACT_CT_MAX_PORT - 1)\n \n-/* 30-31: type, 22-29: owner port, 0-21: index. */\n+/* 29-31: type, 25-28: owner port, 0-24: index */\n #define MLX5_INDIRECT_ACT_CT_GEN_IDX(owner, index) \\\n \t((MLX5_INDIRECT_ACTION_TYPE_CT << MLX5_INDIRECT_ACTION_TYPE_OFFSET) | \\\n \t (((owner) & MLX5_INDIRECT_ACT_CT_OWNER_MASK) << \\\n@@ -1159,6 +1173,9 @@ struct mlx5_action_construct_data {\n \t\tstruct {\n \t\t\tuint32_t id;\n \t\t} shared_counter;\n+\t\tstruct {\n+\t\t\tuint32_t id;\n+\t\t} shared_meter;\n \t};\n };\n \ndiff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c\nindex 90a6c0c78f..e114bf11c1 100644\n--- a/drivers/net/mlx5/mlx5_flow_hw.c\n+++ b/drivers/net/mlx5/mlx5_flow_hw.c\n@@ -615,6 +615,42 @@ __flow_hw_act_data_shared_cnt_append(struct mlx5_priv *priv,\n \treturn 0;\n }\n \n+/**\n+ * Append shared meter_mark action to the dynamic action list.\n+ *\n+ * @param[in] priv\n+ * Pointer to the port private data structure.\n+ * @param[in] acts\n+ * Pointer to the template HW steering DR actions.\n+ * @param[in] type\n+ * Action type.\n+ * @param[in] action_src\n+ * Offset of source rte flow action.\n+ * @param[in] action_dst\n+ * Offset of destination DR action.\n+ * @param[in] mtr_id\n+ * Shared meter id.\n+ *\n+ * @return\n+ * 0 on success, negative value otherwise and rte_errno is set.\n+ */\n+static __rte_always_inline int\n+__flow_hw_act_data_shared_mtr_append(struct mlx5_priv *priv,\n+\t\t\t\t struct mlx5_hw_actions *acts,\n+\t\t\t\t enum rte_flow_action_type type,\n+\t\t\t\t uint16_t action_src,\n+\t\t\t\t uint16_t action_dst,\n+\t\t\t\t cnt_id_t mtr_id)\n+{\tstruct mlx5_action_construct_data *act_data;\n+\n+\tact_data = __flow_hw_act_data_alloc(priv, type, action_src, action_dst);\n+\tif (!act_data)\n+\t\treturn -1;\n+\tact_data->type = type;\n+\tact_data->shared_meter.id = mtr_id;\n+\tLIST_INSERT_HEAD(&acts->act_list, act_data, next);\n+\treturn 0;\n+}\n \n /**\n * Translate shared indirect action.\n@@ -668,6 +704,13 @@ flow_hw_shared_action_translate(struct rte_eth_dev *dev,\n \t\tif (flow_hw_ct_compile(dev, idx, &acts->rule_acts[action_dst]))\n \t\t\treturn -1;\n \t\tbreak;\n+\tcase MLX5_INDIRECT_ACTION_TYPE_METER_MARK:\n+\t\tif (__flow_hw_act_data_shared_mtr_append(priv, acts,\n+\t\t\t(enum rte_flow_action_type)\n+\t\t\tMLX5_RTE_FLOW_ACTION_TYPE_METER_MARK,\n+\t\t\taction_src, action_dst, idx))\n+\t\t\treturn -1;\n+\t\tbreak;\n \tdefault:\n \t\tDRV_LOG(WARNING, \"Unsupported shared action type:%d\", type);\n \t\tbreak;\n@@ -1682,8 +1725,10 @@ flow_hw_shared_action_construct(struct rte_eth_dev *dev,\n \t\t\t\tstruct mlx5dr_rule_action *rule_act)\n {\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tstruct mlx5_aso_mtr_pool *pool = priv->hws_mpool;\n \tstruct mlx5_action_construct_data act_data;\n \tstruct mlx5_shared_action_rss *shared_rss;\n+\tstruct mlx5_aso_mtr *aso_mtr;\n \tuint32_t act_idx = (uint32_t)(uintptr_t)action->conf;\n \tuint32_t type = act_idx >> MLX5_INDIRECT_ACTION_TYPE_OFFSET;\n \tuint32_t idx = act_idx &\n@@ -1719,6 +1764,17 @@ flow_hw_shared_action_construct(struct rte_eth_dev *dev,\n \t\tif (flow_hw_ct_compile(dev, idx, rule_act))\n \t\t\treturn -1;\n \t\tbreak;\n+\tcase MLX5_INDIRECT_ACTION_TYPE_METER_MARK:\n+\t\t/* Find ASO object. */\n+\t\taso_mtr = mlx5_ipool_get(pool->idx_pool, idx);\n+\t\tif (!aso_mtr)\n+\t\t\treturn -1;\n+\t\trule_act->action = pool->action;\n+\t\trule_act->aso_meter.offset = aso_mtr->offset;\n+\t\trule_act->aso_meter.init_color =\n+\t\t\t(enum mlx5dr_action_aso_meter_color)\n+\t\t\trte_col_2_mlx5_col(aso_mtr->init_color);\n+\t\tbreak;\n \tdefault:\n \t\tDRV_LOG(WARNING, \"Unsupported shared action type:%d\", type);\n \t\tbreak;\n@@ -1856,6 +1912,7 @@ flow_hw_actions_construct(struct rte_eth_dev *dev,\n \t\t\t uint32_t queue)\n {\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tstruct mlx5_aso_mtr_pool *pool = priv->hws_mpool;\n \tstruct rte_flow_template_table *table = job->flow->table;\n \tstruct mlx5_action_construct_data *act_data;\n \tconst struct rte_flow_actions_template *at = hw_at->action_template;\n@@ -2065,6 +2122,21 @@ flow_hw_actions_construct(struct rte_eth_dev *dev,\n \t\t\t\t\t &rule_acts[act_data->action_dst]))\n \t\t\t\treturn -1;\n \t\t\tbreak;\n+\t\tcase MLX5_RTE_FLOW_ACTION_TYPE_METER_MARK:\n+\t\t\tmtr_id = act_data->shared_meter.id &\n+\t\t\t\t((1u << MLX5_INDIRECT_ACTION_TYPE_OFFSET) - 1);\n+\t\t\t/* Find ASO object. */\n+\t\t\taso_mtr = mlx5_ipool_get(pool->idx_pool, mtr_id);\n+\t\t\tif (!aso_mtr)\n+\t\t\t\treturn -1;\n+\t\t\trule_acts[act_data->action_dst].action =\n+\t\t\t\t\t\t\tpool->action;\n+\t\t\trule_acts[act_data->action_dst].aso_meter.offset =\n+\t\t\t\t\t\t\taso_mtr->offset;\n+\t\t\trule_acts[act_data->action_dst].aso_meter.init_color =\n+\t\t\t\t(enum mlx5dr_action_aso_meter_color)\n+\t\t\t\trte_col_2_mlx5_col(aso_mtr->init_color);\n+\t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_METER_MARK:\n \t\t\tret = flow_hw_meter_mark_compile(dev,\n \t\t\t\tact_data->action_dst, action,\n@@ -3252,6 +3324,11 @@ flow_hw_dr_actions_template_handle_shared(const struct rte_flow_action *mask,\n \t\taction_types[*curr_off] = MLX5DR_ACTION_TYP_ASO_CT;\n \t\t*curr_off = *curr_off + 1;\n \t\tbreak;\n+\tcase RTE_FLOW_ACTION_TYPE_METER_MARK:\n+\t\tat->actions_off[action_src] = *curr_off;\n+\t\taction_types[*curr_off] = MLX5DR_ACTION_TYP_ASO_METER;\n+\t\t*curr_off = *curr_off + 1;\n+\t\tbreak;\n \tdefault:\n \t\tDRV_LOG(WARNING, \"Unsupported shared action type: %d\", type);\n \t\treturn -EINVAL;\n@@ -5793,7 +5870,9 @@ flow_hw_action_handle_create(struct rte_eth_dev *dev, uint32_t queue,\n {\n \tstruct rte_flow_action_handle *handle = NULL;\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tstruct mlx5_aso_mtr *aso_mtr;\n \tcnt_id_t cnt_id;\n+\tuint32_t mtr_id;\n \n \tRTE_SET_USED(queue);\n \tRTE_SET_USED(attr);\n@@ -5812,6 +5891,14 @@ flow_hw_action_handle_create(struct rte_eth_dev *dev, uint32_t queue,\n \tcase RTE_FLOW_ACTION_TYPE_CONNTRACK:\n \t\thandle = flow_hw_conntrack_create(dev, queue, action->conf, error);\n \t\tbreak;\n+\tcase RTE_FLOW_ACTION_TYPE_METER_MARK:\n+\t\taso_mtr = flow_hw_meter_mark_alloc(dev, action);\n+\t\tif (!aso_mtr)\n+\t\t\tbreak;\n+\t\tmtr_id = (MLX5_INDIRECT_ACTION_TYPE_METER_MARK <<\n+\t\t\tMLX5_INDIRECT_ACTION_TYPE_OFFSET) | (aso_mtr->fm.meter_id);\n+\t\thandle = (struct rte_flow_action_handle *)(uintptr_t)mtr_id;\n+\t\tbreak;\n \tdefault:\n \t\thandle = flow_dv_action_create(dev, conf, action, error);\n \t}\n@@ -5847,18 +5934,58 @@ flow_hw_action_handle_update(struct rte_eth_dev *dev, uint32_t queue,\n \t\t\t void *user_data,\n \t\t\t struct rte_flow_error *error)\n {\n-\tuint32_t act_idx = (uint32_t)(uintptr_t)handle;\n-\tuint32_t type = act_idx >> MLX5_INDIRECT_ACTION_TYPE_OFFSET;\n-\n \tRTE_SET_USED(queue);\n \tRTE_SET_USED(attr);\n \tRTE_SET_USED(user_data);\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tstruct mlx5_aso_mtr_pool *pool = priv->hws_mpool;\n+\tconst struct rte_flow_update_meter_mark *upd_meter_mark =\n+\t\t(const struct rte_flow_update_meter_mark *)update;\n+\tconst struct rte_flow_action_meter_mark *meter_mark;\n+\tstruct mlx5_aso_mtr *aso_mtr;\n+\tstruct mlx5_flow_meter_info *fm;\n+\tuint32_t act_idx = (uint32_t)(uintptr_t)handle;\n+\tuint32_t type = act_idx >> MLX5_INDIRECT_ACTION_TYPE_OFFSET;\n+\tuint32_t idx = act_idx & ((1u << MLX5_INDIRECT_ACTION_TYPE_OFFSET) - 1);\n+\n \tswitch (type) {\n \tcase MLX5_INDIRECT_ACTION_TYPE_CT:\n \t\treturn flow_hw_conntrack_update(dev, queue, update, act_idx, error);\n+\tcase MLX5_INDIRECT_ACTION_TYPE_METER_MARK:\n+\t\tmeter_mark = &upd_meter_mark->meter_mark;\n+\t\t/* Find ASO object. */\n+\t\taso_mtr = mlx5_ipool_get(pool->idx_pool, idx);\n+\t\tif (!aso_mtr)\n+\t\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\tRTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\tNULL, \"Invalid meter_mark update index\");\n+\t\tfm = &aso_mtr->fm;\n+\t\tif (upd_meter_mark->profile_valid)\n+\t\t\tfm->profile = (struct mlx5_flow_meter_profile *)\n+\t\t\t\t\t\t\t(meter_mark->profile);\n+\t\tif (upd_meter_mark->color_mode_valid)\n+\t\t\tfm->color_aware = meter_mark->color_mode;\n+\t\tif (upd_meter_mark->init_color_valid)\n+\t\t\taso_mtr->init_color = (meter_mark->color_mode) ?\n+\t\t\t\tmeter_mark->init_color : RTE_COLOR_GREEN;\n+\t\tif (upd_meter_mark->state_valid)\n+\t\t\tfm->is_enable = meter_mark->state;\n+\t\t/* Update ASO flow meter by wqe. */\n+\t\tif (mlx5_aso_meter_update_by_wqe(priv->sh, aso_mtr,\n+\t\t\t\t\t\t &priv->mtr_bulk))\n+\t\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\tRTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\tNULL, \"Unable to update ASO meter WQE\");\n+\t\t/* Wait for ASO object completion. */\n+\t\tif (mlx5_aso_mtr_wait(priv->sh, aso_mtr))\n+\t\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\tRTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\tNULL, \"Unable to wait for ASO meter CQE\");\n+\t\treturn 0;\n \tdefault:\n-\t\treturn flow_dv_action_update(dev, handle, update, error);\n+\t\tbreak;\n \t}\n+\treturn flow_dv_action_update(dev, handle, update, error);\n }\n \n /**\n@@ -5889,7 +6016,11 @@ flow_hw_action_handle_destroy(struct rte_eth_dev *dev, uint32_t queue,\n {\n \tuint32_t act_idx = (uint32_t)(uintptr_t)handle;\n \tuint32_t type = act_idx >> MLX5_INDIRECT_ACTION_TYPE_OFFSET;\n+\tuint32_t idx = act_idx & ((1u << MLX5_INDIRECT_ACTION_TYPE_OFFSET) - 1);\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tstruct mlx5_aso_mtr_pool *pool = priv->hws_mpool;\n+\tstruct mlx5_aso_mtr *aso_mtr;\n+\tstruct mlx5_flow_meter_info *fm;\n \n \tRTE_SET_USED(queue);\n \tRTE_SET_USED(attr);\n@@ -5899,6 +6030,27 @@ flow_hw_action_handle_destroy(struct rte_eth_dev *dev, uint32_t queue,\n \t\treturn mlx5_hws_cnt_shared_put(priv->hws_cpool, &act_idx);\n \tcase MLX5_INDIRECT_ACTION_TYPE_CT:\n \t\treturn flow_hw_conntrack_destroy(dev, act_idx, error);\n+\tcase MLX5_INDIRECT_ACTION_TYPE_METER_MARK:\n+\t\taso_mtr = mlx5_ipool_get(pool->idx_pool, idx);\n+\t\tif (!aso_mtr)\n+\t\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\tRTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\tNULL, \"Invalid meter_mark destroy index\");\n+\t\tfm = &aso_mtr->fm;\n+\t\tfm->is_enable = 0;\n+\t\t/* Update ASO flow meter by wqe. */\n+\t\tif (mlx5_aso_meter_update_by_wqe(priv->sh, aso_mtr,\n+\t\t\t\t\t\t &priv->mtr_bulk))\n+\t\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\tRTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\tNULL, \"Unable to update ASO meter WQE\");\n+\t\t/* Wait for ASO object completion. */\n+\t\tif (mlx5_aso_mtr_wait(priv->sh, aso_mtr))\n+\t\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\tRTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\tNULL, \"Unable to wait for ASO meter CQE\");\n+\t\tmlx5_ipool_free(pool->idx_pool, idx);\n+\t\treturn 0;\n \tdefault:\n \t\treturn flow_dv_action_destroy(dev, handle, error);\n \t}\n", "prefixes": [ "27/27" ] }