Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/134765/?format=api
{ "id": 134765, "url": "https://patches.dpdk.org/api/patches/134765/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20231203112543.844014-21-michaelba@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": "<20231203112543.844014-21-michaelba@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231203112543.844014-21-michaelba@nvidia.com", "date": "2023-12-03T11:25:40", "name": "[v1,20/23] net/mlx5: add GENEVE option support for profile 0", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "de2d514ae25406a76f918ee144962f9e3ab94249", "submitter": { "id": 1949, "url": "https://patches.dpdk.org/api/people/1949/?format=api", "name": "Michael Baum", "email": "michaelba@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/20231203112543.844014-21-michaelba@nvidia.com/mbox/", "series": [ { "id": 30433, "url": "https://patches.dpdk.org/api/series/30433/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=30433", "date": "2023-12-03T11:25:23", "name": "net/mlx5: support Geneve and options for HWS", "version": 1, "mbox": "https://patches.dpdk.org/series/30433/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/134765/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/134765/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 779134365F;\n\tSun, 3 Dec 2023 12:28:35 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 4958D40EDF;\n\tSun, 3 Dec 2023 12:26:51 +0100 (CET)", "from NAM04-BN8-obe.outbound.protection.outlook.com\n (mail-bn8nam04on2081.outbound.protection.outlook.com [40.107.100.81])\n by mails.dpdk.org (Postfix) with ESMTP id DE3E740E8A\n for <dev@dpdk.org>; Sun, 3 Dec 2023 12:26:47 +0100 (CET)", "from DS7PR03CA0018.namprd03.prod.outlook.com (2603:10b6:5:3b8::23)\n by CH3PR12MB9220.namprd12.prod.outlook.com (2603:10b6:610:198::13) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.32; Sun, 3 Dec\n 2023 11:26:45 +0000", "from DS1PEPF0001709B.namprd05.prod.outlook.com\n (2603:10b6:5:3b8:cafe::9c) by DS7PR03CA0018.outlook.office365.com\n (2603:10b6:5:3b8::23) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.31 via Frontend\n Transport; Sun, 3 Dec 2023 11:26:45 +0000", "from mail.nvidia.com (216.228.117.161) by\n DS1PEPF0001709B.mail.protection.outlook.com (10.167.18.105) with Microsoft\n SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.20.7068.20 via Frontend Transport; Sun, 3 Dec 2023 11:26:45 +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; Sun, 3 Dec 2023\n 03:26:39 -0800", "from rnnvmail205.nvidia.com (10.129.68.10) 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; Sun, 3 Dec 2023\n 03:26:38 -0800", "from nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.10) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41 via Frontend\n Transport; Sun, 3 Dec 2023 03:26:37 -0800" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=ixZ8U3mXmxU4jwfiv8/NGseKDylxnpd0f21UozvnZRGvp536AAodkscCnIRA+cf3mAUQGmUPVzvpJ1ctlBkdxqZnqnboQh5FPopRPBp4SMJLtL14c+5Ga3esOmIGy+K8KanUmbHsWUTNBKCIQ6vtHd2DlzWVaijsZLES6Ga7hpa++uMwgpfp9e6SzbdSbCbcZ9Tko+9m/uFSB+KU/hrLWLkjScUIkjcK9Z7xOpkrgQv913bpjwFH7CPfZIbm+WHIlAEWVIy5r1YddI2aQ6QYpAgpRQthH9t5avBneiWYqsOu2mUqFVL//YR5mpLiN/CdO0CfzJ/Th4mRCtIM3t08rw==", "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=2ZpP9tPwjN0ZtNt1fk/wdglsPcL/PT+GaQx5g/6PkKk=;\n b=kwULWnaZhArup+lnoR+fJYNPSTd5NG1bGTmEMYqSnSRXW6Fvj2Y54tkTmZhPII1pWf1NZJZTZRIBkK2gthS8Moo/w5mrd2bNUvC60o9tpdbrbGgkjzy6cVb519MKIQNFTnI5yG7C84KdOdjFyfcaiu7RaGz5vYoUM+NS+y1ufzoj/GAjA7hKAZKCDtzGncSk597pfYDLoIdz4KtUrocXcDSsV4u5DWySo15/oKCTHpe3LBXcm+pSTdkPWGbSt6D3qTC6hIyH7MviuSnE8wgtwV86q6IsYYkjBTZjwh15lP60yCiWGJPhRR7wosGXPKQeGbpLaxPDewZlLdXbtzTTlw==", "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=2ZpP9tPwjN0ZtNt1fk/wdglsPcL/PT+GaQx5g/6PkKk=;\n b=akDQAcQEzK+OLrIvdF+K7PIeep4sjbHsv8GkwvVHjzdmORZXGgRZRSZoWFp/92pD1TQKEnSn3spZAYDAhqVGZ9kUtzIlBHJtnURNd3/qN3K3lse3BBHtKew83AqXESaL/rnNZq5eE/59orhm2T7BGBzm26JpWa6FEe6ex1HbnO2xbR1ZUX6dRYv5CKpqqQHgtw6av0qK8DZaOxHIHUSlXxFOZmkPfEQLOURMZbETLsXXEG+GktobCZA9ZutgLiBWpNCQW44z37iU6mQuSU2gLnzUQXV3M8DxlfIO/bDDD+2C4mJT1ihzKSc/L8df3bMqR0X7dDByubHipsyftdoR5g==", "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": "Michael Baum <michaelba@nvidia.com>", "To": "<dev@dpdk.org>", "CC": "Matan Azrad <matan@nvidia.com>, Raslan Darawsheh <rasland@nvidia.com>,\n Viacheslav Ovsiienko <viacheslavo@nvidia.com>, Ori Kam <orika@nvidia.com>,\n Suanming Mou <suanmingm@nvidia.com>", "Subject": "[PATCH v1 20/23] net/mlx5: add GENEVE option support for profile 0", "Date": "Sun, 3 Dec 2023 13:25:40 +0200", "Message-ID": "<20231203112543.844014-21-michaelba@nvidia.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20231203112543.844014-1-michaelba@nvidia.com>", "References": "<20231203112543.844014-1-michaelba@nvidia.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-NV-OnPremToCloud": "ExternallySecured", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "DS1PEPF0001709B:EE_|CH3PR12MB9220:EE_", "X-MS-Office365-Filtering-Correlation-Id": "f48325a8-9904-42a6-bcef-08dbf3f2bb64", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n wofpGsOj/OKth+rCPxfN0UHk9jqHo2qNGzDvO+t+Vo0wIBKjZDzJplFkmbbojBwQ/CTMQWKmaTULEVBnxePIoHjgr3dG+IWnpuf/ml0+1YfXSGH5oQYbZhEF+ipEwNijFgN2JvDZbGuI0nl/m8CAo+apQM5IcL/2B+Jp84g4cE1m5zsW7/LqO5LVc7LTK48F6uZqSIW9+rGY/zxzO3UDh5QWaEMSlez/+cunPftvUewh6371fzzMIchXTB7Tb7pNTZmW5zn20EOHA9gHblnfBDKosnfY3pQW/wyyArzAg1/MVOxpcSFp6PhDyQ4F/OVEEcW1yM5VNh5hpMLTHLoK4miABASutR7a8oufh+7NhiWJKpeVu82GMNr82148JMUUYd+EvbdW+9ABIkEro7bf1hIQr3QNCSEC2qgCXHrHrlBjyQKaU3gZj45hwZ0C3cmaAXTH1vHyKJW1Kde+FEDAr1zbMT5QX8Dw/9GLCIEt9EAVyXDoTB56TUm6MLgYT7M7BHEwgyNJ/m3gMP16+2IR18EEsfoaE+IA64LkQclMdLc9gpIRn2U/SPmfTL3N9EMl5P2+apHbUHgU6hckd5Hzp7JqMvOZyS2D095Fol0YNltgfHVuGRBy/DXqwR/LSqxkN6hhdsebVLnImfT6/LKkXrGCA7FYC5SghEky4DDqaMJ+iPAvkrXJ6q2dHxAjvaehL5AB7pRUH1Yyaj77uPAP5jMFP3m9wcMY73bUWsNaFVd5lb5i4MMCvcgqkjpxDvEG", "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)(346002)(376002)(39860400002)(396003)(136003)(230922051799003)(82310400011)(1800799012)(64100799003)(186009)(451199024)(46966006)(40470700004)(36840700001)(478600001)(26005)(83380400001)(7636003)(336012)(6286002)(47076005)(6666004)(7696005)(356005)(1076003)(40480700001)(82740400003)(426003)(36756003)(107886003)(2616005)(316002)(6916009)(54906003)(70206006)(70586007)(36860700001)(55016003)(5660300002)(4326008)(86362001)(2906002)(8936002)(8676002)(40460700003)(41300700001)(30864003);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "03 Dec 2023 11:26:45.3226 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n f48325a8-9904-42a6-bcef-08dbf3f2bb64", "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 DS1PEPF0001709B.namprd05.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "CH3PR12MB9220", "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": "Add support for matching and modifying GENEVE option for\nFLEX_PARSER_PROFILE_ENABLE=0.\nBefore this patch it is supported when FLEX_PARSER_PROFILE_ENABLE=8 in\nHW steering and when FLEX_PARSER_PROFILE_ENABLE=0 in SW steering.\n\nSigned-off-by: Michael Baum <michaelba@nvidia.com>\n---\n doc/guides/nics/mlx5.rst | 9 ++-\n doc/guides/platform/mlx5.rst | 6 +-\n drivers/net/mlx5/mlx5_flow_geneve.c | 114 +++++++++++++++++++++-------\n 3 files changed, 95 insertions(+), 34 deletions(-)", "diff": "diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst\nindex 645b566d80..b946ce00c2 100644\n--- a/doc/guides/nics/mlx5.rst\n+++ b/doc/guides/nics/mlx5.rst\n@@ -347,6 +347,7 @@ Limitations\n - Multiple of same Geneve TLV option isn't supported at the same pattern\n template.\n - Supported only when ``FLEX_PARSER_PROFILE_ENABLE`` = 8.\n+ - Supported also when ``FLEX_PARSER_PROFILE_ENABLE`` = 0 for single DW only.\n \n - VF: flow rules created on VF devices can only match traffic targeted at the\n configured MAC addresses (see ``rte_eth_dev_mac_addr_add()``).\n@@ -2429,8 +2430,14 @@ Limitations\n ~~~~~~~~~~~\n \n * Supported only in HW steering (``dv_flow_en`` = 2).\n-* Supported only when ``FLEX_PARSER_PROFILE_ENABLE`` = 8.\n * Supported for FW version **xx.37.0142** and above.\n+* Parser creation can be done only for E-Switch manager.\n+* Supported for multiple DW only when ``FLEX_PARSER_PROFILE_ENABLE`` = 8.\n+* Supported for single DW also when ``FLEX_PARSER_PROFILE_ENABLE`` = 0 with some limitations:\n+\n+ - ``sample_len`` must be equal to ``option_len`` and not bigger than 1.\n+ - ``match_on_class_mode`` different than 1 is not supported.\n+ - ``offset`` must be 0.\n \n \n Testpmd driver specific commands\ndiff --git a/doc/guides/platform/mlx5.rst b/doc/guides/platform/mlx5.rst\nindex d16508d0da..a66cf778d1 100644\n--- a/doc/guides/platform/mlx5.rst\n+++ b/doc/guides/platform/mlx5.rst\n@@ -536,12 +536,10 @@ Below are some firmware configurations listed.\n or\n FLEX_PARSER_PROFILE_ENABLE=1\n \n-- enable Geneve TLV option flow matching in SW steering::\n+- enable Geneve TLV option flow matching::\n \n FLEX_PARSER_PROFILE_ENABLE=0\n-\n-- enable Geneve TLV option flow matching in HW steering::\n-\n+ or\n FLEX_PARSER_PROFILE_ENABLE=8\n \n - enable GTP flow matching::\ndiff --git a/drivers/net/mlx5/mlx5_flow_geneve.c b/drivers/net/mlx5/mlx5_flow_geneve.c\nindex 2c8dc39e74..f3ee414d02 100644\n--- a/drivers/net/mlx5/mlx5_flow_geneve.c\n+++ b/drivers/net/mlx5/mlx5_flow_geneve.c\n@@ -18,6 +18,8 @@\n #define MAX_GENEVE_OPTION_TOTAL_DATA_SIZE \\\n \t\t(MAX_GENEVE_OPTION_DATA_SIZE * MAX_GENEVE_OPTIONS_RESOURCES)\n \n+#define INVALID_SAMPLE_ID (UINT8_MAX)\n+\n /**\n * Single DW inside GENEVE TLV option.\n */\n@@ -265,6 +267,8 @@ mlx5_geneve_tlv_options_unregister(struct mlx5_priv *priv,\n * Pointer to header layout structure to update.\n * @param resource\n * Pointer to single sample context to fill.\n+ * @param sample_id\n+ * The flex parser id for single DW or UINT8_MAX for multiple DWs.\n *\n * @return\n * 0 on success, a negative errno otherwise and rte_errno is set.\n@@ -274,7 +278,7 @@ mlx5_geneve_tlv_option_create_sample(void *ctx,\n \t\t struct mlx5_devx_geneve_tlv_option_attr *attr,\n \t\t struct mlx5_devx_match_sample_info_query_attr *query_attr,\n \t\t struct mlx5_hl_data *match_data,\n-\t\t struct mlx5_geneve_tlv_resource *resource)\n+\t\t struct mlx5_geneve_tlv_resource *resource, uint8_t sample_id)\n {\n \tstruct mlx5_devx_obj *obj;\n \tint ret;\n@@ -282,7 +286,10 @@ mlx5_geneve_tlv_option_create_sample(void *ctx,\n \tobj = mlx5_devx_cmd_create_geneve_tlv_option(ctx, attr);\n \tif (obj == NULL)\n \t\treturn -rte_errno;\n-\tret = mlx5_devx_cmd_query_geneve_tlv_option(ctx, obj, query_attr);\n+\tif (sample_id == INVALID_SAMPLE_ID)\n+\t\tret = mlx5_devx_cmd_query_geneve_tlv_option(ctx, obj, query_attr);\n+\telse\n+\t\tret = mlx5_devx_cmd_match_sample_info_query(ctx, sample_id, query_attr);\n \tif (ret) {\n \t\tclaim_zero(mlx5_devx_cmd_destroy(obj));\n \t\treturn ret;\n@@ -335,20 +342,22 @@ should_configure_sample_for_dw0(const struct rte_pmd_mlx5_geneve_tlv *spec)\n * Pointer to user configuration.\n * @param option\n * Pointer to single GENEVE TLV option to fill.\n+ * @param sample_id\n+ * The flex parser id for single DW or UINT8_MAX for multiple DWs.\n *\n * @return\n * 0 on success, a negative errno otherwise and rte_errno is set.\n */\n static int\n mlx5_geneve_tlv_option_create(void *ctx, const struct rte_pmd_mlx5_geneve_tlv *spec,\n-\t\t\t struct mlx5_geneve_tlv_option *option)\n+\t\t\t struct mlx5_geneve_tlv_option *option, uint8_t sample_id)\n {\n \tstruct mlx5_devx_geneve_tlv_option_attr attr = {\n \t\t.option_class = spec->option_class,\n \t\t.option_type = spec->option_type,\n \t\t.option_data_len = spec->option_len,\n \t\t.option_class_ignore = spec->match_on_class_mode == 1 ? 0 : 1,\n-\t\t.offset_valid = 1,\n+\t\t.offset_valid = sample_id == INVALID_SAMPLE_ID ? 1 : 0,\n \t};\n \tstruct mlx5_devx_match_sample_info_query_attr query_attr = {0};\n \tstruct mlx5_geneve_tlv_resource *resource;\n@@ -356,12 +365,14 @@ mlx5_geneve_tlv_option_create(void *ctx, const struct rte_pmd_mlx5_geneve_tlv *s\n \tint ret;\n \n \tif (should_configure_sample_for_dw0(spec)) {\n+\t\tMLX5_ASSERT(sample_id == INVALID_SAMPLE_ID);\n \t\tattr.sample_offset = 0;\n \t\tresource = &option->resources[resource_id];\n \t\tret = mlx5_geneve_tlv_option_create_sample(ctx, &attr,\n \t\t\t\t\t\t\t &query_attr,\n \t\t\t\t\t\t\t &option->match_data[0],\n-\t\t\t\t\t\t\t resource);\n+\t\t\t\t\t\t\t resource,\n+\t\t\t\t\t\t\t INVALID_SAMPLE_ID);\n \t\tif (ret)\n \t\t\treturn ret;\n \t\tresource_id++;\n@@ -379,7 +390,8 @@ mlx5_geneve_tlv_option_create(void *ctx, const struct rte_pmd_mlx5_geneve_tlv *s\n \t\tret = mlx5_geneve_tlv_option_create_sample(ctx, &attr,\n \t\t\t\t\t\t\t &query_attr,\n \t\t\t\t\t\t\t &option->match_data[i],\n-\t\t\t\t\t\t\t resource);\n+\t\t\t\t\t\t\t resource,\n+\t\t\t\t\t\t\t sample_id);\n \t\tif (ret)\n \t\t\tgoto error;\n \t\tresource_id++;\n@@ -467,6 +479,8 @@ mlx5_geneve_tlv_option_copy(struct rte_pmd_mlx5_geneve_tlv *dst,\n * A list of GENEVE TLV options to create parser for them.\n * @param nb_options\n * The number of options in TLV list.\n+ * @param sample_id\n+ * The flex parser id for single DW or UINT8_MAX for multiple DWs.\n *\n * @return\n * A pointer to GENEVE TLV options parser structure on success,\n@@ -475,7 +489,7 @@ mlx5_geneve_tlv_option_copy(struct rte_pmd_mlx5_geneve_tlv *dst,\n static struct mlx5_geneve_tlv_options *\n mlx5_geneve_tlv_options_create(struct mlx5_dev_ctx_shared *sh,\n \t\t\t const struct rte_pmd_mlx5_geneve_tlv tlv_list[],\n-\t\t\t uint8_t nb_options)\n+\t\t\t uint8_t nb_options, uint8_t sample_id)\n {\n \tstruct mlx5_geneve_tlv_options *options;\n \tconst struct rte_pmd_mlx5_geneve_tlv *spec;\n@@ -495,7 +509,7 @@ mlx5_geneve_tlv_options_create(struct mlx5_dev_ctx_shared *sh,\n \tfor (i = 0; i < nb_options; ++i) {\n \t\tspec = &tlv_list[i];\n \t\tret = mlx5_geneve_tlv_option_create(sh->cdev->ctx, spec,\n-\t\t\t\t\t\t &options->options[i]);\n+\t\t\t\t\t\t &options->options[i], sample_id);\n \t\tif (ret < 0)\n \t\t\tgoto error;\n \t\t/* Copy the user list for comparing future configuration. */\n@@ -705,6 +719,12 @@ mlx5_is_same_geneve_tlv_options(const struct mlx5_geneve_tlv_options *options,\n \treturn true;\n }\n \n+static inline bool\n+multiple_dws_supported(struct mlx5_hca_attr *attr)\n+{\n+\treturn attr->geneve_tlv_option_offset && attr->geneve_tlv_sample;\n+}\n+\n void *\n mlx5_geneve_tlv_parser_create(uint16_t port_id,\n \t\t\t const struct rte_pmd_mlx5_geneve_tlv tlv_list[],\n@@ -715,8 +735,7 @@ mlx5_geneve_tlv_parser_create(uint16_t port_id,\n \tstruct rte_eth_dev *dev;\n \tstruct mlx5_priv *priv;\n \tstruct mlx5_hca_attr *attr;\n-\tuint8_t total_dws = 0;\n-\tuint8_t i;\n+\tuint8_t sample_id;\n \n \t/*\n \t * Validate the input before taking a lock and before any memory\n@@ -742,34 +761,71 @@ mlx5_geneve_tlv_parser_create(uint16_t port_id,\n \t\treturn NULL;\n \t}\n \tattr = &priv->sh->cdev->config.hca_attr;\n-\tMLX5_ASSERT(MAX_GENEVE_OPTIONS_RESOURCES <=\n-\t\t attr->max_geneve_tlv_options);\n-\tif (!attr->geneve_tlv_option_offset || !attr->geneve_tlv_sample ||\n-\t !attr->query_match_sample_info || !attr->geneve_tlv_opt) {\n-\t\tDRV_LOG(ERR, \"Not enough capabilities to support GENEVE TLV parser, maybe old FW version\");\n+\tif (!attr->query_match_sample_info || !attr->geneve_tlv_opt) {\n+\t\tDRV_LOG(ERR, \"Not enough capabilities to support GENEVE TLV parser, is this device eswitch manager?\");\n \t\trte_errno = ENOTSUP;\n \t\treturn NULL;\n \t}\n-\tif (nb_options > MAX_GENEVE_OPTIONS_RESOURCES) {\n+\tDRV_LOG(DEBUG, \"Max DWs supported for GENEVE TLV option is %u\",\n+\t\tattr->max_geneve_tlv_options);\n+\tif (nb_options > attr->max_geneve_tlv_options) {\n \t\tDRV_LOG(ERR,\n \t\t\t\"GENEVE TLV option number (%u) exceeds the limit (%u).\",\n-\t\t\tnb_options, MAX_GENEVE_OPTIONS_RESOURCES);\n+\t\t\tnb_options, attr->max_geneve_tlv_options);\n \t\trte_errno = EINVAL;\n \t\treturn NULL;\n \t}\n-\tfor (i = 0; i < nb_options; ++i) {\n-\t\tif (mlx5_geneve_tlv_option_validate(attr, &tlv_list[i]) < 0) {\n-\t\t\tDRV_LOG(ERR, \"GENEVE TLV option %u is invalid.\", i);\n+\tif (multiple_dws_supported(attr)) {\n+\t\tuint8_t total_dws = 0;\n+\t\tuint8_t i;\n+\n+\t\tMLX5_ASSERT(attr->max_geneve_tlv_options >= MAX_GENEVE_OPTIONS_RESOURCES);\n+\t\tfor (i = 0; i < nb_options; ++i) {\n+\t\t\tif (mlx5_geneve_tlv_option_validate(attr, &tlv_list[i]) < 0) {\n+\t\t\t\tDRV_LOG(ERR, \"GENEVE TLV option %u is invalid.\", i);\n+\t\t\t\treturn NULL;\n+\t\t\t}\n+\t\t\ttotal_dws += mlx5_geneve_tlv_option_get_nb_dws(&tlv_list[i]);\n+\t\t}\n+\t\tif (total_dws > MAX_GENEVE_OPTIONS_RESOURCES) {\n+\t\t\tDRV_LOG(ERR,\n+\t\t\t\t\"Total requested DWs (%u) exceeds the limit (%u).\",\n+\t\t\t\ttotal_dws, MAX_GENEVE_OPTIONS_RESOURCES);\n+\t\t\trte_errno = EINVAL;\n \t\t\treturn NULL;\n \t\t}\n-\t\ttotal_dws += mlx5_geneve_tlv_option_get_nb_dws(&tlv_list[i]);\n-\t}\n-\tif (total_dws > MAX_GENEVE_OPTIONS_RESOURCES) {\n-\t\tDRV_LOG(ERR,\n-\t\t\t\"Total requested DWs (%u) exceeds the limit (%u).\",\n-\t\t\ttotal_dws, MAX_GENEVE_OPTIONS_RESOURCES);\n-\t\trte_errno = EINVAL;\n-\t\treturn NULL;\n+\t\t/* Multiple DWs is supported, each of the has sample ID given later. */\n+\t\tsample_id = INVALID_SAMPLE_ID;\n+\t\tDRV_LOG(DEBUG, \"GENEVE TLV parser supports multiple DWs, FLEX_PARSER_PROFILE_ENABLE == 8\");\n+\t} else {\n+\t\tconst struct rte_pmd_mlx5_geneve_tlv *option = &tlv_list[0];\n+\n+\t\tif (option->offset != 0) {\n+\t\t\tDRV_LOG(ERR,\n+\t\t\t\t\"GENEVE TLV option offset %u is required but not supported.\",\n+\t\t\t\toption->offset);\n+\t\t\trte_errno = ENOTSUP;\n+\t\t\treturn NULL;\n+\t\t}\n+\t\tif (option->sample_len != option->option_len) {\n+\t\t\tDRV_LOG(ERR,\n+\t\t\t\t\"GENEVE TLV option length (%u) should be equal to sample length (%u).\",\n+\t\t\t\toption->option_len, option->sample_len);\n+\t\t\trte_errno = ENOTSUP;\n+\t\t\treturn NULL;\n+\t\t}\n+\t\tif (option->match_on_class_mode != 1) {\n+\t\t\tDRV_LOG(ERR,\n+\t\t\t\t\"GENEVE TLV option match_on_class_mode %u is invalid for flex parser profile 0.\",\n+\t\t\t\toption->match_on_class_mode);\n+\t\t\trte_errno = EINVAL;\n+\t\t\treturn NULL;\n+\t\t}\n+\t\tif (mlx5_geneve_tlv_option_validate(attr, option) < 0)\n+\t\t\treturn NULL;\n+\t\t/* Single DW is supported, its sample ID is given. */\n+\t\tsample_id = attr->geneve_tlv_option_sample_id;\n+\t\tDRV_LOG(DEBUG, \"GENEVE TLV parser supports only single DW, FLEX_PARSER_PROFILE_ENABLE == 0\");\n \t}\n \t/* Take lock for this physical device and manage the options. */\n \tphdev = mlx5_get_locked_physical_device(priv);\n@@ -793,7 +849,7 @@ mlx5_geneve_tlv_parser_create(uint16_t port_id,\n \t\tgoto exit;\n \t}\n \t/* Create GENEVE TLV options for this physical device. */\n-\toptions = mlx5_geneve_tlv_options_create(priv->sh, tlv_list, nb_options);\n+\toptions = mlx5_geneve_tlv_options_create(priv->sh, tlv_list, nb_options, sample_id);\n \tif (!options) {\n \t\tmlx5_unlock_physical_device();\n \t\treturn NULL;\n", "prefixes": [ "v1", "20/23" ] }