Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 70659,
    "url": "https://patches.dpdk.org/api/patches/70659/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200527161425.22944-1-ophirmu@mellanox.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": "<20200527161425.22944-1-ophirmu@mellanox.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20200527161425.22944-1-ophirmu@mellanox.com",
    "date": "2020-05-27T16:14:23",
    "name": "[v1,1/3] common/mlx5: move glue files under Linux directory",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "b9f3bd13c9ba4e5857b2c6c6699a34fe2d6d1a94",
    "submitter": {
        "id": 793,
        "url": "https://patches.dpdk.org/api/people/793/?format=api",
        "name": "Ophir Munk",
        "email": "ophirmu@mellanox.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/20200527161425.22944-1-ophirmu@mellanox.com/mbox/",
    "series": [
        {
            "id": 10258,
            "url": "https://patches.dpdk.org/api/series/10258/?format=api",
            "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=10258",
            "date": "2020-05-27T16:14:25",
            "name": "[v1,1/3] common/mlx5: move glue files under Linux directory",
            "version": 1,
            "mbox": "https://patches.dpdk.org/series/10258/mbox/"
        }
    ],
    "comments": "https://patches.dpdk.org/api/patches/70659/comments/",
    "check": "warning",
    "checks": "https://patches.dpdk.org/api/patches/70659/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 0B6A3A0093;\n\tWed, 27 May 2020 18:14:54 +0200 (CEST)",
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id AA3311D654;\n\tWed, 27 May 2020 18:14:46 +0200 (CEST)",
            "from EUR04-HE1-obe.outbound.protection.outlook.com\n (mail-eopbgr70075.outbound.protection.outlook.com [40.107.7.75])\n by dpdk.org (Postfix) with ESMTP id 56C371D545\n for <dev@dpdk.org>; Wed, 27 May 2020 18:14:43 +0200 (CEST)",
            "from AM0PR05MB4209.eurprd05.prod.outlook.com (2603:10a6:208:61::22)\n by AM0PR05MB4497.eurprd05.prod.outlook.com (2603:10a6:208:67::22)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.24; Wed, 27 May\n 2020 16:14:40 +0000",
            "from AM0PR05MB4209.eurprd05.prod.outlook.com\n ([fe80::1068:89a9:41d3:b14a]) by AM0PR05MB4209.eurprd05.prod.outlook.com\n ([fe80::1068:89a9:41d3:b14a%3]) with mapi id 15.20.3021.029; Wed, 27 May 2020\n 16:14:40 +0000",
            "from mellanox.com (37.142.13.130) by\n AM0PR10CA0108.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:e6::25) with Microsoft\n SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.20.3045.18 via Frontend Transport; Wed, 27 May 2020 16:14:39 +0000"
        ],
        "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=BQFEt6tcZXlCLp5M+yYKFVGqY675dZtONggwPyuZG7Tawf/I7a2eBp6FMsIFmG9uDLIJEZr4/8P9m06Dc95mTaiQ4PsvPCjoN6sv2NH6l3g8PQ8O52p1ssuMe2D9Jf2KTLi46R3sLWxErF+23rf2wVlOQdu7j9osNS6UruQUYLb3eSIo9vjBVcxY04q4r8Lx5Ek1TuB26yrRqal2Xa/eU3IFvQE+VJtHmFANxZw9quR72wypXy0IX6Ms/0AXa9YX+MbvinAeZZdLPYYo73K8jauaGc76/bcaDwwq42YKZVVpaIzl5cGjCXZr9simrpKCwXdUNwdSzj3p45pOkE6uQg==",
        "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=N+vhtqhEp/fp3NLXNJTqBF+dPkEecWB3dg8N/XMw1HU=;\n b=BNlQJFkIlHHto14jX2/G8a1kgoCr5O3ntM+5bLLRTSdcV8B3bzFEQF+GVLMUnI2cf0FQiniS06toL6/3313kJcr1o7JZvvOf77CLznAGdF4Q5JldP7+eSTgHCvWliVtiYh6tyw+mXi2/0C0Fcykw4wDFq2seGDt4I9Vf6aEn1HPH5Cf8JnM/Pzg5wLdT5nHv5j4kW7nRjd/xXphlRRms1QM5/RvIA+KDxpScP+F+mSDEOEKZ74cJrMLTITMCNiqUKLh7peOo4+MUtFqpIdBxrFAx0Cv+BkPS9GwUCb0RbaBtCwc2SoYL8nCJu8o2DNOz29DKcLAC5psjrvhcUk+yPw==",
        "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com;\n dkim=pass header.d=mellanox.com; arc=none",
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com;\n s=selector1;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=N+vhtqhEp/fp3NLXNJTqBF+dPkEecWB3dg8N/XMw1HU=;\n b=S1hyryhNLbyU0RnwrG1UTVFcCJjZXVZ+xLvWyY/5nvUjik0XaxVwncp9bndYPYfOp/YuQxXzlJAiIJ9wMDRzefZ2ltaO67o0V9jt1WGeMbi8+4VWCjhEkaJQQknW2bUdRkV4SeL0TO4/RNGvUMT830sCMBTHscRqPCUxZrpt18c=",
        "Authentication-Results": "dpdk.org; dkim=none (message not signed)\n header.d=none;dpdk.org; dmarc=none action=none header.from=mellanox.com;",
        "From": "Ophir Munk <ophirmu@mellanox.com>",
        "To": "dev@dpdk.org,\n\tMatan Azrad <matan@mellanox.com>",
        "Cc": "Ophir Munk <ophirmu@mellanox.com>",
        "Date": "Wed, 27 May 2020 16:14:23 +0000",
        "Message-Id": "<20200527161425.22944-1-ophirmu@mellanox.com>",
        "X-Mailer": [
            "git-send-email 2.8.4",
            "git-send-email 2.8.4"
        ],
        "Content-Type": "text/plain",
        "X-ClientProxiedBy": "AM0PR10CA0108.EURPRD10.PROD.OUTLOOK.COM\n (2603:10a6:208:e6::25) To AM0PR05MB4209.eurprd05.prod.outlook.com\n (2603:10a6:208:61::22)",
        "MIME-Version": "1.0",
        "X-MS-Exchange-MessageSentRepresentingType": "1",
        "X-Originating-IP": "[37.142.13.130]",
        "X-MS-PublicTrafficType": "Email",
        "X-MS-Office365-Filtering-HT": "Tenant",
        "X-MS-Office365-Filtering-Correlation-Id": "16b86879-f600-4d1f-f464-08d802590eaf",
        "X-MS-TrafficTypeDiagnostic": "AM0PR05MB4497:",
        "X-MS-Exchange-Transport-Forked": "True",
        "X-Microsoft-Antispam-PRVS": "\n <AM0PR05MB4497CAC9123CACF36EF4083BD1B10@AM0PR05MB4497.eurprd05.prod.outlook.com>",
        "X-MS-Oob-TLC-OOBClassifiers": "OLM:2399;",
        "X-Forefront-PRVS": "04163EF38A",
        "X-MS-Exchange-SenderADCheck": "1",
        "X-Microsoft-Antispam": "BCL:0;",
        "X-Microsoft-Antispam-Message-Info": "\n oXhlYZ7ZgsEkQPpaPyMOZdAPd56wBr9iMmJMJcSce46pcy8Z2MG/uwLOTihVlsFJIj1PV87V8gB5woDmocI41GhVK6D9JdWnEl4wLD88r4DVdst350ci5jhWEjuw9r14K6GmlDktwJA2L1aHvr4WVgeH38JXW9ilqIT4P7+3JO0g9yH1mtv5ZbXHD385Zcr/AQLg3xZnj1O9VXgiljV+ohGEiUxnMrUvi1+qI+wzFttLZ5CJ1Fxkz9gmnqgEDy2HTrtbiN+r+jLWFfdH3YeoxQ7410PAbpnI8ZWsXBeOAiD9Rb1/+S8pEzGKkDh/pFla",
        "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:AM0PR05MB4209.eurprd05.prod.outlook.com; PTR:; CAT:NONE;\n SFTY:;\n SFS:(4636009)(39860400002)(376002)(346002)(396003)(366004)(136003)(2906002)(6636002)(7696005)(8886007)(1076003)(26005)(8676002)(5660300002)(37006003)(52116002)(36756003)(186003)(16526019)(30864003)(6666004)(83380400001)(8936002)(316002)(478600001)(66946007)(66556008)(86362001)(2616005)(956004)(66476007)(6862004)(107886003)(4326008)(55016002)(559001)(579004);\n DIR:OUT; SFP:1101;",
        "X-MS-Exchange-AntiSpam-MessageData": "\n OuP+DolcaCuDvqAUlbzqjpVDtzHQUmSrzXaIx+VmM5ubaNs5sZ1Vt8P4k/QS7Ut/bMFhBUcsi6S9roU+ofAlmyaAj16o+fUIpTvqOKoSJBRNqGlKW/2UA7dtBDrv2qccG5ktmGY+OhfS/Z/cWUFN/JtkNvnatfC/XDvTHu7q3qepPg5rdvUrJARdEPOVemS1X7Xe+yoOWF8Lu/5svOkl+0sMhXZ//j1zAtPHa/aV7Ew7NM9gfdAQiJRJAwSgWHUZYovAn539S4/tT1n3GeTTNieKvVUZVV5I1F5ZUj7eEaNJoEn2iQ5zKmkvPwTu/O49XgObDCaOifHrR+TytOaCNEPLP+4HUnef7HZsIb91XAM+weYxXCBEk4bJ/rfAXRtrGkZhaG2XDoRHtnSEYFkajMQizXC35wpL0iFix7TpJjCwpS/CO5xxCl20Riyhd7h1ILXSI07wh82FKUdWzRrVyMW6AylxCynJHmI9dlvF7WU=",
        "X-OriginatorOrg": "Mellanox.com",
        "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 16b86879-f600-4d1f-f464-08d802590eaf",
        "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "27 May 2020 16:14:39.9239 (UTC)",
        "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted",
        "X-MS-Exchange-CrossTenant-Id": "a652971c-7d2e-4d9b-a6a4-d149256f461b",
        "X-MS-Exchange-CrossTenant-MailboxType": "HOSTED",
        "X-MS-Exchange-CrossTenant-UserPrincipalName": "\n n6wHuWtrToS0Cj/njRjOoGE4pb7ol0uQMkULWj8ZMuNgQKDEA36G2TAAx5scSquZ6YP+skG7EyDS30ibVNTFFw==",
        "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "AM0PR05MB4497",
        "Subject": "[dpdk-dev] [PATCH v1 1/3] common/mlx5: move glue files under Linux\n\tdirectory",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "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 glue file mlx5_glue.c is based on Linux specifics APIs.\nMove it (including file mlx5_glue.h) to common/mlx5/linux directory.\n\nSigned-off-by: Ophir Munk <ophirmu@mellanox.com>\n---\n drivers/common/mlx5/Makefile          |   12 +-\n drivers/common/mlx5/linux/meson.build |  199 +++++\n drivers/common/mlx5/linux/mlx5_glue.c | 1294 +++++++++++++++++++++++++++++++++\n drivers/common/mlx5/linux/mlx5_glue.h |  309 ++++++++\n drivers/common/mlx5/meson.build       |  200 +----\n drivers/common/mlx5/mlx5_glue.c       | 1294 ---------------------------------\n drivers/common/mlx5/mlx5_glue.h       |  309 --------\n drivers/net/mlx5/Makefile             |    1 +\n drivers/vdpa/mlx5/Makefile            |    1 +\n 9 files changed, 1817 insertions(+), 1802 deletions(-)\n create mode 100644 drivers/common/mlx5/linux/meson.build\n create mode 100644 drivers/common/mlx5/linux/mlx5_glue.c\n create mode 100644 drivers/common/mlx5/linux/mlx5_glue.h\n delete mode 100644 drivers/common/mlx5/mlx5_glue.c\n delete mode 100644 drivers/common/mlx5/mlx5_glue.h",
    "diff": "diff --git a/drivers/common/mlx5/Makefile b/drivers/common/mlx5/Makefile\nindex 0d8cc1b..19b1466 100644\n--- a/drivers/common/mlx5/Makefile\n+++ b/drivers/common/mlx5/Makefile\n@@ -12,7 +12,7 @@ LIB_GLUE_VERSION = 20.02.0\n # Sources.\n ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)),y)\n ifneq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y)\n-SRCS-y += mlx5_glue.c\n+SRCS-y += linux/mlx5_glue.c\n endif\n SRCS-y += mlx5_devx_cmds.c\n SRCS-y += mlx5_common.c\n@@ -29,6 +29,8 @@ CFLAGS += -O3\n CFLAGS += -std=c11 -Wall -Wextra\n CFLAGS += -g\n CFLAGS += -I.\n+CFLAGS += -I$(SRCDIR)\n+CFLAGS += -I$(SRCDIR)/linux\n CFLAGS += -D_BSD_SOURCE\n CFLAGS += -D_DEFAULT_SOURCE\n CFLAGS += -D_XOPEN_SOURCE=600\n@@ -37,7 +39,7 @@ CFLAGS += -Wno-strict-prototypes\n ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y)\n CFLAGS += -DMLX5_GLUE='\"$(LIB_GLUE)\"'\n CFLAGS += -DMLX5_GLUE_VERSION='\"$(LIB_GLUE_VERSION)\"'\n-CFLAGS_mlx5_glue.o += -fPIC\n+CFLAGS_linux/mlx5_glue.o += -fPIC\n LDLIBS += -ldl\n else ifeq ($(CONFIG_RTE_IBVERBS_LINK_STATIC),y)\n LDLIBS += $(shell $(RTE_SDK)/buildtools/options-ibverbs-static.sh)\n@@ -346,17 +348,17 @@ GLUE_LDFLAGS := $(call linkerprefix,$(LDFLAGS))\n else\n GLUE_LDFLAGS := $(LDFLAGS)\n endif\n-$(LIB_GLUE): mlx5_glue.o\n+$(LIB_GLUE): linux/mlx5_glue.o\n \t$Q $(LD) $(GLUE_LDFLAGS) $(EXTRA_LDFLAGS) \\\n \t\t-Wl,-h,$(LIB_GLUE) \\\n \t\t-shared -o $@ $< -libverbs -lmlx5\n \n-mlx5_glue.o: mlx5_autoconf.h\n+linux/mlx5_glue.o: mlx5_autoconf.h\n \n endif\n \n clean_mlx5: FORCE\n \t$Q rm -f -- mlx5_autoconf.h mlx5_autoconf.h.new\n-\t$Q rm -f -- mlx5_glue.o $(LIB_GLUE_BASE)*\n+\t$Q rm -f -- linux/mlx5_glue.o $(LIB_GLUE_BASE)*\n \n clean: clean_mlx5\ndiff --git a/drivers/common/mlx5/linux/meson.build b/drivers/common/mlx5/linux/meson.build\nnew file mode 100644\nindex 0000000..a123fd6\n--- /dev/null\n+++ b/drivers/common/mlx5/linux/meson.build\n@@ -0,0 +1,199 @@\n+# SPDX-License-Identifier: BSD-3-Clause\n+# Copyright 2020 Mellanox Technologies, Ltd\n+\n+includes += include_directories('.')\n+\n+static_ibverbs = (get_option('ibverbs_link') == 'static')\n+dlopen_ibverbs = (get_option('ibverbs_link') == 'dlopen')\n+LIB_GLUE_BASE = 'librte_pmd_mlx5_glue.so'\n+LIB_GLUE_VERSION = '20.02.0'\n+LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION\n+if dlopen_ibverbs\n+\tdpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)\n+\tcflags += [\n+\t\t'-DMLX5_GLUE=\"@0@\"'.format(LIB_GLUE),\n+\t\t'-DMLX5_GLUE_VERSION=\"@0@\"'.format(LIB_GLUE_VERSION),\n+\t]\n+endif\n+\n+libnames = [ 'mlx5', 'ibverbs' ]\n+libs = []\n+foreach libname:libnames\n+\tlib = dependency('lib' + libname, static:static_ibverbs, required:false)\n+\tif not lib.found() and not static_ibverbs\n+\t\tlib = cc.find_library(libname, required:false)\n+\tendif\n+\tif lib.found()\n+\t\tlibs += lib\n+\t\tif not static_ibverbs and not dlopen_ibverbs\n+\t\t\text_deps += lib\n+\t\tendif\n+\telse\n+\t\tbuild = false\n+\t\treason = 'missing dependency, \"' + libname + '\"'\n+\t\tsubdir_done()\n+\tendif\n+endforeach\n+if static_ibverbs or dlopen_ibverbs\n+\t# Build without adding shared libs to Requires.private\n+\tibv_cflags = run_command(pkgconf, '--cflags', 'libibverbs').stdout()\n+\text_deps += declare_dependency(compile_args: ibv_cflags.split())\n+endif\n+if static_ibverbs\n+\t# Add static deps ldflags to internal apps and Libs.private\n+\tibv_ldflags = run_command(ldflags_ibverbs_static, check:true).stdout()\n+\text_deps += declare_dependency(link_args:ibv_ldflags.split())\n+endif\n+\n+if not dlopen_ibverbs\n+\tsources += files('mlx5_glue.c')\n+endif\n+\n+# To maintain the compatibility with the make build system\n+# mlx5_autoconf.h file is still generated.\n+# input array for meson member search:\n+# [ \"MACRO to define if found\", \"header for the search\",\n+#   \"symbol to search\", \"struct member to search\" ]\n+has_member_args = [\n+\t[ 'HAVE_IBV_MLX5_MOD_SWP', 'infiniband/mlx5dv.h',\n+\t'struct mlx5dv_sw_parsing_caps', 'sw_parsing_offloads' ],\n+\t[ 'HAVE_IBV_DEVICE_COUNTERS_SET_V42', 'infiniband/verbs.h',\n+\t'struct ibv_counter_set_init_attr', 'counter_set_id' ],\n+\t[ 'HAVE_IBV_DEVICE_COUNTERS_SET_V45', 'infiniband/verbs.h',\n+\t'struct ibv_counters_init_attr', 'comp_mask' ],\n+]\n+# input array for meson symbol search:\n+# [ \"MACRO to define if found\", \"header for the search\",\n+#   \"symbol to search\" ]\n+has_sym_args = [\n+\t[ 'HAVE_IBV_RELAXED_ORDERING', 'infiniband/verbs.h',\n+\t'IBV_ACCESS_RELAXED_ORDERING ' ],\n+\t[ 'HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT', 'infiniband/mlx5dv.h',\n+\t'MLX5DV_CQE_RES_FORMAT_CSUM_STRIDX' ],\n+\t[ 'HAVE_IBV_DEVICE_TUNNEL_SUPPORT', 'infiniband/mlx5dv.h',\n+\t'MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS' ],\n+\t[ 'HAVE_IBV_MLX5_MOD_MPW', 'infiniband/mlx5dv.h',\n+\t'MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED' ],\n+\t[ 'HAVE_IBV_MLX5_MOD_CQE_128B_COMP', 'infiniband/mlx5dv.h',\n+\t'MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP' ],\n+\t[ 'HAVE_IBV_MLX5_MOD_CQE_128B_PAD', 'infiniband/mlx5dv.h',\n+\t'MLX5DV_CQ_INIT_ATTR_FLAGS_CQE_PAD' ],\n+\t[ 'HAVE_IBV_FLOW_DV_SUPPORT', 'infiniband/mlx5dv.h',\n+\t'mlx5dv_create_flow_action_packet_reformat' ],\n+\t[ 'HAVE_IBV_DEVICE_MPLS_SUPPORT', 'infiniband/verbs.h',\n+\t'IBV_FLOW_SPEC_MPLS' ],\n+\t[ 'HAVE_IBV_WQ_FLAGS_PCI_WRITE_END_PADDING', 'infiniband/verbs.h',\n+\t'IBV_WQ_FLAGS_PCI_WRITE_END_PADDING' ],\n+\t[ 'HAVE_IBV_WQ_FLAG_RX_END_PADDING', 'infiniband/verbs.h',\n+\t'IBV_WQ_FLAG_RX_END_PADDING' ],\n+\t[ 'HAVE_MLX5DV_DR_DEVX_PORT', 'infiniband/mlx5dv.h',\n+\t'mlx5dv_query_devx_port' ],\n+\t[ 'HAVE_IBV_DEVX_OBJ', 'infiniband/mlx5dv.h',\n+\t'mlx5dv_devx_obj_create' ],\n+\t[ 'HAVE_IBV_FLOW_DEVX_COUNTERS', 'infiniband/mlx5dv.h',\n+\t'MLX5DV_FLOW_ACTION_COUNTERS_DEVX' ],\n+\t[ 'HAVE_IBV_DEVX_ASYNC', 'infiniband/mlx5dv.h',\n+\t'mlx5dv_devx_obj_query_async' ],\n+\t[ 'HAVE_IBV_DEVX_QP', 'infiniband/mlx5dv.h',\n+\t'mlx5dv_devx_qp_query' ],\n+\t[ 'HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR', 'infiniband/mlx5dv.h',\n+\t'mlx5dv_dr_action_create_dest_devx_tir' ],\n+\t[ 'HAVE_IBV_DEVX_EVENT', 'infiniband/mlx5dv.h',\n+\t'mlx5dv_devx_get_event' ],\n+\t[ 'HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER', 'infiniband/mlx5dv.h',\n+\t'mlx5dv_dr_action_create_flow_meter' ],\n+\t[ 'HAVE_MLX5DV_MMAP_GET_NC_PAGES_CMD', 'infiniband/mlx5dv.h',\n+\t'MLX5_MMAP_GET_NC_PAGES_CMD' ],\n+\t[ 'HAVE_MLX5DV_DR', 'infiniband/mlx5dv.h',\n+\t'MLX5DV_DR_DOMAIN_TYPE_NIC_RX' ],\n+\t[ 'HAVE_MLX5DV_DR_ESWITCH', 'infiniband/mlx5dv.h',\n+\t'MLX5DV_DR_DOMAIN_TYPE_FDB' ],\n+\t[ 'HAVE_MLX5DV_DR_VLAN', 'infiniband/mlx5dv.h',\n+\t'mlx5dv_dr_action_create_push_vlan' ],\n+\t[ 'HAVE_IBV_VAR', 'infiniband/mlx5dv.h', 'mlx5dv_alloc_var' ],\n+\t[ 'HAVE_SUPPORTED_40000baseKR4_Full', 'linux/ethtool.h',\n+\t'SUPPORTED_40000baseKR4_Full' ],\n+\t[ 'HAVE_SUPPORTED_40000baseCR4_Full', 'linux/ethtool.h',\n+\t'SUPPORTED_40000baseCR4_Full' ],\n+\t[ 'HAVE_SUPPORTED_40000baseSR4_Full', 'linux/ethtool.h',\n+\t'SUPPORTED_40000baseSR4_Full' ],\n+\t[ 'HAVE_SUPPORTED_40000baseLR4_Full', 'linux/ethtool.h',\n+\t'SUPPORTED_40000baseLR4_Full' ],\n+\t[ 'HAVE_SUPPORTED_56000baseKR4_Full', 'linux/ethtool.h',\n+\t'SUPPORTED_56000baseKR4_Full' ],\n+\t[ 'HAVE_SUPPORTED_56000baseCR4_Full', 'linux/ethtool.h',\n+\t'SUPPORTED_56000baseCR4_Full' ],\n+\t[ 'HAVE_SUPPORTED_56000baseSR4_Full', 'linux/ethtool.h',\n+\t'SUPPORTED_56000baseSR4_Full' ],\n+\t[ 'HAVE_SUPPORTED_56000baseLR4_Full', 'linux/ethtool.h',\n+\t'SUPPORTED_56000baseLR4_Full' ],\n+\t[ 'HAVE_ETHTOOL_LINK_MODE_25G', 'linux/ethtool.h',\n+\t'ETHTOOL_LINK_MODE_25000baseCR_Full_BIT' ],\n+\t[ 'HAVE_ETHTOOL_LINK_MODE_50G', 'linux/ethtool.h',\n+\t'ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT' ],\n+\t[ 'HAVE_ETHTOOL_LINK_MODE_100G', 'linux/ethtool.h',\n+\t'ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT' ],\n+\t[ 'HAVE_IFLA_NUM_VF', 'linux/if_link.h',\n+\t'IFLA_NUM_VF' ],\n+\t[ 'HAVE_IFLA_EXT_MASK', 'linux/if_link.h',\n+\t'IFLA_EXT_MASK' ],\n+\t[ 'HAVE_IFLA_PHYS_SWITCH_ID', 'linux/if_link.h',\n+\t'IFLA_PHYS_SWITCH_ID' ],\n+\t[ 'HAVE_IFLA_PHYS_PORT_NAME', 'linux/if_link.h',\n+\t'IFLA_PHYS_PORT_NAME' ],\n+\t[ 'HAVE_RDMA_NL_NLDEV', 'rdma/rdma_netlink.h',\n+\t'RDMA_NL_NLDEV' ],\n+\t[ 'HAVE_RDMA_NLDEV_CMD_GET', 'rdma/rdma_netlink.h',\n+\t'RDMA_NLDEV_CMD_GET' ],\n+\t[ 'HAVE_RDMA_NLDEV_CMD_PORT_GET', 'rdma/rdma_netlink.h',\n+\t'RDMA_NLDEV_CMD_PORT_GET' ],\n+\t[ 'HAVE_RDMA_NLDEV_ATTR_DEV_INDEX', 'rdma/rdma_netlink.h',\n+\t'RDMA_NLDEV_ATTR_DEV_INDEX' ],\n+\t[ 'HAVE_RDMA_NLDEV_ATTR_DEV_NAME', 'rdma/rdma_netlink.h',\n+\t'RDMA_NLDEV_ATTR_DEV_NAME' ],\n+\t[ 'HAVE_RDMA_NLDEV_ATTR_PORT_INDEX', 'rdma/rdma_netlink.h',\n+\t'RDMA_NLDEV_ATTR_PORT_INDEX' ],\n+\t[ 'HAVE_RDMA_NLDEV_ATTR_NDEV_INDEX', 'rdma/rdma_netlink.h',\n+\t'RDMA_NLDEV_ATTR_NDEV_INDEX' ],\n+\t[ 'HAVE_MLX5_DR_FLOW_DUMP', 'infiniband/mlx5dv.h',\n+\t'mlx5dv_dump_dr_domain'],\n+\t[ 'HAVE_DEVLINK', 'linux/devlink.h', 'DEVLINK_GENL_NAME' ],\n+]\n+config = configuration_data()\n+foreach arg:has_sym_args\n+\tconfig.set(arg[0], cc.has_header_symbol(arg[1], arg[2],\n+\t\tdependencies: libs))\n+endforeach\n+foreach arg:has_member_args\n+\tfile_prefix = '#include <' + arg[1] + '>'\n+\tconfig.set(arg[0], cc.has_member(arg[2], arg[3],\n+\t\tprefix : file_prefix, dependencies: libs))\n+endforeach\n+configure_file(output : 'mlx5_autoconf.h', configuration : config)\n+\n+# Build Glue Library\n+if dlopen_ibverbs\n+\tdlopen_name = 'mlx5_glue'\n+\tdlopen_lib_name = 'rte_pmd_@0@'.format(dlopen_name)\n+\tdlopen_so_version = LIB_GLUE_VERSION\n+\tdlopen_sources = files('mlx5_glue.c')\n+\tdlopen_install_dir = [ eal_pmd_path + '-glue' ]\n+\tdlopen_includes = [global_inc]\n+\tdlopen_includes += include_directories(\n+\t\t'../../../../lib/librte_eal/include/generic',\n+\t)\n+\tshared_lib = shared_library(\n+\t\tdlopen_lib_name,\n+\t\tdlopen_sources,\n+\t\tinclude_directories: dlopen_includes,\n+\t\tc_args: cflags,\n+\t\tdependencies: libs,\n+\t\tlink_args: [\n+\t\t'-Wl,-export-dynamic',\n+\t\t'-Wl,-h,@0@'.format(LIB_GLUE),\n+\t\t],\n+\t\tsoversion: dlopen_so_version,\n+\t\tinstall: true,\n+\t\tinstall_dir: dlopen_install_dir,\n+\t)\n+endif\ndiff --git a/drivers/common/mlx5/linux/mlx5_glue.c b/drivers/common/mlx5/linux/mlx5_glue.c\nnew file mode 100644\nindex 0000000..f270f67\n--- /dev/null\n+++ b/drivers/common/mlx5/linux/mlx5_glue.c\n@@ -0,0 +1,1294 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright 2018 6WIND S.A.\n+ * Copyright 2018 Mellanox Technologies, Ltd\n+ */\n+\n+#include <errno.h>\n+#include <stdalign.h>\n+#include <stddef.h>\n+#include <stdint.h>\n+#include <stdlib.h>\n+/*\n+ * Not needed by this file; included to work around the lack of off_t\n+ * definition for mlx5dv.h with unpatched rdma-core versions.\n+ */\n+#include <sys/types.h>\n+\n+#include \"mlx5_glue.h\"\n+\n+static int\n+mlx5_glue_fork_init(void)\n+{\n+\treturn ibv_fork_init();\n+}\n+\n+static struct ibv_pd *\n+mlx5_glue_alloc_pd(struct ibv_context *context)\n+{\n+\treturn ibv_alloc_pd(context);\n+}\n+\n+static int\n+mlx5_glue_dealloc_pd(struct ibv_pd *pd)\n+{\n+\treturn ibv_dealloc_pd(pd);\n+}\n+\n+static struct ibv_device **\n+mlx5_glue_get_device_list(int *num_devices)\n+{\n+\treturn ibv_get_device_list(num_devices);\n+}\n+\n+static void\n+mlx5_glue_free_device_list(struct ibv_device **list)\n+{\n+\tibv_free_device_list(list);\n+}\n+\n+static struct ibv_context *\n+mlx5_glue_open_device(struct ibv_device *device)\n+{\n+\treturn ibv_open_device(device);\n+}\n+\n+static int\n+mlx5_glue_close_device(struct ibv_context *context)\n+{\n+\treturn ibv_close_device(context);\n+}\n+\n+static int\n+mlx5_glue_query_device(struct ibv_context *context,\n+\t\t       struct ibv_device_attr *device_attr)\n+{\n+\treturn ibv_query_device(context, device_attr);\n+}\n+\n+static int\n+mlx5_glue_query_device_ex(struct ibv_context *context,\n+\t\t\t  const struct ibv_query_device_ex_input *input,\n+\t\t\t  struct ibv_device_attr_ex *attr)\n+{\n+\treturn ibv_query_device_ex(context, input, attr);\n+}\n+\n+static int\n+mlx5_glue_query_rt_values_ex(struct ibv_context *context,\n+\t\t\t  struct ibv_values_ex *values)\n+{\n+\treturn ibv_query_rt_values_ex(context, values);\n+}\n+\n+static int\n+mlx5_glue_query_port(struct ibv_context *context, uint8_t port_num,\n+\t\t     struct ibv_port_attr *port_attr)\n+{\n+\treturn ibv_query_port(context, port_num, port_attr);\n+}\n+\n+static struct ibv_comp_channel *\n+mlx5_glue_create_comp_channel(struct ibv_context *context)\n+{\n+\treturn ibv_create_comp_channel(context);\n+}\n+\n+static int\n+mlx5_glue_destroy_comp_channel(struct ibv_comp_channel *channel)\n+{\n+\treturn ibv_destroy_comp_channel(channel);\n+}\n+\n+static struct ibv_cq *\n+mlx5_glue_create_cq(struct ibv_context *context, int cqe, void *cq_context,\n+\t\t    struct ibv_comp_channel *channel, int comp_vector)\n+{\n+\treturn ibv_create_cq(context, cqe, cq_context, channel, comp_vector);\n+}\n+\n+static int\n+mlx5_glue_destroy_cq(struct ibv_cq *cq)\n+{\n+\treturn ibv_destroy_cq(cq);\n+}\n+\n+static int\n+mlx5_glue_get_cq_event(struct ibv_comp_channel *channel, struct ibv_cq **cq,\n+\t\t       void **cq_context)\n+{\n+\treturn ibv_get_cq_event(channel, cq, cq_context);\n+}\n+\n+static void\n+mlx5_glue_ack_cq_events(struct ibv_cq *cq, unsigned int nevents)\n+{\n+\tibv_ack_cq_events(cq, nevents);\n+}\n+\n+static struct ibv_rwq_ind_table *\n+mlx5_glue_create_rwq_ind_table(struct ibv_context *context,\n+\t\t\t       struct ibv_rwq_ind_table_init_attr *init_attr)\n+{\n+\treturn ibv_create_rwq_ind_table(context, init_attr);\n+}\n+\n+static int\n+mlx5_glue_destroy_rwq_ind_table(struct ibv_rwq_ind_table *rwq_ind_table)\n+{\n+\treturn ibv_destroy_rwq_ind_table(rwq_ind_table);\n+}\n+\n+static struct ibv_wq *\n+mlx5_glue_create_wq(struct ibv_context *context,\n+\t\t    struct ibv_wq_init_attr *wq_init_attr)\n+{\n+\treturn ibv_create_wq(context, wq_init_attr);\n+}\n+\n+static int\n+mlx5_glue_destroy_wq(struct ibv_wq *wq)\n+{\n+\treturn ibv_destroy_wq(wq);\n+}\n+static int\n+mlx5_glue_modify_wq(struct ibv_wq *wq, struct ibv_wq_attr *wq_attr)\n+{\n+\treturn ibv_modify_wq(wq, wq_attr);\n+}\n+\n+static struct ibv_flow *\n+mlx5_glue_create_flow(struct ibv_qp *qp, struct ibv_flow_attr *flow)\n+{\n+\treturn ibv_create_flow(qp, flow);\n+}\n+\n+static int\n+mlx5_glue_destroy_flow(struct ibv_flow *flow_id)\n+{\n+\treturn ibv_destroy_flow(flow_id);\n+}\n+\n+static int\n+mlx5_glue_destroy_flow_action(void *action)\n+{\n+#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n+#ifdef HAVE_MLX5DV_DR\n+\treturn mlx5dv_dr_action_destroy(action);\n+#else\n+\tstruct mlx5dv_flow_action_attr *attr = action;\n+\tint res = 0;\n+\tswitch (attr->type) {\n+\tcase MLX5DV_FLOW_ACTION_TAG:\n+\t\tbreak;\n+\tdefault:\n+\t\tres = ibv_destroy_flow_action(attr->action);\n+\t\tbreak;\n+\t}\n+\tfree(action);\n+\treturn res;\n+#endif\n+#else\n+\t(void)action;\n+\treturn ENOTSUP;\n+#endif\n+}\n+\n+static struct ibv_qp *\n+mlx5_glue_create_qp(struct ibv_pd *pd, struct ibv_qp_init_attr *qp_init_attr)\n+{\n+\treturn ibv_create_qp(pd, qp_init_attr);\n+}\n+\n+static struct ibv_qp *\n+mlx5_glue_create_qp_ex(struct ibv_context *context,\n+\t\t       struct ibv_qp_init_attr_ex *qp_init_attr_ex)\n+{\n+\treturn ibv_create_qp_ex(context, qp_init_attr_ex);\n+}\n+\n+static int\n+mlx5_glue_destroy_qp(struct ibv_qp *qp)\n+{\n+\treturn ibv_destroy_qp(qp);\n+}\n+\n+static int\n+mlx5_glue_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr, int attr_mask)\n+{\n+\treturn ibv_modify_qp(qp, attr, attr_mask);\n+}\n+\n+static struct ibv_mr *\n+mlx5_glue_reg_mr(struct ibv_pd *pd, void *addr, size_t length, int access)\n+{\n+\treturn ibv_reg_mr(pd, addr, length, access);\n+}\n+\n+static struct ibv_mr *\n+mlx5_glue_alloc_null_mr(struct ibv_pd *pd)\n+{\n+#ifdef HAVE_IBV_DEVX_OBJ\n+\treturn ibv_alloc_null_mr(pd);\n+#else\n+\t(void)pd;\n+\terrno = ENOTSUP;\n+\treturn NULL;\n+#endif\n+}\n+\n+static int\n+mlx5_glue_dereg_mr(struct ibv_mr *mr)\n+{\n+\treturn ibv_dereg_mr(mr);\n+}\n+\n+static struct ibv_counter_set *\n+mlx5_glue_create_counter_set(struct ibv_context *context,\n+\t\t\t     struct ibv_counter_set_init_attr *init_attr)\n+{\n+#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V42\n+\t(void)context;\n+\t(void)init_attr;\n+\treturn NULL;\n+#else\n+\treturn ibv_create_counter_set(context, init_attr);\n+#endif\n+}\n+\n+static int\n+mlx5_glue_destroy_counter_set(struct ibv_counter_set *cs)\n+{\n+#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V42\n+\t(void)cs;\n+\treturn ENOTSUP;\n+#else\n+\treturn ibv_destroy_counter_set(cs);\n+#endif\n+}\n+\n+static int\n+mlx5_glue_describe_counter_set(struct ibv_context *context,\n+\t\t\t       uint16_t counter_set_id,\n+\t\t\t       struct ibv_counter_set_description *cs_desc)\n+{\n+#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V42\n+\t(void)context;\n+\t(void)counter_set_id;\n+\t(void)cs_desc;\n+\treturn ENOTSUP;\n+#else\n+\treturn ibv_describe_counter_set(context, counter_set_id, cs_desc);\n+#endif\n+}\n+\n+static int\n+mlx5_glue_query_counter_set(struct ibv_query_counter_set_attr *query_attr,\n+\t\t\t    struct ibv_counter_set_data *cs_data)\n+{\n+#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V42\n+\t(void)query_attr;\n+\t(void)cs_data;\n+\treturn ENOTSUP;\n+#else\n+\treturn ibv_query_counter_set(query_attr, cs_data);\n+#endif\n+}\n+\n+static struct ibv_counters *\n+mlx5_glue_create_counters(struct ibv_context *context,\n+\t\t\t  struct ibv_counters_init_attr *init_attr)\n+{\n+#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V45\n+\t(void)context;\n+\t(void)init_attr;\n+\terrno = ENOTSUP;\n+\treturn NULL;\n+#else\n+\treturn ibv_create_counters(context, init_attr);\n+#endif\n+}\n+\n+static int\n+mlx5_glue_destroy_counters(struct ibv_counters *counters)\n+{\n+#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V45\n+\t(void)counters;\n+\treturn ENOTSUP;\n+#else\n+\treturn ibv_destroy_counters(counters);\n+#endif\n+}\n+\n+static int\n+mlx5_glue_attach_counters(struct ibv_counters *counters,\n+\t\t\t  struct ibv_counter_attach_attr *attr,\n+\t\t\t  struct ibv_flow *flow)\n+{\n+#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V45\n+\t(void)counters;\n+\t(void)attr;\n+\t(void)flow;\n+\treturn ENOTSUP;\n+#else\n+\treturn ibv_attach_counters_point_flow(counters, attr, flow);\n+#endif\n+}\n+\n+static int\n+mlx5_glue_query_counters(struct ibv_counters *counters,\n+\t\t\t uint64_t *counters_value,\n+\t\t\t uint32_t ncounters,\n+\t\t\t uint32_t flags)\n+{\n+#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V45\n+\t(void)counters;\n+\t(void)counters_value;\n+\t(void)ncounters;\n+\t(void)flags;\n+\treturn ENOTSUP;\n+#else\n+\treturn ibv_read_counters(counters, counters_value, ncounters, flags);\n+#endif\n+}\n+\n+static void\n+mlx5_glue_ack_async_event(struct ibv_async_event *event)\n+{\n+\tibv_ack_async_event(event);\n+}\n+\n+static int\n+mlx5_glue_get_async_event(struct ibv_context *context,\n+\t\t\t  struct ibv_async_event *event)\n+{\n+\treturn ibv_get_async_event(context, event);\n+}\n+\n+static const char *\n+mlx5_glue_port_state_str(enum ibv_port_state port_state)\n+{\n+\treturn ibv_port_state_str(port_state);\n+}\n+\n+static struct ibv_cq *\n+mlx5_glue_cq_ex_to_cq(struct ibv_cq_ex *cq)\n+{\n+\treturn ibv_cq_ex_to_cq(cq);\n+}\n+\n+static void *\n+mlx5_glue_dr_create_flow_action_dest_flow_tbl(void *tbl)\n+{\n+#ifdef HAVE_MLX5DV_DR\n+\treturn mlx5dv_dr_action_create_dest_table(tbl);\n+#else\n+\t(void)tbl;\n+\terrno = ENOTSUP;\n+\treturn NULL;\n+#endif\n+}\n+\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+\treturn mlx5dv_dr_action_create_dest_ib_port(domain, port);\n+#else\n+#ifdef HAVE_MLX5DV_DR_ESWITCH\n+\treturn mlx5dv_dr_action_create_dest_vport(domain, port);\n+#else\n+\t(void)domain;\n+\t(void)port;\n+\terrno = ENOTSUP;\n+\treturn NULL;\n+#endif\n+#endif\n+}\n+\n+static void *\n+mlx5_glue_dr_create_flow_action_drop(void)\n+{\n+#ifdef HAVE_MLX5DV_DR_ESWITCH\n+\treturn mlx5dv_dr_action_create_drop();\n+#else\n+\terrno = ENOTSUP;\n+\treturn NULL;\n+#endif\n+}\n+\n+static void *\n+mlx5_glue_dr_create_flow_action_push_vlan(struct mlx5dv_dr_domain *domain,\n+\t\t\t\t\t  rte_be32_t vlan_tag)\n+{\n+#ifdef HAVE_MLX5DV_DR_VLAN\n+\treturn mlx5dv_dr_action_create_push_vlan(domain, vlan_tag);\n+#else\n+\t(void)domain;\n+\t(void)vlan_tag;\n+\terrno = ENOTSUP;\n+\treturn NULL;\n+#endif\n+}\n+\n+static void *\n+mlx5_glue_dr_create_flow_action_pop_vlan(void)\n+{\n+#ifdef HAVE_MLX5DV_DR_VLAN\n+\treturn mlx5dv_dr_action_create_pop_vlan();\n+#else\n+\terrno = ENOTSUP;\n+\treturn NULL;\n+#endif\n+}\n+\n+static void *\n+mlx5_glue_dr_create_flow_tbl(void *domain, uint32_t level)\n+{\n+#ifdef HAVE_MLX5DV_DR\n+\treturn mlx5dv_dr_table_create(domain, level);\n+#else\n+\t(void)domain;\n+\t(void)level;\n+\terrno = ENOTSUP;\n+\treturn NULL;\n+#endif\n+}\n+\n+static int\n+mlx5_glue_dr_destroy_flow_tbl(void *tbl)\n+{\n+#ifdef HAVE_MLX5DV_DR\n+\treturn mlx5dv_dr_table_destroy(tbl);\n+#else\n+\t(void)tbl;\n+\terrno = ENOTSUP;\n+\treturn errno;\n+#endif\n+}\n+\n+static void *\n+mlx5_glue_dr_create_domain(struct ibv_context *ctx,\n+\t\t\t   enum  mlx5dv_dr_domain_type domain)\n+{\n+#ifdef HAVE_MLX5DV_DR\n+\treturn mlx5dv_dr_domain_create(ctx, domain);\n+#else\n+\t(void)ctx;\n+\t(void)domain;\n+\terrno = ENOTSUP;\n+\treturn NULL;\n+#endif\n+}\n+\n+static int\n+mlx5_glue_dr_destroy_domain(void *domain)\n+{\n+#ifdef HAVE_MLX5DV_DR\n+\treturn mlx5dv_dr_domain_destroy(domain);\n+#else\n+\t(void)domain;\n+\terrno = ENOTSUP;\n+\treturn errno;\n+#endif\n+}\n+\n+static struct ibv_cq_ex *\n+mlx5_glue_dv_create_cq(struct ibv_context *context,\n+\t\t       struct ibv_cq_init_attr_ex *cq_attr,\n+\t\t       struct mlx5dv_cq_init_attr *mlx5_cq_attr)\n+{\n+\treturn mlx5dv_create_cq(context, cq_attr, mlx5_cq_attr);\n+}\n+\n+static struct ibv_wq *\n+mlx5_glue_dv_create_wq(struct ibv_context *context,\n+\t\t       struct ibv_wq_init_attr *wq_attr,\n+\t\t       struct mlx5dv_wq_init_attr *mlx5_wq_attr)\n+{\n+#ifndef HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT\n+\t(void)context;\n+\t(void)wq_attr;\n+\t(void)mlx5_wq_attr;\n+\terrno = ENOTSUP;\n+\treturn NULL;\n+#else\n+\treturn mlx5dv_create_wq(context, wq_attr, mlx5_wq_attr);\n+#endif\n+}\n+\n+static int\n+mlx5_glue_dv_query_device(struct ibv_context *ctx,\n+\t\t\t  struct mlx5dv_context *attrs_out)\n+{\n+\treturn mlx5dv_query_device(ctx, attrs_out);\n+}\n+\n+static int\n+mlx5_glue_dv_set_context_attr(struct ibv_context *ibv_ctx,\n+\t\t\t      enum mlx5dv_set_ctx_attr_type type, void *attr)\n+{\n+\treturn mlx5dv_set_context_attr(ibv_ctx, type, attr);\n+}\n+\n+static int\n+mlx5_glue_dv_init_obj(struct mlx5dv_obj *obj, uint64_t obj_type)\n+{\n+\treturn mlx5dv_init_obj(obj, obj_type);\n+}\n+\n+static struct ibv_qp *\n+mlx5_glue_dv_create_qp(struct ibv_context *context,\n+\t\t       struct ibv_qp_init_attr_ex *qp_init_attr_ex,\n+\t\t       struct mlx5dv_qp_init_attr *dv_qp_init_attr)\n+{\n+#ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT\n+\treturn mlx5dv_create_qp(context, qp_init_attr_ex, dv_qp_init_attr);\n+#else\n+\t(void)context;\n+\t(void)qp_init_attr_ex;\n+\t(void)dv_qp_init_attr;\n+\terrno = ENOTSUP;\n+\treturn NULL;\n+#endif\n+}\n+\n+static void *\n+mlx5_glue_dv_create_flow_matcher(struct ibv_context *context,\n+\t\t\t\t struct mlx5dv_flow_matcher_attr *matcher_attr,\n+\t\t\t\t void *tbl)\n+{\n+#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n+#ifdef HAVE_MLX5DV_DR\n+\t(void)context;\n+\treturn mlx5dv_dr_matcher_create(tbl, matcher_attr->priority,\n+\t\t\t\t\tmatcher_attr->match_criteria_enable,\n+\t\t\t\t\tmatcher_attr->match_mask);\n+#else\n+\t(void)tbl;\n+\treturn mlx5dv_create_flow_matcher(context, matcher_attr);\n+#endif\n+#else\n+\t(void)context;\n+\t(void)matcher_attr;\n+\t(void)tbl;\n+\terrno = ENOTSUP;\n+\treturn NULL;\n+#endif\n+}\n+\n+static void *\n+mlx5_glue_dv_create_flow(void *matcher,\n+\t\t\t void *match_value,\n+\t\t\t size_t num_actions,\n+\t\t\t void *actions[])\n+{\n+#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n+#ifdef HAVE_MLX5DV_DR\n+\treturn mlx5dv_dr_rule_create(matcher, match_value, num_actions,\n+\t\t\t\t     (struct mlx5dv_dr_action **)actions);\n+#else\n+\tstruct mlx5dv_flow_action_attr actions_attr[8];\n+\n+\tif (num_actions > 8)\n+\t\treturn NULL;\n+\tfor (size_t i = 0; i < num_actions; i++)\n+\t\tactions_attr[i] =\n+\t\t\t*((struct mlx5dv_flow_action_attr *)(actions[i]));\n+\treturn mlx5dv_create_flow(matcher, match_value,\n+\t\t\t\t  num_actions, actions_attr);\n+#endif\n+#else\n+\t(void)matcher;\n+\t(void)match_value;\n+\t(void)num_actions;\n+\t(void)actions;\n+\treturn NULL;\n+#endif\n+}\n+\n+static void *\n+mlx5_glue_dv_create_flow_action_counter(void *counter_obj, uint32_t offset)\n+{\n+#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n+#ifdef HAVE_MLX5DV_DR\n+\treturn mlx5dv_dr_action_create_flow_counter(counter_obj, offset);\n+#else\n+\tstruct mlx5dv_flow_action_attr *action;\n+\n+\t(void)offset;\n+\taction = malloc(sizeof(*action));\n+\tif (!action)\n+\t\treturn NULL;\n+\taction->type = MLX5DV_FLOW_ACTION_COUNTERS_DEVX;\n+\taction->obj = counter_obj;\n+\treturn action;\n+#endif\n+#else\n+\t(void)counter_obj;\n+\t(void)offset;\n+\terrno = ENOTSUP;\n+\treturn NULL;\n+#endif\n+}\n+\n+static void *\n+mlx5_glue_dv_create_flow_action_dest_ibv_qp(void *qp)\n+{\n+#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n+#ifdef HAVE_MLX5DV_DR\n+\treturn mlx5dv_dr_action_create_dest_ibv_qp(qp);\n+#else\n+\tstruct mlx5dv_flow_action_attr *action;\n+\n+\taction = malloc(sizeof(*action));\n+\tif (!action)\n+\t\treturn NULL;\n+\taction->type = MLX5DV_FLOW_ACTION_DEST_IBV_QP;\n+\taction->obj = qp;\n+\treturn action;\n+#endif\n+#else\n+\t(void)qp;\n+\terrno = ENOTSUP;\n+\treturn NULL;\n+#endif\n+}\n+\n+static void *\n+mlx5_glue_dv_create_flow_action_dest_devx_tir(void *tir)\n+{\n+#ifdef HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR\n+\treturn mlx5dv_dr_action_create_dest_devx_tir(tir);\n+#else\n+\t(void)tir;\n+\terrno = ENOTSUP;\n+\treturn NULL;\n+#endif\n+}\n+\n+static void *\n+mlx5_glue_dv_create_flow_action_modify_header\n+\t\t\t\t\t(struct ibv_context *ctx,\n+\t\t\t\t\t enum mlx5dv_flow_table_type ft_type,\n+\t\t\t\t\t void *domain, uint64_t flags,\n+\t\t\t\t\t size_t actions_sz,\n+\t\t\t\t\t uint64_t actions[])\n+{\n+#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n+#ifdef HAVE_MLX5DV_DR\n+\t(void)ctx;\n+\t(void)ft_type;\n+\treturn mlx5dv_dr_action_create_modify_header(domain, flags, actions_sz,\n+\t\t\t\t\t\t     (__be64 *)actions);\n+#else\n+\tstruct mlx5dv_flow_action_attr *action;\n+\n+\t(void)domain;\n+\t(void)flags;\n+\taction = malloc(sizeof(*action));\n+\tif (!action)\n+\t\treturn NULL;\n+\taction->type = MLX5DV_FLOW_ACTION_IBV_FLOW_ACTION;\n+\taction->action = mlx5dv_create_flow_action_modify_header\n+\t\t(ctx, actions_sz, actions, ft_type);\n+\treturn action;\n+#endif\n+#else\n+\t(void)ctx;\n+\t(void)ft_type;\n+\t(void)domain;\n+\t(void)flags;\n+\t(void)actions_sz;\n+\t(void)actions;\n+\terrno = ENOTSUP;\n+\treturn NULL;\n+#endif\n+}\n+\n+static void *\n+mlx5_glue_dv_create_flow_action_packet_reformat\n+\t\t(struct ibv_context *ctx,\n+\t\t enum mlx5dv_flow_action_packet_reformat_type reformat_type,\n+\t\t enum mlx5dv_flow_table_type ft_type,\n+\t\t struct mlx5dv_dr_domain *domain,\n+\t\t uint32_t flags, size_t data_sz, void *data)\n+{\n+#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n+#ifdef HAVE_MLX5DV_DR\n+\t(void)ctx;\n+\t(void)ft_type;\n+\treturn mlx5dv_dr_action_create_packet_reformat(domain, flags,\n+\t\t\t\t\t\t       reformat_type, data_sz,\n+\t\t\t\t\t\t       data);\n+#else\n+\t(void)domain;\n+\t(void)flags;\n+\tstruct mlx5dv_flow_action_attr *action;\n+\n+\taction = malloc(sizeof(*action));\n+\tif (!action)\n+\t\treturn NULL;\n+\taction->type = MLX5DV_FLOW_ACTION_IBV_FLOW_ACTION;\n+\taction->action = mlx5dv_create_flow_action_packet_reformat\n+\t\t(ctx, data_sz, data, reformat_type, ft_type);\n+\treturn action;\n+#endif\n+#else\n+\t(void)ctx;\n+\t(void)reformat_type;\n+\t(void)ft_type;\n+\t(void)domain;\n+\t(void)flags;\n+\t(void)data_sz;\n+\t(void)data;\n+\terrno = ENOTSUP;\n+\treturn NULL;\n+#endif\n+}\n+\n+static void *\n+mlx5_glue_dv_create_flow_action_tag(uint32_t tag)\n+{\n+#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n+#ifdef HAVE_MLX5DV_DR\n+\treturn mlx5dv_dr_action_create_tag(tag);\n+#else\n+\tstruct mlx5dv_flow_action_attr *action;\n+\taction = malloc(sizeof(*action));\n+\tif (!action)\n+\t\treturn NULL;\n+\taction->type = MLX5DV_FLOW_ACTION_TAG;\n+\taction->tag_value = tag;\n+\treturn action;\n+#endif\n+#endif\n+\t(void)tag;\n+\terrno = ENOTSUP;\n+\treturn NULL;\n+}\n+\n+static void *\n+mlx5_glue_dv_create_flow_action_meter(struct mlx5dv_dr_flow_meter_attr *attr)\n+{\n+#if defined(HAVE_MLX5DV_DR) && defined(HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER)\n+\treturn mlx5dv_dr_action_create_flow_meter(attr);\n+#else\n+\t(void)attr;\n+\terrno = ENOTSUP;\n+\treturn NULL;\n+#endif\n+}\n+\n+static int\n+mlx5_glue_dv_modify_flow_action_meter(void *action,\n+\t\t\t\t      struct mlx5dv_dr_flow_meter_attr *attr,\n+\t\t\t\t      uint64_t modify_bits)\n+{\n+#if defined(HAVE_MLX5DV_DR) && defined(HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER)\n+\treturn mlx5dv_dr_action_modify_flow_meter(action, attr, modify_bits);\n+#else\n+\t(void)action;\n+\t(void)attr;\n+\t(void)modify_bits;\n+\terrno = ENOTSUP;\n+\treturn errno;\n+#endif\n+}\n+\n+static int\n+mlx5_glue_dv_destroy_flow(void *flow_id)\n+{\n+#ifdef HAVE_MLX5DV_DR\n+\treturn mlx5dv_dr_rule_destroy(flow_id);\n+#else\n+\treturn ibv_destroy_flow(flow_id);\n+#endif\n+}\n+\n+static int\n+mlx5_glue_dv_destroy_flow_matcher(void *matcher)\n+{\n+#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n+#ifdef HAVE_MLX5DV_DR\n+\treturn mlx5dv_dr_matcher_destroy(matcher);\n+#else\n+\treturn mlx5dv_destroy_flow_matcher(matcher);\n+#endif\n+#else\n+\t(void)matcher;\n+\terrno = ENOTSUP;\n+\treturn errno;\n+#endif\n+}\n+\n+static struct ibv_context *\n+mlx5_glue_dv_open_device(struct ibv_device *device)\n+{\n+#ifdef HAVE_IBV_DEVX_OBJ\n+\treturn mlx5dv_open_device(device,\n+\t\t\t\t  &(struct mlx5dv_context_attr){\n+\t\t\t\t\t.flags = MLX5DV_CONTEXT_FLAGS_DEVX,\n+\t\t\t\t  });\n+#else\n+\t(void)device;\n+\terrno = ENOTSUP;\n+\treturn NULL;\n+#endif\n+}\n+\n+static struct mlx5dv_devx_obj *\n+mlx5_glue_devx_obj_create(struct ibv_context *ctx,\n+\t\t\t  const void *in, size_t inlen,\n+\t\t\t  void *out, size_t outlen)\n+{\n+#ifdef HAVE_IBV_DEVX_OBJ\n+\treturn mlx5dv_devx_obj_create(ctx, in, inlen, out, outlen);\n+#else\n+\t(void)ctx;\n+\t(void)in;\n+\t(void)inlen;\n+\t(void)out;\n+\t(void)outlen;\n+\terrno = ENOTSUP;\n+\treturn NULL;\n+#endif\n+}\n+\n+static int\n+mlx5_glue_devx_obj_destroy(struct mlx5dv_devx_obj *obj)\n+{\n+#ifdef HAVE_IBV_DEVX_OBJ\n+\treturn mlx5dv_devx_obj_destroy(obj);\n+#else\n+\t(void)obj;\n+\treturn -ENOTSUP;\n+#endif\n+}\n+\n+static int\n+mlx5_glue_devx_obj_query(struct mlx5dv_devx_obj *obj,\n+\t\t\t const void *in, size_t inlen,\n+\t\t\t void *out, size_t outlen)\n+{\n+#ifdef HAVE_IBV_DEVX_OBJ\n+\treturn mlx5dv_devx_obj_query(obj, in, inlen, out, outlen);\n+#else\n+\t(void)obj;\n+\t(void)in;\n+\t(void)inlen;\n+\t(void)out;\n+\t(void)outlen;\n+\treturn -ENOTSUP;\n+#endif\n+}\n+\n+static int\n+mlx5_glue_devx_obj_modify(struct mlx5dv_devx_obj *obj,\n+\t\t\t  const void *in, size_t inlen,\n+\t\t\t  void *out, size_t outlen)\n+{\n+#ifdef HAVE_IBV_DEVX_OBJ\n+\treturn mlx5dv_devx_obj_modify(obj, in, inlen, out, outlen);\n+#else\n+\t(void)obj;\n+\t(void)in;\n+\t(void)inlen;\n+\t(void)out;\n+\t(void)outlen;\n+\treturn -ENOTSUP;\n+#endif\n+}\n+\n+static int\n+mlx5_glue_devx_general_cmd(struct ibv_context *ctx,\n+\t\t\t   const void *in, size_t inlen,\n+\t\t\t   void *out, size_t outlen)\n+{\n+#ifdef HAVE_IBV_DEVX_OBJ\n+\treturn mlx5dv_devx_general_cmd(ctx, in, inlen, out, outlen);\n+#else\n+\t(void)ctx;\n+\t(void)in;\n+\t(void)inlen;\n+\t(void)out;\n+\t(void)outlen;\n+\treturn -ENOTSUP;\n+#endif\n+}\n+\n+static struct mlx5dv_devx_cmd_comp *\n+mlx5_glue_devx_create_cmd_comp(struct ibv_context *ctx)\n+{\n+#ifdef HAVE_IBV_DEVX_ASYNC\n+\treturn mlx5dv_devx_create_cmd_comp(ctx);\n+#else\n+\t(void)ctx;\n+\terrno = -ENOTSUP;\n+\treturn NULL;\n+#endif\n+}\n+\n+static void\n+mlx5_glue_devx_destroy_cmd_comp(struct mlx5dv_devx_cmd_comp *cmd_comp)\n+{\n+#ifdef HAVE_IBV_DEVX_ASYNC\n+\tmlx5dv_devx_destroy_cmd_comp(cmd_comp);\n+#else\n+\t(void)cmd_comp;\n+\terrno = -ENOTSUP;\n+#endif\n+}\n+\n+static int\n+mlx5_glue_devx_obj_query_async(struct mlx5dv_devx_obj *obj, const void *in,\n+\t\t\t       size_t inlen, size_t outlen, uint64_t wr_id,\n+\t\t\t       struct mlx5dv_devx_cmd_comp *cmd_comp)\n+{\n+#ifdef HAVE_IBV_DEVX_ASYNC\n+\treturn mlx5dv_devx_obj_query_async(obj, in, inlen, outlen, wr_id,\n+\t\t\t\t\t   cmd_comp);\n+#else\n+\t(void)obj;\n+\t(void)in;\n+\t(void)inlen;\n+\t(void)outlen;\n+\t(void)wr_id;\n+\t(void)cmd_comp;\n+\treturn -ENOTSUP;\n+#endif\n+}\n+\n+static int\n+mlx5_glue_devx_get_async_cmd_comp(struct mlx5dv_devx_cmd_comp *cmd_comp,\n+\t\t\t\t  struct mlx5dv_devx_async_cmd_hdr *cmd_resp,\n+\t\t\t\t  size_t cmd_resp_len)\n+{\n+#ifdef HAVE_IBV_DEVX_ASYNC\n+\treturn mlx5dv_devx_get_async_cmd_comp(cmd_comp, cmd_resp,\n+\t\t\t\t\t      cmd_resp_len);\n+#else\n+\t(void)cmd_comp;\n+\t(void)cmd_resp;\n+\t(void)cmd_resp_len;\n+\treturn -ENOTSUP;\n+#endif\n+}\n+\n+static struct mlx5dv_devx_umem *\n+mlx5_glue_devx_umem_reg(struct ibv_context *context, void *addr, size_t size,\n+\t\t\tuint32_t access)\n+{\n+#ifdef HAVE_IBV_DEVX_OBJ\n+\treturn mlx5dv_devx_umem_reg(context, addr, size, access);\n+#else\n+\t(void)context;\n+\t(void)addr;\n+\t(void)size;\n+\t(void)access;\n+\terrno = -ENOTSUP;\n+\treturn NULL;\n+#endif\n+}\n+\n+static int\n+mlx5_glue_devx_umem_dereg(struct mlx5dv_devx_umem *dv_devx_umem)\n+{\n+#ifdef HAVE_IBV_DEVX_OBJ\n+\treturn mlx5dv_devx_umem_dereg(dv_devx_umem);\n+#else\n+\t(void)dv_devx_umem;\n+\treturn -ENOTSUP;\n+#endif\n+}\n+\n+static int\n+mlx5_glue_devx_qp_query(struct ibv_qp *qp,\n+\t\t\tconst void *in, size_t inlen,\n+\t\t\tvoid *out, size_t outlen)\n+{\n+#ifdef HAVE_IBV_DEVX_QP\n+\treturn mlx5dv_devx_qp_query(qp, in, inlen, out, outlen);\n+#else\n+\t(void)qp;\n+\t(void)in;\n+\t(void)inlen;\n+\t(void)out;\n+\t(void)outlen;\n+\terrno = ENOTSUP;\n+\treturn errno;\n+#endif\n+}\n+\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+#ifdef HAVE_MLX5DV_DR_DEVX_PORT\n+\treturn mlx5dv_query_devx_port(ctx, port_num, mlx5_devx_port);\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+}\n+\n+static int\n+mlx5_glue_dr_dump_domain(FILE *file, void *domain)\n+{\n+#ifdef HAVE_MLX5_DR_FLOW_DUMP\n+\treturn mlx5dv_dump_dr_domain(file, domain);\n+#else\n+\tRTE_SET_USED(file);\n+\tRTE_SET_USED(domain);\n+\treturn -ENOTSUP;\n+#endif\n+}\n+\n+static int\n+mlx5_glue_devx_query_eqn(struct ibv_context *ctx, uint32_t cpus,\n+\t\t\t uint32_t *eqn)\n+{\n+#ifdef HAVE_IBV_DEVX_OBJ\n+\treturn mlx5dv_devx_query_eqn(ctx, cpus, eqn);\n+#else\n+\t(void)ctx;\n+\t(void)cpus;\n+\t(void)eqn;\n+\treturn -ENOTSUP;\n+#endif\n+}\n+\n+static struct mlx5dv_devx_event_channel *\n+mlx5_glue_devx_create_event_channel(struct ibv_context *ctx, int flags)\n+{\n+#ifdef HAVE_IBV_DEVX_EVENT\n+\treturn mlx5dv_devx_create_event_channel(ctx, flags);\n+#else\n+\t(void)ctx;\n+\t(void)flags;\n+\terrno = ENOTSUP;\n+\treturn NULL;\n+#endif\n+}\n+\n+static void\n+mlx5_glue_devx_destroy_event_channel(struct mlx5dv_devx_event_channel *eventc)\n+{\n+#ifdef HAVE_IBV_DEVX_EVENT\n+\tmlx5dv_devx_destroy_event_channel(eventc);\n+#else\n+\t(void)eventc;\n+#endif\n+}\n+\n+static int\n+mlx5_glue_devx_subscribe_devx_event(struct mlx5dv_devx_event_channel *eventc,\n+\t\t\t\t    struct mlx5dv_devx_obj *obj,\n+\t\t\t\t    uint16_t events_sz, uint16_t events_num[],\n+\t\t\t\t    uint64_t cookie)\n+{\n+#ifdef HAVE_IBV_DEVX_EVENT\n+\treturn mlx5dv_devx_subscribe_devx_event(eventc, obj, events_sz,\n+\t\t\t\t\t\tevents_num, cookie);\n+#else\n+\t(void)eventc;\n+\t(void)obj;\n+\t(void)events_sz;\n+\t(void)events_num;\n+\t(void)cookie;\n+\treturn -ENOTSUP;\n+#endif\n+}\n+\n+static int\n+mlx5_glue_devx_subscribe_devx_event_fd(struct mlx5dv_devx_event_channel *eventc,\n+\t\t\t\t       int fd, struct mlx5dv_devx_obj *obj,\n+\t\t\t\t       uint16_t event_num)\n+{\n+#ifdef HAVE_IBV_DEVX_EVENT\n+\treturn mlx5dv_devx_subscribe_devx_event_fd(eventc, fd, obj, event_num);\n+#else\n+\t(void)eventc;\n+\t(void)fd;\n+\t(void)obj;\n+\t(void)event_num;\n+\treturn -ENOTSUP;\n+#endif\n+}\n+\n+static ssize_t\n+mlx5_glue_devx_get_event(struct mlx5dv_devx_event_channel *eventc,\n+\t\t\t struct mlx5dv_devx_async_event_hdr *event_data,\n+\t\t\t size_t event_resp_len)\n+{\n+#ifdef HAVE_IBV_DEVX_EVENT\n+\treturn mlx5dv_devx_get_event(eventc, event_data, event_resp_len);\n+#else\n+\t(void)eventc;\n+\t(void)event_data;\n+\t(void)event_resp_len;\n+\terrno = ENOTSUP;\n+\treturn -1;\n+#endif\n+}\n+\n+static struct mlx5dv_devx_uar *\n+mlx5_glue_devx_alloc_uar(struct ibv_context *context, uint32_t flags)\n+{\n+#ifdef HAVE_IBV_DEVX_OBJ\n+\treturn mlx5dv_devx_alloc_uar(context, flags);\n+#else\n+\t(void)context;\n+\t(void)flags;\n+\terrno = ENOTSUP;\n+\treturn NULL;\n+#endif\n+}\n+\n+static void\n+mlx5_glue_devx_free_uar(struct mlx5dv_devx_uar *devx_uar)\n+{\n+#ifdef HAVE_IBV_DEVX_OBJ\n+\tmlx5dv_devx_free_uar(devx_uar);\n+#else\n+\t(void)devx_uar;\n+#endif\n+}\n+\n+static struct mlx5dv_var *\n+mlx5_glue_dv_alloc_var(struct ibv_context *context, uint32_t flags)\n+{\n+#ifdef HAVE_IBV_VAR\n+\treturn mlx5dv_alloc_var(context, flags);\n+#else\n+\t(void)context;\n+\t(void)flags;\n+\terrno = ENOTSUP;\n+\treturn NULL;\n+#endif\n+}\n+\n+static void\n+mlx5_glue_dv_free_var(struct mlx5dv_var *var)\n+{\n+#ifdef HAVE_IBV_VAR\n+\tmlx5dv_free_var(var);\n+#else\n+\t(void)var;\n+\terrno = ENOTSUP;\n+#endif\n+}\n+\n+__rte_cache_aligned\n+const struct mlx5_glue *mlx5_glue = &(const struct mlx5_glue) {\n+\t.version = MLX5_GLUE_VERSION,\n+\t.fork_init = mlx5_glue_fork_init,\n+\t.alloc_pd = mlx5_glue_alloc_pd,\n+\t.dealloc_pd = mlx5_glue_dealloc_pd,\n+\t.get_device_list = mlx5_glue_get_device_list,\n+\t.free_device_list = mlx5_glue_free_device_list,\n+\t.open_device = mlx5_glue_open_device,\n+\t.close_device = mlx5_glue_close_device,\n+\t.query_device = mlx5_glue_query_device,\n+\t.query_device_ex = mlx5_glue_query_device_ex,\n+\t.query_rt_values_ex = mlx5_glue_query_rt_values_ex,\n+\t.query_port = mlx5_glue_query_port,\n+\t.create_comp_channel = mlx5_glue_create_comp_channel,\n+\t.destroy_comp_channel = mlx5_glue_destroy_comp_channel,\n+\t.create_cq = mlx5_glue_create_cq,\n+\t.destroy_cq = mlx5_glue_destroy_cq,\n+\t.get_cq_event = mlx5_glue_get_cq_event,\n+\t.ack_cq_events = mlx5_glue_ack_cq_events,\n+\t.create_rwq_ind_table = mlx5_glue_create_rwq_ind_table,\n+\t.destroy_rwq_ind_table = mlx5_glue_destroy_rwq_ind_table,\n+\t.create_wq = mlx5_glue_create_wq,\n+\t.destroy_wq = mlx5_glue_destroy_wq,\n+\t.modify_wq = mlx5_glue_modify_wq,\n+\t.create_flow = mlx5_glue_create_flow,\n+\t.destroy_flow = mlx5_glue_destroy_flow,\n+\t.destroy_flow_action = mlx5_glue_destroy_flow_action,\n+\t.create_qp = mlx5_glue_create_qp,\n+\t.create_qp_ex = mlx5_glue_create_qp_ex,\n+\t.destroy_qp = mlx5_glue_destroy_qp,\n+\t.modify_qp = mlx5_glue_modify_qp,\n+\t.reg_mr = mlx5_glue_reg_mr,\n+\t.alloc_null_mr = mlx5_glue_alloc_null_mr,\n+\t.dereg_mr = mlx5_glue_dereg_mr,\n+\t.create_counter_set = mlx5_glue_create_counter_set,\n+\t.destroy_counter_set = mlx5_glue_destroy_counter_set,\n+\t.describe_counter_set = mlx5_glue_describe_counter_set,\n+\t.query_counter_set = mlx5_glue_query_counter_set,\n+\t.create_counters = mlx5_glue_create_counters,\n+\t.destroy_counters = mlx5_glue_destroy_counters,\n+\t.attach_counters = mlx5_glue_attach_counters,\n+\t.query_counters = mlx5_glue_query_counters,\n+\t.ack_async_event = mlx5_glue_ack_async_event,\n+\t.get_async_event = mlx5_glue_get_async_event,\n+\t.port_state_str = mlx5_glue_port_state_str,\n+\t.cq_ex_to_cq = mlx5_glue_cq_ex_to_cq,\n+\t.dr_create_flow_action_dest_flow_tbl =\n+\t\tmlx5_glue_dr_create_flow_action_dest_flow_tbl,\n+\t.dr_create_flow_action_dest_port =\n+\t\tmlx5_glue_dr_create_flow_action_dest_port,\n+\t.dr_create_flow_action_drop =\n+\t\tmlx5_glue_dr_create_flow_action_drop,\n+\t.dr_create_flow_action_push_vlan =\n+\t\tmlx5_glue_dr_create_flow_action_push_vlan,\n+\t.dr_create_flow_action_pop_vlan =\n+\t\tmlx5_glue_dr_create_flow_action_pop_vlan,\n+\t.dr_create_flow_tbl = mlx5_glue_dr_create_flow_tbl,\n+\t.dr_destroy_flow_tbl = mlx5_glue_dr_destroy_flow_tbl,\n+\t.dr_create_domain = mlx5_glue_dr_create_domain,\n+\t.dr_destroy_domain = mlx5_glue_dr_destroy_domain,\n+\t.dv_create_cq = mlx5_glue_dv_create_cq,\n+\t.dv_create_wq = mlx5_glue_dv_create_wq,\n+\t.dv_query_device = mlx5_glue_dv_query_device,\n+\t.dv_set_context_attr = mlx5_glue_dv_set_context_attr,\n+\t.dv_init_obj = mlx5_glue_dv_init_obj,\n+\t.dv_create_qp = mlx5_glue_dv_create_qp,\n+\t.dv_create_flow_matcher = mlx5_glue_dv_create_flow_matcher,\n+\t.dv_create_flow = mlx5_glue_dv_create_flow,\n+\t.dv_create_flow_action_counter =\n+\t\tmlx5_glue_dv_create_flow_action_counter,\n+\t.dv_create_flow_action_dest_ibv_qp =\n+\t\tmlx5_glue_dv_create_flow_action_dest_ibv_qp,\n+\t.dv_create_flow_action_dest_devx_tir =\n+\t\tmlx5_glue_dv_create_flow_action_dest_devx_tir,\n+\t.dv_create_flow_action_modify_header =\n+\t\tmlx5_glue_dv_create_flow_action_modify_header,\n+\t.dv_create_flow_action_packet_reformat =\n+\t\tmlx5_glue_dv_create_flow_action_packet_reformat,\n+\t.dv_create_flow_action_tag =  mlx5_glue_dv_create_flow_action_tag,\n+\t.dv_create_flow_action_meter = mlx5_glue_dv_create_flow_action_meter,\n+\t.dv_modify_flow_action_meter = mlx5_glue_dv_modify_flow_action_meter,\n+\t.dv_destroy_flow = mlx5_glue_dv_destroy_flow,\n+\t.dv_destroy_flow_matcher = mlx5_glue_dv_destroy_flow_matcher,\n+\t.dv_open_device = mlx5_glue_dv_open_device,\n+\t.devx_obj_create = mlx5_glue_devx_obj_create,\n+\t.devx_obj_destroy = mlx5_glue_devx_obj_destroy,\n+\t.devx_obj_query = mlx5_glue_devx_obj_query,\n+\t.devx_obj_modify = mlx5_glue_devx_obj_modify,\n+\t.devx_general_cmd = mlx5_glue_devx_general_cmd,\n+\t.devx_create_cmd_comp = mlx5_glue_devx_create_cmd_comp,\n+\t.devx_destroy_cmd_comp = mlx5_glue_devx_destroy_cmd_comp,\n+\t.devx_obj_query_async = mlx5_glue_devx_obj_query_async,\n+\t.devx_get_async_cmd_comp = mlx5_glue_devx_get_async_cmd_comp,\n+\t.devx_umem_reg = mlx5_glue_devx_umem_reg,\n+\t.devx_umem_dereg = mlx5_glue_devx_umem_dereg,\n+\t.devx_qp_query = mlx5_glue_devx_qp_query,\n+\t.devx_port_query = mlx5_glue_devx_port_query,\n+\t.dr_dump_domain = mlx5_glue_dr_dump_domain,\n+\t.devx_query_eqn = mlx5_glue_devx_query_eqn,\n+\t.devx_create_event_channel = mlx5_glue_devx_create_event_channel,\n+\t.devx_destroy_event_channel = mlx5_glue_devx_destroy_event_channel,\n+\t.devx_subscribe_devx_event = mlx5_glue_devx_subscribe_devx_event,\n+\t.devx_subscribe_devx_event_fd = mlx5_glue_devx_subscribe_devx_event_fd,\n+\t.devx_get_event = mlx5_glue_devx_get_event,\n+\t.devx_alloc_uar = mlx5_glue_devx_alloc_uar,\n+\t.devx_free_uar = mlx5_glue_devx_free_uar,\n+\t.dv_alloc_var = mlx5_glue_dv_alloc_var,\n+\t.dv_free_var = mlx5_glue_dv_free_var,\n+};\ndiff --git a/drivers/common/mlx5/linux/mlx5_glue.h b/drivers/common/mlx5/linux/mlx5_glue.h\nnew file mode 100644\nindex 0000000..81d6a22\n--- /dev/null\n+++ b/drivers/common/mlx5/linux/mlx5_glue.h\n@@ -0,0 +1,309 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright 2018 6WIND S.A.\n+ * Copyright 2018 Mellanox Technologies, Ltd\n+ */\n+\n+#ifndef MLX5_GLUE_H_\n+#define MLX5_GLUE_H_\n+\n+#include <stddef.h>\n+#include <stdint.h>\n+/* Verbs headers do not support -pedantic. */\n+#ifdef PEDANTIC\n+#pragma GCC diagnostic ignored \"-Wpedantic\"\n+#endif\n+#include <infiniband/mlx5dv.h>\n+#include <infiniband/verbs.h>\n+#ifdef PEDANTIC\n+#pragma GCC diagnostic error \"-Wpedantic\"\n+#endif\n+\n+#include <rte_byteorder.h>\n+\n+#include \"mlx5_autoconf.h\"\n+\n+#ifndef MLX5_GLUE_VERSION\n+#define MLX5_GLUE_VERSION \"\"\n+#endif\n+\n+#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V42\n+struct ibv_counter_set;\n+struct ibv_counter_set_data;\n+struct ibv_counter_set_description;\n+struct ibv_counter_set_init_attr;\n+struct ibv_query_counter_set_attr;\n+#endif\n+\n+#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V45\n+struct ibv_counters;\n+struct ibv_counters_init_attr;\n+struct ibv_counter_attach_attr;\n+#endif\n+\n+#ifndef HAVE_IBV_DEVICE_TUNNEL_SUPPORT\n+struct mlx5dv_qp_init_attr;\n+#endif\n+\n+#ifndef HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT\n+struct mlx5dv_wq_init_attr;\n+#endif\n+\n+#ifndef HAVE_IBV_FLOW_DV_SUPPORT\n+struct mlx5dv_flow_matcher;\n+struct mlx5dv_flow_matcher_attr;\n+struct mlx5dv_flow_action_attr;\n+struct mlx5dv_flow_match_parameters;\n+struct mlx5dv_dr_flow_meter_attr;\n+struct ibv_flow_action;\n+enum mlx5dv_flow_action_packet_reformat_type { packet_reformat_type = 0, };\n+enum mlx5dv_flow_table_type { flow_table_type = 0, };\n+#endif\n+\n+#ifndef HAVE_IBV_FLOW_DEVX_COUNTERS\n+#define MLX5DV_FLOW_ACTION_COUNTERS_DEVX 0\n+#endif\n+\n+#ifndef HAVE_IBV_DEVX_OBJ\n+struct mlx5dv_devx_obj;\n+struct mlx5dv_devx_umem { uint32_t umem_id; };\n+struct mlx5dv_devx_uar { void *reg_addr; void *base_addr; uint32_t page_id; };\n+#endif\n+\n+#ifndef HAVE_IBV_DEVX_ASYNC\n+struct mlx5dv_devx_cmd_comp;\n+struct mlx5dv_devx_async_cmd_hdr;\n+#endif\n+\n+#ifndef HAVE_MLX5DV_DR\n+enum  mlx5dv_dr_domain_type { unused, };\n+struct mlx5dv_dr_domain;\n+#endif\n+\n+#ifndef HAVE_MLX5DV_DR_DEVX_PORT\n+struct mlx5dv_devx_port;\n+#endif\n+\n+#ifndef HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER\n+struct mlx5dv_dr_flow_meter_attr;\n+#endif\n+\n+#ifndef HAVE_IBV_DEVX_EVENT\n+struct mlx5dv_devx_event_channel { int fd; };\n+struct mlx5dv_devx_async_event_hdr;\n+#define MLX5DV_DEVX_CREATE_EVENT_CHANNEL_FLAGS_OMIT_EV_DATA 1\n+#endif\n+\n+#ifndef HAVE_IBV_VAR\n+struct mlx5dv_var { uint32_t page_id; uint32_t length; off_t mmap_off;\n+\t\t\tuint64_t comp_mask; };\n+#endif\n+\n+#ifndef HAVE_IBV_RELAXED_ORDERING\n+#define IBV_ACCESS_RELAXED_ORDERING 0\n+#endif\n+\n+/* LIB_GLUE_VERSION must be updated every time this structure is modified. */\n+struct mlx5_glue {\n+\tconst char *version;\n+\tint (*fork_init)(void);\n+\tstruct ibv_pd *(*alloc_pd)(struct ibv_context *context);\n+\tint (*dealloc_pd)(struct ibv_pd *pd);\n+\tstruct ibv_device **(*get_device_list)(int *num_devices);\n+\tvoid (*free_device_list)(struct ibv_device **list);\n+\tstruct ibv_context *(*open_device)(struct ibv_device *device);\n+\tint (*close_device)(struct ibv_context *context);\n+\tint (*query_device)(struct ibv_context *context,\n+\t\t\t    struct ibv_device_attr *device_attr);\n+\tint (*query_device_ex)(struct ibv_context *context,\n+\t\t\t       const struct ibv_query_device_ex_input *input,\n+\t\t\t       struct ibv_device_attr_ex *attr);\n+\tint (*query_rt_values_ex)(struct ibv_context *context,\n+\t\t\t       struct ibv_values_ex *values);\n+\tint (*query_port)(struct ibv_context *context, uint8_t port_num,\n+\t\t\t  struct ibv_port_attr *port_attr);\n+\tstruct ibv_comp_channel *(*create_comp_channel)\n+\t\t(struct ibv_context *context);\n+\tint (*destroy_comp_channel)(struct ibv_comp_channel *channel);\n+\tstruct ibv_cq *(*create_cq)(struct ibv_context *context, int cqe,\n+\t\t\t\t    void *cq_context,\n+\t\t\t\t    struct ibv_comp_channel *channel,\n+\t\t\t\t    int comp_vector);\n+\tint (*destroy_cq)(struct ibv_cq *cq);\n+\tint (*get_cq_event)(struct ibv_comp_channel *channel,\n+\t\t\t    struct ibv_cq **cq, void **cq_context);\n+\tvoid (*ack_cq_events)(struct ibv_cq *cq, unsigned int nevents);\n+\tstruct ibv_rwq_ind_table *(*create_rwq_ind_table)\n+\t\t(struct ibv_context *context,\n+\t\t struct ibv_rwq_ind_table_init_attr *init_attr);\n+\tint (*destroy_rwq_ind_table)(struct ibv_rwq_ind_table *rwq_ind_table);\n+\tstruct ibv_wq *(*create_wq)(struct ibv_context *context,\n+\t\t\t\t    struct ibv_wq_init_attr *wq_init_attr);\n+\tint (*destroy_wq)(struct ibv_wq *wq);\n+\tint (*modify_wq)(struct ibv_wq *wq, struct ibv_wq_attr *wq_attr);\n+\tstruct ibv_flow *(*create_flow)(struct ibv_qp *qp,\n+\t\t\t\t\tstruct ibv_flow_attr *flow);\n+\tint (*destroy_flow)(struct ibv_flow *flow_id);\n+\tint (*destroy_flow_action)(void *action);\n+\tstruct ibv_qp *(*create_qp)(struct ibv_pd *pd,\n+\t\t\t\t    struct ibv_qp_init_attr *qp_init_attr);\n+\tstruct ibv_qp *(*create_qp_ex)\n+\t\t(struct ibv_context *context,\n+\t\t struct ibv_qp_init_attr_ex *qp_init_attr_ex);\n+\tint (*destroy_qp)(struct ibv_qp *qp);\n+\tint (*modify_qp)(struct ibv_qp *qp, struct ibv_qp_attr *attr,\n+\t\t\t int attr_mask);\n+\tstruct ibv_mr *(*reg_mr)(struct ibv_pd *pd, void *addr,\n+\t\t\t\t size_t length, int access);\n+\tstruct ibv_mr *(*alloc_null_mr)(struct ibv_pd *pd);\n+\tint (*dereg_mr)(struct ibv_mr *mr);\n+\tstruct ibv_counter_set *(*create_counter_set)\n+\t\t(struct ibv_context *context,\n+\t\t struct ibv_counter_set_init_attr *init_attr);\n+\tint (*destroy_counter_set)(struct ibv_counter_set *cs);\n+\tint (*describe_counter_set)\n+\t\t(struct ibv_context *context,\n+\t\t uint16_t counter_set_id,\n+\t\t struct ibv_counter_set_description *cs_desc);\n+\tint (*query_counter_set)(struct ibv_query_counter_set_attr *query_attr,\n+\t\t\t\t struct ibv_counter_set_data *cs_data);\n+\tstruct ibv_counters *(*create_counters)\n+\t\t(struct ibv_context *context,\n+\t\t struct ibv_counters_init_attr *init_attr);\n+\tint (*destroy_counters)(struct ibv_counters *counters);\n+\tint (*attach_counters)(struct ibv_counters *counters,\n+\t\t\t       struct ibv_counter_attach_attr *attr,\n+\t\t\t       struct ibv_flow *flow);\n+\tint (*query_counters)(struct ibv_counters *counters,\n+\t\t\t      uint64_t *counters_value,\n+\t\t\t      uint32_t ncounters,\n+\t\t\t      uint32_t flags);\n+\tvoid (*ack_async_event)(struct ibv_async_event *event);\n+\tint (*get_async_event)(struct ibv_context *context,\n+\t\t\t       struct ibv_async_event *event);\n+\tconst char *(*port_state_str)(enum ibv_port_state port_state);\n+\tstruct ibv_cq *(*cq_ex_to_cq)(struct ibv_cq_ex *cq);\n+\tvoid *(*dr_create_flow_action_dest_flow_tbl)(void *tbl);\n+\tvoid *(*dr_create_flow_action_dest_port)(void *domain,\n+\t\t\t\t\t\t uint32_t port);\n+\tvoid *(*dr_create_flow_action_drop)();\n+\tvoid *(*dr_create_flow_action_push_vlan)\n+\t\t\t\t\t(struct mlx5dv_dr_domain *domain,\n+\t\t\t\t\t rte_be32_t vlan_tag);\n+\tvoid *(*dr_create_flow_action_pop_vlan)();\n+\tvoid *(*dr_create_flow_tbl)(void *domain, uint32_t level);\n+\tint (*dr_destroy_flow_tbl)(void *tbl);\n+\tvoid *(*dr_create_domain)(struct ibv_context *ctx,\n+\t\t\t\t  enum mlx5dv_dr_domain_type domain);\n+\tint (*dr_destroy_domain)(void *domain);\n+\tstruct ibv_cq_ex *(*dv_create_cq)\n+\t\t(struct ibv_context *context,\n+\t\t struct ibv_cq_init_attr_ex *cq_attr,\n+\t\t struct mlx5dv_cq_init_attr *mlx5_cq_attr);\n+\tstruct ibv_wq *(*dv_create_wq)\n+\t\t(struct ibv_context *context,\n+\t\t struct ibv_wq_init_attr *wq_attr,\n+\t\t struct mlx5dv_wq_init_attr *mlx5_wq_attr);\n+\tint (*dv_query_device)(struct ibv_context *ctx_in,\n+\t\t\t       struct mlx5dv_context *attrs_out);\n+\tint (*dv_set_context_attr)(struct ibv_context *ibv_ctx,\n+\t\t\t\t   enum mlx5dv_set_ctx_attr_type type,\n+\t\t\t\t   void *attr);\n+\tint (*dv_init_obj)(struct mlx5dv_obj *obj, uint64_t obj_type);\n+\tstruct ibv_qp *(*dv_create_qp)\n+\t\t(struct ibv_context *context,\n+\t\t struct ibv_qp_init_attr_ex *qp_init_attr_ex,\n+\t\t struct mlx5dv_qp_init_attr *dv_qp_init_attr);\n+\tvoid *(*dv_create_flow_matcher)\n+\t\t(struct ibv_context *context,\n+\t\t struct mlx5dv_flow_matcher_attr *matcher_attr,\n+\t\t void *tbl);\n+\tvoid *(*dv_create_flow)(void *matcher, void *match_value,\n+\t\t\t  size_t num_actions, void *actions[]);\n+\tvoid *(*dv_create_flow_action_counter)(void *obj, uint32_t  offset);\n+\tvoid *(*dv_create_flow_action_dest_ibv_qp)(void *qp);\n+\tvoid *(*dv_create_flow_action_dest_devx_tir)(void *tir);\n+\tvoid *(*dv_create_flow_action_modify_header)\n+\t\t(struct ibv_context *ctx, enum mlx5dv_flow_table_type ft_type,\n+\t\t void *domain, uint64_t flags, size_t actions_sz,\n+\t\t uint64_t actions[]);\n+\tvoid *(*dv_create_flow_action_packet_reformat)\n+\t\t(struct ibv_context *ctx,\n+\t\t enum mlx5dv_flow_action_packet_reformat_type reformat_type,\n+\t\t enum mlx5dv_flow_table_type ft_type,\n+\t\t struct mlx5dv_dr_domain *domain,\n+\t\t uint32_t flags, size_t data_sz, void *data);\n+\tvoid *(*dv_create_flow_action_tag)(uint32_t tag);\n+\tvoid *(*dv_create_flow_action_meter)\n+\t\t(struct mlx5dv_dr_flow_meter_attr *attr);\n+\tint (*dv_modify_flow_action_meter)(void *action,\n+\t\tstruct mlx5dv_dr_flow_meter_attr *attr, uint64_t modify_bits);\n+\tint (*dv_destroy_flow)(void *flow);\n+\tint (*dv_destroy_flow_matcher)(void *matcher);\n+\tstruct ibv_context *(*dv_open_device)(struct ibv_device *device);\n+\tstruct mlx5dv_var *(*dv_alloc_var)(struct ibv_context *context,\n+\t\t\t\t\t   uint32_t flags);\n+\tvoid (*dv_free_var)(struct mlx5dv_var *var);\n+\tstruct mlx5dv_devx_uar *(*devx_alloc_uar)(struct ibv_context *context,\n+\t\t\t\t\t\t  uint32_t flags);\n+\tvoid (*devx_free_uar)(struct mlx5dv_devx_uar *devx_uar);\n+\tstruct mlx5dv_devx_obj *(*devx_obj_create)\n+\t\t\t\t\t(struct ibv_context *ctx,\n+\t\t\t\t\t const void *in, size_t inlen,\n+\t\t\t\t\t void *out, size_t outlen);\n+\tint (*devx_obj_destroy)(struct mlx5dv_devx_obj *obj);\n+\tint (*devx_obj_query)(struct mlx5dv_devx_obj *obj,\n+\t\t\t      const void *in, size_t inlen,\n+\t\t\t      void *out, size_t outlen);\n+\tint (*devx_obj_modify)(struct mlx5dv_devx_obj *obj,\n+\t\t\t       const void *in, size_t inlen,\n+\t\t\t       void *out, size_t outlen);\n+\tint (*devx_general_cmd)(struct ibv_context *context,\n+\t\t\t\tconst void *in, size_t inlen,\n+\t\t\t\tvoid *out, size_t outlen);\n+\tstruct mlx5dv_devx_cmd_comp *(*devx_create_cmd_comp)\n+\t\t\t\t\t(struct ibv_context *context);\n+\tvoid (*devx_destroy_cmd_comp)(struct mlx5dv_devx_cmd_comp *cmd_comp);\n+\tint (*devx_obj_query_async)(struct mlx5dv_devx_obj *obj,\n+\t\t\t\t    const void *in, size_t inlen,\n+\t\t\t\t    size_t outlen, uint64_t wr_id,\n+\t\t\t\t    struct mlx5dv_devx_cmd_comp *cmd_comp);\n+\tint (*devx_get_async_cmd_comp)(struct mlx5dv_devx_cmd_comp *cmd_comp,\n+\t\t\t\t       struct mlx5dv_devx_async_cmd_hdr *resp,\n+\t\t\t\t       size_t cmd_resp_len);\n+\tstruct mlx5dv_devx_umem *(*devx_umem_reg)(struct ibv_context *context,\n+\t\t\t\t\t\t  void *addr, size_t size,\n+\t\t\t\t\t\t  uint32_t access);\n+\tint (*devx_umem_dereg)(struct mlx5dv_devx_umem *dv_devx_umem);\n+\tint (*devx_qp_query)(struct ibv_qp *qp,\n+\t\t\t     const void *in, size_t inlen,\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+\tint (*dr_dump_domain)(FILE *file, void *domain);\n+\tint (*devx_query_eqn)(struct ibv_context *context, uint32_t cpus,\n+\t\t\t      uint32_t *eqn);\n+\tstruct mlx5dv_devx_event_channel *(*devx_create_event_channel)\n+\t\t\t\t(struct ibv_context *context, int flags);\n+\tvoid (*devx_destroy_event_channel)\n+\t\t\t(struct mlx5dv_devx_event_channel *event_channel);\n+\tint (*devx_subscribe_devx_event)\n+\t\t\t(struct mlx5dv_devx_event_channel *event_channel,\n+\t\t\t struct mlx5dv_devx_obj *obj,\n+\t\t\t uint16_t events_sz,\n+\t\t\t uint16_t events_num[],\n+\t\t\t uint64_t cookie);\n+\tint (*devx_subscribe_devx_event_fd)\n+\t\t\t(struct mlx5dv_devx_event_channel *event_channel,\n+\t\t\t int fd,\n+\t\t\t struct mlx5dv_devx_obj *obj,\n+\t\t\t uint16_t event_num);\n+\tssize_t (*devx_get_event)\n+\t\t\t(struct mlx5dv_devx_event_channel *event_channel,\n+\t\t\t struct mlx5dv_devx_async_event_hdr *event_data,\n+\t\t\t size_t event_resp_len);\n+};\n+\n+extern const struct mlx5_glue *mlx5_glue;\n+\n+#endif /* MLX5_GLUE_H_ */\ndiff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build\nindex 5a802ba..9806865 100644\n--- a/drivers/common/mlx5/meson.build\n+++ b/drivers/common/mlx5/meson.build\n@@ -1,65 +1,23 @@\n # SPDX-License-Identifier: BSD-3-Clause\n # Copyright 2019 Mellanox Technologies, Ltd\n \n-if not is_linux\n+if not (is_linux or is_windows)\n \tbuild = false\n-\treason = 'only supported on Linux'\n+\treason = 'only supported on Linux and Windows'\n \tsubdir_done()\n endif\n \n-static_ibverbs = (get_option('ibverbs_link') == 'static')\n-dlopen_ibverbs = (get_option('ibverbs_link') == 'dlopen')\n-LIB_GLUE_BASE = 'librte_pmd_mlx5_glue.so'\n-LIB_GLUE_VERSION = '20.02.0'\n-LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION\n-if dlopen_ibverbs\n-\tdpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)\n-\tcflags += [\n-\t\t'-DMLX5_GLUE=\"@0@\"'.format(LIB_GLUE),\n-\t\t'-DMLX5_GLUE_VERSION=\"@0@\"'.format(LIB_GLUE_VERSION),\n-\t]\n-endif\n-\n-libnames = [ 'mlx5', 'ibverbs' ]\n-libs = []\n-foreach libname:libnames\n-\tlib = dependency('lib' + libname, static:static_ibverbs, required:false)\n-\tif not lib.found() and not static_ibverbs\n-\t\tlib = cc.find_library(libname, required:false)\n-\tendif\n-\tif lib.found()\n-\t\tlibs += lib\n-\t\tif not static_ibverbs and not dlopen_ibverbs\n-\t\t\text_deps += lib\n-\t\tendif\n-\telse\n-\t\tbuild = false\n-\t\treason = 'missing dependency, \"' + libname + '\"'\n-\t\tsubdir_done()\n-\tendif\n-endforeach\n-if static_ibverbs or dlopen_ibverbs\n-\t# Build without adding shared libs to Requires.private\n-\tibv_cflags = run_command(pkgconf, '--cflags', 'libibverbs').stdout()\n-\text_deps += declare_dependency(compile_args: ibv_cflags.split())\n-endif\n-if static_ibverbs\n-\t# Add static deps ldflags to internal apps and Libs.private\n-\tibv_ldflags = run_command(ldflags_ibverbs_static, check:true).stdout()\n-\text_deps += declare_dependency(link_args:ibv_ldflags.split())\n-endif\n+allow_experimental_apis = true\n \n deps += ['hash', 'pci', 'net', 'eal', 'kvargs']\n-sources = files(\n+sources += files(\n \t'mlx5_devx_cmds.c',\n \t'mlx5_common.c',\n \t'mlx5_nl.c',\n \t'mlx5_common_mp.c',\n \t'mlx5_common_mr.c',\n )\n-if not dlopen_ibverbs\n-\tsources += files('mlx5_glue.c')\n-endif\n+\n cflags_options = [\n \t'-std=c11',\n \t'-Wno-strict-prototypes',\n@@ -77,151 +35,5 @@ if get_option('buildtype').contains('debug')\n else\n \tcflags += [ '-UPEDANTIC' ]\n endif\n-# To maintain the compatibility with the make build system\n-# mlx5_autoconf.h file is still generated.\n-# input array for meson member search:\n-# [ \"MACRO to define if found\", \"header for the search\",\n-#   \"symbol to search\", \"struct member to search\" ]\n-has_member_args = [\n-\t[ 'HAVE_IBV_MLX5_MOD_SWP', 'infiniband/mlx5dv.h',\n-\t'struct mlx5dv_sw_parsing_caps', 'sw_parsing_offloads' ],\n-\t[ 'HAVE_IBV_DEVICE_COUNTERS_SET_V42', 'infiniband/verbs.h',\n-\t'struct ibv_counter_set_init_attr', 'counter_set_id' ],\n-\t[ 'HAVE_IBV_DEVICE_COUNTERS_SET_V45', 'infiniband/verbs.h',\n-\t'struct ibv_counters_init_attr', 'comp_mask' ],\n-]\n-# input array for meson symbol search:\n-# [ \"MACRO to define if found\", \"header for the search\",\n-#   \"symbol to search\" ]\n-has_sym_args = [\n-\t[ 'HAVE_IBV_RELAXED_ORDERING', 'infiniband/verbs.h',\n-\t'IBV_ACCESS_RELAXED_ORDERING ' ],\n-\t[ 'HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT', 'infiniband/mlx5dv.h',\n-\t'MLX5DV_CQE_RES_FORMAT_CSUM_STRIDX' ],\n-\t[ 'HAVE_IBV_DEVICE_TUNNEL_SUPPORT', 'infiniband/mlx5dv.h',\n-\t'MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS' ],\n-\t[ 'HAVE_IBV_MLX5_MOD_MPW', 'infiniband/mlx5dv.h',\n-\t'MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED' ],\n-\t[ 'HAVE_IBV_MLX5_MOD_CQE_128B_COMP', 'infiniband/mlx5dv.h',\n-\t'MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP' ],\n-\t[ 'HAVE_IBV_MLX5_MOD_CQE_128B_PAD', 'infiniband/mlx5dv.h',\n-\t'MLX5DV_CQ_INIT_ATTR_FLAGS_CQE_PAD' ],\n-\t[ 'HAVE_IBV_FLOW_DV_SUPPORT', 'infiniband/mlx5dv.h',\n-\t'mlx5dv_create_flow_action_packet_reformat' ],\n-\t[ 'HAVE_IBV_DEVICE_MPLS_SUPPORT', 'infiniband/verbs.h',\n-\t'IBV_FLOW_SPEC_MPLS' ],\n-\t[ 'HAVE_IBV_WQ_FLAGS_PCI_WRITE_END_PADDING', 'infiniband/verbs.h',\n-\t'IBV_WQ_FLAGS_PCI_WRITE_END_PADDING' ],\n-\t[ 'HAVE_IBV_WQ_FLAG_RX_END_PADDING', 'infiniband/verbs.h',\n-\t'IBV_WQ_FLAG_RX_END_PADDING' ],\n-\t[ 'HAVE_MLX5DV_DR_DEVX_PORT', 'infiniband/mlx5dv.h',\n-\t'mlx5dv_query_devx_port' ],\n-\t[ 'HAVE_IBV_DEVX_OBJ', 'infiniband/mlx5dv.h',\n-\t'mlx5dv_devx_obj_create' ],\n-\t[ 'HAVE_IBV_FLOW_DEVX_COUNTERS', 'infiniband/mlx5dv.h',\n-\t'MLX5DV_FLOW_ACTION_COUNTERS_DEVX' ],\n-\t[ 'HAVE_IBV_DEVX_ASYNC', 'infiniband/mlx5dv.h',\n-\t'mlx5dv_devx_obj_query_async' ],\n-\t[ 'HAVE_IBV_DEVX_QP', 'infiniband/mlx5dv.h',\n-\t'mlx5dv_devx_qp_query' ],\n-\t[ 'HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR', 'infiniband/mlx5dv.h',\n-\t'mlx5dv_dr_action_create_dest_devx_tir' ],\n-\t[ 'HAVE_IBV_DEVX_EVENT', 'infiniband/mlx5dv.h',\n-\t'mlx5dv_devx_get_event' ],\n-\t[ 'HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER', 'infiniband/mlx5dv.h',\n-\t'mlx5dv_dr_action_create_flow_meter' ],\n-\t[ 'HAVE_MLX5DV_MMAP_GET_NC_PAGES_CMD', 'infiniband/mlx5dv.h',\n-\t'MLX5_MMAP_GET_NC_PAGES_CMD' ],\n-\t[ 'HAVE_MLX5DV_DR', 'infiniband/mlx5dv.h',\n-\t'MLX5DV_DR_DOMAIN_TYPE_NIC_RX' ],\n-\t[ 'HAVE_MLX5DV_DR_ESWITCH', 'infiniband/mlx5dv.h',\n-\t'MLX5DV_DR_DOMAIN_TYPE_FDB' ],\n-\t[ 'HAVE_MLX5DV_DR_VLAN', 'infiniband/mlx5dv.h',\n-\t'mlx5dv_dr_action_create_push_vlan' ],\n-\t[ 'HAVE_IBV_VAR', 'infiniband/mlx5dv.h', 'mlx5dv_alloc_var' ],\n-\t[ 'HAVE_SUPPORTED_40000baseKR4_Full', 'linux/ethtool.h',\n-\t'SUPPORTED_40000baseKR4_Full' ],\n-\t[ 'HAVE_SUPPORTED_40000baseCR4_Full', 'linux/ethtool.h',\n-\t'SUPPORTED_40000baseCR4_Full' ],\n-\t[ 'HAVE_SUPPORTED_40000baseSR4_Full', 'linux/ethtool.h',\n-\t'SUPPORTED_40000baseSR4_Full' ],\n-\t[ 'HAVE_SUPPORTED_40000baseLR4_Full', 'linux/ethtool.h',\n-\t'SUPPORTED_40000baseLR4_Full' ],\n-\t[ 'HAVE_SUPPORTED_56000baseKR4_Full', 'linux/ethtool.h',\n-\t'SUPPORTED_56000baseKR4_Full' ],\n-\t[ 'HAVE_SUPPORTED_56000baseCR4_Full', 'linux/ethtool.h',\n-\t'SUPPORTED_56000baseCR4_Full' ],\n-\t[ 'HAVE_SUPPORTED_56000baseSR4_Full', 'linux/ethtool.h',\n-\t'SUPPORTED_56000baseSR4_Full' ],\n-\t[ 'HAVE_SUPPORTED_56000baseLR4_Full', 'linux/ethtool.h',\n-\t'SUPPORTED_56000baseLR4_Full' ],\n-\t[ 'HAVE_ETHTOOL_LINK_MODE_25G', 'linux/ethtool.h',\n-\t'ETHTOOL_LINK_MODE_25000baseCR_Full_BIT' ],\n-\t[ 'HAVE_ETHTOOL_LINK_MODE_50G', 'linux/ethtool.h',\n-\t'ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT' ],\n-\t[ 'HAVE_ETHTOOL_LINK_MODE_100G', 'linux/ethtool.h',\n-\t'ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT' ],\n-\t[ 'HAVE_IFLA_NUM_VF', 'linux/if_link.h',\n-\t'IFLA_NUM_VF' ],\n-\t[ 'HAVE_IFLA_EXT_MASK', 'linux/if_link.h',\n-\t'IFLA_EXT_MASK' ],\n-\t[ 'HAVE_IFLA_PHYS_SWITCH_ID', 'linux/if_link.h',\n-\t'IFLA_PHYS_SWITCH_ID' ],\n-\t[ 'HAVE_IFLA_PHYS_PORT_NAME', 'linux/if_link.h',\n-\t'IFLA_PHYS_PORT_NAME' ],\n-\t[ 'HAVE_RDMA_NL_NLDEV', 'rdma/rdma_netlink.h',\n-\t'RDMA_NL_NLDEV' ],\n-\t[ 'HAVE_RDMA_NLDEV_CMD_GET', 'rdma/rdma_netlink.h',\n-\t'RDMA_NLDEV_CMD_GET' ],\n-\t[ 'HAVE_RDMA_NLDEV_CMD_PORT_GET', 'rdma/rdma_netlink.h',\n-\t'RDMA_NLDEV_CMD_PORT_GET' ],\n-\t[ 'HAVE_RDMA_NLDEV_ATTR_DEV_INDEX', 'rdma/rdma_netlink.h',\n-\t'RDMA_NLDEV_ATTR_DEV_INDEX' ],\n-\t[ 'HAVE_RDMA_NLDEV_ATTR_DEV_NAME', 'rdma/rdma_netlink.h',\n-\t'RDMA_NLDEV_ATTR_DEV_NAME' ],\n-\t[ 'HAVE_RDMA_NLDEV_ATTR_PORT_INDEX', 'rdma/rdma_netlink.h',\n-\t'RDMA_NLDEV_ATTR_PORT_INDEX' ],\n-\t[ 'HAVE_RDMA_NLDEV_ATTR_NDEV_INDEX', 'rdma/rdma_netlink.h',\n-\t'RDMA_NLDEV_ATTR_NDEV_INDEX' ],\n-\t[ 'HAVE_MLX5_DR_FLOW_DUMP', 'infiniband/mlx5dv.h',\n-\t'mlx5dv_dump_dr_domain'],\n-\t[ 'HAVE_DEVLINK', 'linux/devlink.h', 'DEVLINK_GENL_NAME' ],\n-]\n-config = configuration_data()\n-foreach arg:has_sym_args\n-\tconfig.set(arg[0], cc.has_header_symbol(arg[1], arg[2],\n-\t\tdependencies: libs))\n-endforeach\n-foreach arg:has_member_args\n-\tfile_prefix = '#include <' + arg[1] + '>'\n-\tconfig.set(arg[0], cc.has_member(arg[2], arg[3],\n-\t\tprefix : file_prefix, dependencies: libs))\n-endforeach\n-configure_file(output : 'mlx5_autoconf.h', configuration : config)\n \n-# Build Glue Library\n-if dlopen_ibverbs\n-\tdlopen_name = 'mlx5_glue'\n-\tdlopen_lib_name = 'rte_pmd_@0@'.format(dlopen_name)\n-\tdlopen_so_version = LIB_GLUE_VERSION\n-\tdlopen_sources = files('mlx5_glue.c')\n-\tdlopen_install_dir = [ eal_pmd_path + '-glue' ]\n-\tdlopen_includes = [global_inc]\n-\tdlopen_includes += include_directories(\n-\t\t'../../../lib/librte_eal/include/generic',\n-\t)\n-\tshared_lib = shared_library(\n-\t\tdlopen_lib_name,\n-\t\tdlopen_sources,\n-\t\tinclude_directories: dlopen_includes,\n-\t\tc_args: cflags,\n-\t\tdependencies: libs,\n-\t\tlink_args: [\n-\t\t'-Wl,-export-dynamic',\n-\t\t'-Wl,-h,@0@'.format(LIB_GLUE),\n-\t\t],\n-\t\tsoversion: dlopen_so_version,\n-\t\tinstall: true,\n-\t\tinstall_dir: dlopen_install_dir,\n-\t)\n-endif\n+subdir(exec_env)\ndiff --git a/drivers/common/mlx5/mlx5_glue.c b/drivers/common/mlx5/mlx5_glue.c\ndeleted file mode 100644\nindex f270f67..0000000\n--- a/drivers/common/mlx5/mlx5_glue.c\n+++ /dev/null\n@@ -1,1294 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright 2018 6WIND S.A.\n- * Copyright 2018 Mellanox Technologies, Ltd\n- */\n-\n-#include <errno.h>\n-#include <stdalign.h>\n-#include <stddef.h>\n-#include <stdint.h>\n-#include <stdlib.h>\n-/*\n- * Not needed by this file; included to work around the lack of off_t\n- * definition for mlx5dv.h with unpatched rdma-core versions.\n- */\n-#include <sys/types.h>\n-\n-#include \"mlx5_glue.h\"\n-\n-static int\n-mlx5_glue_fork_init(void)\n-{\n-\treturn ibv_fork_init();\n-}\n-\n-static struct ibv_pd *\n-mlx5_glue_alloc_pd(struct ibv_context *context)\n-{\n-\treturn ibv_alloc_pd(context);\n-}\n-\n-static int\n-mlx5_glue_dealloc_pd(struct ibv_pd *pd)\n-{\n-\treturn ibv_dealloc_pd(pd);\n-}\n-\n-static struct ibv_device **\n-mlx5_glue_get_device_list(int *num_devices)\n-{\n-\treturn ibv_get_device_list(num_devices);\n-}\n-\n-static void\n-mlx5_glue_free_device_list(struct ibv_device **list)\n-{\n-\tibv_free_device_list(list);\n-}\n-\n-static struct ibv_context *\n-mlx5_glue_open_device(struct ibv_device *device)\n-{\n-\treturn ibv_open_device(device);\n-}\n-\n-static int\n-mlx5_glue_close_device(struct ibv_context *context)\n-{\n-\treturn ibv_close_device(context);\n-}\n-\n-static int\n-mlx5_glue_query_device(struct ibv_context *context,\n-\t\t       struct ibv_device_attr *device_attr)\n-{\n-\treturn ibv_query_device(context, device_attr);\n-}\n-\n-static int\n-mlx5_glue_query_device_ex(struct ibv_context *context,\n-\t\t\t  const struct ibv_query_device_ex_input *input,\n-\t\t\t  struct ibv_device_attr_ex *attr)\n-{\n-\treturn ibv_query_device_ex(context, input, attr);\n-}\n-\n-static int\n-mlx5_glue_query_rt_values_ex(struct ibv_context *context,\n-\t\t\t  struct ibv_values_ex *values)\n-{\n-\treturn ibv_query_rt_values_ex(context, values);\n-}\n-\n-static int\n-mlx5_glue_query_port(struct ibv_context *context, uint8_t port_num,\n-\t\t     struct ibv_port_attr *port_attr)\n-{\n-\treturn ibv_query_port(context, port_num, port_attr);\n-}\n-\n-static struct ibv_comp_channel *\n-mlx5_glue_create_comp_channel(struct ibv_context *context)\n-{\n-\treturn ibv_create_comp_channel(context);\n-}\n-\n-static int\n-mlx5_glue_destroy_comp_channel(struct ibv_comp_channel *channel)\n-{\n-\treturn ibv_destroy_comp_channel(channel);\n-}\n-\n-static struct ibv_cq *\n-mlx5_glue_create_cq(struct ibv_context *context, int cqe, void *cq_context,\n-\t\t    struct ibv_comp_channel *channel, int comp_vector)\n-{\n-\treturn ibv_create_cq(context, cqe, cq_context, channel, comp_vector);\n-}\n-\n-static int\n-mlx5_glue_destroy_cq(struct ibv_cq *cq)\n-{\n-\treturn ibv_destroy_cq(cq);\n-}\n-\n-static int\n-mlx5_glue_get_cq_event(struct ibv_comp_channel *channel, struct ibv_cq **cq,\n-\t\t       void **cq_context)\n-{\n-\treturn ibv_get_cq_event(channel, cq, cq_context);\n-}\n-\n-static void\n-mlx5_glue_ack_cq_events(struct ibv_cq *cq, unsigned int nevents)\n-{\n-\tibv_ack_cq_events(cq, nevents);\n-}\n-\n-static struct ibv_rwq_ind_table *\n-mlx5_glue_create_rwq_ind_table(struct ibv_context *context,\n-\t\t\t       struct ibv_rwq_ind_table_init_attr *init_attr)\n-{\n-\treturn ibv_create_rwq_ind_table(context, init_attr);\n-}\n-\n-static int\n-mlx5_glue_destroy_rwq_ind_table(struct ibv_rwq_ind_table *rwq_ind_table)\n-{\n-\treturn ibv_destroy_rwq_ind_table(rwq_ind_table);\n-}\n-\n-static struct ibv_wq *\n-mlx5_glue_create_wq(struct ibv_context *context,\n-\t\t    struct ibv_wq_init_attr *wq_init_attr)\n-{\n-\treturn ibv_create_wq(context, wq_init_attr);\n-}\n-\n-static int\n-mlx5_glue_destroy_wq(struct ibv_wq *wq)\n-{\n-\treturn ibv_destroy_wq(wq);\n-}\n-static int\n-mlx5_glue_modify_wq(struct ibv_wq *wq, struct ibv_wq_attr *wq_attr)\n-{\n-\treturn ibv_modify_wq(wq, wq_attr);\n-}\n-\n-static struct ibv_flow *\n-mlx5_glue_create_flow(struct ibv_qp *qp, struct ibv_flow_attr *flow)\n-{\n-\treturn ibv_create_flow(qp, flow);\n-}\n-\n-static int\n-mlx5_glue_destroy_flow(struct ibv_flow *flow_id)\n-{\n-\treturn ibv_destroy_flow(flow_id);\n-}\n-\n-static int\n-mlx5_glue_destroy_flow_action(void *action)\n-{\n-#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n-#ifdef HAVE_MLX5DV_DR\n-\treturn mlx5dv_dr_action_destroy(action);\n-#else\n-\tstruct mlx5dv_flow_action_attr *attr = action;\n-\tint res = 0;\n-\tswitch (attr->type) {\n-\tcase MLX5DV_FLOW_ACTION_TAG:\n-\t\tbreak;\n-\tdefault:\n-\t\tres = ibv_destroy_flow_action(attr->action);\n-\t\tbreak;\n-\t}\n-\tfree(action);\n-\treturn res;\n-#endif\n-#else\n-\t(void)action;\n-\treturn ENOTSUP;\n-#endif\n-}\n-\n-static struct ibv_qp *\n-mlx5_glue_create_qp(struct ibv_pd *pd, struct ibv_qp_init_attr *qp_init_attr)\n-{\n-\treturn ibv_create_qp(pd, qp_init_attr);\n-}\n-\n-static struct ibv_qp *\n-mlx5_glue_create_qp_ex(struct ibv_context *context,\n-\t\t       struct ibv_qp_init_attr_ex *qp_init_attr_ex)\n-{\n-\treturn ibv_create_qp_ex(context, qp_init_attr_ex);\n-}\n-\n-static int\n-mlx5_glue_destroy_qp(struct ibv_qp *qp)\n-{\n-\treturn ibv_destroy_qp(qp);\n-}\n-\n-static int\n-mlx5_glue_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr, int attr_mask)\n-{\n-\treturn ibv_modify_qp(qp, attr, attr_mask);\n-}\n-\n-static struct ibv_mr *\n-mlx5_glue_reg_mr(struct ibv_pd *pd, void *addr, size_t length, int access)\n-{\n-\treturn ibv_reg_mr(pd, addr, length, access);\n-}\n-\n-static struct ibv_mr *\n-mlx5_glue_alloc_null_mr(struct ibv_pd *pd)\n-{\n-#ifdef HAVE_IBV_DEVX_OBJ\n-\treturn ibv_alloc_null_mr(pd);\n-#else\n-\t(void)pd;\n-\terrno = ENOTSUP;\n-\treturn NULL;\n-#endif\n-}\n-\n-static int\n-mlx5_glue_dereg_mr(struct ibv_mr *mr)\n-{\n-\treturn ibv_dereg_mr(mr);\n-}\n-\n-static struct ibv_counter_set *\n-mlx5_glue_create_counter_set(struct ibv_context *context,\n-\t\t\t     struct ibv_counter_set_init_attr *init_attr)\n-{\n-#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V42\n-\t(void)context;\n-\t(void)init_attr;\n-\treturn NULL;\n-#else\n-\treturn ibv_create_counter_set(context, init_attr);\n-#endif\n-}\n-\n-static int\n-mlx5_glue_destroy_counter_set(struct ibv_counter_set *cs)\n-{\n-#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V42\n-\t(void)cs;\n-\treturn ENOTSUP;\n-#else\n-\treturn ibv_destroy_counter_set(cs);\n-#endif\n-}\n-\n-static int\n-mlx5_glue_describe_counter_set(struct ibv_context *context,\n-\t\t\t       uint16_t counter_set_id,\n-\t\t\t       struct ibv_counter_set_description *cs_desc)\n-{\n-#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V42\n-\t(void)context;\n-\t(void)counter_set_id;\n-\t(void)cs_desc;\n-\treturn ENOTSUP;\n-#else\n-\treturn ibv_describe_counter_set(context, counter_set_id, cs_desc);\n-#endif\n-}\n-\n-static int\n-mlx5_glue_query_counter_set(struct ibv_query_counter_set_attr *query_attr,\n-\t\t\t    struct ibv_counter_set_data *cs_data)\n-{\n-#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V42\n-\t(void)query_attr;\n-\t(void)cs_data;\n-\treturn ENOTSUP;\n-#else\n-\treturn ibv_query_counter_set(query_attr, cs_data);\n-#endif\n-}\n-\n-static struct ibv_counters *\n-mlx5_glue_create_counters(struct ibv_context *context,\n-\t\t\t  struct ibv_counters_init_attr *init_attr)\n-{\n-#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V45\n-\t(void)context;\n-\t(void)init_attr;\n-\terrno = ENOTSUP;\n-\treturn NULL;\n-#else\n-\treturn ibv_create_counters(context, init_attr);\n-#endif\n-}\n-\n-static int\n-mlx5_glue_destroy_counters(struct ibv_counters *counters)\n-{\n-#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V45\n-\t(void)counters;\n-\treturn ENOTSUP;\n-#else\n-\treturn ibv_destroy_counters(counters);\n-#endif\n-}\n-\n-static int\n-mlx5_glue_attach_counters(struct ibv_counters *counters,\n-\t\t\t  struct ibv_counter_attach_attr *attr,\n-\t\t\t  struct ibv_flow *flow)\n-{\n-#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V45\n-\t(void)counters;\n-\t(void)attr;\n-\t(void)flow;\n-\treturn ENOTSUP;\n-#else\n-\treturn ibv_attach_counters_point_flow(counters, attr, flow);\n-#endif\n-}\n-\n-static int\n-mlx5_glue_query_counters(struct ibv_counters *counters,\n-\t\t\t uint64_t *counters_value,\n-\t\t\t uint32_t ncounters,\n-\t\t\t uint32_t flags)\n-{\n-#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V45\n-\t(void)counters;\n-\t(void)counters_value;\n-\t(void)ncounters;\n-\t(void)flags;\n-\treturn ENOTSUP;\n-#else\n-\treturn ibv_read_counters(counters, counters_value, ncounters, flags);\n-#endif\n-}\n-\n-static void\n-mlx5_glue_ack_async_event(struct ibv_async_event *event)\n-{\n-\tibv_ack_async_event(event);\n-}\n-\n-static int\n-mlx5_glue_get_async_event(struct ibv_context *context,\n-\t\t\t  struct ibv_async_event *event)\n-{\n-\treturn ibv_get_async_event(context, event);\n-}\n-\n-static const char *\n-mlx5_glue_port_state_str(enum ibv_port_state port_state)\n-{\n-\treturn ibv_port_state_str(port_state);\n-}\n-\n-static struct ibv_cq *\n-mlx5_glue_cq_ex_to_cq(struct ibv_cq_ex *cq)\n-{\n-\treturn ibv_cq_ex_to_cq(cq);\n-}\n-\n-static void *\n-mlx5_glue_dr_create_flow_action_dest_flow_tbl(void *tbl)\n-{\n-#ifdef HAVE_MLX5DV_DR\n-\treturn mlx5dv_dr_action_create_dest_table(tbl);\n-#else\n-\t(void)tbl;\n-\terrno = ENOTSUP;\n-\treturn NULL;\n-#endif\n-}\n-\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-\treturn mlx5dv_dr_action_create_dest_ib_port(domain, port);\n-#else\n-#ifdef HAVE_MLX5DV_DR_ESWITCH\n-\treturn mlx5dv_dr_action_create_dest_vport(domain, port);\n-#else\n-\t(void)domain;\n-\t(void)port;\n-\terrno = ENOTSUP;\n-\treturn NULL;\n-#endif\n-#endif\n-}\n-\n-static void *\n-mlx5_glue_dr_create_flow_action_drop(void)\n-{\n-#ifdef HAVE_MLX5DV_DR_ESWITCH\n-\treturn mlx5dv_dr_action_create_drop();\n-#else\n-\terrno = ENOTSUP;\n-\treturn NULL;\n-#endif\n-}\n-\n-static void *\n-mlx5_glue_dr_create_flow_action_push_vlan(struct mlx5dv_dr_domain *domain,\n-\t\t\t\t\t  rte_be32_t vlan_tag)\n-{\n-#ifdef HAVE_MLX5DV_DR_VLAN\n-\treturn mlx5dv_dr_action_create_push_vlan(domain, vlan_tag);\n-#else\n-\t(void)domain;\n-\t(void)vlan_tag;\n-\terrno = ENOTSUP;\n-\treturn NULL;\n-#endif\n-}\n-\n-static void *\n-mlx5_glue_dr_create_flow_action_pop_vlan(void)\n-{\n-#ifdef HAVE_MLX5DV_DR_VLAN\n-\treturn mlx5dv_dr_action_create_pop_vlan();\n-#else\n-\terrno = ENOTSUP;\n-\treturn NULL;\n-#endif\n-}\n-\n-static void *\n-mlx5_glue_dr_create_flow_tbl(void *domain, uint32_t level)\n-{\n-#ifdef HAVE_MLX5DV_DR\n-\treturn mlx5dv_dr_table_create(domain, level);\n-#else\n-\t(void)domain;\n-\t(void)level;\n-\terrno = ENOTSUP;\n-\treturn NULL;\n-#endif\n-}\n-\n-static int\n-mlx5_glue_dr_destroy_flow_tbl(void *tbl)\n-{\n-#ifdef HAVE_MLX5DV_DR\n-\treturn mlx5dv_dr_table_destroy(tbl);\n-#else\n-\t(void)tbl;\n-\terrno = ENOTSUP;\n-\treturn errno;\n-#endif\n-}\n-\n-static void *\n-mlx5_glue_dr_create_domain(struct ibv_context *ctx,\n-\t\t\t   enum  mlx5dv_dr_domain_type domain)\n-{\n-#ifdef HAVE_MLX5DV_DR\n-\treturn mlx5dv_dr_domain_create(ctx, domain);\n-#else\n-\t(void)ctx;\n-\t(void)domain;\n-\terrno = ENOTSUP;\n-\treturn NULL;\n-#endif\n-}\n-\n-static int\n-mlx5_glue_dr_destroy_domain(void *domain)\n-{\n-#ifdef HAVE_MLX5DV_DR\n-\treturn mlx5dv_dr_domain_destroy(domain);\n-#else\n-\t(void)domain;\n-\terrno = ENOTSUP;\n-\treturn errno;\n-#endif\n-}\n-\n-static struct ibv_cq_ex *\n-mlx5_glue_dv_create_cq(struct ibv_context *context,\n-\t\t       struct ibv_cq_init_attr_ex *cq_attr,\n-\t\t       struct mlx5dv_cq_init_attr *mlx5_cq_attr)\n-{\n-\treturn mlx5dv_create_cq(context, cq_attr, mlx5_cq_attr);\n-}\n-\n-static struct ibv_wq *\n-mlx5_glue_dv_create_wq(struct ibv_context *context,\n-\t\t       struct ibv_wq_init_attr *wq_attr,\n-\t\t       struct mlx5dv_wq_init_attr *mlx5_wq_attr)\n-{\n-#ifndef HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT\n-\t(void)context;\n-\t(void)wq_attr;\n-\t(void)mlx5_wq_attr;\n-\terrno = ENOTSUP;\n-\treturn NULL;\n-#else\n-\treturn mlx5dv_create_wq(context, wq_attr, mlx5_wq_attr);\n-#endif\n-}\n-\n-static int\n-mlx5_glue_dv_query_device(struct ibv_context *ctx,\n-\t\t\t  struct mlx5dv_context *attrs_out)\n-{\n-\treturn mlx5dv_query_device(ctx, attrs_out);\n-}\n-\n-static int\n-mlx5_glue_dv_set_context_attr(struct ibv_context *ibv_ctx,\n-\t\t\t      enum mlx5dv_set_ctx_attr_type type, void *attr)\n-{\n-\treturn mlx5dv_set_context_attr(ibv_ctx, type, attr);\n-}\n-\n-static int\n-mlx5_glue_dv_init_obj(struct mlx5dv_obj *obj, uint64_t obj_type)\n-{\n-\treturn mlx5dv_init_obj(obj, obj_type);\n-}\n-\n-static struct ibv_qp *\n-mlx5_glue_dv_create_qp(struct ibv_context *context,\n-\t\t       struct ibv_qp_init_attr_ex *qp_init_attr_ex,\n-\t\t       struct mlx5dv_qp_init_attr *dv_qp_init_attr)\n-{\n-#ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT\n-\treturn mlx5dv_create_qp(context, qp_init_attr_ex, dv_qp_init_attr);\n-#else\n-\t(void)context;\n-\t(void)qp_init_attr_ex;\n-\t(void)dv_qp_init_attr;\n-\terrno = ENOTSUP;\n-\treturn NULL;\n-#endif\n-}\n-\n-static void *\n-mlx5_glue_dv_create_flow_matcher(struct ibv_context *context,\n-\t\t\t\t struct mlx5dv_flow_matcher_attr *matcher_attr,\n-\t\t\t\t void *tbl)\n-{\n-#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n-#ifdef HAVE_MLX5DV_DR\n-\t(void)context;\n-\treturn mlx5dv_dr_matcher_create(tbl, matcher_attr->priority,\n-\t\t\t\t\tmatcher_attr->match_criteria_enable,\n-\t\t\t\t\tmatcher_attr->match_mask);\n-#else\n-\t(void)tbl;\n-\treturn mlx5dv_create_flow_matcher(context, matcher_attr);\n-#endif\n-#else\n-\t(void)context;\n-\t(void)matcher_attr;\n-\t(void)tbl;\n-\terrno = ENOTSUP;\n-\treturn NULL;\n-#endif\n-}\n-\n-static void *\n-mlx5_glue_dv_create_flow(void *matcher,\n-\t\t\t void *match_value,\n-\t\t\t size_t num_actions,\n-\t\t\t void *actions[])\n-{\n-#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n-#ifdef HAVE_MLX5DV_DR\n-\treturn mlx5dv_dr_rule_create(matcher, match_value, num_actions,\n-\t\t\t\t     (struct mlx5dv_dr_action **)actions);\n-#else\n-\tstruct mlx5dv_flow_action_attr actions_attr[8];\n-\n-\tif (num_actions > 8)\n-\t\treturn NULL;\n-\tfor (size_t i = 0; i < num_actions; i++)\n-\t\tactions_attr[i] =\n-\t\t\t*((struct mlx5dv_flow_action_attr *)(actions[i]));\n-\treturn mlx5dv_create_flow(matcher, match_value,\n-\t\t\t\t  num_actions, actions_attr);\n-#endif\n-#else\n-\t(void)matcher;\n-\t(void)match_value;\n-\t(void)num_actions;\n-\t(void)actions;\n-\treturn NULL;\n-#endif\n-}\n-\n-static void *\n-mlx5_glue_dv_create_flow_action_counter(void *counter_obj, uint32_t offset)\n-{\n-#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n-#ifdef HAVE_MLX5DV_DR\n-\treturn mlx5dv_dr_action_create_flow_counter(counter_obj, offset);\n-#else\n-\tstruct mlx5dv_flow_action_attr *action;\n-\n-\t(void)offset;\n-\taction = malloc(sizeof(*action));\n-\tif (!action)\n-\t\treturn NULL;\n-\taction->type = MLX5DV_FLOW_ACTION_COUNTERS_DEVX;\n-\taction->obj = counter_obj;\n-\treturn action;\n-#endif\n-#else\n-\t(void)counter_obj;\n-\t(void)offset;\n-\terrno = ENOTSUP;\n-\treturn NULL;\n-#endif\n-}\n-\n-static void *\n-mlx5_glue_dv_create_flow_action_dest_ibv_qp(void *qp)\n-{\n-#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n-#ifdef HAVE_MLX5DV_DR\n-\treturn mlx5dv_dr_action_create_dest_ibv_qp(qp);\n-#else\n-\tstruct mlx5dv_flow_action_attr *action;\n-\n-\taction = malloc(sizeof(*action));\n-\tif (!action)\n-\t\treturn NULL;\n-\taction->type = MLX5DV_FLOW_ACTION_DEST_IBV_QP;\n-\taction->obj = qp;\n-\treturn action;\n-#endif\n-#else\n-\t(void)qp;\n-\terrno = ENOTSUP;\n-\treturn NULL;\n-#endif\n-}\n-\n-static void *\n-mlx5_glue_dv_create_flow_action_dest_devx_tir(void *tir)\n-{\n-#ifdef HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR\n-\treturn mlx5dv_dr_action_create_dest_devx_tir(tir);\n-#else\n-\t(void)tir;\n-\terrno = ENOTSUP;\n-\treturn NULL;\n-#endif\n-}\n-\n-static void *\n-mlx5_glue_dv_create_flow_action_modify_header\n-\t\t\t\t\t(struct ibv_context *ctx,\n-\t\t\t\t\t enum mlx5dv_flow_table_type ft_type,\n-\t\t\t\t\t void *domain, uint64_t flags,\n-\t\t\t\t\t size_t actions_sz,\n-\t\t\t\t\t uint64_t actions[])\n-{\n-#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n-#ifdef HAVE_MLX5DV_DR\n-\t(void)ctx;\n-\t(void)ft_type;\n-\treturn mlx5dv_dr_action_create_modify_header(domain, flags, actions_sz,\n-\t\t\t\t\t\t     (__be64 *)actions);\n-#else\n-\tstruct mlx5dv_flow_action_attr *action;\n-\n-\t(void)domain;\n-\t(void)flags;\n-\taction = malloc(sizeof(*action));\n-\tif (!action)\n-\t\treturn NULL;\n-\taction->type = MLX5DV_FLOW_ACTION_IBV_FLOW_ACTION;\n-\taction->action = mlx5dv_create_flow_action_modify_header\n-\t\t(ctx, actions_sz, actions, ft_type);\n-\treturn action;\n-#endif\n-#else\n-\t(void)ctx;\n-\t(void)ft_type;\n-\t(void)domain;\n-\t(void)flags;\n-\t(void)actions_sz;\n-\t(void)actions;\n-\terrno = ENOTSUP;\n-\treturn NULL;\n-#endif\n-}\n-\n-static void *\n-mlx5_glue_dv_create_flow_action_packet_reformat\n-\t\t(struct ibv_context *ctx,\n-\t\t enum mlx5dv_flow_action_packet_reformat_type reformat_type,\n-\t\t enum mlx5dv_flow_table_type ft_type,\n-\t\t struct mlx5dv_dr_domain *domain,\n-\t\t uint32_t flags, size_t data_sz, void *data)\n-{\n-#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n-#ifdef HAVE_MLX5DV_DR\n-\t(void)ctx;\n-\t(void)ft_type;\n-\treturn mlx5dv_dr_action_create_packet_reformat(domain, flags,\n-\t\t\t\t\t\t       reformat_type, data_sz,\n-\t\t\t\t\t\t       data);\n-#else\n-\t(void)domain;\n-\t(void)flags;\n-\tstruct mlx5dv_flow_action_attr *action;\n-\n-\taction = malloc(sizeof(*action));\n-\tif (!action)\n-\t\treturn NULL;\n-\taction->type = MLX5DV_FLOW_ACTION_IBV_FLOW_ACTION;\n-\taction->action = mlx5dv_create_flow_action_packet_reformat\n-\t\t(ctx, data_sz, data, reformat_type, ft_type);\n-\treturn action;\n-#endif\n-#else\n-\t(void)ctx;\n-\t(void)reformat_type;\n-\t(void)ft_type;\n-\t(void)domain;\n-\t(void)flags;\n-\t(void)data_sz;\n-\t(void)data;\n-\terrno = ENOTSUP;\n-\treturn NULL;\n-#endif\n-}\n-\n-static void *\n-mlx5_glue_dv_create_flow_action_tag(uint32_t tag)\n-{\n-#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n-#ifdef HAVE_MLX5DV_DR\n-\treturn mlx5dv_dr_action_create_tag(tag);\n-#else\n-\tstruct mlx5dv_flow_action_attr *action;\n-\taction = malloc(sizeof(*action));\n-\tif (!action)\n-\t\treturn NULL;\n-\taction->type = MLX5DV_FLOW_ACTION_TAG;\n-\taction->tag_value = tag;\n-\treturn action;\n-#endif\n-#endif\n-\t(void)tag;\n-\terrno = ENOTSUP;\n-\treturn NULL;\n-}\n-\n-static void *\n-mlx5_glue_dv_create_flow_action_meter(struct mlx5dv_dr_flow_meter_attr *attr)\n-{\n-#if defined(HAVE_MLX5DV_DR) && defined(HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER)\n-\treturn mlx5dv_dr_action_create_flow_meter(attr);\n-#else\n-\t(void)attr;\n-\terrno = ENOTSUP;\n-\treturn NULL;\n-#endif\n-}\n-\n-static int\n-mlx5_glue_dv_modify_flow_action_meter(void *action,\n-\t\t\t\t      struct mlx5dv_dr_flow_meter_attr *attr,\n-\t\t\t\t      uint64_t modify_bits)\n-{\n-#if defined(HAVE_MLX5DV_DR) && defined(HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER)\n-\treturn mlx5dv_dr_action_modify_flow_meter(action, attr, modify_bits);\n-#else\n-\t(void)action;\n-\t(void)attr;\n-\t(void)modify_bits;\n-\terrno = ENOTSUP;\n-\treturn errno;\n-#endif\n-}\n-\n-static int\n-mlx5_glue_dv_destroy_flow(void *flow_id)\n-{\n-#ifdef HAVE_MLX5DV_DR\n-\treturn mlx5dv_dr_rule_destroy(flow_id);\n-#else\n-\treturn ibv_destroy_flow(flow_id);\n-#endif\n-}\n-\n-static int\n-mlx5_glue_dv_destroy_flow_matcher(void *matcher)\n-{\n-#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n-#ifdef HAVE_MLX5DV_DR\n-\treturn mlx5dv_dr_matcher_destroy(matcher);\n-#else\n-\treturn mlx5dv_destroy_flow_matcher(matcher);\n-#endif\n-#else\n-\t(void)matcher;\n-\terrno = ENOTSUP;\n-\treturn errno;\n-#endif\n-}\n-\n-static struct ibv_context *\n-mlx5_glue_dv_open_device(struct ibv_device *device)\n-{\n-#ifdef HAVE_IBV_DEVX_OBJ\n-\treturn mlx5dv_open_device(device,\n-\t\t\t\t  &(struct mlx5dv_context_attr){\n-\t\t\t\t\t.flags = MLX5DV_CONTEXT_FLAGS_DEVX,\n-\t\t\t\t  });\n-#else\n-\t(void)device;\n-\terrno = ENOTSUP;\n-\treturn NULL;\n-#endif\n-}\n-\n-static struct mlx5dv_devx_obj *\n-mlx5_glue_devx_obj_create(struct ibv_context *ctx,\n-\t\t\t  const void *in, size_t inlen,\n-\t\t\t  void *out, size_t outlen)\n-{\n-#ifdef HAVE_IBV_DEVX_OBJ\n-\treturn mlx5dv_devx_obj_create(ctx, in, inlen, out, outlen);\n-#else\n-\t(void)ctx;\n-\t(void)in;\n-\t(void)inlen;\n-\t(void)out;\n-\t(void)outlen;\n-\terrno = ENOTSUP;\n-\treturn NULL;\n-#endif\n-}\n-\n-static int\n-mlx5_glue_devx_obj_destroy(struct mlx5dv_devx_obj *obj)\n-{\n-#ifdef HAVE_IBV_DEVX_OBJ\n-\treturn mlx5dv_devx_obj_destroy(obj);\n-#else\n-\t(void)obj;\n-\treturn -ENOTSUP;\n-#endif\n-}\n-\n-static int\n-mlx5_glue_devx_obj_query(struct mlx5dv_devx_obj *obj,\n-\t\t\t const void *in, size_t inlen,\n-\t\t\t void *out, size_t outlen)\n-{\n-#ifdef HAVE_IBV_DEVX_OBJ\n-\treturn mlx5dv_devx_obj_query(obj, in, inlen, out, outlen);\n-#else\n-\t(void)obj;\n-\t(void)in;\n-\t(void)inlen;\n-\t(void)out;\n-\t(void)outlen;\n-\treturn -ENOTSUP;\n-#endif\n-}\n-\n-static int\n-mlx5_glue_devx_obj_modify(struct mlx5dv_devx_obj *obj,\n-\t\t\t  const void *in, size_t inlen,\n-\t\t\t  void *out, size_t outlen)\n-{\n-#ifdef HAVE_IBV_DEVX_OBJ\n-\treturn mlx5dv_devx_obj_modify(obj, in, inlen, out, outlen);\n-#else\n-\t(void)obj;\n-\t(void)in;\n-\t(void)inlen;\n-\t(void)out;\n-\t(void)outlen;\n-\treturn -ENOTSUP;\n-#endif\n-}\n-\n-static int\n-mlx5_glue_devx_general_cmd(struct ibv_context *ctx,\n-\t\t\t   const void *in, size_t inlen,\n-\t\t\t   void *out, size_t outlen)\n-{\n-#ifdef HAVE_IBV_DEVX_OBJ\n-\treturn mlx5dv_devx_general_cmd(ctx, in, inlen, out, outlen);\n-#else\n-\t(void)ctx;\n-\t(void)in;\n-\t(void)inlen;\n-\t(void)out;\n-\t(void)outlen;\n-\treturn -ENOTSUP;\n-#endif\n-}\n-\n-static struct mlx5dv_devx_cmd_comp *\n-mlx5_glue_devx_create_cmd_comp(struct ibv_context *ctx)\n-{\n-#ifdef HAVE_IBV_DEVX_ASYNC\n-\treturn mlx5dv_devx_create_cmd_comp(ctx);\n-#else\n-\t(void)ctx;\n-\terrno = -ENOTSUP;\n-\treturn NULL;\n-#endif\n-}\n-\n-static void\n-mlx5_glue_devx_destroy_cmd_comp(struct mlx5dv_devx_cmd_comp *cmd_comp)\n-{\n-#ifdef HAVE_IBV_DEVX_ASYNC\n-\tmlx5dv_devx_destroy_cmd_comp(cmd_comp);\n-#else\n-\t(void)cmd_comp;\n-\terrno = -ENOTSUP;\n-#endif\n-}\n-\n-static int\n-mlx5_glue_devx_obj_query_async(struct mlx5dv_devx_obj *obj, const void *in,\n-\t\t\t       size_t inlen, size_t outlen, uint64_t wr_id,\n-\t\t\t       struct mlx5dv_devx_cmd_comp *cmd_comp)\n-{\n-#ifdef HAVE_IBV_DEVX_ASYNC\n-\treturn mlx5dv_devx_obj_query_async(obj, in, inlen, outlen, wr_id,\n-\t\t\t\t\t   cmd_comp);\n-#else\n-\t(void)obj;\n-\t(void)in;\n-\t(void)inlen;\n-\t(void)outlen;\n-\t(void)wr_id;\n-\t(void)cmd_comp;\n-\treturn -ENOTSUP;\n-#endif\n-}\n-\n-static int\n-mlx5_glue_devx_get_async_cmd_comp(struct mlx5dv_devx_cmd_comp *cmd_comp,\n-\t\t\t\t  struct mlx5dv_devx_async_cmd_hdr *cmd_resp,\n-\t\t\t\t  size_t cmd_resp_len)\n-{\n-#ifdef HAVE_IBV_DEVX_ASYNC\n-\treturn mlx5dv_devx_get_async_cmd_comp(cmd_comp, cmd_resp,\n-\t\t\t\t\t      cmd_resp_len);\n-#else\n-\t(void)cmd_comp;\n-\t(void)cmd_resp;\n-\t(void)cmd_resp_len;\n-\treturn -ENOTSUP;\n-#endif\n-}\n-\n-static struct mlx5dv_devx_umem *\n-mlx5_glue_devx_umem_reg(struct ibv_context *context, void *addr, size_t size,\n-\t\t\tuint32_t access)\n-{\n-#ifdef HAVE_IBV_DEVX_OBJ\n-\treturn mlx5dv_devx_umem_reg(context, addr, size, access);\n-#else\n-\t(void)context;\n-\t(void)addr;\n-\t(void)size;\n-\t(void)access;\n-\terrno = -ENOTSUP;\n-\treturn NULL;\n-#endif\n-}\n-\n-static int\n-mlx5_glue_devx_umem_dereg(struct mlx5dv_devx_umem *dv_devx_umem)\n-{\n-#ifdef HAVE_IBV_DEVX_OBJ\n-\treturn mlx5dv_devx_umem_dereg(dv_devx_umem);\n-#else\n-\t(void)dv_devx_umem;\n-\treturn -ENOTSUP;\n-#endif\n-}\n-\n-static int\n-mlx5_glue_devx_qp_query(struct ibv_qp *qp,\n-\t\t\tconst void *in, size_t inlen,\n-\t\t\tvoid *out, size_t outlen)\n-{\n-#ifdef HAVE_IBV_DEVX_QP\n-\treturn mlx5dv_devx_qp_query(qp, in, inlen, out, outlen);\n-#else\n-\t(void)qp;\n-\t(void)in;\n-\t(void)inlen;\n-\t(void)out;\n-\t(void)outlen;\n-\terrno = ENOTSUP;\n-\treturn errno;\n-#endif\n-}\n-\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-#ifdef HAVE_MLX5DV_DR_DEVX_PORT\n-\treturn mlx5dv_query_devx_port(ctx, port_num, mlx5_devx_port);\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-}\n-\n-static int\n-mlx5_glue_dr_dump_domain(FILE *file, void *domain)\n-{\n-#ifdef HAVE_MLX5_DR_FLOW_DUMP\n-\treturn mlx5dv_dump_dr_domain(file, domain);\n-#else\n-\tRTE_SET_USED(file);\n-\tRTE_SET_USED(domain);\n-\treturn -ENOTSUP;\n-#endif\n-}\n-\n-static int\n-mlx5_glue_devx_query_eqn(struct ibv_context *ctx, uint32_t cpus,\n-\t\t\t uint32_t *eqn)\n-{\n-#ifdef HAVE_IBV_DEVX_OBJ\n-\treturn mlx5dv_devx_query_eqn(ctx, cpus, eqn);\n-#else\n-\t(void)ctx;\n-\t(void)cpus;\n-\t(void)eqn;\n-\treturn -ENOTSUP;\n-#endif\n-}\n-\n-static struct mlx5dv_devx_event_channel *\n-mlx5_glue_devx_create_event_channel(struct ibv_context *ctx, int flags)\n-{\n-#ifdef HAVE_IBV_DEVX_EVENT\n-\treturn mlx5dv_devx_create_event_channel(ctx, flags);\n-#else\n-\t(void)ctx;\n-\t(void)flags;\n-\terrno = ENOTSUP;\n-\treturn NULL;\n-#endif\n-}\n-\n-static void\n-mlx5_glue_devx_destroy_event_channel(struct mlx5dv_devx_event_channel *eventc)\n-{\n-#ifdef HAVE_IBV_DEVX_EVENT\n-\tmlx5dv_devx_destroy_event_channel(eventc);\n-#else\n-\t(void)eventc;\n-#endif\n-}\n-\n-static int\n-mlx5_glue_devx_subscribe_devx_event(struct mlx5dv_devx_event_channel *eventc,\n-\t\t\t\t    struct mlx5dv_devx_obj *obj,\n-\t\t\t\t    uint16_t events_sz, uint16_t events_num[],\n-\t\t\t\t    uint64_t cookie)\n-{\n-#ifdef HAVE_IBV_DEVX_EVENT\n-\treturn mlx5dv_devx_subscribe_devx_event(eventc, obj, events_sz,\n-\t\t\t\t\t\tevents_num, cookie);\n-#else\n-\t(void)eventc;\n-\t(void)obj;\n-\t(void)events_sz;\n-\t(void)events_num;\n-\t(void)cookie;\n-\treturn -ENOTSUP;\n-#endif\n-}\n-\n-static int\n-mlx5_glue_devx_subscribe_devx_event_fd(struct mlx5dv_devx_event_channel *eventc,\n-\t\t\t\t       int fd, struct mlx5dv_devx_obj *obj,\n-\t\t\t\t       uint16_t event_num)\n-{\n-#ifdef HAVE_IBV_DEVX_EVENT\n-\treturn mlx5dv_devx_subscribe_devx_event_fd(eventc, fd, obj, event_num);\n-#else\n-\t(void)eventc;\n-\t(void)fd;\n-\t(void)obj;\n-\t(void)event_num;\n-\treturn -ENOTSUP;\n-#endif\n-}\n-\n-static ssize_t\n-mlx5_glue_devx_get_event(struct mlx5dv_devx_event_channel *eventc,\n-\t\t\t struct mlx5dv_devx_async_event_hdr *event_data,\n-\t\t\t size_t event_resp_len)\n-{\n-#ifdef HAVE_IBV_DEVX_EVENT\n-\treturn mlx5dv_devx_get_event(eventc, event_data, event_resp_len);\n-#else\n-\t(void)eventc;\n-\t(void)event_data;\n-\t(void)event_resp_len;\n-\terrno = ENOTSUP;\n-\treturn -1;\n-#endif\n-}\n-\n-static struct mlx5dv_devx_uar *\n-mlx5_glue_devx_alloc_uar(struct ibv_context *context, uint32_t flags)\n-{\n-#ifdef HAVE_IBV_DEVX_OBJ\n-\treturn mlx5dv_devx_alloc_uar(context, flags);\n-#else\n-\t(void)context;\n-\t(void)flags;\n-\terrno = ENOTSUP;\n-\treturn NULL;\n-#endif\n-}\n-\n-static void\n-mlx5_glue_devx_free_uar(struct mlx5dv_devx_uar *devx_uar)\n-{\n-#ifdef HAVE_IBV_DEVX_OBJ\n-\tmlx5dv_devx_free_uar(devx_uar);\n-#else\n-\t(void)devx_uar;\n-#endif\n-}\n-\n-static struct mlx5dv_var *\n-mlx5_glue_dv_alloc_var(struct ibv_context *context, uint32_t flags)\n-{\n-#ifdef HAVE_IBV_VAR\n-\treturn mlx5dv_alloc_var(context, flags);\n-#else\n-\t(void)context;\n-\t(void)flags;\n-\terrno = ENOTSUP;\n-\treturn NULL;\n-#endif\n-}\n-\n-static void\n-mlx5_glue_dv_free_var(struct mlx5dv_var *var)\n-{\n-#ifdef HAVE_IBV_VAR\n-\tmlx5dv_free_var(var);\n-#else\n-\t(void)var;\n-\terrno = ENOTSUP;\n-#endif\n-}\n-\n-__rte_cache_aligned\n-const struct mlx5_glue *mlx5_glue = &(const struct mlx5_glue) {\n-\t.version = MLX5_GLUE_VERSION,\n-\t.fork_init = mlx5_glue_fork_init,\n-\t.alloc_pd = mlx5_glue_alloc_pd,\n-\t.dealloc_pd = mlx5_glue_dealloc_pd,\n-\t.get_device_list = mlx5_glue_get_device_list,\n-\t.free_device_list = mlx5_glue_free_device_list,\n-\t.open_device = mlx5_glue_open_device,\n-\t.close_device = mlx5_glue_close_device,\n-\t.query_device = mlx5_glue_query_device,\n-\t.query_device_ex = mlx5_glue_query_device_ex,\n-\t.query_rt_values_ex = mlx5_glue_query_rt_values_ex,\n-\t.query_port = mlx5_glue_query_port,\n-\t.create_comp_channel = mlx5_glue_create_comp_channel,\n-\t.destroy_comp_channel = mlx5_glue_destroy_comp_channel,\n-\t.create_cq = mlx5_glue_create_cq,\n-\t.destroy_cq = mlx5_glue_destroy_cq,\n-\t.get_cq_event = mlx5_glue_get_cq_event,\n-\t.ack_cq_events = mlx5_glue_ack_cq_events,\n-\t.create_rwq_ind_table = mlx5_glue_create_rwq_ind_table,\n-\t.destroy_rwq_ind_table = mlx5_glue_destroy_rwq_ind_table,\n-\t.create_wq = mlx5_glue_create_wq,\n-\t.destroy_wq = mlx5_glue_destroy_wq,\n-\t.modify_wq = mlx5_glue_modify_wq,\n-\t.create_flow = mlx5_glue_create_flow,\n-\t.destroy_flow = mlx5_glue_destroy_flow,\n-\t.destroy_flow_action = mlx5_glue_destroy_flow_action,\n-\t.create_qp = mlx5_glue_create_qp,\n-\t.create_qp_ex = mlx5_glue_create_qp_ex,\n-\t.destroy_qp = mlx5_glue_destroy_qp,\n-\t.modify_qp = mlx5_glue_modify_qp,\n-\t.reg_mr = mlx5_glue_reg_mr,\n-\t.alloc_null_mr = mlx5_glue_alloc_null_mr,\n-\t.dereg_mr = mlx5_glue_dereg_mr,\n-\t.create_counter_set = mlx5_glue_create_counter_set,\n-\t.destroy_counter_set = mlx5_glue_destroy_counter_set,\n-\t.describe_counter_set = mlx5_glue_describe_counter_set,\n-\t.query_counter_set = mlx5_glue_query_counter_set,\n-\t.create_counters = mlx5_glue_create_counters,\n-\t.destroy_counters = mlx5_glue_destroy_counters,\n-\t.attach_counters = mlx5_glue_attach_counters,\n-\t.query_counters = mlx5_glue_query_counters,\n-\t.ack_async_event = mlx5_glue_ack_async_event,\n-\t.get_async_event = mlx5_glue_get_async_event,\n-\t.port_state_str = mlx5_glue_port_state_str,\n-\t.cq_ex_to_cq = mlx5_glue_cq_ex_to_cq,\n-\t.dr_create_flow_action_dest_flow_tbl =\n-\t\tmlx5_glue_dr_create_flow_action_dest_flow_tbl,\n-\t.dr_create_flow_action_dest_port =\n-\t\tmlx5_glue_dr_create_flow_action_dest_port,\n-\t.dr_create_flow_action_drop =\n-\t\tmlx5_glue_dr_create_flow_action_drop,\n-\t.dr_create_flow_action_push_vlan =\n-\t\tmlx5_glue_dr_create_flow_action_push_vlan,\n-\t.dr_create_flow_action_pop_vlan =\n-\t\tmlx5_glue_dr_create_flow_action_pop_vlan,\n-\t.dr_create_flow_tbl = mlx5_glue_dr_create_flow_tbl,\n-\t.dr_destroy_flow_tbl = mlx5_glue_dr_destroy_flow_tbl,\n-\t.dr_create_domain = mlx5_glue_dr_create_domain,\n-\t.dr_destroy_domain = mlx5_glue_dr_destroy_domain,\n-\t.dv_create_cq = mlx5_glue_dv_create_cq,\n-\t.dv_create_wq = mlx5_glue_dv_create_wq,\n-\t.dv_query_device = mlx5_glue_dv_query_device,\n-\t.dv_set_context_attr = mlx5_glue_dv_set_context_attr,\n-\t.dv_init_obj = mlx5_glue_dv_init_obj,\n-\t.dv_create_qp = mlx5_glue_dv_create_qp,\n-\t.dv_create_flow_matcher = mlx5_glue_dv_create_flow_matcher,\n-\t.dv_create_flow = mlx5_glue_dv_create_flow,\n-\t.dv_create_flow_action_counter =\n-\t\tmlx5_glue_dv_create_flow_action_counter,\n-\t.dv_create_flow_action_dest_ibv_qp =\n-\t\tmlx5_glue_dv_create_flow_action_dest_ibv_qp,\n-\t.dv_create_flow_action_dest_devx_tir =\n-\t\tmlx5_glue_dv_create_flow_action_dest_devx_tir,\n-\t.dv_create_flow_action_modify_header =\n-\t\tmlx5_glue_dv_create_flow_action_modify_header,\n-\t.dv_create_flow_action_packet_reformat =\n-\t\tmlx5_glue_dv_create_flow_action_packet_reformat,\n-\t.dv_create_flow_action_tag =  mlx5_glue_dv_create_flow_action_tag,\n-\t.dv_create_flow_action_meter = mlx5_glue_dv_create_flow_action_meter,\n-\t.dv_modify_flow_action_meter = mlx5_glue_dv_modify_flow_action_meter,\n-\t.dv_destroy_flow = mlx5_glue_dv_destroy_flow,\n-\t.dv_destroy_flow_matcher = mlx5_glue_dv_destroy_flow_matcher,\n-\t.dv_open_device = mlx5_glue_dv_open_device,\n-\t.devx_obj_create = mlx5_glue_devx_obj_create,\n-\t.devx_obj_destroy = mlx5_glue_devx_obj_destroy,\n-\t.devx_obj_query = mlx5_glue_devx_obj_query,\n-\t.devx_obj_modify = mlx5_glue_devx_obj_modify,\n-\t.devx_general_cmd = mlx5_glue_devx_general_cmd,\n-\t.devx_create_cmd_comp = mlx5_glue_devx_create_cmd_comp,\n-\t.devx_destroy_cmd_comp = mlx5_glue_devx_destroy_cmd_comp,\n-\t.devx_obj_query_async = mlx5_glue_devx_obj_query_async,\n-\t.devx_get_async_cmd_comp = mlx5_glue_devx_get_async_cmd_comp,\n-\t.devx_umem_reg = mlx5_glue_devx_umem_reg,\n-\t.devx_umem_dereg = mlx5_glue_devx_umem_dereg,\n-\t.devx_qp_query = mlx5_glue_devx_qp_query,\n-\t.devx_port_query = mlx5_glue_devx_port_query,\n-\t.dr_dump_domain = mlx5_glue_dr_dump_domain,\n-\t.devx_query_eqn = mlx5_glue_devx_query_eqn,\n-\t.devx_create_event_channel = mlx5_glue_devx_create_event_channel,\n-\t.devx_destroy_event_channel = mlx5_glue_devx_destroy_event_channel,\n-\t.devx_subscribe_devx_event = mlx5_glue_devx_subscribe_devx_event,\n-\t.devx_subscribe_devx_event_fd = mlx5_glue_devx_subscribe_devx_event_fd,\n-\t.devx_get_event = mlx5_glue_devx_get_event,\n-\t.devx_alloc_uar = mlx5_glue_devx_alloc_uar,\n-\t.devx_free_uar = mlx5_glue_devx_free_uar,\n-\t.dv_alloc_var = mlx5_glue_dv_alloc_var,\n-\t.dv_free_var = mlx5_glue_dv_free_var,\n-};\ndiff --git a/drivers/common/mlx5/mlx5_glue.h b/drivers/common/mlx5/mlx5_glue.h\ndeleted file mode 100644\nindex 81d6a22..0000000\n--- a/drivers/common/mlx5/mlx5_glue.h\n+++ /dev/null\n@@ -1,309 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright 2018 6WIND S.A.\n- * Copyright 2018 Mellanox Technologies, Ltd\n- */\n-\n-#ifndef MLX5_GLUE_H_\n-#define MLX5_GLUE_H_\n-\n-#include <stddef.h>\n-#include <stdint.h>\n-/* Verbs headers do not support -pedantic. */\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic ignored \"-Wpedantic\"\n-#endif\n-#include <infiniband/mlx5dv.h>\n-#include <infiniband/verbs.h>\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic error \"-Wpedantic\"\n-#endif\n-\n-#include <rte_byteorder.h>\n-\n-#include \"mlx5_autoconf.h\"\n-\n-#ifndef MLX5_GLUE_VERSION\n-#define MLX5_GLUE_VERSION \"\"\n-#endif\n-\n-#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V42\n-struct ibv_counter_set;\n-struct ibv_counter_set_data;\n-struct ibv_counter_set_description;\n-struct ibv_counter_set_init_attr;\n-struct ibv_query_counter_set_attr;\n-#endif\n-\n-#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V45\n-struct ibv_counters;\n-struct ibv_counters_init_attr;\n-struct ibv_counter_attach_attr;\n-#endif\n-\n-#ifndef HAVE_IBV_DEVICE_TUNNEL_SUPPORT\n-struct mlx5dv_qp_init_attr;\n-#endif\n-\n-#ifndef HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT\n-struct mlx5dv_wq_init_attr;\n-#endif\n-\n-#ifndef HAVE_IBV_FLOW_DV_SUPPORT\n-struct mlx5dv_flow_matcher;\n-struct mlx5dv_flow_matcher_attr;\n-struct mlx5dv_flow_action_attr;\n-struct mlx5dv_flow_match_parameters;\n-struct mlx5dv_dr_flow_meter_attr;\n-struct ibv_flow_action;\n-enum mlx5dv_flow_action_packet_reformat_type { packet_reformat_type = 0, };\n-enum mlx5dv_flow_table_type { flow_table_type = 0, };\n-#endif\n-\n-#ifndef HAVE_IBV_FLOW_DEVX_COUNTERS\n-#define MLX5DV_FLOW_ACTION_COUNTERS_DEVX 0\n-#endif\n-\n-#ifndef HAVE_IBV_DEVX_OBJ\n-struct mlx5dv_devx_obj;\n-struct mlx5dv_devx_umem { uint32_t umem_id; };\n-struct mlx5dv_devx_uar { void *reg_addr; void *base_addr; uint32_t page_id; };\n-#endif\n-\n-#ifndef HAVE_IBV_DEVX_ASYNC\n-struct mlx5dv_devx_cmd_comp;\n-struct mlx5dv_devx_async_cmd_hdr;\n-#endif\n-\n-#ifndef HAVE_MLX5DV_DR\n-enum  mlx5dv_dr_domain_type { unused, };\n-struct mlx5dv_dr_domain;\n-#endif\n-\n-#ifndef HAVE_MLX5DV_DR_DEVX_PORT\n-struct mlx5dv_devx_port;\n-#endif\n-\n-#ifndef HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER\n-struct mlx5dv_dr_flow_meter_attr;\n-#endif\n-\n-#ifndef HAVE_IBV_DEVX_EVENT\n-struct mlx5dv_devx_event_channel { int fd; };\n-struct mlx5dv_devx_async_event_hdr;\n-#define MLX5DV_DEVX_CREATE_EVENT_CHANNEL_FLAGS_OMIT_EV_DATA 1\n-#endif\n-\n-#ifndef HAVE_IBV_VAR\n-struct mlx5dv_var { uint32_t page_id; uint32_t length; off_t mmap_off;\n-\t\t\tuint64_t comp_mask; };\n-#endif\n-\n-#ifndef HAVE_IBV_RELAXED_ORDERING\n-#define IBV_ACCESS_RELAXED_ORDERING 0\n-#endif\n-\n-/* LIB_GLUE_VERSION must be updated every time this structure is modified. */\n-struct mlx5_glue {\n-\tconst char *version;\n-\tint (*fork_init)(void);\n-\tstruct ibv_pd *(*alloc_pd)(struct ibv_context *context);\n-\tint (*dealloc_pd)(struct ibv_pd *pd);\n-\tstruct ibv_device **(*get_device_list)(int *num_devices);\n-\tvoid (*free_device_list)(struct ibv_device **list);\n-\tstruct ibv_context *(*open_device)(struct ibv_device *device);\n-\tint (*close_device)(struct ibv_context *context);\n-\tint (*query_device)(struct ibv_context *context,\n-\t\t\t    struct ibv_device_attr *device_attr);\n-\tint (*query_device_ex)(struct ibv_context *context,\n-\t\t\t       const struct ibv_query_device_ex_input *input,\n-\t\t\t       struct ibv_device_attr_ex *attr);\n-\tint (*query_rt_values_ex)(struct ibv_context *context,\n-\t\t\t       struct ibv_values_ex *values);\n-\tint (*query_port)(struct ibv_context *context, uint8_t port_num,\n-\t\t\t  struct ibv_port_attr *port_attr);\n-\tstruct ibv_comp_channel *(*create_comp_channel)\n-\t\t(struct ibv_context *context);\n-\tint (*destroy_comp_channel)(struct ibv_comp_channel *channel);\n-\tstruct ibv_cq *(*create_cq)(struct ibv_context *context, int cqe,\n-\t\t\t\t    void *cq_context,\n-\t\t\t\t    struct ibv_comp_channel *channel,\n-\t\t\t\t    int comp_vector);\n-\tint (*destroy_cq)(struct ibv_cq *cq);\n-\tint (*get_cq_event)(struct ibv_comp_channel *channel,\n-\t\t\t    struct ibv_cq **cq, void **cq_context);\n-\tvoid (*ack_cq_events)(struct ibv_cq *cq, unsigned int nevents);\n-\tstruct ibv_rwq_ind_table *(*create_rwq_ind_table)\n-\t\t(struct ibv_context *context,\n-\t\t struct ibv_rwq_ind_table_init_attr *init_attr);\n-\tint (*destroy_rwq_ind_table)(struct ibv_rwq_ind_table *rwq_ind_table);\n-\tstruct ibv_wq *(*create_wq)(struct ibv_context *context,\n-\t\t\t\t    struct ibv_wq_init_attr *wq_init_attr);\n-\tint (*destroy_wq)(struct ibv_wq *wq);\n-\tint (*modify_wq)(struct ibv_wq *wq, struct ibv_wq_attr *wq_attr);\n-\tstruct ibv_flow *(*create_flow)(struct ibv_qp *qp,\n-\t\t\t\t\tstruct ibv_flow_attr *flow);\n-\tint (*destroy_flow)(struct ibv_flow *flow_id);\n-\tint (*destroy_flow_action)(void *action);\n-\tstruct ibv_qp *(*create_qp)(struct ibv_pd *pd,\n-\t\t\t\t    struct ibv_qp_init_attr *qp_init_attr);\n-\tstruct ibv_qp *(*create_qp_ex)\n-\t\t(struct ibv_context *context,\n-\t\t struct ibv_qp_init_attr_ex *qp_init_attr_ex);\n-\tint (*destroy_qp)(struct ibv_qp *qp);\n-\tint (*modify_qp)(struct ibv_qp *qp, struct ibv_qp_attr *attr,\n-\t\t\t int attr_mask);\n-\tstruct ibv_mr *(*reg_mr)(struct ibv_pd *pd, void *addr,\n-\t\t\t\t size_t length, int access);\n-\tstruct ibv_mr *(*alloc_null_mr)(struct ibv_pd *pd);\n-\tint (*dereg_mr)(struct ibv_mr *mr);\n-\tstruct ibv_counter_set *(*create_counter_set)\n-\t\t(struct ibv_context *context,\n-\t\t struct ibv_counter_set_init_attr *init_attr);\n-\tint (*destroy_counter_set)(struct ibv_counter_set *cs);\n-\tint (*describe_counter_set)\n-\t\t(struct ibv_context *context,\n-\t\t uint16_t counter_set_id,\n-\t\t struct ibv_counter_set_description *cs_desc);\n-\tint (*query_counter_set)(struct ibv_query_counter_set_attr *query_attr,\n-\t\t\t\t struct ibv_counter_set_data *cs_data);\n-\tstruct ibv_counters *(*create_counters)\n-\t\t(struct ibv_context *context,\n-\t\t struct ibv_counters_init_attr *init_attr);\n-\tint (*destroy_counters)(struct ibv_counters *counters);\n-\tint (*attach_counters)(struct ibv_counters *counters,\n-\t\t\t       struct ibv_counter_attach_attr *attr,\n-\t\t\t       struct ibv_flow *flow);\n-\tint (*query_counters)(struct ibv_counters *counters,\n-\t\t\t      uint64_t *counters_value,\n-\t\t\t      uint32_t ncounters,\n-\t\t\t      uint32_t flags);\n-\tvoid (*ack_async_event)(struct ibv_async_event *event);\n-\tint (*get_async_event)(struct ibv_context *context,\n-\t\t\t       struct ibv_async_event *event);\n-\tconst char *(*port_state_str)(enum ibv_port_state port_state);\n-\tstruct ibv_cq *(*cq_ex_to_cq)(struct ibv_cq_ex *cq);\n-\tvoid *(*dr_create_flow_action_dest_flow_tbl)(void *tbl);\n-\tvoid *(*dr_create_flow_action_dest_port)(void *domain,\n-\t\t\t\t\t\t uint32_t port);\n-\tvoid *(*dr_create_flow_action_drop)();\n-\tvoid *(*dr_create_flow_action_push_vlan)\n-\t\t\t\t\t(struct mlx5dv_dr_domain *domain,\n-\t\t\t\t\t rte_be32_t vlan_tag);\n-\tvoid *(*dr_create_flow_action_pop_vlan)();\n-\tvoid *(*dr_create_flow_tbl)(void *domain, uint32_t level);\n-\tint (*dr_destroy_flow_tbl)(void *tbl);\n-\tvoid *(*dr_create_domain)(struct ibv_context *ctx,\n-\t\t\t\t  enum mlx5dv_dr_domain_type domain);\n-\tint (*dr_destroy_domain)(void *domain);\n-\tstruct ibv_cq_ex *(*dv_create_cq)\n-\t\t(struct ibv_context *context,\n-\t\t struct ibv_cq_init_attr_ex *cq_attr,\n-\t\t struct mlx5dv_cq_init_attr *mlx5_cq_attr);\n-\tstruct ibv_wq *(*dv_create_wq)\n-\t\t(struct ibv_context *context,\n-\t\t struct ibv_wq_init_attr *wq_attr,\n-\t\t struct mlx5dv_wq_init_attr *mlx5_wq_attr);\n-\tint (*dv_query_device)(struct ibv_context *ctx_in,\n-\t\t\t       struct mlx5dv_context *attrs_out);\n-\tint (*dv_set_context_attr)(struct ibv_context *ibv_ctx,\n-\t\t\t\t   enum mlx5dv_set_ctx_attr_type type,\n-\t\t\t\t   void *attr);\n-\tint (*dv_init_obj)(struct mlx5dv_obj *obj, uint64_t obj_type);\n-\tstruct ibv_qp *(*dv_create_qp)\n-\t\t(struct ibv_context *context,\n-\t\t struct ibv_qp_init_attr_ex *qp_init_attr_ex,\n-\t\t struct mlx5dv_qp_init_attr *dv_qp_init_attr);\n-\tvoid *(*dv_create_flow_matcher)\n-\t\t(struct ibv_context *context,\n-\t\t struct mlx5dv_flow_matcher_attr *matcher_attr,\n-\t\t void *tbl);\n-\tvoid *(*dv_create_flow)(void *matcher, void *match_value,\n-\t\t\t  size_t num_actions, void *actions[]);\n-\tvoid *(*dv_create_flow_action_counter)(void *obj, uint32_t  offset);\n-\tvoid *(*dv_create_flow_action_dest_ibv_qp)(void *qp);\n-\tvoid *(*dv_create_flow_action_dest_devx_tir)(void *tir);\n-\tvoid *(*dv_create_flow_action_modify_header)\n-\t\t(struct ibv_context *ctx, enum mlx5dv_flow_table_type ft_type,\n-\t\t void *domain, uint64_t flags, size_t actions_sz,\n-\t\t uint64_t actions[]);\n-\tvoid *(*dv_create_flow_action_packet_reformat)\n-\t\t(struct ibv_context *ctx,\n-\t\t enum mlx5dv_flow_action_packet_reformat_type reformat_type,\n-\t\t enum mlx5dv_flow_table_type ft_type,\n-\t\t struct mlx5dv_dr_domain *domain,\n-\t\t uint32_t flags, size_t data_sz, void *data);\n-\tvoid *(*dv_create_flow_action_tag)(uint32_t tag);\n-\tvoid *(*dv_create_flow_action_meter)\n-\t\t(struct mlx5dv_dr_flow_meter_attr *attr);\n-\tint (*dv_modify_flow_action_meter)(void *action,\n-\t\tstruct mlx5dv_dr_flow_meter_attr *attr, uint64_t modify_bits);\n-\tint (*dv_destroy_flow)(void *flow);\n-\tint (*dv_destroy_flow_matcher)(void *matcher);\n-\tstruct ibv_context *(*dv_open_device)(struct ibv_device *device);\n-\tstruct mlx5dv_var *(*dv_alloc_var)(struct ibv_context *context,\n-\t\t\t\t\t   uint32_t flags);\n-\tvoid (*dv_free_var)(struct mlx5dv_var *var);\n-\tstruct mlx5dv_devx_uar *(*devx_alloc_uar)(struct ibv_context *context,\n-\t\t\t\t\t\t  uint32_t flags);\n-\tvoid (*devx_free_uar)(struct mlx5dv_devx_uar *devx_uar);\n-\tstruct mlx5dv_devx_obj *(*devx_obj_create)\n-\t\t\t\t\t(struct ibv_context *ctx,\n-\t\t\t\t\t const void *in, size_t inlen,\n-\t\t\t\t\t void *out, size_t outlen);\n-\tint (*devx_obj_destroy)(struct mlx5dv_devx_obj *obj);\n-\tint (*devx_obj_query)(struct mlx5dv_devx_obj *obj,\n-\t\t\t      const void *in, size_t inlen,\n-\t\t\t      void *out, size_t outlen);\n-\tint (*devx_obj_modify)(struct mlx5dv_devx_obj *obj,\n-\t\t\t       const void *in, size_t inlen,\n-\t\t\t       void *out, size_t outlen);\n-\tint (*devx_general_cmd)(struct ibv_context *context,\n-\t\t\t\tconst void *in, size_t inlen,\n-\t\t\t\tvoid *out, size_t outlen);\n-\tstruct mlx5dv_devx_cmd_comp *(*devx_create_cmd_comp)\n-\t\t\t\t\t(struct ibv_context *context);\n-\tvoid (*devx_destroy_cmd_comp)(struct mlx5dv_devx_cmd_comp *cmd_comp);\n-\tint (*devx_obj_query_async)(struct mlx5dv_devx_obj *obj,\n-\t\t\t\t    const void *in, size_t inlen,\n-\t\t\t\t    size_t outlen, uint64_t wr_id,\n-\t\t\t\t    struct mlx5dv_devx_cmd_comp *cmd_comp);\n-\tint (*devx_get_async_cmd_comp)(struct mlx5dv_devx_cmd_comp *cmd_comp,\n-\t\t\t\t       struct mlx5dv_devx_async_cmd_hdr *resp,\n-\t\t\t\t       size_t cmd_resp_len);\n-\tstruct mlx5dv_devx_umem *(*devx_umem_reg)(struct ibv_context *context,\n-\t\t\t\t\t\t  void *addr, size_t size,\n-\t\t\t\t\t\t  uint32_t access);\n-\tint (*devx_umem_dereg)(struct mlx5dv_devx_umem *dv_devx_umem);\n-\tint (*devx_qp_query)(struct ibv_qp *qp,\n-\t\t\t     const void *in, size_t inlen,\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-\tint (*dr_dump_domain)(FILE *file, void *domain);\n-\tint (*devx_query_eqn)(struct ibv_context *context, uint32_t cpus,\n-\t\t\t      uint32_t *eqn);\n-\tstruct mlx5dv_devx_event_channel *(*devx_create_event_channel)\n-\t\t\t\t(struct ibv_context *context, int flags);\n-\tvoid (*devx_destroy_event_channel)\n-\t\t\t(struct mlx5dv_devx_event_channel *event_channel);\n-\tint (*devx_subscribe_devx_event)\n-\t\t\t(struct mlx5dv_devx_event_channel *event_channel,\n-\t\t\t struct mlx5dv_devx_obj *obj,\n-\t\t\t uint16_t events_sz,\n-\t\t\t uint16_t events_num[],\n-\t\t\t uint64_t cookie);\n-\tint (*devx_subscribe_devx_event_fd)\n-\t\t\t(struct mlx5dv_devx_event_channel *event_channel,\n-\t\t\t int fd,\n-\t\t\t struct mlx5dv_devx_obj *obj,\n-\t\t\t uint16_t event_num);\n-\tssize_t (*devx_get_event)\n-\t\t\t(struct mlx5dv_devx_event_channel *event_channel,\n-\t\t\t struct mlx5dv_devx_async_event_hdr *event_data,\n-\t\t\t size_t event_resp_len);\n-};\n-\n-extern const struct mlx5_glue *mlx5_glue;\n-\n-#endif /* MLX5_GLUE_H_ */\ndiff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile\nindex 2577ee5..c160e6b 100644\n--- a/drivers/net/mlx5/Makefile\n+++ b/drivers/net/mlx5/Makefile\n@@ -38,6 +38,7 @@ CFLAGS += -O3\n CFLAGS += -std=c11 -Wall -Wextra\n CFLAGS += -g\n CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5\n+CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5/linux\n CFLAGS += -I$(RTE_SDK)/drivers/net/mlx5\n CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5\n CFLAGS += -D_BSD_SOURCE\ndiff --git a/drivers/vdpa/mlx5/Makefile b/drivers/vdpa/mlx5/Makefile\nindex ef34c0b..91c89d6 100644\n--- a/drivers/vdpa/mlx5/Makefile\n+++ b/drivers/vdpa/mlx5/Makefile\n@@ -20,6 +20,7 @@ CFLAGS += -O3\n CFLAGS += -std=c11 -Wall -Wextra\n CFLAGS += -g\n CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5\n+CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5/linux\n CFLAGS += -I$(RTE_SDK)/drivers/net/mlx5_vdpa\n CFLAGS += -I$(RTE_SDK)/lib/librte_sched\n CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5\n",
    "prefixes": [
        "v1",
        "1/3"
    ]
}