Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/133644/?format=api
{ "id": 133644, "url": "http://patches.dpdk.org/api/patches/133644/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20231031094244.381557-6-rongweil@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": "<20231031094244.381557-6-rongweil@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231031094244.381557-6-rongweil@nvidia.com", "date": "2023-10-31T09:42:43", "name": "[v2,5/6] net/mlx5: implement IPv6 routing push remove", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "1ddf8703670418686c40d87f0611ceac9bd97cf5", "submitter": { "id": 2223, "url": "http://patches.dpdk.org/api/people/2223/?format=api", "name": "Rongwei Liu", "email": "rongweil@nvidia.com" }, "delegate": { "id": 3268, "url": "http://patches.dpdk.org/api/users/3268/?format=api", "username": "rasland", "first_name": "Raslan", "last_name": "Darawsheh", "email": "rasland@nvidia.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20231031094244.381557-6-rongweil@nvidia.com/mbox/", "series": [ { "id": 30070, "url": "http://patches.dpdk.org/api/series/30070/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=30070", "date": "2023-10-31T09:42:39", "name": "support IPv6 extension push remove", "version": 2, "mbox": "http://patches.dpdk.org/series/30070/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/133644/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/133644/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 184D343251;\n\tTue, 31 Oct 2023 10:44:01 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 37E3A40E64;\n\tTue, 31 Oct 2023 10:43:38 +0100 (CET)", "from NAM04-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam04on2079.outbound.protection.outlook.com [40.107.102.79])\n by mails.dpdk.org (Postfix) with ESMTP id 75D7D40E68\n for <dev@dpdk.org>; Tue, 31 Oct 2023 10:43:36 +0100 (CET)", "from PH8PR02CA0013.namprd02.prod.outlook.com (2603:10b6:510:2d0::14)\n by DM8PR12MB5495.namprd12.prod.outlook.com (2603:10b6:8:33::12) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.29; Tue, 31 Oct\n 2023 09:43:34 +0000", "from SA2PEPF000015CD.namprd03.prod.outlook.com\n (2603:10b6:510:2d0:cafe::45) by PH8PR02CA0013.outlook.office365.com\n (2603:10b6:510:2d0::14) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.29 via Frontend\n Transport; Tue, 31 Oct 2023 09:43:34 +0000", "from mail.nvidia.com (216.228.117.161) by\n SA2PEPF000015CD.mail.protection.outlook.com (10.167.241.203) with Microsoft\n SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.20.6954.19 via Frontend Transport; Tue, 31 Oct 2023 09:43:33 +0000", "from rnnvmail201.nvidia.com (10.129.68.8) 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; Tue, 31 Oct\n 2023 02:43:12 -0700", "from nvidia.com (10.126.230.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.41; Tue, 31 Oct\n 2023 02:43:10 -0700" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=Z1nWkucWcKkiQPY+ATsmWDKKKDK0S4hegsHdQiW1yJ9ufT0aXmPfoSdmMF/J5XKbziwouSNWH33yh4B1AXUoWOvO+Soo3MTj53bcZgiXJZ2vCycQx5jIpEHj8egnavRVQI3cFcfA/ul7hEHyD6yFFaMhGUvbrsbTnVIdsKeugvBLb/P6dkRfkr38pwZixi0RFe+eOLrPdF06E+MpjTRhko8u66F1qHYXHTKbXwJnmH/zqb9NmATM+1R5E9KpTn0/aqw9Lo/UEUS3TnbVGSa+IxfvUUBTAYd0ZX/9b92WIQXfknw/1torlhO5LaDitKteYi64FyoxW/KUJlzoL0MGqg==", "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=mNj0chj1By+EZKBwsqhD2ojiSCrqGTGQGI4LGsrHcv8=;\n b=lmLX+1wdxRD+0sdjFmN4e00gJ3BRLDh0jZWtgPZkcSEDIpaxykpQhTHhosQP/sbZRiRhrUO3g7WWqVUGjGZ86TWsiMzW0ez028Ze+8MeR+GfVByyUaEg9ie2Qn0gHHgi4Fegyt++7E+gqeaZbnFhQqwiky8vuRyMfr7ME+eCeNc2TDMagn3vk2WOUzf6IHAo01a5+CUWXGe5CX6ZsVU/AN8Wddk2nyNXvb0t8YvTjk7iNhns2gJYqj/lezxmQbJsOMvgZ+aQdxI+jw+zD2DkEhNlkRcI19ZCxKPy8OnAhBRi7L/vPV7C+q4LafXwimmb1m7LUWXhTQp4ZD1DJhOhoA==", "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 (0)", "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=mNj0chj1By+EZKBwsqhD2ojiSCrqGTGQGI4LGsrHcv8=;\n b=XZUXRWURe5RLtOmbRxrajQZ48yVxHCWZmdCJoFEEk7Vtrsk/C1Ik5DocSfpfEFOR7TaXiHLer9cv0YclH/c466sNSSfKFdGpAwk7iwubmYRlbDOrUDpd30qoU7Y/8wOJOSGndaHIvU18qVNnkhqZxyG/U/XUbrV8zhicGaiUea2Dpvnvu1VEevnoXok/BShBCRFqeLB9c0lpNiEqMxJgtIuRzTYP9i800Jpdpnrp8ZcKuI6sN2ArHJnpLf/FVcYU8PW8v4DMhtQFj+fHbdgXWCDsYqJgQqX3b9EXL4bwLEe5IQCtzgucfoDsORCkQDd/tJcAEU9q+SJg09UaeRY4og==", "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": "Rongwei Liu <rongweil@nvidia.com>", "To": "<dev@dpdk.org>, <matan@nvidia.com>, <viacheslavo@nvidia.com>,\n <orika@nvidia.com>, <suanmingm@nvidia.com>, <thomas@monjalon.net>", "Subject": "[PATCH v2 5/6] net/mlx5: implement IPv6 routing push remove", "Date": "Tue, 31 Oct 2023 11:42:43 +0200", "Message-ID": "<20231031094244.381557-6-rongweil@nvidia.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20231031094244.381557-1-rongweil@nvidia.com>", "References": "<20230417092540.2617450-5-rongweil@nvidia.com>\n <20231031094244.381557-1-rongweil@nvidia.com>", "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 rnnvmail201.nvidia.com (10.129.68.8)", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "SA2PEPF000015CD:EE_|DM8PR12MB5495:EE_", "X-MS-Office365-Filtering-Correlation-Id": "d980ca12-d192-49b9-397f-08dbd9f5d95a", "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 qWS+7yWnsiH5RZ8s9gVcQlfYLtcDiG3qBIp8P2V6qbDvqunLihhpRk4u/7sme8LD5O5qAbaOtUvuj5ORyNVDg00hedXjQmIpcV0A19xPwisAXrIejhWTXdv1EWfTXgctWvN/vfF9rKRfSqAdTnULe1hRFxfcq0BQZl+mBRowjx45htWuM/oZe1UM15YOgX2LBcIizUHCh9bAPBOjC9LFrrNu+CvjT6zrcBi6eeRGQoA5PbFTgLAuEsoN6CqFktKPSmBjhg/KKNgFAUQqGHf7XMtua32mi3qRQxwCV7U/7IRgj+yY1PbvEoaxTPeFFAziRAMXC44k1EnviM221Q0gneZOLVGKpI/ap2+5zkaQNjPb3/A4HeSGVLDf0Rt0MQlzdQOQmDEvXLKneSQLY8t5NaiSn4uFzwVv823Ip+Ej+BW1NL+gEFxafkmtlsiOonRzObEAL1Hw/ie7stV36pJS66QFnVLJFYVF3imCi+e6GX/QH1oVBtcWhuDB66W5KV8UFPn+mG12iZWtVVILc/e0sP5V5lZ2vPYYr9kntlkx7txkU7KT9ilnnmGEUYAy0Ow/e2mE4rLEET5JzJQDPJXfLDbukaCW1fZYJ9Fq6KYNchj5VRY8vSGbkBY4XcicMGM4Px737BcGQjRDCM91wKO2Ami25bVSU9iCGurmh8cNBCSFEErFau11xPKHoMYgjet79/O12g4XwFxZsw0Owpc8Bix+fGurc1qLKLn7EzThNNSrSjj+hWOZO4k7+cRsAePVWtkvqfsDgR0R36hFCzIT2719GRpVW+gWFX5yPIq1QVU=", "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)(136003)(376002)(346002)(39860400002)(396003)(230922051799003)(230173577357003)(230273577357003)(64100799003)(451199024)(1800799009)(82310400011)(186009)(46966006)(40470700004)(36840700001)(30864003)(1076003)(26005)(2616005)(16526019)(6286002)(40460700003)(55016003)(40480700001)(36756003)(86362001)(356005)(7636003)(82740400003)(336012)(2906002)(83380400001)(478600001)(7696005)(36860700001)(6666004)(47076005)(8936002)(8676002)(316002)(41300700001)(70206006)(70586007)(110136005)(5660300002)(426003);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "31 Oct 2023 09:43:33.8434 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n d980ca12-d192-49b9-397f-08dbd9f5d95a", "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 SA2PEPF000015CD.namprd03.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "DM8PR12MB5495", "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": "Reserve the push data buffer for each job and the maximum\nlength is set to 128 for now.\n\nOnly supports type IPPROTO_ROUTING when translating the rte\nflow action.\n\nRemove actions must be shared globally and only supports next layer\nas TCP or UDP.\n\nSigned-off-by: Rongwei Liu <rongweil@nvidia.com>\nAcked-by: Ori Kam <orika@nvidia.com>\nAcked-by: Suanming Mou <suanmingm@nvidia.com>\n---\n doc/guides/nics/features/mlx5.ini | 2 +\n doc/guides/nics/mlx5.rst | 11 +-\n doc/guides/rel_notes/release_23_11.rst | 2 +\n drivers/net/mlx5/mlx5.h | 1 +\n drivers/net/mlx5/mlx5_flow.h | 21 +-\n drivers/net/mlx5/mlx5_flow_hw.c | 282 ++++++++++++++++++++++++-\n 6 files changed, 309 insertions(+), 10 deletions(-)", "diff": "diff --git a/doc/guides/nics/features/mlx5.ini b/doc/guides/nics/features/mlx5.ini\nindex 0ed9a6aefc..0739fe9d63 100644\n--- a/doc/guides/nics/features/mlx5.ini\n+++ b/doc/guides/nics/features/mlx5.ini\n@@ -108,6 +108,8 @@ flag = Y\n inc_tcp_ack = Y\n inc_tcp_seq = Y\n indirect_list = Y\n+ipv6_ext_push = Y\n+ipv6_ext_remove = Y\n jump = Y\n mark = Y\n meter = Y\ndiff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst\nindex be5054e68a..955dedf3db 100644\n--- a/doc/guides/nics/mlx5.rst\n+++ b/doc/guides/nics/mlx5.rst\n@@ -148,7 +148,9 @@ Features\n - Matching on GTP extension header with raw encap/decap action.\n - Matching on Geneve TLV option header with raw encap/decap action.\n - Matching on ESP header SPI field.\n+- Matching on flex item with specific pattern.\n - Matching on InfiniBand BTH.\n+- Modify flex item field.\n - Modify IPv4/IPv6 ECN field.\n - RSS support in sample action.\n - E-Switch mirroring and jump.\n@@ -166,7 +168,7 @@ Features\n - Sub-Function.\n - Matching on represented port.\n - Matching on aggregated affinity.\n-\n+- Push or remove IPv6 routing extension.\n \n Limitations\n -----------\n@@ -759,6 +761,13 @@ Limitations\n to the representor of the source virtual port (SF/VF), while if it is disabled, the\n traffic will be routed based on the steering rules in the ingress domain.\n \n+- IPv6 routing extension push or remove:\n+\n+ - Supported only with HW Steering enabled (``dv_flow_en`` = 2).\n+ - Supported in non-zero group (No limits on transfer domain if `fdb_def_rule_en` = 1 which is default).\n+ - Only supports TCP or UDP as next layer.\n+ - IPv6 routing header must be the only present extension.\n+ - Not supported on guest port.\n \n Statistics\n ----------\ndiff --git a/doc/guides/rel_notes/release_23_11.rst b/doc/guides/rel_notes/release_23_11.rst\nindex 322d8b1e0e..78e774cf02 100644\n--- a/doc/guides/rel_notes/release_23_11.rst\n+++ b/doc/guides/rel_notes/release_23_11.rst\n@@ -150,6 +150,8 @@ New Features\n * Added support for ``RTE_FLOW_ACTION_TYPE_INDIRECT_LIST`` flow action.\n * Added support for ``RTE_FLOW_ITEM_TYPE_PTYPE`` flow item.\n * Added support for ``RTE_FLOW_ACTION_TYPE_PORT_REPRESENTOR`` flow action and mirror.\n+ * Added support for ``RTE_FLOW_ACTION_TYPE_IPV6_EXT_PUSH`` flow action.\n+ * Added support for ``RTE_FLOW_ACTION_TYPE_IPV6_EXT_REMOVE`` flow action.\n \n * **Updated Solarflare net driver.**\n \ndiff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex f13a56ee9e..277bbbf407 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -373,6 +373,7 @@ struct mlx5_hw_q_job {\n \t};\n \tvoid *user_data; /* Job user data. */\n \tuint8_t *encap_data; /* Encap data. */\n+\tuint8_t *push_data; /* IPv6 routing push data. */\n \tstruct mlx5_modification_cmd *mhdr_cmd;\n \tstruct rte_flow_item *items;\n \tunion {\ndiff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h\nindex 43608e15d2..c7be1f3553 100644\n--- a/drivers/net/mlx5/mlx5_flow.h\n+++ b/drivers/net/mlx5/mlx5_flow.h\n@@ -363,6 +363,8 @@ enum mlx5_feature_name {\n #define MLX5_FLOW_ACTION_INDIRECT_AGE (1ull << 44)\n #define MLX5_FLOW_ACTION_QUOTA (1ull << 46)\n #define MLX5_FLOW_ACTION_PORT_REPRESENTOR (1ull << 47)\n+#define MLX5_FLOW_ACTION_IPV6_ROUTING_REMOVE (1ull << 48)\n+#define MLX5_FLOW_ACTION_IPV6_ROUTING_PUSH (1ull << 49)\n \n #define MLX5_FLOW_DROP_INCLUSIVE_ACTIONS \\\n \t(MLX5_FLOW_ACTION_COUNT | MLX5_FLOW_ACTION_SAMPLE | MLX5_FLOW_ACTION_AGE)\n@@ -1269,6 +1271,8 @@ typedef int\n \t\t\t const struct rte_flow_action *,\n \t\t\t struct mlx5dr_rule_action *);\n \n+#define MLX5_MHDR_MAX_CMD ((MLX5_MAX_MODIFY_NUM) * 2 + 1)\n+\n /* rte flow action translate to DR action struct. */\n struct mlx5_action_construct_data {\n \tLIST_ENTRY(mlx5_action_construct_data) next;\n@@ -1315,6 +1319,10 @@ struct mlx5_action_construct_data {\n \t\tstruct {\n \t\t\tcnt_id_t id;\n \t\t} shared_counter;\n+\t\tstruct {\n+\t\t\t/* IPv6 extension push data len. */\n+\t\t\tuint16_t len;\n+\t\t} ipv6_ext;\n \t\tstruct {\n \t\t\tuint32_t id;\n \t\t\tuint32_t conf_masked:1;\n@@ -1359,6 +1367,7 @@ struct rte_flow_actions_template {\n \tuint16_t *src_off; /* RTE action displacement from app. template */\n \tuint16_t reformat_off; /* Offset of DR reformat action. */\n \tuint16_t mhdr_off; /* Offset of DR modify header action. */\n+\tuint16_t recom_off; /* Offset of DR IPv6 routing push remove action. */\n \tuint32_t refcnt; /* Reference counter. */\n \tuint8_t flex_item; /* flex item index. */\n };\n@@ -1384,7 +1393,14 @@ struct mlx5_hw_encap_decap_action {\n \tuint8_t data[]; /* Action data. */\n };\n \n-#define MLX5_MHDR_MAX_CMD ((MLX5_MAX_MODIFY_NUM) * 2 + 1)\n+/* Push remove action struct. */\n+struct mlx5_hw_push_remove_action {\n+\tstruct mlx5dr_action *action; /* Action object. */\n+\t/* Is push_remove action shared across flows in table. */\n+\tuint8_t shared;\n+\tsize_t data_size; /* Action metadata size. */\n+\tuint8_t data[]; /* Action data. */\n+};\n \n /* Modify field action struct. */\n struct mlx5_hw_modify_header_action {\n@@ -1415,6 +1431,9 @@ struct mlx5_hw_actions {\n \t/* Encap/Decap action. */\n \tstruct mlx5_hw_encap_decap_action *encap_decap;\n \tuint16_t encap_decap_pos; /* Encap/Decap action position. */\n+\t/* Push/remove action. */\n+\tstruct mlx5_hw_push_remove_action *push_remove;\n+\tuint16_t push_remove_pos; /* Push/remove action position. */\n \tuint32_t mark:1; /* Indicate the mark action. */\n \tcnt_id_t cnt_id; /* Counter id. */\n \tuint32_t mtr_id; /* Meter id. */\ndiff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c\nindex 977751394e..592d436099 100644\n--- a/drivers/net/mlx5/mlx5_flow_hw.c\n+++ b/drivers/net/mlx5/mlx5_flow_hw.c\n@@ -624,6 +624,12 @@ __flow_hw_action_template_destroy(struct rte_eth_dev *dev,\n \t\tmlx5_free(acts->encap_decap);\n \t\tacts->encap_decap = NULL;\n \t}\n+\tif (acts->push_remove) {\n+\t\tif (acts->push_remove->action)\n+\t\t\tmlx5dr_action_destroy(acts->push_remove->action);\n+\t\tmlx5_free(acts->push_remove);\n+\t\tacts->push_remove = NULL;\n+\t}\n \tif (acts->mhdr) {\n \t\tflow_hw_template_destroy_mhdr_action(acts->mhdr);\n \t\tmlx5_free(acts->mhdr);\n@@ -761,6 +767,44 @@ __flow_hw_act_data_encap_append(struct mlx5_priv *priv,\n \treturn 0;\n }\n \n+/**\n+ * Append dynamic push action to the dynamic action list.\n+ *\n+ * @param[in] dev\n+ * Pointer to the port.\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] len\n+ * Length of the data to be updated.\n+ *\n+ * @return\n+ * Data pointer on success, NULL otherwise and rte_errno is set.\n+ */\n+static __rte_always_inline void *\n+__flow_hw_act_data_push_append(struct rte_eth_dev *dev,\n+\t\t\t struct mlx5_hw_actions *acts,\n+\t\t\t enum rte_flow_action_type type,\n+\t\t\t uint16_t action_src,\n+\t\t\t uint16_t action_dst,\n+\t\t\t uint16_t len)\n+{\n+\tstruct mlx5_action_construct_data *act_data;\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\n+\tact_data = __flow_hw_act_data_alloc(priv, type, action_src, action_dst);\n+\tif (!act_data)\n+\t\treturn NULL;\n+\tact_data->ipv6_ext.len = len;\n+\tLIST_INSERT_HEAD(&acts->act_list, act_data, next);\n+\treturn act_data;\n+}\n+\n static __rte_always_inline int\n __flow_hw_act_data_hdr_modify_append(struct mlx5_priv *priv,\n \t\t\t\t struct mlx5_hw_actions *acts,\n@@ -1924,6 +1968,82 @@ mlx5_tbl_translate_modify_header(struct rte_eth_dev *dev,\n \treturn 0;\n }\n \n+\n+static int\n+mlx5_create_ipv6_ext_reformat(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 uint8_t *push_data, uint8_t *push_data_m,\n+\t\t\t size_t push_size, uint16_t recom_src,\n+\t\t\t enum mlx5dr_action_type recom_type)\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 type = get_mlx5dr_table_type(attr);\n+\tstruct mlx5_action_construct_data *act_data;\n+\tstruct mlx5dr_action_reformat_header hdr = {0};\n+\tuint32_t flag, bulk = 0;\n+\n+\tflag = mlx5_hw_act_flag[!!attr->group][type];\n+\tacts->push_remove = mlx5_malloc(MLX5_MEM_ZERO,\n+\t\t\t\t\tsizeof(*acts->push_remove) + push_size,\n+\t\t\t\t\t0, SOCKET_ID_ANY);\n+\tif (!acts->push_remove)\n+\t\treturn -ENOMEM;\n+\n+\tswitch (recom_type) {\n+\tcase MLX5DR_ACTION_TYP_PUSH_IPV6_ROUTE_EXT:\n+\t\tif (!push_data || !push_size)\n+\t\t\tgoto err1;\n+\t\tif (!push_data_m) {\n+\t\t\tbulk = rte_log2_u32(table_attr->nb_flows);\n+\t\t} else {\n+\t\t\tflag |= MLX5DR_ACTION_FLAG_SHARED;\n+\t\t\tacts->push_remove->shared = 1;\n+\t\t}\n+\t\tacts->push_remove->data_size = push_size;\n+\t\tmemcpy(acts->push_remove->data, push_data, push_size);\n+\t\thdr.data = push_data;\n+\t\thdr.sz = push_size;\n+\t\tbreak;\n+\tcase MLX5DR_ACTION_TYP_POP_IPV6_ROUTE_EXT:\n+\t\tflag |= MLX5DR_ACTION_FLAG_SHARED;\n+\t\tacts->push_remove->shared = 1;\n+\t\tbreak;\n+\tdefault:\n+\t\tbreak;\n+\t}\n+\n+\tacts->push_remove->action =\n+\t\tmlx5dr_action_create_reformat_ipv6_ext(priv->dr_ctx,\n+\t\t\t\trecom_type, &hdr, bulk, flag);\n+\tif (!acts->push_remove->action)\n+\t\tgoto err1;\n+\tacts->rule_acts[at->recom_off].action = acts->push_remove->action;\n+\tacts->rule_acts[at->recom_off].ipv6_ext.header = acts->push_remove->data;\n+\tacts->rule_acts[at->recom_off].ipv6_ext.offset = 0;\n+\tacts->push_remove_pos = at->recom_off;\n+\tif (!acts->push_remove->shared) {\n+\t\tact_data = __flow_hw_act_data_push_append(dev, acts,\n+\t\t\t\tRTE_FLOW_ACTION_TYPE_IPV6_EXT_PUSH,\n+\t\t\t\trecom_src, at->recom_off, push_size);\n+\t\tif (!act_data)\n+\t\t\tgoto err;\n+\t}\n+\treturn 0;\n+err:\n+\tif (acts->push_remove->action)\n+\t\tmlx5dr_action_destroy(acts->push_remove->action);\n+err1:\n+\tif (acts->push_remove) {\n+\t\tmlx5_free(acts->push_remove);\n+\t\tacts->push_remove = NULL;\n+\t}\n+\treturn -EINVAL;\n+}\n+\n /**\n * Translate rte_flow actions to DR action.\n *\n@@ -1957,19 +2077,24 @@ __flow_hw_actions_translate(struct rte_eth_dev *dev,\n {\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n \tconst struct rte_flow_template_table_attr *table_attr = &cfg->attr;\n+\tstruct mlx5_hca_flex_attr *hca_attr = &priv->sh->cdev->config.hca_attr.flex;\n \tconst struct rte_flow_attr *attr = &table_attr->flow_attr;\n \tstruct rte_flow_action *actions = at->actions;\n \tstruct rte_flow_action *masks = at->masks;\n \tenum mlx5dr_action_type refmt_type = MLX5DR_ACTION_TYP_LAST;\n+\tenum mlx5dr_action_type recom_type = MLX5DR_ACTION_TYP_LAST;\n \tconst struct rte_flow_action_raw_encap *raw_encap_data;\n+\tconst struct rte_flow_action_ipv6_ext_push *ipv6_ext_data;\n \tconst struct rte_flow_item *enc_item = NULL, *enc_item_m = NULL;\n-\tuint16_t reformat_src = 0;\n+\tuint16_t reformat_src = 0, recom_src = 0;\n \tuint8_t *encap_data = NULL, *encap_data_m = NULL;\n-\tsize_t data_size = 0;\n+\tuint8_t *push_data = NULL, *push_data_m = NULL;\n+\tsize_t data_size = 0, push_size = 0;\n \tstruct mlx5_hw_modify_header_action mhdr = { 0 };\n \tbool actions_end = false;\n \tuint32_t type;\n \tbool reformat_used = false;\n+\tbool recom_used = false;\n \tunsigned int of_vlan_offset;\n \tuint16_t jump_pos;\n \tuint32_t ct_idx;\n@@ -2175,6 +2300,36 @@ __flow_hw_actions_translate(struct rte_eth_dev *dev,\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_IPV6_EXT_PUSH:\n+\t\t\tif (!hca_attr->query_match_sample_info || !hca_attr->parse_graph_anchor ||\n+\t\t\t !priv->sh->srh_flex_parser.flex.mapnum) {\n+\t\t\t\tDRV_LOG(ERR, \"SRv6 anchor is not supported.\");\n+\t\t\t\tgoto err;\n+\t\t\t}\n+\t\t\tMLX5_ASSERT(!recom_used && !recom_type);\n+\t\t\trecom_used = true;\n+\t\t\trecom_type = MLX5DR_ACTION_TYP_PUSH_IPV6_ROUTE_EXT;\n+\t\t\tipv6_ext_data =\n+\t\t\t\t(const struct rte_flow_action_ipv6_ext_push *)masks->conf;\n+\t\t\tif (ipv6_ext_data)\n+\t\t\t\tpush_data_m = ipv6_ext_data->data;\n+\t\t\tipv6_ext_data =\n+\t\t\t\t(const struct rte_flow_action_ipv6_ext_push *)actions->conf;\n+\t\t\tif (ipv6_ext_data) {\n+\t\t\t\tpush_data = ipv6_ext_data->data;\n+\t\t\t\tpush_size = ipv6_ext_data->size;\n+\t\t\t}\n+\t\t\trecom_src = src_pos;\n+\t\t\tbreak;\n+\t\tcase RTE_FLOW_ACTION_TYPE_IPV6_EXT_REMOVE:\n+\t\t\tif (!hca_attr->query_match_sample_info || !hca_attr->parse_graph_anchor ||\n+\t\t\t !priv->sh->srh_flex_parser.flex.mapnum) {\n+\t\t\t\tDRV_LOG(ERR, \"SRv6 anchor is not supported.\");\n+\t\t\t\tgoto err;\n+\t\t\t}\n+\t\t\trecom_used = true;\n+\t\t\trecom_type = MLX5DR_ACTION_TYP_POP_IPV6_ROUTE_EXT;\n+\t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_SEND_TO_KERNEL:\n \t\t\tflow_hw_translate_group(dev, cfg, attr->group,\n \t\t\t\t\t\t&target_grp, error);\n@@ -2322,6 +2477,14 @@ __flow_hw_actions_translate(struct rte_eth_dev *dev,\n \t\tif (ret)\n \t\t\tgoto err;\n \t}\n+\tif (recom_used) {\n+\t\tMLX5_ASSERT(at->recom_off != UINT16_MAX);\n+\t\tret = mlx5_create_ipv6_ext_reformat(dev, cfg, acts, at, push_data,\n+\t\t\t\t\t\t push_data_m, push_size, recom_src,\n+\t\t\t\t\t\t recom_type);\n+\t\tif (ret)\n+\t\t\tgoto err;\n+\t}\n \treturn 0;\n err:\n \terr = rte_errno;\n@@ -2719,11 +2882,13 @@ flow_hw_actions_construct(struct rte_eth_dev *dev,\n \tconst struct mlx5_hw_actions *hw_acts = &hw_at->acts;\n \tconst struct rte_flow_action *action;\n \tconst struct rte_flow_action_raw_encap *raw_encap_data;\n+\tconst struct rte_flow_action_ipv6_ext_push *ipv6_push;\n \tconst struct rte_flow_item *enc_item = NULL;\n \tconst struct rte_flow_action_ethdev *port_action = NULL;\n \tconst struct rte_flow_action_meter *meter = NULL;\n \tconst struct rte_flow_action_age *age = NULL;\n \tuint8_t *buf = job->encap_data;\n+\tuint8_t *push_buf = job->push_data;\n \tstruct rte_flow_attr attr = {\n \t\t\t.ingress = 1,\n \t};\n@@ -2854,6 +3019,13 @@ flow_hw_actions_construct(struct rte_eth_dev *dev,\n \t\t\tMLX5_ASSERT(raw_encap_data->size ==\n \t\t\t\t act_data->encap.len);\n \t\t\tbreak;\n+\t\tcase RTE_FLOW_ACTION_TYPE_IPV6_EXT_PUSH:\n+\t\t\tipv6_push =\n+\t\t\t\t(const struct rte_flow_action_ipv6_ext_push *)action->conf;\n+\t\t\trte_memcpy((void *)push_buf, ipv6_push->data,\n+\t\t\t\t act_data->ipv6_ext.len);\n+\t\t\tMLX5_ASSERT(ipv6_push->size == act_data->ipv6_ext.len);\n+\t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_MODIFY_FIELD:\n \t\t\tif (action->type == RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID)\n \t\t\t\tret = flow_hw_set_vlan_vid_construct(dev, job,\n@@ -3010,6 +3182,11 @@ flow_hw_actions_construct(struct rte_eth_dev *dev,\n \t\t\t\tjob->flow->res_idx - 1;\n \t\trule_acts[hw_acts->encap_decap_pos].reformat.data = buf;\n \t}\n+\tif (hw_acts->push_remove && !hw_acts->push_remove->shared) {\n+\t\trule_acts[hw_acts->push_remove_pos].ipv6_ext.offset =\n+\t\t\t\tjob->flow->res_idx - 1;\n+\t\trule_acts[hw_acts->push_remove_pos].ipv6_ext.header = push_buf;\n+\t}\n \tif (mlx5_hws_cnt_id_valid(hw_acts->cnt_id))\n \t\tjob->flow->cnt_id = hw_acts->cnt_id;\n \treturn 0;\n@@ -5113,6 +5290,38 @@ flow_hw_validate_action_indirect(struct rte_eth_dev *dev,\n \treturn 0;\n }\n \n+/**\n+ * Validate ipv6_ext_push action.\n+ *\n+ * @param[in] dev\n+ * Pointer to rte_eth_dev structure.\n+ * @param[in] action\n+ * Pointer to the indirect action.\n+ * @param[out] error\n+ * Pointer to error structure.\n+ *\n+ * @return\n+ * 0 on success, a negative errno value otherwise and rte_errno is set.\n+ */\n+static int\n+flow_hw_validate_action_ipv6_ext_push(struct rte_eth_dev *dev __rte_unused,\n+\t\t\t\t const struct rte_flow_action *action,\n+\t\t\t\t struct rte_flow_error *error)\n+{\n+\tconst struct rte_flow_action_ipv6_ext_push *raw_push_data = action->conf;\n+\n+\tif (!raw_push_data || !raw_push_data->size || !raw_push_data->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 ipv6_ext_push data\");\n+\tif (raw_push_data->type != IPPROTO_ROUTING ||\n+\t raw_push_data->size > MLX5_PUSH_MAX_LEN)\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 \"Unsupported ipv6_ext_push type or length\");\n+\treturn 0;\n+}\n+\n /**\n * Validate raw_encap action.\n *\n@@ -5340,6 +5549,7 @@ mlx5_flow_hw_actions_validate(struct rte_eth_dev *dev,\n #endif\n \tuint16_t i;\n \tint ret;\n+\tconst struct rte_flow_action_ipv6_ext_remove *remove_data;\n \n \t/* FDB actions are only valid to proxy port. */\n \tif (attr->transfer && (!priv->sh->config.dv_esw_en || !priv->master))\n@@ -5436,6 +5646,21 @@ mlx5_flow_hw_actions_validate(struct rte_eth_dev *dev,\n \t\t\t/* TODO: Validation logic */\n \t\t\taction_flags |= MLX5_FLOW_ACTION_DECAP;\n \t\t\tbreak;\n+\t\tcase RTE_FLOW_ACTION_TYPE_IPV6_EXT_PUSH:\n+\t\t\tret = flow_hw_validate_action_ipv6_ext_push(dev, action, error);\n+\t\t\tif (ret < 0)\n+\t\t\t\treturn ret;\n+\t\t\taction_flags |= MLX5_FLOW_ACTION_IPV6_ROUTING_PUSH;\n+\t\t\tbreak;\n+\t\tcase RTE_FLOW_ACTION_TYPE_IPV6_EXT_REMOVE:\n+\t\t\tremove_data = action->conf;\n+\t\t\t/* Remove action must be shared. */\n+\t\t\tif (remove_data->type != IPPROTO_ROUTING || !mask) {\n+\t\t\t\tDRV_LOG(ERR, \"Only supports shared IPv6 routing remove\");\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\t\t\taction_flags |= MLX5_FLOW_ACTION_IPV6_ROUTING_REMOVE;\n+\t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_METER:\n \t\t\t/* TODO: Validation logic */\n \t\t\taction_flags |= MLX5_FLOW_ACTION_METER;\n@@ -5551,6 +5776,8 @@ static enum mlx5dr_action_type mlx5_hw_dr_action_types[] = {\n \t[RTE_FLOW_ACTION_TYPE_OF_POP_VLAN] = MLX5DR_ACTION_TYP_POP_VLAN,\n \t[RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN] = MLX5DR_ACTION_TYP_PUSH_VLAN,\n \t[RTE_FLOW_ACTION_TYPE_SEND_TO_KERNEL] = MLX5DR_ACTION_TYP_DEST_ROOT,\n+\t[RTE_FLOW_ACTION_TYPE_IPV6_EXT_PUSH] = MLX5DR_ACTION_TYP_PUSH_IPV6_ROUTE_EXT,\n+\t[RTE_FLOW_ACTION_TYPE_IPV6_EXT_REMOVE] = MLX5DR_ACTION_TYP_POP_IPV6_ROUTE_EXT,\n };\n \n static inline void\n@@ -5648,6 +5875,8 @@ flow_hw_template_actions_list(struct rte_flow_actions_template *at,\n /**\n * Create DR action template based on a provided sequence of flow actions.\n *\n+ * @param[in] dev\n+ * Pointer to the rte_eth_dev structure.\n * @param[in] at\n * Pointer to flow actions template to be updated.\n *\n@@ -5656,7 +5885,8 @@ flow_hw_template_actions_list(struct rte_flow_actions_template *at,\n * NULL otherwise.\n */\n static struct mlx5dr_action_template *\n-flow_hw_dr_actions_template_create(struct rte_flow_actions_template *at)\n+flow_hw_dr_actions_template_create(struct rte_eth_dev *dev,\n+\t\t\t\t struct rte_flow_actions_template *at)\n {\n \tstruct mlx5dr_action_template *dr_template;\n \tenum mlx5dr_action_type action_types[MLX5_HW_MAX_ACTS] = { MLX5DR_ACTION_TYP_LAST };\n@@ -5665,8 +5895,11 @@ flow_hw_dr_actions_template_create(struct rte_flow_actions_template *at)\n \tenum mlx5dr_action_type reformat_act_type = MLX5DR_ACTION_TYP_REFORMAT_TNL_L2_TO_L2;\n \tuint16_t reformat_off = UINT16_MAX;\n \tuint16_t mhdr_off = UINT16_MAX;\n+\tuint16_t recom_off = UINT16_MAX;\n \tuint16_t cnt_off = UINT16_MAX;\n+\tenum mlx5dr_action_type recom_type = MLX5DR_ACTION_TYP_LAST;\n \tint ret;\n+\n \tfor (i = 0, curr_off = 0; at->actions[i].type != RTE_FLOW_ACTION_TYPE_END; ++i) {\n \t\tconst struct rte_flow_action_raw_encap *raw_encap_data;\n \t\tsize_t data_size;\n@@ -5698,6 +5931,16 @@ flow_hw_dr_actions_template_create(struct rte_flow_actions_template *at)\n \t\t\treformat_off = curr_off++;\n \t\t\treformat_act_type = mlx5_hw_dr_action_types[at->actions[i].type];\n \t\t\tbreak;\n+\t\tcase RTE_FLOW_ACTION_TYPE_IPV6_EXT_PUSH:\n+\t\t\tMLX5_ASSERT(recom_off == UINT16_MAX);\n+\t\t\trecom_type = MLX5DR_ACTION_TYP_PUSH_IPV6_ROUTE_EXT;\n+\t\t\trecom_off = curr_off++;\n+\t\t\tbreak;\n+\t\tcase RTE_FLOW_ACTION_TYPE_IPV6_EXT_REMOVE:\n+\t\t\tMLX5_ASSERT(recom_off == UINT16_MAX);\n+\t\t\trecom_type = MLX5DR_ACTION_TYP_POP_IPV6_ROUTE_EXT;\n+\t\t\trecom_off = curr_off++;\n+\t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_RAW_ENCAP:\n \t\t\traw_encap_data = at->actions[i].conf;\n \t\t\tdata_size = raw_encap_data->size;\n@@ -5770,11 +6013,25 @@ flow_hw_dr_actions_template_create(struct rte_flow_actions_template *at)\n \t\tat->reformat_off = reformat_off;\n \t\taction_types[reformat_off] = reformat_act_type;\n \t}\n+\tif (recom_off != UINT16_MAX) {\n+\t\tat->recom_off = recom_off;\n+\t\taction_types[recom_off] = recom_type;\n+\t}\n \tdr_template = mlx5dr_action_template_create(action_types);\n-\tif (dr_template)\n+\tif (dr_template) {\n \t\tat->dr_actions_num = curr_off;\n-\telse\n+\t} else {\n \t\tDRV_LOG(ERR, \"Failed to create DR action template: %d\", rte_errno);\n+\t\treturn NULL;\n+\t}\n+\t/* Create srh flex parser for remove anchor. */\n+\tif ((recom_type == MLX5DR_ACTION_TYP_POP_IPV6_ROUTE_EXT ||\n+\t recom_type == MLX5DR_ACTION_TYP_PUSH_IPV6_ROUTE_EXT) &&\n+\t mlx5_alloc_srh_flex_parser(dev)) {\n+\t\tDRV_LOG(ERR, \"Failed to create srv6 flex parser\");\n+\t\tclaim_zero(mlx5dr_action_template_destroy(dr_template));\n+\t\treturn NULL;\n+\t}\n \treturn dr_template;\n err_actions_num:\n \tDRV_LOG(ERR, \"Number of HW actions (%u) exceeded maximum (%u) allowed in template\",\n@@ -6183,7 +6440,7 @@ flow_hw_actions_template_create(struct rte_eth_dev *dev,\n \t\t\tbreak;\n \t\t}\n \t}\n-\tat->tmpl = flow_hw_dr_actions_template_create(at);\n+\tat->tmpl = flow_hw_dr_actions_template_create(dev, at);\n \tif (!at->tmpl)\n \t\tgoto error;\n \tat->action_flags = action_flags;\n@@ -6220,6 +6477,9 @@ flow_hw_actions_template_destroy(struct rte_eth_dev *dev,\n \t\t\t\t struct rte_flow_actions_template *template,\n \t\t\t\t struct rte_flow_error *error __rte_unused)\n {\n+\tuint64_t flag = MLX5_FLOW_ACTION_IPV6_ROUTING_REMOVE |\n+\t\t\tMLX5_FLOW_ACTION_IPV6_ROUTING_PUSH;\n+\n \tif (__atomic_load_n(&template->refcnt, __ATOMIC_RELAXED) > 1) {\n \t\tDRV_LOG(WARNING, \"Action template %p is still in use.\",\n \t\t\t(void *)template);\n@@ -6228,6 +6488,8 @@ flow_hw_actions_template_destroy(struct rte_eth_dev *dev,\n \t\t\t\t NULL,\n \t\t\t\t \"action template in using\");\n \t}\n+\tif (template->action_flags & flag)\n+\t\tmlx5_free_srh_flex_parser(dev);\n \tLIST_REMOVE(template, next);\n \tflow_hw_flex_item_release(dev, &template->flex_item);\n \tif (template->tmpl)\n@@ -8796,6 +9058,7 @@ flow_hw_configure(struct rte_eth_dev *dev,\n \t\tmem_size += (sizeof(struct mlx5_hw_q_job *) +\n \t\t\t sizeof(struct mlx5_hw_q_job) +\n \t\t\t sizeof(uint8_t) * MLX5_ENCAP_MAX_LEN +\n+\t\t\t sizeof(uint8_t) * MLX5_PUSH_MAX_LEN +\n \t\t\t sizeof(struct mlx5_modification_cmd) *\n \t\t\t MLX5_MHDR_MAX_CMD +\n \t\t\t sizeof(struct rte_flow_item) *\n@@ -8811,7 +9074,7 @@ flow_hw_configure(struct rte_eth_dev *dev,\n \t}\n \tfor (i = 0; i < nb_q_updated; i++) {\n \t\tchar mz_name[RTE_MEMZONE_NAMESIZE];\n-\t\tuint8_t *encap = NULL;\n+\t\tuint8_t *encap = NULL, *push = NULL;\n \t\tstruct mlx5_modification_cmd *mhdr_cmd = NULL;\n \t\tstruct rte_flow_item *items = NULL;\n \t\tstruct rte_flow_hw *upd_flow = NULL;\n@@ -8831,13 +9094,16 @@ flow_hw_configure(struct rte_eth_dev *dev,\n \t\t\t &job[_queue_attr[i]->size];\n \t\tencap = (uint8_t *)\n \t\t\t &mhdr_cmd[_queue_attr[i]->size * MLX5_MHDR_MAX_CMD];\n-\t\titems = (struct rte_flow_item *)\n+\t\tpush = (uint8_t *)\n \t\t\t &encap[_queue_attr[i]->size * MLX5_ENCAP_MAX_LEN];\n+\t\titems = (struct rte_flow_item *)\n+\t\t\t &push[_queue_attr[i]->size * MLX5_PUSH_MAX_LEN];\n \t\tupd_flow = (struct rte_flow_hw *)\n \t\t\t&items[_queue_attr[i]->size * MLX5_HW_MAX_ITEMS];\n \t\tfor (j = 0; j < _queue_attr[i]->size; j++) {\n \t\t\tjob[j].mhdr_cmd = &mhdr_cmd[j * MLX5_MHDR_MAX_CMD];\n \t\t\tjob[j].encap_data = &encap[j * MLX5_ENCAP_MAX_LEN];\n+\t\t\tjob[j].push_data = &push[j * MLX5_PUSH_MAX_LEN];\n \t\t\tjob[j].items = &items[j * MLX5_HW_MAX_ITEMS];\n \t\t\tjob[j].upd_flow = &upd_flow[j];\n \t\t\tpriv->hw_q[i].job[j] = &job[j];\n", "prefixes": [ "v2", "5/6" ] }