From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70084.outbound.protection.outlook.com [40.107.7.84]) by dpdk.org (Postfix) with ESMTP id 8D9801B484 for ; Wed, 9 Jan 2019 16:03:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Gn2Y/nDzclKOAipx/EYcJlWk44AGXPpxP9HXJgPx9/8=; b=UmUM6oufXxTKlePC27QlPp06aGBCulmH30H61EYzodVOQSfvjA51OjFRWXpxrgyqAsojrakdmgZYMOZ+MiAOhD5r7EcGK9joqUUgkNzihFUlP9dFgUcElSS3o3fb88OpIChUDgvbmaU+L1BElX+taNRqPPVzsq0IIF0e7m3ohIs= Received: from DB7PR05MB4426.eurprd05.prod.outlook.com (52.134.109.15) by DB7PR05MB4860.eurprd05.prod.outlook.com (20.176.235.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1516.14; Wed, 9 Jan 2019 15:03:31 +0000 Received: from DB7PR05MB4426.eurprd05.prod.outlook.com ([fe80::b0a0:72a4:7547:1c3c]) by DB7PR05MB4426.eurprd05.prod.outlook.com ([fe80::b0a0:72a4:7547:1c3c%4]) with mapi id 15.20.1495.011; Wed, 9 Jan 2019 15:03:31 +0000 From: Shahaf Shuler To: Thomas Monjalon , Yongseok Koh CC: "dev@dpdk.org" , "ferruh.yigit@intel.com" , "bruce.richardson@intel.com" Thread-Topic: [PATCH v2 1/2] config: gather options for dlopen mlx dependency Thread-Index: AQHUqCbjjklsfjDNN0Oe5F+36CMS/6WnCIdA Date: Wed, 9 Jan 2019 15:03:30 +0000 Message-ID: References: <20190109020524.3633-1-thomas@monjalon.net> <20190109142319.15148-1-thomas@monjalon.net> In-Reply-To: <20190109142319.15148-1-thomas@monjalon.net> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=shahafs@mellanox.com; x-originating-ip: [193.47.165.251] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB7PR05MB4860; 6:B1SdkrAIVoo+STozbAcUug8JrLkqtKk0ywZE8B/7BRxteYrG03ePDEwoiSpzaUvSi6uBkl+VekCIO/vHtJ2Ks9A4hJKvcCc3lHLsHtK+/9MXsFUcx+0POgmN3BwF5yOtg897sJMi2K3ZHPooR5BSe5Jk6t9vQCeqVeikxpIStOpPx2/5jCqPh9tAJ1u7VN2mg2P5RBJbm1ty5sjTEakbRICkuf0Vy4HJfQxlRlTs8GOHNdb2vJNWabL306Z241a4CFdNdbrnXZCa1UtWLbj0M2gnCJtE82pHpY2d9Ap8sFdtG9MELsV1cTKFnWtJhh6o9S5I/vDVEIWJzJUEHAeRywrVpwvpYLlacaLR5L57jeBF1Qyx7SU5IMh9yqoOo4jdzu04mswmcgvxcxpY+6JYh4eHeT7A4JVRGCheyeqYJDdgKL+CVMOiPLRrVyTiyuAy//KiR86gpIncoSnaZRIZFg==; 5:YdthsCLTGvsfCvqQh8OMpWKlKG+aUzWvpZ+2wY9MjzkD7jAtYP6sPf6voICUGW4fLN3fdsv46IOl2SM/wAJgqLZCrkG5WIDbE0fLAtkOC+W58ucLLRg93yxSrL+/gC4kU90TRR/GYByKZai1C/rmlt5ocPar0Z6na9ZoN4L4ZsNpTmIZP0XkzQ7NntgVF89YafLx/HYV5TcOG4RbnNk0kg==; 7:wVQyEhId1wUvZ4cpw1STo9+LtBJRXyki79H4YhaOa5m/OYGFGhJ0UyEJ2+xoVKlErcu9pIOE4ZyhVTTSUpU4wPuG8GIW03fIcmwoQnTOxWYV88ee2HhDsFWQzczYnXfV9lAJuPglMrEuYADY+YqaGg== x-ms-exchange-antispam-srfa-diagnostics: SOS; x-ms-office365-filtering-correlation-id: 82825eeb-5dda-42fe-2ebe-08d676439e51 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB7PR05MB4860; x-ms-traffictypediagnostic: DB7PR05MB4860: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(908002)(999002)(5005026)(6040522)(8220060)(2401047)(8121501046)(10201501046)(93006095)(93001095)(3002001)(3231475)(944501520)(52105112)(6055026)(6041310)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095); SRVR:DB7PR05MB4860; BCL:0; PCL:0; RULEID:; SRVR:DB7PR05MB4860; x-forefront-prvs: 0912297777 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(39860400002)(376002)(346002)(136003)(396003)(189003)(199004)(4744004)(6116002)(71190400001)(71200400001)(3846002)(9686003)(25786009)(14454004)(486006)(7696005)(229853002)(54906003)(76176011)(316002)(6636002)(66066001)(53936002)(478600001)(55016002)(97736004)(6436002)(106356001)(8936002)(7736002)(6506007)(5660300001)(6246003)(105586002)(102836004)(305945005)(81156014)(81166006)(8676002)(2906002)(4326008)(186003)(99286004)(256004)(33656002)(26005)(68736007)(110136005)(446003)(476003)(11346002)(86362001)(74316002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR05MB4860; H:DB7PR05MB4426.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: yrVkOOsxCbUwo2/u3gCZPB2MeMn67txkujR2cVA2DLcMzwxtwo6eUm/kLFH9kMMcSgndOLDsHBSnEctTOMRXsO7sjGLa82rKbkPfaWYtuzEs/05knZHSV55+Kve8re6CgJrjXznAwj/0fnTEfFL5iEyoNLw9Z9X9sddVWc9iIkDXLwuNhNqKmFTK2KKE5QNYPgEqOiDygQvFdQbHOdzE5yfoFwCna/jiLoaF6gDD+29/Wr5fHLuK3JJmHurIVWrJqDJARwYVCRPrIc8Nbyd91T+a0C5W3ItG49E92xWgqMxkBGKpJ6Wso4eyBeercnif spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 82825eeb-5dda-42fe-2ebe-08d676439e51 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jan 2019 15:03:30.9329 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR05MB4860 Subject: Re: [dpdk-dev] [PATCH v2 1/2] config: gather options for dlopen mlx dependency X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2019 15:03:32 -0000 Wednesday, January 9, 2019 4:23 PM, Thomas Monjalon: > Subject: [PATCH v2 1/2] config: gather options for dlopen mlx dependency >=20 > Rename options CONFIG_RTE_LIBRTE_MLX4_DLOPEN_DEPS and > CONFIG_RTE_LIBRTE_MLX5_DLOPEN_DEPS to a single option > CONFIG_RTE_IBVERBS_LINK_DLOPEN. > Rename meson option enable_driver_mlx_glue to ibverbs_link. >=20 > There was no good reason for setting a different link option for mlx4 and= mlx5. > Having a single common option makes it easier to understand and unify mak= e > and meson systems. >=20 > Signed-off-by: Thomas Monjalon > Acked-by: Shahaf Shuler Applied to next-net-mlx with replacement of the v1. Thanks.=20 > --- > v2: use "combo" option type (Bruce review) > --- > config/common_base | 7 +++++-- > doc/guides/nics/mlx4.rst | 4 ++-- > doc/guides/nics/mlx5.rst | 4 ++-- > drivers/net/mlx4/Makefile | 8 ++++---- > drivers/net/mlx4/meson.build | 4 ++-- > drivers/net/mlx4/mlx4.c | 4 ++-- > drivers/net/mlx5/Makefile | 8 ++++---- > drivers/net/mlx5/meson.build | 4 ++-- > drivers/net/mlx5/mlx5.c | 4 ++-- > meson_options.txt | 4 ++-- > mk/rte.app.mk | 15 +++++++-------- > 11 files changed, 34 insertions(+), 32 deletions(-) >=20 > diff --git a/config/common_base b/config/common_base index > 964a6956e..37f692ce1 100644 > --- a/config/common_base > +++ b/config/common_base > @@ -320,7 +320,6 @@ CONFIG_RTE_LIBRTE_AVF_16BYTE_RX_DESC=3Dn > # > CONFIG_RTE_LIBRTE_MLX4_PMD=3Dn > CONFIG_RTE_LIBRTE_MLX4_DEBUG=3Dn > -CONFIG_RTE_LIBRTE_MLX4_DLOPEN_DEPS=3Dn >=20 > # > # Compile burst-oriented Mellanox ConnectX-4, ConnectX-5, @@ -328,7 > +327,11 @@ CONFIG_RTE_LIBRTE_MLX4_DLOPEN_DEPS=3Dn > # > CONFIG_RTE_LIBRTE_MLX5_PMD=3Dn > CONFIG_RTE_LIBRTE_MLX5_DEBUG=3Dn > -CONFIG_RTE_LIBRTE_MLX5_DLOPEN_DEPS=3Dn > + > +# Linking method for mlx4/5 dependency on ibverbs and related libraries > +# Default linking is dynamic by linker. > +# Other option is dynamic by dlopen at run-time. > +CONFIG_RTE_IBVERBS_LINK_DLOPEN=3Dn >=20 > # > # Compile burst-oriented Netronome NFP PMD driver diff --git > a/doc/guides/nics/mlx4.rst b/doc/guides/nics/mlx4.rst index > 5326d916e..88d467a23 100644 > --- a/doc/guides/nics/mlx4.rst > +++ b/doc/guides/nics/mlx4.rst > @@ -60,7 +60,7 @@ These options can be modified in the ``.config`` file. >=20 > Toggle compilation of librte_pmd_mlx4 itself. >=20 > -- ``CONFIG_RTE_LIBRTE_MLX4_DLOPEN_DEPS`` (default **n**) > +- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) >=20 > Build PMD with additional code to make it loadable without hard > dependencies on **libibverbs** nor **libmlx4**, which may not be insta= lled > @@ -93,7 +93,7 @@ Environment variables > A list of directories in which to search for the rdma-core "glue" plug= -in, > separated by colons or semi-colons. >=20 > - Only matters when compiled with > ``CONFIG_RTE_LIBRTE_MLX4_DLOPEN_DEPS`` > + Only matters when compiled with ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` > enabled and most useful when ``CONFIG_RTE_EAL_PMD_PATH`` is also set, > since ``LD_LIBRARY_PATH`` has no effect in this case. >=20 > diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index > add8bc1ed..749acd222 100644 > --- a/doc/guides/nics/mlx5.rst > +++ b/doc/guides/nics/mlx5.rst > @@ -191,7 +191,7 @@ These options can be modified in the ``.config`` file= . >=20 > Toggle compilation of librte_pmd_mlx5 itself. >=20 > -- ``CONFIG_RTE_LIBRTE_MLX5_DLOPEN_DEPS`` (default **n**) > +- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) >=20 > Build PMD with additional code to make it loadable without hard > dependencies on **libibverbs** nor **libmlx5**, which may not be insta= lled > @@ -224,7 +224,7 @@ Environment variables > A list of directories in which to search for the rdma-core "glue" plug= -in, > separated by colons or semi-colons. >=20 > - Only matters when compiled with > ``CONFIG_RTE_LIBRTE_MLX5_DLOPEN_DEPS`` > + Only matters when compiled with ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` > enabled and most useful when ``CONFIG_RTE_EAL_PMD_PATH`` is also set, > since ``LD_LIBRARY_PATH`` has no effect in this case. >=20 > diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile index > 92e932250..724a4dcbc 100644 > --- a/drivers/net/mlx4/Makefile > +++ b/drivers/net/mlx4/Makefile > @@ -14,7 +14,7 @@ LIB_GLUE_VERSION =3D 18.02.0 > SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) +=3D mlx4.c > SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) +=3D mlx4_ethdev.c > SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) +=3D mlx4_flow.c -ifneq > ($(CONFIG_RTE_LIBRTE_MLX4_DLOPEN_DEPS),y) > +ifneq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) > SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) +=3D mlx4_glue.c endif > SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) +=3D mlx4_intr.c @@ -24,7 +24,7 > @@ SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) +=3D mlx4_rxtx.c > SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) +=3D mlx4_txq.c > SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) +=3D mlx4_utils.c >=20 > -ifeq ($(CONFIG_RTE_LIBRTE_MLX4_DLOPEN_DEPS),y) > +ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) > INSTALL-$(CONFIG_RTE_LIBRTE_MLX4_PMD)-lib +=3D $(LIB_GLUE) endif >=20 > @@ -38,7 +38,7 @@ CFLAGS +=3D -D_DEFAULT_SOURCE CFLAGS +=3D - > D_XOPEN_SOURCE=3D600 CFLAGS +=3D $(WERROR_FLAGS) CFLAGS +=3D - > DALLOW_EXPERIMENTAL_API -ifeq > ($(CONFIG_RTE_LIBRTE_MLX4_DLOPEN_DEPS),y) > +ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) > CFLAGS +=3D -DMLX4_GLUE=3D'"$(LIB_GLUE)"' > CFLAGS +=3D -DMLX4_GLUE_VERSION=3D'"$(LIB_GLUE_VERSION)"' > CFLAGS_mlx4_glue.o +=3D -fPIC > @@ -103,7 +103,7 @@ $(SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD):.c=3D.o): > mlx4_autoconf.h # Generate dependency plug-in for rdma-core when the PMD > must not be linked # directly, so that applications do not inherit this > dependency. >=20 > -ifeq ($(CONFIG_RTE_LIBRTE_MLX4_DLOPEN_DEPS),y) > +ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) >=20 > $(LIB): $(LIB_GLUE) >=20 > diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build = index > 7de571e2a..4bccd68e0 100644 > --- a/drivers/net/mlx4/meson.build > +++ b/drivers/net/mlx4/meson.build > @@ -2,12 +2,12 @@ > # Copyright 2018 6WIND S.A. > # Copyright 2018 Mellanox Technologies, Ltd >=20 > -pmd_dlopen =3D get_option('enable_driver_mlx_glue') > +pmd_dlopen =3D (get_option('ibverbs_link') =3D=3D 'dlopen') > LIB_GLUE_BASE =3D 'librte_pmd_mlx4_glue.so' > LIB_GLUE_VERSION =3D '18.02.0' > LIB_GLUE =3D LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION if pmd_dlopen > - dpdk_conf.set('RTE_LIBRTE_MLX4_DLOPEN_DEPS', 1) > + dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1) > cflags +=3D [ > '-DMLX4_GLUE=3D"@0@"'.format(LIB_GLUE), > '- > DMLX4_GLUE_VERSION=3D"@0@"'.format(LIB_GLUE_VERSION), > diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index > 7f07b8dc0..070cf7111 100644 > --- a/drivers/net/mlx4/mlx4.c > +++ b/drivers/net/mlx4/mlx4.c > @@ -838,7 +838,7 @@ static struct rte_pci_driver mlx4_driver =3D { > RTE_PCI_DRV_INTR_RMV, > }; >=20 > -#ifdef RTE_LIBRTE_MLX4_DLOPEN_DEPS > +#ifdef RTE_IBVERBS_LINK_DLOPEN >=20 > /** > * Suffix RTE_EAL_PMD_PATH with "-glue". > @@ -986,7 +986,7 @@ RTE_INIT(rte_mlx4_pmd_init) > * using this PMD, which is not supported in forked processes. > */ > setenv("RDMAV_HUGEPAGES_SAFE", "1", 1); -#ifdef > RTE_LIBRTE_MLX4_DLOPEN_DEPS > +#ifdef RTE_IBVERBS_LINK_DLOPEN > if (mlx4_glue_init()) > return; > assert(mlx4_glue); > diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index > 1353c1827..47a7f4d68 100644 > --- a/drivers/net/mlx5/Makefile > +++ b/drivers/net/mlx5/Makefile > @@ -12,7 +12,7 @@ LIB_GLUE_VERSION =3D 19.02.0 >=20 > # Sources. > SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) +=3D mlx5.c -ifneq > ($(CONFIG_RTE_LIBRTE_MLX5_DLOPEN_DEPS),y) > +ifneq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) > SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) +=3D mlx5_glue.c endif > SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) +=3D mlx5_rxq.c @@ -37,7 +37,7 @@ > SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) +=3D mlx5_flow_verbs.c > SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) +=3D mlx5_socket.c > SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) +=3D mlx5_nl.c >=20 > -ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DLOPEN_DEPS),y) > +ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) > INSTALL-$(CONFIG_RTE_LIBRTE_MLX5_PMD)-lib +=3D $(LIB_GLUE) endif >=20 > @@ -52,7 +52,7 @@ CFLAGS +=3D -D_XOPEN_SOURCE=3D600 CFLAGS +=3D > $(WERROR_FLAGS) CFLAGS +=3D -Wno-strict-prototypes CFLAGS +=3D $(shell > command -v pkg-config > /dev/null 2>&1 && pkg-config --cflags libmnl) -if= eq > ($(CONFIG_RTE_LIBRTE_MLX5_DLOPEN_DEPS),y) > +ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) > CFLAGS +=3D -DMLX5_GLUE=3D'"$(LIB_GLUE)"' > CFLAGS +=3D -DMLX5_GLUE_VERSION=3D'"$(LIB_GLUE_VERSION)"' > CFLAGS_mlx5_glue.o +=3D -fPIC > @@ -525,7 +525,7 @@ $(SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD):.c=3D.o): > mlx5_autoconf.h # Generate dependency plug-in for rdma-core when the PMD > must not be linked # directly, so that applications do not inherit this > dependency. >=20 > -ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DLOPEN_DEPS),y) > +ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) >=20 > $(LIB): $(LIB_GLUE) >=20 > diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build = index > 8ba19e818..a1130d610 100644 > --- a/drivers/net/mlx5/meson.build > +++ b/drivers/net/mlx5/meson.build > @@ -2,12 +2,12 @@ > # Copyright 2018 6WIND S.A. > # Copyright 2018 Mellanox Technologies, Ltd >=20 > -pmd_dlopen =3D get_option('enable_driver_mlx_glue') > +pmd_dlopen =3D (get_option('ibverbs_link') =3D=3D 'dlopen') > LIB_GLUE_BASE =3D 'librte_pmd_mlx5_glue.so' > LIB_GLUE_VERSION =3D '19.02.0' > LIB_GLUE =3D LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION if pmd_dlopen > - dpdk_conf.set('RTE_LIBRTE_MLX5_DLOPEN_DEPS', 1) > + dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1) > cflags +=3D [ > '-DMLX5_GLUE=3D"@0@"'.format(LIB_GLUE), > '- > DMLX5_GLUE_VERSION=3D"@0@"'.format(LIB_GLUE_VERSION), > diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index > 45210451d..f111e6ef8 100644 > --- a/drivers/net/mlx5/mlx5.c > +++ b/drivers/net/mlx5/mlx5.c > @@ -1609,7 +1609,7 @@ static struct rte_pci_driver mlx5_driver =3D { > RTE_PCI_DRV_PROBE_AGAIN), > }; >=20 > -#ifdef RTE_LIBRTE_MLX5_DLOPEN_DEPS > +#ifdef RTE_IBVERBS_LINK_DLOPEN >=20 > /** > * Suffix RTE_EAL_PMD_PATH with "-glue". > @@ -1770,7 +1770,7 @@ RTE_INIT(rte_mlx5_pmd_init) > * cleanup all the Verbs resources even when the device was removed. > */ > setenv("MLX5_DEVICE_FATAL_CLEANUP", "1", 1); -#ifdef > RTE_LIBRTE_MLX5_DLOPEN_DEPS > +#ifdef RTE_IBVERBS_LINK_DLOPEN > if (mlx5_glue_init()) > return; > assert(mlx5_glue); > diff --git a/meson_options.txt b/meson_options.txt index > 10b541615..574054597 100644 > --- a/meson_options.txt > +++ b/meson_options.txt > @@ -2,8 +2,8 @@ option('allow_invalid_socket_id', type: 'boolean', value: > false, > description: 'allow out-of-range NUMA socket id\'s for platforms that > don\'t report the value correctly') option('drivers_install_subdir', typ= e: 'string', > value: 'dpdk/pmds-', > description: 'Subdirectory of libdir where to install PMDs. Defaults to > using a versioned subdirectory.') -option('enable_driver_mlx_glue', type: > 'boolean', value: false, > - description: 'Enable glue library for Mellanox PMDs') > +option('ibverbs_link', type: 'combo', choices : ['shared', 'dlopen'], va= lue: > 'shared', > + description: 'Linkage method (shared/dlopen) for Mellanox PMDs with > +ibverbs dependencies.') > option('enable_kmods', type: 'boolean', value: true, > description: 'build kernel modules') > option('enable_docs', type: 'boolean', value: false, diff --git a/mk/rte= .app.mk > b/mk/rte.app.mk index 02e8b6f05..d5b1ec6b7 100644 > --- a/mk/rte.app.mk > +++ b/mk/rte.app.mk > @@ -169,15 +169,14 @@ ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) > _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KNI) +=3D -lrte_pmd_kni > endif > _LDLIBS-$(CONFIG_RTE_LIBRTE_LIO_PMD) +=3D -lrte_pmd_lio > -ifeq ($(CONFIG_RTE_LIBRTE_MLX4_DLOPEN_DEPS),y) > -_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) +=3D -lrte_pmd_mlx4 -ldl > +_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) +=3D -lrte_pmd_mlx4 > +_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) +=3D -lrte_pmd_mlx5 -lmnl > +ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) > +_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) +=3D -ldl > +_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) +=3D -ldl > else > -_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) +=3D -lrte_pmd_mlx4 -libverb= s > -lmlx4 > -endif > -ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DLOPEN_DEPS),y) > -_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) +=3D -lrte_pmd_mlx5 -ldl -lm= nl > -else > -_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) +=3D -lrte_pmd_mlx5 -libverb= s > -lmlx5 -lmnl > +_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) +=3D -libverbs -lmlx4 > +_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) +=3D -libverbs -lmlx5 > endif > _LDLIBS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) +=3D -lrte_pmd_mvpp2 > _LDLIBS-$(CONFIG_RTE_LIBRTE_MVNETA_PMD) +=3D -lrte_pmd_mvneta > -- > 2.20.1