From patchwork Wed Sep 13 14:12:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 28667 X-Patchwork-Delegate: bruce.richardson@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4872B1B19C; Wed, 13 Sep 2017 17:08:20 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 8E21A1AF03 for ; Wed, 13 Sep 2017 17:08:14 +0200 (CEST) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Sep 2017 08:08:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,388,1500966000"; d="scan'208";a="311250576" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga004.fm.intel.com with ESMTP; 13 Sep 2017 08:08:12 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: nhorman@tuxdriver.com, luca.boccassi@gmail.com, harry.van.haaren@intel.com, keith.wiles@intel.com, Bruce Richardson Date: Wed, 13 Sep 2017 15:12:08 +0100 Message-Id: <20170913141222.253688-4-bruce.richardson@intel.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170913141222.253688-1-bruce.richardson@intel.com> References: <20170912103809.140473-1-bruce.richardson@intel.com> <20170913141222.253688-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v3 03/17] igb_uio: add igb_uio kmod to 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Support building igb_uio using meson and ninja. For this, we still use the kernel's kbuild system, by calling out to make, since it's safer and easier than trying to reproduce that in meson. A list of suitable file dependencies is given so that we have a reasonable chance of a rebuild when necessary. Signed-off-by: Bruce Richardson --- lib/librte_eal/linuxapp/igb_uio/Kbuild | 1 + lib/librte_eal/linuxapp/igb_uio/meson.build | 46 +++++++++++++++++++++++++++++ lib/librte_eal/linuxapp/meson.build | 10 +++++++ meson_options.txt | 2 ++ 4 files changed, 59 insertions(+) create mode 100644 lib/librte_eal/linuxapp/igb_uio/Kbuild create mode 100644 lib/librte_eal/linuxapp/igb_uio/meson.build diff --git a/lib/librte_eal/linuxapp/igb_uio/Kbuild b/lib/librte_eal/linuxapp/igb_uio/Kbuild new file mode 100644 index 000000000..98c98fe52 --- /dev/null +++ b/lib/librte_eal/linuxapp/igb_uio/Kbuild @@ -0,0 +1 @@ +obj-m := igb_uio.o diff --git a/lib/librte_eal/linuxapp/igb_uio/meson.build b/lib/librte_eal/linuxapp/igb_uio/meson.build new file mode 100644 index 000000000..4712756ea --- /dev/null +++ b/lib/librte_eal/linuxapp/igb_uio/meson.build @@ -0,0 +1,46 @@ +# BSD LICENSE +# +# Copyright(c) 2017 Intel Corporation. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Intel Corporation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +mkfile = custom_target('igb_uio_makefile', + output: 'Makefile', + command: ['touch', '@OUTPUT@']) + +custom_target('igb_uio', + input: ['igb_uio.c', 'Kbuild'], + output: 'igb_uio.ko', + command: ['make', '-C', kernel_dir, + 'M=' + meson.current_build_dir(), + 'src=' + meson.current_source_dir(), + 'EXTRA_CFLAGS=-I' + meson.current_source_dir() + + '/../../common/include', + 'modules'], + depends: mkfile, + build_by_default: true) diff --git a/lib/librte_eal/linuxapp/meson.build b/lib/librte_eal/linuxapp/meson.build index bda974a9a..16a3f6b8b 100644 --- a/lib/librte_eal/linuxapp/meson.build +++ b/lib/librte_eal/linuxapp/meson.build @@ -30,3 +30,13 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. subdir('eal') + +if get_option('enable_kmods') + kernel_dir = get_option('kernel_dir') + if kernel_dir == '' + kernel_version = run_command('uname', '-r').stdout().strip() + kernel_dir = '/lib/modules/' + kernel_version + '/build' + endif + + subdir('igb_uio') +endif diff --git a/meson_options.txt b/meson_options.txt index c03b79fbd..9c45b8159 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,3 +4,5 @@ option('max_numa_nodes', type: 'string', value: '4', description: 'maximum numbe option('use_hpet', type: 'boolean', value: false, description: 'use HPET timer in EAL') 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('enable_kmods', type: 'boolean', value: true, description: 'build kernel modules') +option('kernel_dir', type: 'string', value: '', description: 'path to the kernel for building kernel modules')