Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/131589/?format=api
{ "id": 131589, "url": "https://patches.dpdk.org/api/patches/131589/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20230919050027.752483-1-getelson@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": "<20230919050027.752483-1-getelson@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230919050027.752483-1-getelson@nvidia.com", "date": "2023-09-19T05:00:27", "name": "net/mlx5: reuse reformat and modify header actions in a table", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "e91b58cd68da7de4184daa577c59f7cc9b20b5ff", "submitter": { "id": 1882, "url": "https://patches.dpdk.org/api/people/1882/?format=api", "name": "Gregory Etelson", "email": "getelson@nvidia.com" }, "delegate": { "id": 3268, "url": "https://patches.dpdk.org/api/users/3268/?format=api", "username": "rasland", "first_name": "Raslan", "last_name": "Darawsheh", "email": "rasland@nvidia.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20230919050027.752483-1-getelson@nvidia.com/mbox/", "series": [ { "id": 29541, "url": "https://patches.dpdk.org/api/series/29541/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=29541", "date": "2023-09-19T05:00:27", "name": "net/mlx5: reuse reformat and modify header actions in a table", "version": 1, "mbox": "https://patches.dpdk.org/series/29541/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/131589/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/131589/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 BE29E425F8;\n\tTue, 19 Sep 2023 07:01:28 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 946AE402D2;\n\tTue, 19 Sep 2023 07:01:28 +0200 (CEST)", "from NAM11-BN8-obe.outbound.protection.outlook.com\n (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40])\n by mails.dpdk.org (Postfix) with ESMTP id D59D540278\n for <dev@dpdk.org>; Tue, 19 Sep 2023 07:01:27 +0200 (CEST)", "from DM6PR13CA0004.namprd13.prod.outlook.com (2603:10b6:5:bc::17) by\n PH7PR12MB6884.namprd12.prod.outlook.com (2603:10b6:510:1ba::12) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.28; Tue, 19 Sep\n 2023 05:00:59 +0000", "from DS1PEPF00017093.namprd03.prod.outlook.com\n (2603:10b6:5:bc:cafe::eb) by DM6PR13CA0004.outlook.office365.com\n (2603:10b6:5:bc::17) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27 via Frontend\n Transport; Tue, 19 Sep 2023 05:00:59 +0000", "from mail.nvidia.com (216.228.117.161) by\n DS1PEPF00017093.mail.protection.outlook.com (10.167.17.136) with Microsoft\n SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.20.6792.20 via Frontend Transport; Tue, 19 Sep 2023 05:00:58 +0000", "from rnnvmail202.nvidia.com (10.129.68.7) by mail.nvidia.com\n (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 18 Sep\n 2023 22:00:46 -0700", "from nvidia.com (10.126.230.35) by rnnvmail202.nvidia.com\n (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 18 Sep\n 2023 22:00:43 -0700" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=W6oBfmjz73Ju8LrbnoPs0VqsgNNoMfomJ32VZegGNQxXAoJzrl+ummKrWVOQJZg7HpoUyYmLSuezBQsouOOWfpeKcGaxlxbExHXprUAT5IFaW8MlTbVoVxfNafISKiGJ9+RLoVMazyRaBfCefybM50EOnd+ihhS36inD77dkmcUwzjAom6z2WJVVMBXYtLyubIFhU4TXyPX8iDSYMZJd34ih9/XZVcPOo1moIbZ2st6rikpXEkQH++gVkInigBL6nZc1owuzxtuuqsWqpX0qHTw7AoTKNfbGQ4D0/B6mUHSqgM/zTElk5XKmKaql9dGnf1goQqVEaOkVhkqfcThklQ==", "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=P3bQuQVeFJLpnE9nKm+UeksdHN50i42k6v2cZng8h6E=;\n b=BTV58xr+ywuNL4KkzbsWaDZEvXtsyoeBgRSDQiQqlnF5/BSW8myDqf+oDH+p1Lk9doU6ELW9+RMvF7gyfwROspemMtpTxlYsxpbWeaHFsVkGovpJOlAjdrgBh3jlBRiTHnbt00cT+My/u5+fl+/RDunX79Z4MElgLqkqzzSBLH9rdB4XPJ3zOTdDzcFmlbNlcXgh75d5epRXAu67D7kvb+hxq3Lglcdd2CXIzqvrsMI2TKf9X0/I0dLtQWnwXFBcZwdFpc/WpPkLp6Osla1mEA4mTHqycKImfb8OGGcbeRxuGuNHLKkyjlHhPcTYrUefseM/MXqld3Obr/gazaxzSA==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass (sender ip is\n 216.228.117.161) 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=P3bQuQVeFJLpnE9nKm+UeksdHN50i42k6v2cZng8h6E=;\n b=rO5ZxWcxN1zGy8sm+/K2qQj7bM48b5JdYxWSxPWM9f7eqUG+GCRtFUQvPG9m1oaMjXtJ4Z/TczEI8QZgB8gRjZoZq4m66JOPnH6FUjOnoILjKmtEwLUd7nNOOu4gNrLtjnsOnJms+W0A9qrf3yPMsKvGYLSOO/n1Ho/u2NG6h0P6ibtbDlxV9ZKBqhpW9pwogPuN2QsqX3/DVhxPGNTf6wKhcgLuWNx5DZogyZWRsfKzR+L1G1JTjBzYQhZ0i9621dLCGuORThCLRe9h2LuXjv68A4Ng2Be/G9wzBvt/FQuFDhC/Gs5Y/0Nn8FMdaZ0DvV/eap52GQnQZLgBFhdCyA==", "X-MS-Exchange-Authentication-Results": "spf=pass (sender IP is 216.228.117.161)\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.161 as permitted sender) receiver=protection.outlook.com;\n client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C", "From": "Gregory Etelson <getelson@nvidia.com>", "To": "<dev@dpdk.org>", "CC": "<getelson@nvidia.com>, =?utf-8?b?wqA=?= <mkashani@nvidia.com>,\n \"Matan Azrad\" <matan@nvidia.com>,\n Viacheslav Ovsiienko <viacheslavo@nvidia.com>, \"Ori Kam\" <orika@nvidia.com>,\n Suanming Mou <suanmingm@nvidia.com>", "Subject": "[PATCH] net/mlx5: reuse reformat and modify header actions in a table", "Date": "Tue, 19 Sep 2023 08:00:27 +0300", "Message-ID": "<20230919050027.752483-1-getelson@nvidia.com>", "X-Mailer": "git-send-email 2.39.2", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Originating-IP": "[10.126.230.35]", "X-ClientProxiedBy": "rnnvmail203.nvidia.com (10.129.68.9) To\n rnnvmail202.nvidia.com (10.129.68.7)", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "DS1PEPF00017093:EE_|PH7PR12MB6884:EE_", "X-MS-Office365-Filtering-Correlation-Id": "c0749337-2e7f-4cc3-a19d-08dbb8cd69e6", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n I6kajepjk9ZC3trr8aHOT9S7sQa4r4u0j0fUqON3O7Iwnp5zk/AdE0RHAf5XmRTdJFXw51IklO3UFqBHmBRVe5KO+n0AXQAP5WVFSgHSpNiqR+9Wub9NSLscvRRZGOLbOhnhqWfBWkYlgrVetfhixnw9nModWAuoLZ3fAz08iCCTlP33dvNtqWEK5o5k8pnHOPlqG3borlJEK2DIhQiBj9LgVDeHQVZe3xncHfcj4FvBe0tXAscb85JC7OO+aiaiVhTvKpGk5KP0hpi1Ed17GY6OzoSZNA1Lmh31+ekwzQzcw2jyzXGC7wejXiTh26hnCH31jKHuKiS7eTHlFwc2/ryd2lnin+Uoiz5H+sO+IemiYqN44BHYZtSP2vYkNM8dcGBcLqEk8iYSsyUY0rMRUFvlifhfSiPcg6gSIv39t0INj+1Vr1Zepxe9F9znpdPlRJps3TrvX8Zb0HzpMnonjE2SoYylF9I06NEvtjPZCWtJRCJKzdRPuVASaVlsF06E0qy+zP18kfKQP3jo3HabD+px7qEDmJx2z64kSA2kwHOPVjlU5mLufNhm3YKakMmMKg4JYeGA2x9qU+w1eSDHGe8rZXXfJMgyhibzYY2ksTU11oBsnlH/hI13HI9AqnjREHINcvQeyyXe4ts+bpp7ZXYTym05ylyW+Y9Ur3o5gasw1Gx7Y+nDlEWhO7lWatnXJHcHROSudCemho7n6fCnPeZS5rXkYLr3A0OktDhyBLf3xoqXI/JIFv28vcqwInJe", "X-Forefront-Antispam-Report": "CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1;\n SRV:;\n IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE;\n SFS:(13230031)(4636009)(376002)(39860400002)(136003)(396003)(346002)(82310400011)(186009)(1800799009)(451199024)(36840700001)(40470700004)(46966006)(8676002)(4326008)(8936002)(47076005)(36860700001)(83380400001)(336012)(478600001)(70206006)(70586007)(6916009)(54906003)(2616005)(107886003)(426003)(6286002)(1076003)(26005)(16526019)(7696005)(6666004)(41300700001)(40460700003)(30864003)(316002)(2906002)(55016003)(86362001)(5660300002)(7636003)(40480700001)(82740400003)(356005)(36756003);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "19 Sep 2023 05:00:58.6023 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n c0749337-2e7f-4cc3-a19d-08dbb8cd69e6", "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.161];\n Helo=[mail.nvidia.com]", "X-MS-Exchange-CrossTenant-AuthSource": "\n DS1PEPF00017093.namprd03.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "PH7PR12MB6884", "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": "If application defined several actions templates with non-shared\nreformat or modify headers actions AND used these templates to create\na table, HWS could share reformat or modify headers resources,\ninstead of creating a resource for each action template.\n\nThe patch activates HWS code in a way that provides reformat or\nmodify header resources sharing.\n\nThe patch updates modify field and raw encap template actions\nvalidations:\n- modify field does not allow empty action template masks.\n- raw encap added action template mask validation.\n\nSigned-off-by: Gregory Etelson <getelson@nvidia.com>\n---\nDepends-on: patch-129406 (\"net/mlx5/hws: add support for multi pattern\")\n---\n drivers/net/mlx5/mlx5_flow.h | 8 +-\n drivers/net/mlx5/mlx5_flow_dv.c | 3 +-\n drivers/net/mlx5/mlx5_flow_hw.c | 568 +++++++++++++++++++++++++-------\n 3 files changed, 452 insertions(+), 127 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h\nindex 3a97975d69..68fa6cf46d 100644\n--- a/drivers/net/mlx5/mlx5_flow.h\n+++ b/drivers/net/mlx5/mlx5_flow.h\n@@ -1318,7 +1318,9 @@ struct mlx5_hw_jump_action {\n struct mlx5_hw_encap_decap_action {\n \tstruct mlx5dr_action *action; /* Action object. */\n \t/* Is header_reformat action shared across flows in table. */\n-\tbool shared;\n+\tuint32_t shared:1;\n+\tuint32_t multi_pattern:1;\n+\tvolatile uint32_t *multi_pattern_refcnt;\n \tsize_t data_size; /* Action metadata size. */\n \tuint8_t data[]; /* Action data. */\n };\n@@ -1332,7 +1334,9 @@ struct mlx5_hw_modify_header_action {\n \t/* Modify header action position in action rule table. */\n \tuint16_t pos;\n \t/* Is MODIFY_HEADER action shared across flows in table. */\n-\tbool shared;\n+\tuint32_t shared:1;\n+\tuint32_t multi_pattern:1;\n+\tvolatile uint32_t *multi_pattern_refcnt;\n \t/* Amount of modification commands stored in the precompiled buffer. */\n \tuint32_t mhdr_cmds_num;\n \t/* Precompiled modification commands. */\ndiff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c\nindex 3f4325c5c8..d3e002ec41 100644\n--- a/drivers/net/mlx5/mlx5_flow_dv.c\n+++ b/drivers/net/mlx5/mlx5_flow_dv.c\n@@ -4573,7 +4573,8 @@ flow_dv_convert_encap_data(const struct rte_flow_item *items, uint8_t *buf,\n \t\t\t\t\t\t (void *)items->type,\n \t\t\t\t\t\t \"items total size is too big\"\n \t\t\t\t\t\t \" for encap action\");\n-\t\trte_memcpy((void *)&buf[temp_size], items->spec, len);\n+\t\tif (items->spec)\n+\t\t\trte_memcpy(&buf[temp_size], items->spec, len);\n \t\tswitch (items->type) {\n \t\tcase RTE_FLOW_ITEM_TYPE_ETH:\n \t\t\teth = (struct rte_ether_hdr *)&buf[temp_size];\ndiff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c\nindex 83910c097d..04f1095c9c 100644\n--- a/drivers/net/mlx5/mlx5_flow_hw.c\n+++ b/drivers/net/mlx5/mlx5_flow_hw.c\n@@ -58,6 +58,95 @@\n #define MLX5_HW_VLAN_PUSH_VID_IDX 1\n #define MLX5_HW_VLAN_PUSH_PCP_IDX 2\n \n+#define MLX5_CONST_ENCAP_ITEM(encap_type, ptr) \\\n+(((const struct encap_type *)(ptr))->definition)\n+\n+struct mlx5_multi_pattern_ctx {\n+\tunion {\n+\t\tstruct mlx5dr_action_reformat_header reformat_hdr;\n+\t\tstruct mlx5dr_action_mh_pattern mh_pattern;\n+\t};\n+\tunion {\n+\t\t/* action template auxiliary structures for object destruction */\n+\t\tstruct mlx5_hw_encap_decap_action *encap;\n+\t\tstruct mlx5_hw_modify_header_action *mhdr;\n+\t};\n+\t/* multi pattern action */\n+\tstruct mlx5dr_rule_action *rule_action;\n+};\n+\n+#define MLX5_MULTIPATTERN_ENCAP_NUM 4\n+\n+struct mlx5_tbl_multi_pattern_ctx {\n+\tstruct {\n+\t\tuint32_t elements_num;\n+\t\tstruct mlx5_multi_pattern_ctx ctx[MLX5_HW_TBL_MAX_ACTION_TEMPLATE];\n+\t} reformat[MLX5_MULTIPATTERN_ENCAP_NUM];\n+\n+\tstruct {\n+\t\tuint32_t elements_num;\n+\t\tstruct mlx5_multi_pattern_ctx ctx[MLX5_HW_TBL_MAX_ACTION_TEMPLATE];\n+\t} mh;\n+};\n+\n+#define MLX5_EMPTY_MULTI_PATTERN_CTX {{{0,}},}\n+\n+static int\n+mlx5_tbl_multi_pattern_process(struct rte_eth_dev *dev,\n+\t\t\t struct rte_flow_template_table *tbl,\n+\t\t\t struct mlx5_tbl_multi_pattern_ctx *mpat,\n+\t\t\t struct rte_flow_error *error);\n+\n+static __rte_always_inline int\n+mlx5_multi_pattern_reformat_to_index(enum mlx5dr_action_type type)\n+{\n+\tswitch (type) {\n+\tcase MLX5DR_ACTION_TYP_REFORMAT_TNL_L2_TO_L2:\n+\t\treturn 0;\n+\tcase MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L2:\n+\t\treturn 1;\n+\tcase MLX5DR_ACTION_TYP_REFORMAT_TNL_L3_TO_L2:\n+\t\treturn 2;\n+\tcase MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L3:\n+\t\treturn 3;\n+\tdefault:\n+\t\tbreak;\n+\t}\n+\treturn -1;\n+}\n+\n+static __rte_always_inline enum mlx5dr_action_type\n+mlx5_multi_pattern_reformat_index_to_type(uint32_t ix)\n+{\n+\tswitch (ix) {\n+\tcase 0:\n+\t\treturn MLX5DR_ACTION_TYP_REFORMAT_TNL_L2_TO_L2;\n+\tcase 1:\n+\t\treturn MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L2;\n+\tcase 2:\n+\t\treturn MLX5DR_ACTION_TYP_REFORMAT_TNL_L3_TO_L2;\n+\tcase 3:\n+\t\treturn MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L3;\n+\tdefault:\n+\t\tbreak;\n+\t}\n+\treturn MLX5DR_ACTION_TYP_MAX;\n+}\n+\n+static inline enum mlx5dr_table_type\n+get_mlx5dr_table_type(const struct rte_flow_attr *attr)\n+{\n+\tenum mlx5dr_table_type type;\n+\n+\tif (attr->transfer)\n+\t\ttype = MLX5DR_TABLE_TYPE_FDB;\n+\telse if (attr->egress)\n+\t\ttype = MLX5DR_TABLE_TYPE_NIC_TX;\n+\telse\n+\t\ttype = MLX5DR_TABLE_TYPE_NIC_RX;\n+\treturn type;\n+}\n+\n static int flow_hw_flush_all_ctrl_flows(struct rte_eth_dev *dev);\n static int flow_hw_translate_group(struct rte_eth_dev *dev,\n \t\t\t\t const struct mlx5_flow_template_table_cfg *cfg,\n@@ -437,6 +526,34 @@ flow_hw_ct_compile(struct rte_eth_dev *dev,\n \treturn 0;\n }\n \n+static void\n+flow_hw_template_destroy_reformat_action(struct mlx5_hw_encap_decap_action *encap_decap)\n+{\n+\tif (encap_decap->multi_pattern) {\n+\t\tuint32_t refcnt = __atomic_sub_fetch(encap_decap->multi_pattern_refcnt,\n+\t\t\t\t\t\t 1, __ATOMIC_RELAXED);\n+\t\tif (refcnt)\n+\t\t\treturn;\n+\t\tmlx5_free((void *)(uintptr_t)encap_decap->multi_pattern_refcnt);\n+\t}\n+\tif (encap_decap->action)\n+\t\tmlx5dr_action_destroy(encap_decap->action);\n+}\n+\n+static void\n+flow_hw_template_destroy_mhdr_action(struct mlx5_hw_modify_header_action *mhdr)\n+{\n+\tif (mhdr->multi_pattern) {\n+\t\tuint32_t refcnt = __atomic_sub_fetch(mhdr->multi_pattern_refcnt,\n+\t\t\t\t\t\t 1, __ATOMIC_RELAXED);\n+\t\tif (refcnt)\n+\t\t\treturn;\n+\t\tmlx5_free((void *)(uintptr_t)mhdr->multi_pattern_refcnt);\n+\t}\n+\tif (mhdr->action)\n+\t\tmlx5dr_action_destroy(mhdr->action);\n+}\n+\n /**\n * Destroy DR actions created by action template.\n *\n@@ -478,14 +595,12 @@ __flow_hw_action_template_destroy(struct rte_eth_dev *dev,\n \t\tacts->tir = NULL;\n \t}\n \tif (acts->encap_decap) {\n-\t\tif (acts->encap_decap->action)\n-\t\t\tmlx5dr_action_destroy(acts->encap_decap->action);\n+\t\tflow_hw_template_destroy_reformat_action(acts->encap_decap);\n \t\tmlx5_free(acts->encap_decap);\n \t\tacts->encap_decap = NULL;\n \t}\n \tif (acts->mhdr) {\n-\t\tif (acts->mhdr->action)\n-\t\t\tmlx5dr_action_destroy(acts->mhdr->action);\n+\t\tflow_hw_template_destroy_mhdr_action(acts->mhdr);\n \t\tmlx5_free(acts->mhdr);\n \t\tacts->mhdr = NULL;\n \t}\n@@ -840,8 +955,6 @@ flow_hw_action_modify_field_is_shared(const struct rte_flow_action *action,\n \tif (v->src.field == RTE_FLOW_FIELD_VALUE) {\n \t\tuint32_t j;\n \n-\t\tif (m == NULL)\n-\t\t\treturn false;\n \t\tfor (j = 0; j < RTE_DIM(m->src.value); ++j) {\n \t\t\t/*\n \t\t\t * Immediate value is considered to be masked\n@@ -1387,6 +1500,137 @@ flow_hw_meter_mark_compile(struct rte_eth_dev *dev,\n \treturn 0;\n }\n \n+static int\n+mlx5_tbl_translate_reformat(struct mlx5_priv *priv,\n+\t\t\t const struct rte_flow_template_table_attr *table_attr,\n+\t\t\t struct mlx5_hw_actions *acts,\n+\t\t\t struct rte_flow_actions_template *at,\n+\t\t\t const struct rte_flow_item *enc_item,\n+\t\t\t const struct rte_flow_item *enc_item_m,\n+\t\t\t uint8_t *encap_data, uint8_t *encap_data_m,\n+\t\t\t struct mlx5_tbl_multi_pattern_ctx *mp_ctx,\n+\t\t\t size_t data_size, uint16_t reformat_src,\n+\t\t\t enum mlx5dr_action_type refmt_type,\n+\t\t\t struct rte_flow_error *error)\n+{\n+\tint mp_reformat_ix = mlx5_multi_pattern_reformat_to_index(refmt_type);\n+\tconst struct rte_flow_attr *attr = &table_attr->flow_attr;\n+\tenum mlx5dr_table_type tbl_type = get_mlx5dr_table_type(attr);\n+\tstruct mlx5dr_action_reformat_header hdr;\n+\tuint8_t buf[MLX5_ENCAP_MAX_LEN];\n+\tbool shared_rfmt = false;\n+\tint ret;\n+\n+\tMLX5_ASSERT(at->reformat_off != UINT16_MAX);\n+\tif (enc_item) {\n+\t\tMLX5_ASSERT(!encap_data);\n+\t\tret = flow_dv_convert_encap_data(enc_item, buf, &data_size, error);\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\t\tencap_data = buf;\n+\t\tif (enc_item_m)\n+\t\t\tshared_rfmt = true;\n+\t} else if (encap_data && encap_data_m) {\n+\t\tshared_rfmt = true;\n+\t}\n+\tacts->encap_decap = mlx5_malloc(MLX5_MEM_ZERO,\n+\t\t\t\t\tsizeof(*acts->encap_decap) + data_size,\n+\t\t\t\t\t0, SOCKET_ID_ANY);\n+\tif (!acts->encap_decap)\n+\t\treturn rte_flow_error_set(error, ENOMEM,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\t\t NULL, \"no memory for reformat context\");\n+\thdr.sz = data_size;\n+\thdr.data = encap_data;\n+\tif (shared_rfmt || mp_reformat_ix < 0) {\n+\t\tuint16_t reformat_ix = at->reformat_off;\n+\t\tuint32_t flags = mlx5_hw_act_flag[!!attr->group][tbl_type] |\n+\t\t\t\t MLX5DR_ACTION_FLAG_SHARED;\n+\n+\t\tacts->encap_decap->action =\n+\t\t\tmlx5dr_action_create_reformat(priv->dr_ctx, refmt_type,\n+\t\t\t\t\t\t 1, &hdr, 0, flags);\n+\t\tif (!acts->encap_decap->action)\n+\t\t\treturn -rte_errno;\n+\t\tacts->rule_acts[reformat_ix].action = acts->encap_decap->action;\n+\t\tacts->rule_acts[reformat_ix].reformat.data = acts->encap_decap->data;\n+\t\tacts->rule_acts[reformat_ix].reformat.offset = 0;\n+\t\tacts->encap_decap->shared = true;\n+\t} else {\n+\t\tuint32_t ix;\n+\t\ttypeof(mp_ctx->reformat[0]) *reformat_ctx = mp_ctx->reformat +\n+\t\t\t\t\t\t\t mp_reformat_ix;\n+\n+\t\tix = reformat_ctx->elements_num++;\n+\t\treformat_ctx->ctx[ix].reformat_hdr = hdr;\n+\t\treformat_ctx->ctx[ix].rule_action = &acts->rule_acts[at->reformat_off];\n+\t\treformat_ctx->ctx[ix].encap = acts->encap_decap;\n+\t\tacts->rule_acts[at->reformat_off].reformat.hdr_idx = ix;\n+\t\tacts->encap_decap_pos = at->reformat_off;\n+\t\tacts->encap_decap->data_size = data_size;\n+\t\tret = __flow_hw_act_data_encap_append\n+\t\t\t(priv, acts, (at->actions + reformat_src)->type,\n+\t\t\t reformat_src, at->reformat_off, data_size);\n+\t\tif (ret)\n+\t\t\treturn -rte_errno;\n+\t}\n+\treturn 0;\n+}\n+\n+static int\n+mlx5_tbl_translate_modify_header(struct rte_eth_dev *dev,\n+\t\t\t\t const struct mlx5_flow_template_table_cfg *cfg,\n+\t\t\t\t struct mlx5_hw_actions *acts,\n+\t\t\t\t struct mlx5_tbl_multi_pattern_ctx *mp_ctx,\n+\t\t\t\t struct mlx5_hw_modify_header_action *mhdr,\n+\t\t\t\t struct rte_flow_error *error)\n+{\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tconst struct rte_flow_template_table_attr *table_attr = &cfg->attr;\n+\tconst struct rte_flow_attr *attr = &table_attr->flow_attr;\n+\tenum mlx5dr_table_type tbl_type = get_mlx5dr_table_type(attr);\n+\tuint16_t mhdr_ix = mhdr->pos;\n+\tstruct mlx5dr_action_mh_pattern pattern = {\n+\t\t.sz = sizeof(struct mlx5_modification_cmd) * mhdr->mhdr_cmds_num\n+\t};\n+\n+\tif (flow_hw_validate_compiled_modify_field(dev, cfg, mhdr, error)) {\n+\t\t__flow_hw_action_template_destroy(dev, acts);\n+\t\treturn -rte_errno;\n+\t}\n+\tacts->mhdr = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*acts->mhdr),\n+\t\t\t\t 0, SOCKET_ID_ANY);\n+\tif (!acts->mhdr)\n+\t\treturn rte_flow_error_set(error, ENOMEM,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\t\t NULL, \"translate modify_header: no memory for modify header context\");\n+\trte_memcpy(acts->mhdr, mhdr, sizeof(*mhdr));\n+\tpattern.data = (__be64 *)acts->mhdr->mhdr_cmds;\n+\tif (mhdr->shared) {\n+\t\tuint32_t flags = mlx5_hw_act_flag[!!attr->group][tbl_type] |\n+\t\t\t\t MLX5DR_ACTION_FLAG_SHARED;\n+\n+\t\tacts->mhdr->action = mlx5dr_action_create_modify_header\n+\t\t\t\t\t\t(priv->dr_ctx, 1, &pattern, 0,\n+\t\t\t\t\t\t flags);\n+\t\tif (!acts->mhdr->action)\n+\t\t\treturn rte_flow_error_set(error, rte_errno,\n+\t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\t\t\t NULL, \"translate modify_header: failed to create DR action\");\n+\t\tacts->rule_acts[mhdr_ix].action = acts->mhdr->action;\n+\t} else {\n+\t\ttypeof(mp_ctx->mh) *mh = &mp_ctx->mh;\n+\t\tuint32_t idx = mh->elements_num;\n+\t\tstruct mlx5_multi_pattern_ctx *mh_ctx = mh->ctx + mh->elements_num++;\n+\n+\t\tmh_ctx->mh_pattern = pattern;\n+\t\tmh_ctx->mhdr = acts->mhdr;\n+\t\tmh_ctx->rule_action = &acts->rule_acts[mhdr_ix];\n+\t\tacts->rule_acts[mhdr_ix].modify_header.pattern_idx = idx;\n+\t}\n+\treturn 0;\n+}\n+\n /**\n * Translate rte_flow actions to DR action.\n *\n@@ -1415,6 +1659,7 @@ __flow_hw_actions_translate(struct rte_eth_dev *dev,\n \t\t\t const struct mlx5_flow_template_table_cfg *cfg,\n \t\t\t struct mlx5_hw_actions *acts,\n \t\t\t struct rte_flow_actions_template *at,\n+\t\t\t struct mlx5_tbl_multi_pattern_ctx *mp_ctx,\n \t\t\t struct rte_flow_error *error)\n {\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n@@ -1437,7 +1682,7 @@ __flow_hw_actions_translate(struct rte_eth_dev *dev,\n \tuint16_t action_pos;\n \tuint16_t jump_pos;\n \tuint32_t ct_idx;\n-\tint err;\n+\tint ret, err;\n \tuint32_t target_grp = 0;\n \n \tflow_hw_modify_field_init(&mhdr, at);\n@@ -1571,32 +1816,26 @@ __flow_hw_actions_translate(struct rte_eth_dev *dev,\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP:\n \t\t\tMLX5_ASSERT(!reformat_used);\n-\t\t\tenc_item = ((const struct rte_flow_action_vxlan_encap *)\n-\t\t\t\t actions->conf)->definition;\n+\t\t\tenc_item = MLX5_CONST_ENCAP_ITEM(rte_flow_action_vxlan_encap,\n+\t\t\t\t\t\t\t actions->conf);\n \t\t\tif (masks->conf)\n-\t\t\t\tenc_item_m = ((const struct rte_flow_action_vxlan_encap *)\n-\t\t\t\t\t masks->conf)->definition;\n+\t\t\t\tenc_item_m = MLX5_CONST_ENCAP_ITEM(rte_flow_action_vxlan_encap,\n+\t\t\t\t\t\t\t\t masks->conf);\n \t\t\treformat_used = true;\n \t\t\treformat_src = actions - action_start;\n \t\t\trefmt_type = MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L2;\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP:\n \t\t\tMLX5_ASSERT(!reformat_used);\n-\t\t\tenc_item = ((const struct rte_flow_action_nvgre_encap *)\n-\t\t\t\t actions->conf)->definition;\n+\t\t\tenc_item = MLX5_CONST_ENCAP_ITEM(rte_flow_action_nvgre_encap,\n+\t\t\t\t\t\t\t actions->conf);\n \t\t\tif (masks->conf)\n-\t\t\t\tenc_item_m = ((const struct rte_flow_action_nvgre_encap *)\n-\t\t\t\t\t masks->conf)->definition;\n+\t\t\t\tenc_item_m = MLX5_CONST_ENCAP_ITEM(rte_flow_action_nvgre_encap,\n+\t\t\t\t\t\t\t\t masks->conf);\n \t\t\treformat_used = true;\n \t\t\treformat_src = actions - action_start;\n \t\t\trefmt_type = MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L2;\n \t\t\tbreak;\n-\t\tcase RTE_FLOW_ACTION_TYPE_VXLAN_DECAP:\n-\t\tcase RTE_FLOW_ACTION_TYPE_NVGRE_DECAP:\n-\t\t\tMLX5_ASSERT(!reformat_used);\n-\t\t\treformat_used = true;\n-\t\t\trefmt_type = MLX5DR_ACTION_TYP_REFORMAT_TNL_L2_TO_L2;\n-\t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_RAW_ENCAP:\n \t\t\traw_encap_data =\n \t\t\t\t(const struct rte_flow_action_raw_encap *)\n@@ -1620,6 +1859,12 @@ __flow_hw_actions_translate(struct rte_eth_dev *dev,\n \t\t\t}\n \t\t\treformat_src = actions - action_start;\n \t\t\tbreak;\n+\t\tcase RTE_FLOW_ACTION_TYPE_VXLAN_DECAP:\n+\t\tcase RTE_FLOW_ACTION_TYPE_NVGRE_DECAP:\n+\t\t\tMLX5_ASSERT(!reformat_used);\n+\t\t\treformat_used = true;\n+\t\t\trefmt_type = MLX5DR_ACTION_TYP_REFORMAT_TNL_L2_TO_L2;\n+\t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_RAW_DECAP:\n \t\t\treformat_used = true;\n \t\t\trefmt_type = MLX5DR_ACTION_TYP_REFORMAT_TNL_L2_TO_L2;\n@@ -1770,83 +2015,20 @@ __flow_hw_actions_translate(struct rte_eth_dev *dev,\n \t\t}\n \t}\n \tif (mhdr.pos != UINT16_MAX) {\n-\t\tstruct mlx5dr_action_mh_pattern pattern;\n-\t\tuint32_t flags;\n-\t\tuint32_t bulk_size;\n-\t\tsize_t mhdr_len;\n-\n-\t\tif (flow_hw_validate_compiled_modify_field(dev, cfg, &mhdr, error)) {\n-\t\t\t__flow_hw_action_template_destroy(dev, acts);\n-\t\t\treturn -rte_errno;\n-\t\t}\n-\t\tacts->mhdr = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*acts->mhdr),\n-\t\t\t\t\t 0, SOCKET_ID_ANY);\n-\t\tif (!acts->mhdr)\n-\t\t\tgoto err;\n-\t\trte_memcpy(acts->mhdr, &mhdr, sizeof(*acts->mhdr));\n-\t\tmhdr_len = sizeof(struct mlx5_modification_cmd) * acts->mhdr->mhdr_cmds_num;\n-\t\tflags = mlx5_hw_act_flag[!!attr->group][type];\n-\t\tif (acts->mhdr->shared) {\n-\t\t\tflags |= MLX5DR_ACTION_FLAG_SHARED;\n-\t\t\tbulk_size = 0;\n-\t\t} else {\n-\t\t\tbulk_size = rte_log2_u32(table_attr->nb_flows);\n-\t\t}\n-\t\tpattern.data = (__be64 *)acts->mhdr->mhdr_cmds;\n-\t\tpattern.sz = mhdr_len;\n-\t\tacts->mhdr->action = mlx5dr_action_create_modify_header\n-\t\t\t\t(priv->dr_ctx, 1, &pattern,\n-\t\t\t\t bulk_size, flags);\n-\t\tif (!acts->mhdr->action)\n+\t\tret = mlx5_tbl_translate_modify_header(dev, cfg, acts, mp_ctx,\n+\t\t\t\t\t\t &mhdr, error);\n+\t\tif (ret)\n \t\t\tgoto err;\n-\t\tacts->rule_acts[acts->mhdr->pos].action = acts->mhdr->action;\n \t}\n \tif (reformat_used) {\n-\t\tstruct mlx5dr_action_reformat_header hdr;\n-\t\tuint8_t buf[MLX5_ENCAP_MAX_LEN];\n-\t\tbool shared_rfmt = true;\n-\n-\t\tMLX5_ASSERT(at->reformat_off != UINT16_MAX);\n-\t\tif (enc_item) {\n-\t\t\tMLX5_ASSERT(!encap_data);\n-\t\t\tif (flow_dv_convert_encap_data(enc_item, buf, &data_size, error))\n-\t\t\t\tgoto err;\n-\t\t\tencap_data = buf;\n-\t\t\tif (!enc_item_m)\n-\t\t\t\tshared_rfmt = false;\n-\t\t} else if (encap_data && !encap_data_m) {\n-\t\t\tshared_rfmt = false;\n-\t\t}\n-\t\tacts->encap_decap = mlx5_malloc(MLX5_MEM_ZERO,\n-\t\t\t\t sizeof(*acts->encap_decap) + data_size,\n-\t\t\t\t 0, SOCKET_ID_ANY);\n-\t\tif (!acts->encap_decap)\n-\t\t\tgoto err;\n-\t\tif (data_size) {\n-\t\t\tacts->encap_decap->data_size = data_size;\n-\t\t\tmemcpy(acts->encap_decap->data, encap_data, data_size);\n-\t\t}\n-\n-\t\thdr.sz = data_size;\n-\t\thdr.data = encap_data;\n-\t\tacts->encap_decap->action = mlx5dr_action_create_reformat\n-\t\t\t\t(priv->dr_ctx, refmt_type,\n-\t\t\t\t 1, &hdr,\n-\t\t\t\t shared_rfmt ? 0 : rte_log2_u32(table_attr->nb_flows),\n-\t\t\t\t mlx5_hw_act_flag[!!attr->group][type] |\n-\t\t\t\t (shared_rfmt ? MLX5DR_ACTION_FLAG_SHARED : 0));\n-\t\tif (!acts->encap_decap->action)\n-\t\t\tgoto err;\n-\t\tacts->rule_acts[at->reformat_off].action = acts->encap_decap->action;\n-\t\tacts->rule_acts[at->reformat_off].reformat.data = acts->encap_decap->data;\n-\t\tif (shared_rfmt)\n-\t\t\tacts->rule_acts[at->reformat_off].reformat.offset = 0;\n-\t\telse if (__flow_hw_act_data_encap_append(priv, acts,\n-\t\t\t\t (action_start + reformat_src)->type,\n-\t\t\t\t reformat_src, at->reformat_off, data_size))\n+\t\tret = mlx5_tbl_translate_reformat(priv, table_attr, acts, at,\n+\t\t\t\t\t\t enc_item, enc_item_m,\n+\t\t\t\t\t\t encap_data, encap_data_m,\n+\t\t\t\t\t\t mp_ctx, data_size,\n+\t\t\t\t\t\t reformat_src,\n+\t\t\t\t\t\t refmt_type, error);\n+\t\tif (ret)\n \t\t\tgoto err;\n-\t\tacts->encap_decap->shared = shared_rfmt;\n-\t\tacts->encap_decap_pos = at->reformat_off;\n \t}\n \treturn 0;\n err:\n@@ -1875,15 +2057,20 @@ flow_hw_actions_translate(struct rte_eth_dev *dev,\n \t\t\t struct rte_flow_template_table *tbl,\n \t\t\t struct rte_flow_error *error)\n {\n+\tint ret;\n \tuint32_t i;\n+\tstruct mlx5_tbl_multi_pattern_ctx mpat = MLX5_EMPTY_MULTI_PATTERN_CTX;\n \n \tfor (i = 0; i < tbl->nb_action_templates; i++) {\n \t\tif (__flow_hw_actions_translate(dev, &tbl->cfg,\n \t\t\t\t\t\t&tbl->ats[i].acts,\n \t\t\t\t\t\ttbl->ats[i].action_template,\n-\t\t\t\t\t\terror))\n+\t\t\t\t\t\t&mpat, error))\n \t\t\tgoto err;\n \t}\n+\tret = mlx5_tbl_multi_pattern_process(dev, tbl, &mpat, error);\n+\tif (ret)\n+\t\tgoto err;\n \treturn 0;\n err:\n \twhile (i--)\n@@ -3393,6 +3580,143 @@ flow_hw_q_flow_flush(struct rte_eth_dev *dev,\n \treturn 0;\n }\n \n+static int\n+mlx5_tbl_multi_pattern_process(struct rte_eth_dev *dev,\n+\t\t\t struct rte_flow_template_table *tbl,\n+\t\t\t struct mlx5_tbl_multi_pattern_ctx *mpat,\n+\t\t\t struct rte_flow_error *error)\n+{\n+\tuint32_t i;\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tconst struct rte_flow_template_table_attr *table_attr = &tbl->cfg.attr;\n+\tconst struct rte_flow_attr *attr = &table_attr->flow_attr;\n+\tenum mlx5dr_table_type type = get_mlx5dr_table_type(attr);\n+\tuint32_t flags = mlx5_hw_act_flag[!!attr->group][type];\n+\tstruct mlx5dr_action *dr_action;\n+\tuint32_t bulk_size = rte_log2_u32(table_attr->nb_flows);\n+\n+\tfor (i = 0; i < MLX5_MULTIPATTERN_ENCAP_NUM; i++) {\n+\t\tuint32_t j;\n+\t\tuint32_t *reformat_refcnt;\n+\t\ttypeof(mpat->reformat[0]) *reformat = mpat->reformat + i;\n+\t\tstruct mlx5dr_action_reformat_header hdr[MLX5_HW_TBL_MAX_ACTION_TEMPLATE];\n+\t\tenum mlx5dr_action_type reformat_type =\n+\t\t\tmlx5_multi_pattern_reformat_index_to_type(i);\n+\n+\t\tif (!reformat->elements_num)\n+\t\t\tcontinue;\n+\t\tfor (j = 0; j < reformat->elements_num; j++)\n+\t\t\thdr[j] = reformat->ctx[j].reformat_hdr;\n+\t\treformat_refcnt = mlx5_malloc(MLX5_MEM_ZERO, sizeof(uint32_t), 0,\n+\t\t\t\t\t rte_socket_id());\n+\t\tif (!reformat_refcnt)\n+\t\t\treturn rte_flow_error_set(error, ENOMEM,\n+\t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\t\t\t NULL, \"failed to allocate multi-pattern encap counter\");\n+\t\t*reformat_refcnt = reformat->elements_num;\n+\t\tdr_action = mlx5dr_action_create_reformat\n+\t\t\t(priv->dr_ctx, reformat_type, reformat->elements_num, hdr,\n+\t\t\t bulk_size, flags);\n+\t\tif (!dr_action) {\n+\t\t\tmlx5_free(reformat_refcnt);\n+\t\t\treturn rte_flow_error_set(error, rte_errno,\n+\t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\t\t\t NULL,\n+\t\t\t\t\t\t \"failed to create multi-pattern encap action\");\n+\t\t}\n+\t\tfor (j = 0; j < reformat->elements_num; j++) {\n+\t\t\treformat->ctx[j].rule_action->action = dr_action;\n+\t\t\treformat->ctx[j].encap->action = dr_action;\n+\t\t\treformat->ctx[j].encap->multi_pattern = 1;\n+\t\t\treformat->ctx[j].encap->multi_pattern_refcnt = reformat_refcnt;\n+\t\t}\n+\t}\n+\tif (mpat->mh.elements_num) {\n+\t\ttypeof(mpat->mh) *mh = &mpat->mh;\n+\t\tstruct mlx5dr_action_mh_pattern pattern[MLX5_HW_TBL_MAX_ACTION_TEMPLATE];\n+\t\tuint32_t *mh_refcnt = mlx5_malloc(MLX5_MEM_ZERO, sizeof(uint32_t),\n+\t\t\t\t\t\t 0, rte_socket_id());\n+\n+\t\tif (!mh_refcnt)\n+\t\t\treturn rte_flow_error_set(error, ENOMEM,\n+\t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\t\t\t NULL, \"failed to allocate modify header counter\");\n+\t\t*mh_refcnt = mpat->mh.elements_num;\n+\t\tfor (i = 0; i < mpat->mh.elements_num; i++)\n+\t\t\tpattern[i] = mh->ctx[i].mh_pattern;\n+\t\tdr_action = mlx5dr_action_create_modify_header\n+\t\t\t(priv->dr_ctx, mpat->mh.elements_num, pattern,\n+\t\t\t bulk_size, flags);\n+\t\tif (!dr_action) {\n+\t\t\tmlx5_free(mh_refcnt);\n+\t\t\treturn rte_flow_error_set(error, rte_errno,\n+\t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\t\t\t NULL,\n+\t\t\t\t\t\t \"failed to create multi-pattern header modify action\");\n+\t\t}\n+\t\tfor (i = 0; i < mpat->mh.elements_num; i++) {\n+\t\t\tmh->ctx[i].rule_action->action = dr_action;\n+\t\t\tmh->ctx[i].mhdr->action = dr_action;\n+\t\t\tmh->ctx[i].mhdr->multi_pattern = 1;\n+\t\t\tmh->ctx[i].mhdr->multi_pattern_refcnt = mh_refcnt;\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+mlx5_hw_build_template_table(struct rte_eth_dev *dev,\n+\t\t\t uint8_t nb_action_templates,\n+\t\t\t struct rte_flow_actions_template *action_templates[],\n+\t\t\t struct mlx5dr_action_template *at[],\n+\t\t\t struct rte_flow_template_table *tbl,\n+\t\t\t struct rte_flow_error *error)\n+{\n+\tint ret;\n+\tuint8_t i;\n+\tstruct mlx5_tbl_multi_pattern_ctx mpat = MLX5_EMPTY_MULTI_PATTERN_CTX;\n+\n+\tfor (i = 0; i < nb_action_templates; i++) {\n+\t\tuint32_t refcnt = __atomic_add_fetch(&action_templates[i]->refcnt, 1,\n+\t\t\t\t\t\t __ATOMIC_RELAXED);\n+\n+\t\tif (refcnt <= 1) {\n+\t\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION,\n+\t\t\t\t\t &action_templates[i], \"invalid AT refcount\");\n+\t\t\tgoto at_error;\n+\t\t}\n+\t\tat[i] = action_templates[i]->tmpl;\n+\t\ttbl->ats[i].action_template = action_templates[i];\n+\t\tLIST_INIT(&tbl->ats[i].acts.act_list);\n+\t\t/* do NOT translate table action if `dev` was not started */\n+\t\tif (!dev->data->dev_started)\n+\t\t\tcontinue;\n+\t\tret = __flow_hw_actions_translate(dev, &tbl->cfg,\n+\t\t\t\t\t\t &tbl->ats[i].acts,\n+\t\t\t\t\t\t action_templates[i],\n+\t\t\t\t\t\t &mpat, error);\n+\t\tif (ret) {\n+\t\t\ti++;\n+\t\t\tgoto at_error;\n+\t\t}\n+\t}\n+\ttbl->nb_action_templates = nb_action_templates;\n+\tret = mlx5_tbl_multi_pattern_process(dev, tbl, &mpat, error);\n+\tif (ret)\n+\t\tgoto at_error;\n+\treturn 0;\n+\n+at_error:\n+\twhile (i--) {\n+\t\t__flow_hw_action_template_destroy(dev, &tbl->ats[i].acts);\n+\t\t__atomic_sub_fetch(&action_templates[i]->refcnt,\n+\t\t\t\t 1, __ATOMIC_RELAXED);\n+\t}\n+\treturn rte_errno;\n+}\n+\n /**\n * Create flow table.\n *\n@@ -3545,29 +3869,12 @@ flow_hw_table_create(struct rte_eth_dev *dev,\n \t}\n \ttbl->nb_item_templates = nb_item_templates;\n \t/* Build the action template. */\n-\tfor (i = 0; i < nb_action_templates; i++) {\n-\t\tuint32_t ret;\n-\n-\t\tret = __atomic_fetch_add(&action_templates[i]->refcnt, 1,\n-\t\t\t\t\t __ATOMIC_RELAXED) + 1;\n-\t\tif (ret <= 1) {\n-\t\t\trte_errno = EINVAL;\n-\t\t\tgoto at_error;\n-\t\t}\n-\t\tat[i] = action_templates[i]->tmpl;\n-\t\ttbl->ats[i].action_template = action_templates[i];\n-\t\tLIST_INIT(&tbl->ats[i].acts.act_list);\n-\t\tif (!port_started)\n-\t\t\tcontinue;\n-\t\terr = __flow_hw_actions_translate(dev, &tbl->cfg,\n-\t\t\t\t\t\t &tbl->ats[i].acts,\n-\t\t\t\t\t\t action_templates[i], &sub_error);\n-\t\tif (err) {\n-\t\t\ti++;\n-\t\t\tgoto at_error;\n-\t\t}\n+\terr = mlx5_hw_build_template_table(dev, nb_action_templates,\n+\t\t\t\t\t action_templates, at, tbl, &sub_error);\n+\tif (err) {\n+\t\ti = nb_item_templates;\n+\t\tgoto it_error;\n \t}\n-\ttbl->nb_action_templates = nb_action_templates;\n \ttbl->matcher = mlx5dr_matcher_create\n \t\t(tbl->grp->tbl, mt, nb_item_templates, at, nb_action_templates, &matcher_attr);\n \tif (!tbl->matcher)\n@@ -3581,7 +3888,7 @@ flow_hw_table_create(struct rte_eth_dev *dev,\n \t\tLIST_INSERT_HEAD(&priv->flow_hw_tbl_ongo, tbl, next);\n \treturn tbl;\n at_error:\n-\twhile (i--) {\n+\tfor (i = 0; i < nb_action_templates; i++) {\n \t\t__flow_hw_action_template_destroy(dev, &tbl->ats[i].acts);\n \t\t__atomic_fetch_sub(&action_templates[i]->refcnt,\n \t\t\t\t 1, __ATOMIC_RELAXED);\n@@ -3823,6 +4130,10 @@ flow_hw_validate_action_modify_field(const struct rte_flow_action *action,\n \tconst struct rte_flow_action_modify_field *mask_conf = mask->conf;\n \tint ret;\n \n+\tif (!mask_conf)\n+\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, action,\n+\t\t\t\t\t \"modify_field mask conf is missing\");\n \tif (action_conf->operation != mask_conf->operation)\n \t\treturn rte_flow_error_set(error, EINVAL,\n \t\t\t\tRTE_FLOW_ERROR_TYPE_ACTION, action,\n@@ -4183,16 +4494,25 @@ flow_hw_validate_action_indirect(struct rte_eth_dev *dev,\n * 0 on success, a negative errno value otherwise and rte_errno is set.\n */\n static int\n-flow_hw_validate_action_raw_encap(struct rte_eth_dev *dev __rte_unused,\n-\t\t\t\t const struct rte_flow_action *action,\n+flow_hw_validate_action_raw_encap(const struct rte_flow_action *action,\n+\t\t\t\t const struct rte_flow_action *mask,\n \t\t\t\t struct rte_flow_error *error)\n {\n-\tconst struct rte_flow_action_raw_encap *raw_encap_data = action->conf;\n+\tconst struct rte_flow_action_raw_encap *mask_conf = mask->conf;\n+\tconst struct rte_flow_action_raw_encap *action_conf = action->conf;\n \n-\tif (!raw_encap_data || !raw_encap_data->size || !raw_encap_data->data)\n+\tif (!mask_conf || !mask_conf->size)\n+\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, mask,\n+\t\t\t\t\t \"raw_encap: size must be masked\");\n+\tif (!action_conf || !action_conf->size)\n+\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, action,\n+\t\t\t\t\t \"raw_encap: invalid action configuration\");\n+\tif (mask_conf->data && !action_conf->data)\n \t\treturn rte_flow_error_set(error, EINVAL,\n \t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, action,\n-\t\t\t\t\t \"invalid raw_encap_data\");\n+\t\t\t\t\t \"raw_encap: masked data is missing\");\n \treturn 0;\n }\n \n@@ -4430,7 +4750,7 @@ mlx5_flow_hw_actions_validate(struct rte_eth_dev *dev,\n \t\t\taction_flags |= MLX5_FLOW_ACTION_DECAP;\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_RAW_ENCAP:\n-\t\t\tret = flow_hw_validate_action_raw_encap(dev, action, error);\n+\t\t\tret = flow_hw_validate_action_raw_encap(action, mask, error);\n \t\t\tif (ret < 0)\n \t\t\t\treturn ret;\n \t\t\taction_flags |= MLX5_FLOW_ACTION_ENCAP;\n", "prefixes": [] }