Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/94554/?format=api
{ "id": 94554, "url": "https://patches.dpdk.org/api/patches/94554/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210619124830.25297-1-viacheslavo@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": "<20210619124830.25297-1-viacheslavo@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210619124830.25297-1-viacheslavo@nvidia.com", "date": "2021-06-19T12:48:30", "name": "[v2] common/mlx5: add provider query port support to glue library", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "b39ebb3f456aadea0b08da9b248c3fd9996760ab", "submitter": { "id": 1926, "url": "https://patches.dpdk.org/api/people/1926/?format=api", "name": "Slava Ovsiienko", "email": "viacheslavo@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/20210619124830.25297-1-viacheslavo@nvidia.com/mbox/", "series": [ { "id": 17406, "url": "https://patches.dpdk.org/api/series/17406/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=17406", "date": "2021-06-19T12:48:30", "name": "[v2] common/mlx5: add provider query port support to glue library", "version": 2, "mbox": "https://patches.dpdk.org/series/17406/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/94554/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/94554/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 1B76BA0A0C;\n\tSat, 19 Jun 2021 14:48:55 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 98B0640E64;\n\tSat, 19 Jun 2021 14:48:54 +0200 (CEST)", "from NAM10-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam10on2055.outbound.protection.outlook.com [40.107.93.55])\n by mails.dpdk.org (Postfix) with ESMTP id C3C1440E32;\n Sat, 19 Jun 2021 14:48:52 +0200 (CEST)", "from DM6PR17CA0008.namprd17.prod.outlook.com (2603:10b6:5:1b3::21)\n by MW3PR12MB4394.namprd12.prod.outlook.com (2603:10b6:303:54::20) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.19; Sat, 19 Jun\n 2021 12:48:49 +0000", "from DM6NAM11FT036.eop-nam11.prod.protection.outlook.com\n (2603:10b6:5:1b3:cafe::3a) by DM6PR17CA0008.outlook.office365.com\n (2603:10b6:5:1b3::21) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.15 via Frontend\n Transport; Sat, 19 Jun 2021 12:48:49 +0000", "from mail.nvidia.com (216.228.112.34) by\n DM6NAM11FT036.mail.protection.outlook.com (10.13.172.64) with Microsoft SMTP\n Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id\n 15.20.4242.16 via Frontend Transport; Sat, 19 Jun 2021 12:48:49 +0000", "from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com\n (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sat, 19 Jun\n 2021 12:48:45 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=WYv0vn/OkVIiI03NpOB4BLCSeWI9EaX+4IDgC4NQMkhpsxLd2nr5gKtqZz18Zap9Dhe/kBZW03AMA50d/nIqc5Xc2cHCtK+P+GYrKDQc+HuGCWgteiu1RfwJ8ht/wK1CjPYLCQQPdbGk4NFuHkLMWO96v7tvrvi6D2oDQlt0c7sanjXuXzhUAuoXAGQb5/jtcszsnqyD3MLZXW+faqYtrh1UNNMFk1bi0MQCoS0G6xgmHUln7I9COWfCUJ+68+Az5L/q55TCb1NrYSCe1PDvFMLc0HOc84vvb0aYzt4aG+uz9arkHMlJnyYpM0eHFnYzupoqtyFxyAHBQpqgLeQGlg==", "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-SenderADCheck;\n bh=A3HpFh0CeTPK6yelSWDDytktx7s0gHDHgGbraSIb4Wc=;\n b=AHfu+Wpkgvmr2lYTy7GS6A1ShlexSy/E25ol60XWhtNY56PzTIETiy/XdYCPKLG8KVY63lpqhzDURD6cMCIW3jOEHsV4Boso3VvIPzwSQBoTPadYb9T/KMvlPY7Pn5UYFnmTUzFDjvQ8J/e9QRkhwyZFm7IwoSF3uRwOUXEQSQIIuz6GcGVRZKoxD4RKOWrqgIZv1loMEDngZsrqgZF/UzHJd/XqZ+lYPJLhZGqfifhNF8ooqowpv/F//fRFzoRyn6NvEYBCmBQzSUpDpgN38R8+IKdK6wt6iILXfTKrCi6UUixD4I6Zu8FmZsNhycJ+jIUJi8DqVhGoydly5MZzGg==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass (sender ip is\n 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com;\n dmarc=pass (p=none sp=none 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=A3HpFh0CeTPK6yelSWDDytktx7s0gHDHgGbraSIb4Wc=;\n b=Y6SQ7vQ11hiRvVzk1mB6MVFKA437WbpqmmgPSUq9l63FwuSnYC3FyUp0HC+WytE5hFbM8Rk2d6XyqI9wpNVOpyh3QPrkbtMP9xn6e2P4o+XEn6b4Owtx0XGBuvX0mmATzU1FE99sjMPI5GjAi7PT5IrCrHgHtoYspVX6mI9Xht/rjSqdlujl7QfSPC42u+ksWTNMkUP2OwYCQgiQUKUVWiMcMdnUPZUzDWPXYoQYyCNFp0/bXvZUKiTLnkI079BrcvtZVeZ999Ed+V7jlSvqjQqVeTW60jKX/Y8gMk0k6Wz6Owm8Z+hCjCeKfBYxkUOwuaoCLb6ODuoYJd0wyyqBaw==", "X-MS-Exchange-Authentication-Results": "spf=pass (sender IP is 216.228.112.34)\n smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed)\n header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com;", "Received-SPF": "Pass (protection.outlook.com: domain of nvidia.com designates\n 216.228.112.34 as permitted sender) receiver=protection.outlook.com;\n client-ip=216.228.112.34; helo=mail.nvidia.com;", "From": "Viacheslav Ovsiienko <viacheslavo@nvidia.com>", "To": "<dev@dpdk.org>", "CC": "<rasland@nvidia.com>, <matan@nvidia.com>, <thomas@monjalon.net>,\n <stable@dpdk.org>", "Date": "Sat, 19 Jun 2021 15:48:30 +0300", "Message-ID": "<20210619124830.25297-1-viacheslavo@nvidia.com>", "X-Mailer": "git-send-email 2.18.1", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[172.20.187.5]", "X-ClientProxiedBy": "HQMAIL107.nvidia.com (172.20.187.13) To\n HQMAIL107.nvidia.com (172.20.187.13)", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "eb2999a0-fe1b-4078-d06b-08d9332095a7", "X-MS-TrafficTypeDiagnostic": "MW3PR12MB4394:", "X-LD-Processed": "43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr", "X-Microsoft-Antispam-PRVS": "\n <MW3PR12MB43945BF3007FBE25A8E8C9D4DF0C9@MW3PR12MB4394.namprd12.prod.outlook.com>", "X-MS-Oob-TLC-OOBClassifiers": "OLM:1360;", "X-MS-Exchange-SenderADCheck": "1", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n aedDuXHMDLEfCyNstROfDDXgmduILcwsA+55byYhm3Il/WROM+2b/nR2dLFPgipAwXGr5QRQL/t3O8W4LISD0MImhM+0eddXlIfpIcGbHO/Vb1Vv0xh9FBvE3HkqYN9ggaX239Kloh4Kas7aUrZ9w+f0aODm5MzTcTZaOAcoE89fQXWbMPK9557M12TLVaauktyJF1wu8SIcPUavh8EkjVaDg5gpAJSUzSFvq21X8AmAAR2Ey76jgBDry3DF5w54wPHJuW0tyHNnEZZi6nZAZBeqPDrGYff8puQvFXk5XgbCT3rfklKt4Tq90Qe118pwxMtGryB5kX4Q+YXufMn/Q4CDoHVWIpdWphiiHYTXvh9llcWQ7obahiKIPVOFoQ2ilha/h10OFEaeyBu/N38huuPMzxWFMssWghS2dh0R5ZboQD81IGv2fcIyPPNggKkzQyqUQwYNSOBn+BJQckwTn6XfpBkIv5LRqULvHNj4LAVKcSxqaNxHVsxqCAwAyQcXBxuE2JAaHKgmp4VOjJay0MtkSSrJUTTttbQmdzvtEKof12qBMk8McpghoiKui5BuXw6YsqXAhxptMrvJpmP3jAHsYJj1NdpCyZLtOsoiewxx60mcnLfzlUYB8qE/MBceHCoG/SZNlLws7fUSzUV/qnhe/67SWtN/7ke0aXggJP4zQI1FlBxrbxZkgNJnHMiZ8w9eHGpAjTAl+Csw3kdcb7rdanU2QKOwOwFDo8L5JrZIFuTyiklXxJFNxWYlkNWu2kwaXLCsk3RUsLneBu00Zw==", "X-Forefront-Antispam-Report": "CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1;\n SRV:;\n IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE;\n SFS:(4636009)(396003)(136003)(346002)(376002)(39860400002)(46966006)(36840700001)(8676002)(426003)(47076005)(966005)(82310400003)(8936002)(36756003)(4326008)(26005)(55016002)(83380400001)(478600001)(7636003)(356005)(82740400003)(186003)(16526019)(70586007)(86362001)(7696005)(54906003)(2906002)(1076003)(336012)(30864003)(6916009)(6666004)(6286002)(36860700001)(36906005)(2616005)(5660300002)(316002)(70206006);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "19 Jun 2021 12:48:49.1229 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n eb2999a0-fe1b-4078-d06b-08d9332095a7", "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.112.34];\n Helo=[mail.nvidia.com]", "X-MS-Exchange-CrossTenant-AuthSource": "\n DM6NAM11FT036.eop-nam11.prod.protection.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "MW3PR12MB4394", "Subject": "[dpdk-dev] [PATCH v2] common/mlx5: add provider query port support\n to glue library", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "The rdma-core mlx5 provider introduced the port attributes query\nAPI since version v35.0 - the mlx5dv_query_port routine. In order\nto support this change in the rdma-core the conditional compilation\nflag HAVE_MLX5DV_DR_DEVX_PORT_V35 is introduced by the this patch.\n\nIn the OFED rdma-core version the new compatible mlx5dv_query_port\nroutine was introduced as well, replacing the existing proprietary\nmlx5dv_query_devx_port routine. The proprietary routine was\ncontrolled in PMD code with HAVE_MLX5DV_DR_DEVX_PORT conditional\nflag.\n\nCurrently, the OFED rdma-core library contains both versions of\nport query API. And this version is a transitional one, there are\nthe plans to remove the proprietary mlx5dv_query_devx_port routine\nand the HAVE_MLX5DV_DR_DEVX_PORT flag in PMD will not work anymore.\n\nWe had one more dependency on this flag in the code (for the\nmlx5dv_dr_action_create_dest_ib_port routine) and the patch\nfixes mentioned dependency also, by introducing the new\ndedicated conditional flag - HAVE_MLX5DV_DR_CREATE_DEST_IB_PORT.\n\nThis patch is highly desirable to be provided in DPDK LTS releases\ndue to it covers the major compatibility issue.\n\nCc: stable@dpdk.org\n\nSigned-off-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>\nAcked-by: Matan Azrad <matan@nvidia.com>\n---\n\nv1: http://patches.dpdk.org/project/dpdk/patch/20210607093726.14546-1-viacheslavo@nvidia.com/\nv2: commit message was clarified\n\n drivers/common/mlx5/linux/meson.build | 4 ++\n drivers/common/mlx5/linux/mlx5_glue.c | 57 ++++++++++++++++++++-----\n drivers/common/mlx5/linux/mlx5_glue.h | 16 ++++++-\n drivers/net/mlx5/linux/mlx5_os.c | 60 ++++++++++++---------------\n drivers/net/mlx5/mlx5_flow_dv.c | 2 +-\n 5 files changed, 93 insertions(+), 46 deletions(-)", "diff": "diff --git a/drivers/common/mlx5/linux/meson.build b/drivers/common/mlx5/linux/meson.build\nindex 007834a49b..5cea1b44d7 100644\n--- a/drivers/common/mlx5/linux/meson.build\n+++ b/drivers/common/mlx5/linux/meson.build\n@@ -93,6 +93,10 @@ has_sym_args = [\n 'IBV_WQ_FLAG_RX_END_PADDING' ],\n [ 'HAVE_MLX5DV_DR_DEVX_PORT', 'infiniband/mlx5dv.h',\n 'mlx5dv_query_devx_port' ],\n+\t[ 'HAVE_MLX5DV_DR_DEVX_PORT_V35', 'infiniband/mlx5dv.h',\n+\t 'mlx5dv_query_port' ],\n+\t[ 'HAVE_MLX5DV_DR_CREATE_DEST_IB_PORT', 'infiniband/mlx5dv.h',\n+\t 'mlx5dv_dr_action_create_dest_ib_port' ],\n [ 'HAVE_IBV_DEVX_OBJ', 'infiniband/mlx5dv.h',\n 'mlx5dv_devx_obj_create' ],\n [ 'HAVE_IBV_FLOW_DEVX_COUNTERS', 'infiniband/mlx5dv.h',\ndiff --git a/drivers/common/mlx5/linux/mlx5_glue.c b/drivers/common/mlx5/linux/mlx5_glue.c\nindex d3bd645a5b..00be8114be 100644\n--- a/drivers/common/mlx5/linux/mlx5_glue.c\n+++ b/drivers/common/mlx5/linux/mlx5_glue.c\n@@ -391,7 +391,7 @@ mlx5_glue_dr_create_flow_action_dest_flow_tbl(void *tbl)\n static void *\n mlx5_glue_dr_create_flow_action_dest_port(void *domain, uint32_t port)\n {\n-#ifdef HAVE_MLX5DV_DR_DEVX_PORT\n+#ifdef HAVE_MLX5DV_DR_CREATE_DEST_IB_PORT\n \treturn mlx5dv_dr_action_create_dest_ib_port(domain, port);\n #else\n #ifdef HAVE_MLX5DV_DR_ESWITCH\n@@ -1087,17 +1087,54 @@ mlx5_glue_devx_wq_query(struct ibv_wq *wq, const void *in, size_t inlen,\n static int\n mlx5_glue_devx_port_query(struct ibv_context *ctx,\n \t\t\t uint32_t port_num,\n-\t\t\t struct mlx5dv_devx_port *mlx5_devx_port)\n-{\n+\t\t\t struct mlx5_port_info *info)\n+{\n+\tint err = 0;\n+\n+\tinfo->query_flags = 0;\n+#ifdef HAVE_MLX5DV_DR_DEVX_PORT_V35\n+\t/* The DevX port query API is implemented (rdma-core v35 and above). */\n+\tstruct mlx5_ib_uapi_query_port devx_port;\n+\n+\tmemset(&devx_port, 0, sizeof(devx_port));\n+\terr = mlx5dv_query_port(ctx, port_num, &devx_port);\n+\tif (err)\n+\t\treturn err;\n+\tif (devx_port.flags & MLX5DV_QUERY_PORT_VPORT_REG_C0) {\n+\t\tinfo->vport_meta_tag = devx_port.reg_c0.value;\n+\t\tinfo->vport_meta_mask = devx_port.reg_c0.mask;\n+\t\tinfo->query_flags |= MLX5_PORT_QUERY_REG_C0;\n+\t}\n+\tif (devx_port.flags & MLX5DV_QUERY_PORT_VPORT) {\n+\t\tinfo->vport_id = devx_port.vport;\n+\t\tinfo->query_flags |= MLX5_PORT_QUERY_VPORT;\n+\t}\n+#else\n #ifdef HAVE_MLX5DV_DR_DEVX_PORT\n-\treturn mlx5dv_query_devx_port(ctx, port_num, mlx5_devx_port);\n+\t/* The legacy DevX port query API is implemented (prior v35). */\n+\tstruct mlx5dv_devx_port devx_port = {\n+\t\t.comp_mask = MLX5DV_DEVX_PORT_VPORT |\n+\t\t\t MLX5DV_DEVX_PORT_MATCH_REG_C_0\n+\t};\n+\n+\terr = mlx5dv_query_devx_port(ctx, port_num, &devx_port);\n+\tif (err)\n+\t\treturn err;\n+\tif (devx_port.comp_mask & MLX5DV_DEVX_PORT_MATCH_REG_C_0) {\n+\t\tinfo->vport_meta_tag = devx_port.reg_c_0.value;\n+\t\tinfo->vport_meta_mask = devx_port.reg_c_0.mask;\n+\t\tinfo->query_flags |= MLX5_PORT_QUERY_REG_C0;\n+\t}\n+\tif (devx_port.comp_mask & MLX5DV_DEVX_PORT_VPORT) {\n+\t\tinfo->vport_id = devx_port.vport_num;\n+\t\tinfo->query_flags |= MLX5_PORT_QUERY_VPORT;\n+\t}\n #else\n-\t(void)ctx;\n-\t(void)port_num;\n-\t(void)mlx5_devx_port;\n-\terrno = ENOTSUP;\n-\treturn errno;\n-#endif\n+\tRTE_SET_USED(ctx);\n+\tRTE_SET_USED(port_num);\n+#endif /* HAVE_MLX5DV_DR_DEVX_PORT */\n+#endif /* HAVE_MLX5DV_DR_DEVX_PORT_V35 */\n+\treturn err;\n }\n \n static int\ndiff --git a/drivers/common/mlx5/linux/mlx5_glue.h b/drivers/common/mlx5/linux/mlx5_glue.h\nindex 97462e9ab8..840d8cf57f 100644\n--- a/drivers/common/mlx5/linux/mlx5_glue.h\n+++ b/drivers/common/mlx5/linux/mlx5_glue.h\n@@ -84,6 +84,20 @@ struct mlx5dv_dr_action;\n struct mlx5dv_devx_port;\n #endif\n \n+#ifndef HAVE_MLX5DV_DR_DEVX_PORT_V35\n+struct mlx5dv_port;\n+#endif\n+\n+#define MLX5_PORT_QUERY_VPORT (1u << 0)\n+#define MLX5_PORT_QUERY_REG_C0 (1u << 1)\n+\n+struct mlx5_port_info {\n+\tuint16_t query_flags;\n+\tuint16_t vport_id; /* Associated VF vport index (if any). */\n+\tuint32_t vport_meta_tag; /* Used for vport index match ove VF LAG. */\n+\tuint32_t vport_meta_mask; /* Used for vport index field match mask. */\n+};\n+\n #ifndef HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER\n struct mlx5dv_dr_flow_meter_attr;\n #endif\n@@ -311,7 +325,7 @@ struct mlx5_glue {\n \t\t\t void *out, size_t outlen);\n \tint (*devx_port_query)(struct ibv_context *ctx,\n \t\t\t uint32_t port_num,\n-\t\t\t struct mlx5dv_devx_port *mlx5_devx_port);\n+\t\t\t struct mlx5_port_info *info);\n \tint (*dr_dump_domain)(FILE *file, void *domain);\n \tint (*dr_dump_rule)(FILE *file, void *rule);\n \tint (*devx_query_eqn)(struct ibv_context *context, uint32_t cpus,\ndiff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c\nindex 534a56a555..54e4a1fe60 100644\n--- a/drivers/net/mlx5/linux/mlx5_os.c\n+++ b/drivers/net/mlx5/linux/mlx5_os.c\n@@ -822,9 +822,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,\n \tchar name[RTE_ETH_NAME_MAX_LEN];\n \tint own_domain_id = 0;\n \tuint16_t port_id;\n-#ifdef HAVE_MLX5DV_DR_DEVX_PORT\n-\tstruct mlx5dv_devx_port devx_port = { .comp_mask = 0 };\n-#endif\n+\tstruct mlx5_port_info vport_info = { .query_flags = 0 };\n \n \t/* Determine if this port representor is supposed to be spawned. */\n \tif (switch_info->representor && dpdk_dev->devargs &&\n@@ -1055,29 +1053,27 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,\n \tpriv->vport_meta_tag = 0;\n \tpriv->vport_meta_mask = 0;\n \tpriv->pf_bond = spawn->pf_bond;\n-#ifdef HAVE_MLX5DV_DR_DEVX_PORT\n \t/*\n-\t * The DevX port query API is implemented. E-Switch may use\n-\t * either vport or reg_c[0] metadata register to match on\n-\t * vport index. The engaged part of metadata register is\n-\t * defined by mask.\n+\t * If we have E-Switch we should determine the vport attributes.\n+\t * E-Switch may use either source vport field or reg_c[0] metadata\n+\t * register to match on vport index. The engaged part of metadata\n+\t * register is defined by mask.\n \t */\n \tif (switch_info->representor || switch_info->master) {\n-\t\tdevx_port.comp_mask = MLX5DV_DEVX_PORT_VPORT |\n-\t\t\t\t MLX5DV_DEVX_PORT_MATCH_REG_C_0;\n-\t\terr = mlx5_glue->devx_port_query(sh->ctx, spawn->phys_port,\n-\t\t\t\t\t\t &devx_port);\n+\t\terr = mlx5_glue->devx_port_query(sh->ctx,\n+\t\t\t\t\t\t spawn->phys_port,\n+\t\t\t\t\t\t &vport_info);\n \t\tif (err) {\n \t\t\tDRV_LOG(WARNING,\n \t\t\t\t\"can't query devx port %d on device %s\",\n \t\t\t\tspawn->phys_port,\n \t\t\t\tmlx5_os_get_dev_device_name(spawn->phys_dev));\n-\t\t\tdevx_port.comp_mask = 0;\n+\t\t\tvport_info.query_flags = 0;\n \t\t}\n \t}\n-\tif (devx_port.comp_mask & MLX5DV_DEVX_PORT_MATCH_REG_C_0) {\n-\t\tpriv->vport_meta_tag = devx_port.reg_c_0.value;\n-\t\tpriv->vport_meta_mask = devx_port.reg_c_0.mask;\n+\tif (vport_info.query_flags & MLX5_PORT_QUERY_REG_C0) {\n+\t\tpriv->vport_meta_tag = vport_info.vport_meta_tag;\n+\t\tpriv->vport_meta_mask = vport_info.vport_meta_mask;\n \t\tif (!priv->vport_meta_mask) {\n \t\t\tDRV_LOG(ERR, \"vport zero mask for port %d\"\n \t\t\t\t \" on bonding device %s\",\n@@ -1097,8 +1093,8 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,\n \t\t\tgoto error;\n \t\t}\n \t}\n-\tif (devx_port.comp_mask & MLX5DV_DEVX_PORT_VPORT) {\n-\t\tpriv->vport_id = devx_port.vport_num;\n+\tif (vport_info.query_flags & MLX5_PORT_QUERY_VPORT) {\n+\t\tpriv->vport_id = vport_info.vport_id;\n \t} else if (spawn->pf_bond >= 0 &&\n \t\t (switch_info->representor || switch_info->master)) {\n \t\tDRV_LOG(ERR, \"can't deduce vport index for port %d\"\n@@ -1108,25 +1104,21 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,\n \t\terr = ENOTSUP;\n \t\tgoto error;\n \t} else {\n-\t\t/* Suppose vport index in compatible way. */\n+\t\t/*\n+\t\t * Suppose vport index in compatible way. Kernel/rdma_core\n+\t\t * support single E-Switch per PF configurations only and\n+\t\t * vport_id field contains the vport index for associated VF,\n+\t\t * which is deduced from representor port name.\n+\t\t * For example, let's have the IB device port 10, it has\n+\t\t * attached network device eth0, which has port name attribute\n+\t\t * pf0vf2, we can deduce the VF number as 2, and set vport index\n+\t\t * as 3 (2+1). This assigning schema should be changed if the\n+\t\t * multiple E-Switch instances per PF configurations or/and PCI\n+\t\t * subfunctions are added.\n+\t\t */\n \t\tpriv->vport_id = switch_info->representor ?\n \t\t\t\t switch_info->port_name + 1 : -1;\n \t}\n-#else\n-\t/*\n-\t * Kernel/rdma_core support single E-Switch per PF configurations\n-\t * only and vport_id field contains the vport index for\n-\t * associated VF, which is deduced from representor port name.\n-\t * For example, let's have the IB device port 10, it has\n-\t * attached network device eth0, which has port name attribute\n-\t * pf0vf2, we can deduce the VF number as 2, and set vport index\n-\t * as 3 (2+1). This assigning schema should be changed if the\n-\t * multiple E-Switch instances per PF configurations or/and PCI\n-\t * subfunctions are added.\n-\t */\n-\tpriv->vport_id = switch_info->representor ?\n-\t\t\t switch_info->port_name + 1 : -1;\n-#endif\n \tpriv->representor_id = mlx5_representor_id_encode(switch_info,\n \t\t\t\t\t\t\t eth_da->type);\n \t/*\ndiff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c\nindex 1b2639d232..dafd37ab93 100644\n--- a/drivers/net/mlx5/mlx5_flow_dv.c\n+++ b/drivers/net/mlx5/mlx5_flow_dv.c\n@@ -10337,7 +10337,7 @@ flow_dv_translate_action_port_id(struct rte_eth_dev *dev,\n \t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION,\n \t\t\t\t\t NULL,\n \t\t\t\t\t \"No eswitch info was found for port\");\n-#ifdef HAVE_MLX5DV_DR_DEVX_PORT\n+#ifdef HAVE_MLX5DV_DR_CREATE_DEST_IB_PORT\n \t/*\n \t * This parameter is transferred to\n \t * mlx5dv_dr_action_create_dest_ib_port().\n", "prefixes": [ "v2" ] }