From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 3BD6A5F57 for ; Thu, 13 Sep 2018 14:23:11 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from shahafs@mellanox.com) with ESMTPS (AES256-SHA encrypted); 13 Sep 2018 15:15:32 +0300 Received: from unicorn01.mtl.labs.mlnx. (unicorn01.mtl.labs.mlnx [10.7.12.62]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id w8DCBGrZ020457; Thu, 13 Sep 2018 15:11:16 +0300 From: Shahaf Shuler To: yskoh@mellanox.com, matan@mellanox.com, nelio.laranjeiro@6wind.com, bluca@debian.org, bruce.richardson@intel.com Cc: dev@dpdk.org Date: Thu, 13 Sep 2018 15:11:06 +0300 Message-Id: <63536a5911f417a5c35b6d2004ae22fadb65722f.1536839688.git.shahafs@mellanox.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180905114746.117936-1-shahafs@mellanox.com> References: <20180905114746.117936-1-shahafs@mellanox.com> Subject: [dpdk-dev] [PATCH v6 2/2] net/mlx4: support meson build 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: Thu, 13 Sep 2018 12:23:11 -0000 From: Nelio Laranjeiro Compile Mellanox driver when their external dependencies are met. A glue version of the driver can still be requested by using the -Denable_driver_mlx_glue=true To avoid modifying the whole sources and keep the compatibility with current build systems (e.g. make), the mlx4_autoconf.h is still generated by invoking DPDK scripts though meson's run_command() instead of using has_types, has_members, ... commands. Meson will try to find the required external libraries. When they are not installed system wide, they can be provided though CFLAGS, LDFLAGS and LD_LIBRARY_PATH environment variables, example (considering RDMA-Core is installed in /tmp/rdma-core): # CLFAGS=-I/tmp/rdma-core/build/include \ LDFLAGS=-L/tmp/rdma-core/build/lib \ LD_LIBRARY_PATH=/tmp/rdma-core/build/lib \ meson output # LD_LIBRARY_PATH=/tmp/rdma-core/build/lib \ ninja -C output install Note: LD_LIBRARY_PATH before ninja is necessary when the meson configuration has changed (e.g. meson configure has been called), in such situation the LD_LIBRARY_PATH is necessary to invoke the autoconfiguration script. Signed-off-by: Nelio Laranjeiro Acked-by: Bruce Richardson Signed-off-by: Shahaf Shuler --- Changes in v6: - split into two patches for mlx5 and mlx4 - ident with tabs instead of spaces - no need to remove the confiugration file, meson will override it - split configuration file creation into two loops: symbols and structs Changes in v5: - use meson tool to generate Mellanox config file instead of DPDK custom scripts. Changes in v4: - remove implicit -Wall flag (set by default by meson), - add item information in the autoconfiguration failure error message, - reword the help for the glue library option, Changes in v3: Sanitize the build files: - remove enable_driver_mlx{4,5} options, - test cflags capabilities before using them, - remove old autoconfiguration file, - use an array for autoconfiguration and put them in the build directory, - use dependencies in shared_library for link arguments. Changes in v2: - dropped patch https://patches.dpdk.org/patch/43897/ - remove extra_{cflags,ldflags} as already honored by meson through environment variables. --- drivers/net/meson.build | 1 + drivers/net/mlx4/meson.build | 102 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 drivers/net/mlx4/meson.build diff --git a/drivers/net/meson.build b/drivers/net/meson.build index d444c3287f..c7a2d0e7db 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -18,6 +18,7 @@ drivers = ['af_packet', 'ixgbe', 'kni', 'liquidio', + 'mlx4', 'mlx5', 'mvpp2', 'netvsc', diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build new file mode 100644 index 0000000000..7de571e2a2 --- /dev/null +++ b/drivers/net/mlx4/meson.build @@ -0,0 +1,102 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2018 6WIND S.A. +# Copyright 2018 Mellanox Technologies, Ltd + +pmd_dlopen = get_option('enable_driver_mlx_glue') +LIB_GLUE_BASE = 'librte_pmd_mlx4_glue.so' +LIB_GLUE_VERSION = '18.02.0' +LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION +if pmd_dlopen + dpdk_conf.set('RTE_LIBRTE_MLX4_DLOPEN_DEPS', 1) + cflags += [ + '-DMLX4_GLUE="@0@"'.format(LIB_GLUE), + '-DMLX4_GLUE_VERSION="@0@"'.format(LIB_GLUE_VERSION), + ] +endif +libs = [ + cc.find_library('mnl', required:false), + cc.find_library('mlx4', required:false), + cc.find_library('ibverbs', required:false), +] +build = true +foreach lib:libs + if not lib.found() + build = false + endif +endforeach +# Compile PMD +if build + allow_experimental_apis = true + ext_deps += libs + sources = files( + 'mlx4.c', + 'mlx4_ethdev.c', + 'mlx4_flow.c', + 'mlx4_intr.c', + 'mlx4_mr.c', + 'mlx4_rxq.c', + 'mlx4_rxtx.c', + 'mlx4_txq.c', + 'mlx4_utils.c', + ) + if not pmd_dlopen + sources += files('mlx4_glue.c') + endif + cflags_options = [ + '-Wextra', + '-std=c11', + '-Wno-strict-prototypes', + '-D_BSD_SOURCE', + '-D_DEFAULT_SOURCE', + '-D_XOPEN_SOURCE=600' + ] + foreach option:cflags_options + if cc.has_argument(option) + cflags += option + endif + endforeach + if get_option('buildtype').contains('debug') + cflags += [ '-pedantic', '-UNDEBUG', '-DPEDANTIC' ] + else + cflags += [ '-DNDEBUG', '-UPEDANTIC' ] + endif + # To maintain the compatibility with the make build system + # mlx4_autoconf.h file is still generated. + # input array for meson member search: + # [ "MACRO to define if found", "header for the search", + # "symbol to search","struct member to search" ] + # + has_member_args = [ + [ 'HAVE_IBV_MLX4_WQE_LSO_SEG', 'infiniband/mlx4dv.h', + 'struct mlx4_wqe_lso_seg', 'mss_hdr_size' ], + ] + config = configuration_data() + foreach arg:has_member_args + file_prefix = '#include<' + arg[1] + '>' + config.set(arg[0], cc.has_member(arg[2], arg[3], + prefix : file_prefix)) + endforeach + configure_file(output : 'mlx4_autoconf.h', configuration : config) +endif +# Build Glue Library +if pmd_dlopen and build + dlopen_name = 'mlx4_glue' + dlopen_lib_name = driver_name_fmt.format(dlopen_name) + dlopen_so_version = LIB_GLUE_VERSION + dlopen_sources = files('mlx4_glue.c') + dlopen_install_dir = [ eal_pmd_path + '-glue' ] + shared_lib = shared_library( + dlopen_lib_name, + dlopen_sources, + include_directories: global_inc, + c_args: cflags, + dependencies: libs, + link_args: [ + '-Wl,-export-dynamic', + '-Wl,-h,@0@'.format(LIB_GLUE), + ], + soversion: dlopen_so_version, + install: true, + install_dir: dlopen_install_dir, + ) +endif -- 2.12.0