Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/44678/?format=api
{ "id": 44678, "url": "https://patches.dpdk.org/api/patches/44678/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/63536a5911f417a5c35b6d2004ae22fadb65722f.1536839688.git.shahafs@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": "<63536a5911f417a5c35b6d2004ae22fadb65722f.1536839688.git.shahafs@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/63536a5911f417a5c35b6d2004ae22fadb65722f.1536839688.git.shahafs@mellanox.com", "date": "2018-09-13T12:11:06", "name": "[v6,2/2] net/mlx4: support meson build", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "a30ca33fb474da9f86e46be047b8432c550b30c6", "submitter": { "id": 634, "url": "https://patches.dpdk.org/api/people/634/?format=api", "name": "Shahaf Shuler", "email": "shahafs@mellanox.com" }, "delegate": { "id": 6624, "url": "https://patches.dpdk.org/api/users/6624/?format=api", "username": "shahafs", "first_name": "Shahaf", "last_name": "Shuler", "email": "shahafs@mellanox.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/63536a5911f417a5c35b6d2004ae22fadb65722f.1536839688.git.shahafs@mellanox.com/mbox/", "series": [ { "id": 1188, "url": "https://patches.dpdk.org/api/series/1188/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=1188", "date": "2018-09-05T11:47:46", "name": "[v5] net/mlx: add meson build support", "version": 5, "mbox": "https://patches.dpdk.org/series/1188/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/44678/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/44678/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 2D00F5F62;\n\tThu, 13 Sep 2018 14:23:12 +0200 (CEST)", "from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])\n\tby dpdk.org (Postfix) with ESMTP id 3BD6A5F57\n\tfor <dev@dpdk.org>; Thu, 13 Sep 2018 14:23:11 +0200 (CEST)", "from Internal Mail-Server by MTLPINE1 (envelope-from\n\tshahafs@mellanox.com)\n\twith ESMTPS (AES256-SHA encrypted); 13 Sep 2018 15:15:32 +0300", "from unicorn01.mtl.labs.mlnx. (unicorn01.mtl.labs.mlnx\n\t[10.7.12.62])\n\tby labmailer.mlnx (8.13.8/8.13.8) with ESMTP id w8DCBGrZ020457;\n\tThu, 13 Sep 2018 15:11:16 +0300" ], "From": "Shahaf Shuler <shahafs@mellanox.com>", "To": "yskoh@mellanox.com, matan@mellanox.com, nelio.laranjeiro@6wind.com,\n\tbluca@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 <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>\n\nCompile Mellanox driver when their external dependencies are met. A\nglue version of the driver can still be requested by using the\n-Denable_driver_mlx_glue=true\n\nTo avoid modifying the whole sources and keep the compatibility with\ncurrent build systems (e.g. make), the mlx4_autoconf.h is still\ngenerated by invoking DPDK scripts though meson's run_command() instead\nof using has_types, has_members, ... commands.\n\nMeson will try to find the required external libraries. When they are\nnot installed system wide, they can be provided though CFLAGS, LDFLAGS\nand LD_LIBRARY_PATH environment variables, example (considering\nRDMA-Core is installed in /tmp/rdma-core):\n\n # CLFAGS=-I/tmp/rdma-core/build/include \\\n LDFLAGS=-L/tmp/rdma-core/build/lib \\\n LD_LIBRARY_PATH=/tmp/rdma-core/build/lib \\\n meson output\n # LD_LIBRARY_PATH=/tmp/rdma-core/build/lib \\\n ninja -C output install\n\nNote: LD_LIBRARY_PATH before ninja is necessary when the meson\nconfiguration has changed (e.g. meson configure has been called), in\nsuch situation the LD_LIBRARY_PATH is necessary to invoke the\nautoconfiguration script.\n\nSigned-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>\nAcked-by: Bruce Richardson <bruce.richardson@intel.com>\nSigned-off-by: Shahaf Shuler <shahafs@mellanox.com>\n\n---\nChanges in v6:\n- split into two patches for mlx5 and mlx4\n- ident with tabs instead of spaces\n- no need to remove the confiugration file, meson will override it\n- split configuration file creation into two loops: symbols and structs\n\nChanges in v5:\n\n- use meson tool to generate Mellanox config file instead of DPDK custom scripts.\n\nChanges in v4:\n\n- remove implicit -Wall flag (set by default by meson),\n- add item information in the autoconfiguration failure error message,\n- reword the help for the glue library option,\n\nChanges in v3:\n\nSanitize the build files:\n- remove enable_driver_mlx{4,5} options,\n- test cflags capabilities before using them,\n- remove old autoconfiguration file,\n- use an array for autoconfiguration and put them in the build directory,\n- use dependencies in shared_library for link arguments.\n\nChanges in v2:\n\n- dropped patch https://patches.dpdk.org/patch/43897/\n- remove extra_{cflags,ldflags} as already honored by meson through\nenvironment variables.\n---\n drivers/net/meson.build | 1 +\n drivers/net/mlx4/meson.build | 102 +++++++++++++++++++++++++++++++++++++++++++\n 2 files changed, 103 insertions(+)\n create mode 100644 drivers/net/mlx4/meson.build", "diff": "diff --git a/drivers/net/meson.build b/drivers/net/meson.build\nindex d444c3287f..c7a2d0e7db 100644\n--- a/drivers/net/meson.build\n+++ b/drivers/net/meson.build\n@@ -18,6 +18,7 @@ drivers = ['af_packet',\n \t'ixgbe',\n \t'kni',\n \t'liquidio',\n+\t'mlx4',\n \t'mlx5',\n \t'mvpp2',\n \t'netvsc',\ndiff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build\nnew file mode 100644\nindex 0000000000..7de571e2a2\n--- /dev/null\n+++ b/drivers/net/mlx4/meson.build\n@@ -0,0 +1,102 @@\n+# SPDX-License-Identifier: BSD-3-Clause\n+# Copyright 2018 6WIND S.A.\n+# Copyright 2018 Mellanox Technologies, Ltd\n+\n+pmd_dlopen = get_option('enable_driver_mlx_glue')\n+LIB_GLUE_BASE = 'librte_pmd_mlx4_glue.so'\n+LIB_GLUE_VERSION = '18.02.0'\n+LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION\n+if pmd_dlopen\n+\tdpdk_conf.set('RTE_LIBRTE_MLX4_DLOPEN_DEPS', 1)\n+\tcflags += [\n+\t\t'-DMLX4_GLUE=\"@0@\"'.format(LIB_GLUE),\n+\t\t'-DMLX4_GLUE_VERSION=\"@0@\"'.format(LIB_GLUE_VERSION),\n+\t]\n+endif\n+libs = [\n+\tcc.find_library('mnl', required:false),\n+\tcc.find_library('mlx4', required:false),\n+\tcc.find_library('ibverbs', required:false),\n+]\n+build = true\n+foreach lib:libs\n+\tif not lib.found()\n+\t\tbuild = false\n+\tendif\n+endforeach\n+# Compile PMD\n+if build\n+\tallow_experimental_apis = true\n+\text_deps += libs\n+\tsources = files(\n+\t\t'mlx4.c',\n+\t\t'mlx4_ethdev.c',\n+\t\t'mlx4_flow.c',\n+\t\t'mlx4_intr.c',\n+\t\t'mlx4_mr.c',\n+\t\t'mlx4_rxq.c',\n+\t\t'mlx4_rxtx.c',\n+\t\t'mlx4_txq.c',\n+\t\t'mlx4_utils.c',\n+\t)\n+\tif not pmd_dlopen\n+\t\tsources += files('mlx4_glue.c')\n+\tendif\n+\tcflags_options = [\n+\t\t'-Wextra',\n+\t\t'-std=c11',\n+\t\t'-Wno-strict-prototypes',\n+\t\t'-D_BSD_SOURCE',\n+\t\t'-D_DEFAULT_SOURCE',\n+\t\t'-D_XOPEN_SOURCE=600'\n+\t]\n+\tforeach option:cflags_options\n+\t\tif cc.has_argument(option)\n+\t\t\tcflags += option\n+\t\tendif\n+\tendforeach\n+\tif get_option('buildtype').contains('debug')\n+\t\tcflags += [ '-pedantic', '-UNDEBUG', '-DPEDANTIC' ]\n+\telse\n+\t\tcflags += [ '-DNDEBUG', '-UPEDANTIC' ]\n+\tendif\n+\t# To maintain the compatibility with the make build system\n+\t# mlx4_autoconf.h file is still generated.\n+\t# input array for meson member search:\n+\t# [ \"MACRO to define if found\", \"header for the search\",\n+\t# \"symbol to search\",\"struct member to search\" ]\n+\t#\n+\thas_member_args = [\n+\t\t[ 'HAVE_IBV_MLX4_WQE_LSO_SEG', 'infiniband/mlx4dv.h',\n+\t\t'struct mlx4_wqe_lso_seg', 'mss_hdr_size' ],\n+\t]\n+\tconfig = configuration_data()\n+\tforeach arg:has_member_args\n+\t\tfile_prefix = '#include<' + arg[1] + '>'\n+\t\tconfig.set(arg[0], cc.has_member(arg[2], arg[3],\n+\t\t\tprefix : file_prefix))\n+\tendforeach\n+\tconfigure_file(output : 'mlx4_autoconf.h', configuration : config)\n+endif\n+# Build Glue Library\n+if pmd_dlopen and build\n+\tdlopen_name = 'mlx4_glue'\n+\tdlopen_lib_name = driver_name_fmt.format(dlopen_name)\n+\tdlopen_so_version = LIB_GLUE_VERSION\n+\tdlopen_sources = files('mlx4_glue.c')\n+\tdlopen_install_dir = [ eal_pmd_path + '-glue' ]\n+\tshared_lib = shared_library(\n+\t\tdlopen_lib_name,\n+\t\tdlopen_sources,\n+\t\tinclude_directories: global_inc,\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", "prefixes": [ "v6", "2/2" ] }