[dpdk-dev] build: clean up building kernel modules using meson
Checks
Commit Message
The meson.build files for building the kernel modules directory could
be improved now that it is extracted from the EAL. For example, no
global processing is necessary inside the kernel folder, just need to
subdir to the appropriate bsd or linux folder to do the actual work.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
NOTE: this patch depends upon patch #35336, to move kernel modules to
a top-level "kernel" folder.
---
kernel/freebsd/BSDmakefile.meson | 47 ++++++++++------------------------------
kernel/freebsd/meson.build | 26 ++++++++++++++++++++++
kernel/linux/meson.build | 8 +++++++
kernel/meson.build | 44 +------------------------------------
4 files changed, 46 insertions(+), 79 deletions(-)
create mode 100644 kernel/freebsd/meson.build
create mode 100644 kernel/linux/meson.build
Comments
On 2/22/2018 11:08 PM, Bruce Richardson wrote:
> The meson.build files for building the kernel modules directory could
> be improved now that it is extracted from the EAL. For example, no
> global processing is necessary inside the kernel folder, just need to
> subdir to the appropriate bsd or linux folder to do the actual work.
>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
> NOTE: this patch depends upon patch #35336, to move kernel modules to
> a top-level "kernel" folder.
Tested-by: Hemant Agrawal <hemant.agrawal@nxp.com>
Build was fine, but observed one error print.
b10814@freebsd:~/dpdk/build % ninja
[333/654] Generating contigmem with a custom command.
@ -> /usr/src/sys
machine -> /usr/src/sys/amd64/include
x86 -> /usr/src/sys/x86/include
awk -f @/tools/makeobjops.awk @/kern/device_if.m -h
awk -f @/tools/makeobjops.awk @/kern/bus_if.m -h
awk -f @/tools/makeobjops.awk @/dev/pci/pci_if.m -h
cc -O2 -pipe -include rte_config.h -fno-strict-aliasing -Werror
-D_KERNEL -DKLD_MODULE -nostdinc -I/usr/home/b10814/dpdk/build
-I/usr/home/b10814/dpdk/config -I. -I@ -I@/contrib/altq -fno-common
-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -mno-aes -mno-avx
-mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -msoft-float
-fno-asynchronous-unwind-tables -ffreestanding -fstack-protector
-std=iso9899:1999 -Qunused-arguments -fstack-protector -Wall
-Wredundant-decls -Wnested-externs -Wstrict-prototypes
-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef
-Wno-pointer-sign -fformat-extensions -Wmissing-include-dirs
-fdiagnostics-show-option -Wno-error-tautological-compare
-Wno-error-empty-body -Wno-error-parentheses-equality
-Wno-error-unused-function -c
/usr/home/b10814/dpdk/kernel/freebsd/contigmem/contigmem.c -o contigmem.o
ld -d -warn-common -r -d -o contigmem.ko contigmem.o
:> export_syms
awk -f /sys/conf/kmod_syms.awk contigmem.ko export_syms | xargs -J%
objcopy % contigmem.ko
objcopy --strip-debug contigmem.ko
[334/654] Generating nic_uio with a custom command.
awk -f @/tools/makeobjops.awk @/kern/bus_if.m -h
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
mv: rename bus_if.h.tmp to bus_if.h: No such file or directory
makeobjops.awk: mv -f bus_if.h.tmp bus_if.h failed (1)
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
cc -O2 -pipe -include rte_config.h -fno-strict-aliasing -Werror
-D_KERNEL -DKLD_MODULE -nostdinc -I/usr/home/b10814/dpdk/build
-I/usr/home/b10814/dpdk/config -I. -I@ -I@/contrib/altq -fno-common
-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -mno-aes -mno-avx
-mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -msoft-float
-fno-asynchronous-unwind-tables -ffreestanding -fstack-protector
-std=iso9899:1999 -Qunused-arguments -fstack-protector -Wall
-Wredundant-decls -Wnested-externs -Wstrict-prototypes
-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef
-Wno-pointer-sign -fformat-extensions -Wmissing-include-dirs
-fdiagnostics-show-option -Wno-error-tautological-compare
-Wno-error-empty-body -Wno-error-parentheses-equality
-Wno-error-unused-function -c
/usr/home/b10814/dpdk/kernel/freebsd/nic_uio/nic_uio.c -o nic_uio.o
ld -d -warn-common -r -d -o nic_uio.ko nic_uio.o
:> export_syms
awk -f /sys/conf/kmod_syms.awk nic_uio.ko export_syms | xargs -J%
objcopy % nic_uio.ko
objcopy --strip-debug nic_uio.ko
[654/654] Linking target app/test-eventdev/dpdk-test-eventdev.
<snip>...
On Wed, Apr 04, 2018 at 04:53:32PM +0100, Bruce Richardson wrote:
> The meson.build files for building the kernel modules directory could
> be improved now that it is extracted from the EAL. For example, no
> global processing is necessary inside the kernel folder, just need to
> subdir to the appropriate bsd or linux folder to do the actual work.
>
> To avoid potential race conditions with the BSD module builds when
> the kernel build system is creating the dev_if.h and other files,
> we serialize the kernel module builds (all 2 of them!) by setting
> up each module to depend on all the previous.
>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> Tested-by: Hemant Agrawal <hemant.agrawal@nxp.com>
>
> ---
> v2: serialize the BSD module builds to try and resolve the
> warnings seen about bus_if.h/dev_if.h/etc. in some cases.
> Issue reported by Hemant.
> ---
Hi Hemant,
I haven't been able to reproduce reliably the issue you reported, but the
above fixes what I *think* to be the issue causing the error print. If you
get a chance, can you do a quick re-test and see if it re-occurs for you.
If not, I'll apply this version - otherwise I might just apply V1, since
the error itself appears harmless, as you say.
/Bruce
Just checked. Your V2 got build without any warnings for me.
Regards,
Hemant
> -----Original Message-----
> From: Bruce Richardson [mailto:bruce.richardson@intel.com]
> Sent: Wednesday, April 04, 2018 9:27 PM
> To: Hemant Agrawal <hemant.agrawal@nxp.com>
> Cc: dev@dpdk.org
> Subject: Re: [PATCH v2] build: clean up building kernel modules using meson
> Importance: High
>
> On Wed, Apr 04, 2018 at 04:53:32PM +0100, Bruce Richardson wrote:
> > The meson.build files for building the kernel modules directory could
> > be improved now that it is extracted from the EAL. For example, no
> > global processing is necessary inside the kernel folder, just need to
> > subdir to the appropriate bsd or linux folder to do the actual work.
> >
> > To avoid potential race conditions with the BSD module builds when the
> > kernel build system is creating the dev_if.h and other files, we
> > serialize the kernel module builds (all 2 of them!) by setting up each
> > module to depend on all the previous.
> >
> > Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> > Tested-by: Hemant Agrawal <hemant.agrawal@nxp.com>
> >
> > ---
> > v2: serialize the BSD module builds to try and resolve the
> > warnings seen about bus_if.h/dev_if.h/etc. in some cases.
> > Issue reported by Hemant.
> > ---
>
> Hi Hemant,
>
> I haven't been able to reproduce reliably the issue you reported, but the above
> fixes what I *think* to be the issue causing the error print. If you get a chance,
> can you do a quick re-test and see if it re-occurs for you.
> If not, I'll apply this version - otherwise I might just apply V1, since the error
> itself appears harmless, as you say.
>
> /Bruce
On Wed, Apr 04, 2018 at 04:47:25PM +0000, Hemant Agrawal wrote:
> Just checked. Your V2 got build without any warnings for me.
>
> Regards,
> Hemant
>
Thanks.
/Bruce
> > -----Original Message-----
> > From: Bruce Richardson [mailto:bruce.richardson@intel.com]
> > Sent: Wednesday, April 04, 2018 9:27 PM
> > To: Hemant Agrawal <hemant.agrawal@nxp.com>
> > Cc: dev@dpdk.org
> > Subject: Re: [PATCH v2] build: clean up building kernel modules using meson
> > Importance: High
> >
> > On Wed, Apr 04, 2018 at 04:53:32PM +0100, Bruce Richardson wrote:
> > > The meson.build files for building the kernel modules directory could
> > > be improved now that it is extracted from the EAL. For example, no
> > > global processing is necessary inside the kernel folder, just need to
> > > subdir to the appropriate bsd or linux folder to do the actual work.
> > >
> > > To avoid potential race conditions with the BSD module builds when the
> > > kernel build system is creating the dev_if.h and other files, we
> > > serialize the kernel module builds (all 2 of them!) by setting up each
> > > module to depend on all the previous.
> > >
> > > Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> > > Tested-by: Hemant Agrawal <hemant.agrawal@nxp.com>
> > >
> > > ---
> > > v2: serialize the BSD module builds to try and resolve the
> > > warnings seen about bus_if.h/dev_if.h/etc. in some cases.
> > > Issue reported by Hemant.
> > > ---
> >
> > Hi Hemant,
> >
> > I haven't been able to reproduce reliably the issue you reported, but the above
> > fixes what I *think* to be the issue causing the error print. If you get a chance,
> > can you do a quick re-test and see if it re-occurs for you.
> > If not, I'll apply this version - otherwise I might just apply V1, since the error
> > itself appears harmless, as you say.
> >
> > /Bruce
@@ -1,43 +1,18 @@
-# BSD LICENSE
-#
-# Copyright(c) 2017 Intel Corporation. All rights reserved.
-# 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.
-#
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017 Intel Corporation
# makefile for building kernel modules using meson
# takes parameters from the environment
-# source file is passed via KMOD_SRC as full path, we only use final
-# component of it, as VPATH is used to find actual file, so as to
-# have the .o files placed in the build, not source directory
-VPATH = ${KMOD_SRC:H}
-SRCS = ${KMOD_SRC:T} device_if.h bus_if.h pci_if.h
+# source file is passed via KMOD_SRC as relative path, we only use final
+# (tail) component of it (:T), as VPATH is used to find actual file. The
+# VPATH is similarly extracted from the non-final (head) portion of the
+# path (:H) converted to absolute path (:tA). This use of VPATH is to have
+# the .o files placed in the build, not source directory
+
+VPATH := ${KMOD_SRC:H:tA}
+SRCS := ${KMOD_SRC:T} device_if.h bus_if.h pci_if.h
CFLAGS += $(KMOD_CFLAGS)
+.OBJDIR: ${KMOD_OBJDIR}
.include <bsd.kmod.mk>
new file mode 100644
@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+kmods = ['contigmem', 'nic_uio']
+
+# for building kernel modules, we use kernel build system using make, as
+# with Linux. We have a skeleton BSDmakefile, which pulls many of its
+# values from the environment. Each module only has a single source file
+# right now, which allows us to simplify things. We pull in the sourcer
+# files from the individual meson.build files, and then use a custom
+# target to call make, passing in the values as env parameters.
+kmod_cflags = ['-I' + meson.build_root(),
+ '-I' + join_paths(meson.source_root(), 'config'),
+ '-include rte_config.h']
+foreach k:kmods
+ subdir(k)
+ custom_target(k,
+ input: [files('BSDmakefile.meson'), sources],
+ output: k + '.ko',
+ command: ['make', '-f', '@INPUT0@',
+ 'KMOD_OBJDIR=@OUTDIR@',
+ 'KMOD_SRC=@INPUT1@',
+ 'KMOD=' + k,
+ 'KMOD_CFLAGS=' + ' '.join(kmod_cflags)],
+ build_by_default: get_option('enable_kmods'))
+endforeach
new file mode 100644
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+subdirs = ['igb_uio']
+
+foreach d:subdirs
+ subdir(d)
+endforeach
@@ -1,46 +1,4 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
-# Initially pull in common settings
-#eal_inc = [global_inc]
-#subdir('common') # defines common_sources, common_objs, etc.
-
-# Now do OS/exec-env specific settings, including building kernel modules
-# The <exec-env>/eal/meson.build file should define env_sources, etc.
-if host_machine.system() == 'linux'
- dpdk_conf.set('RTE_EXEC_ENV_LINUXAPP', 1)
- subdir('linux/igb_uio')
-
-elif host_machine.system() == 'freebsd'
- dpdk_conf.set('RTE_EXEC_ENV_BSDAPP', 1)
- kmods = ['contigmem', 'nic_uio']
-
- # for building kernel modules, we use kernel build system using make, as
- # with Linux. We have a skeleton BSDmakefile, which pulls many of its
- # values from the environment. Each module only has a single source file
- # right now, which allows us to simplify things. We pull in the sourcer
- # files from the individual meson.build files, and then use a custom
- # target to call make, passing in the values as env parameters.
- kmod_cflags = ['-I' + meson.build_root(),
- '-I' + join_paths(meson.source_root(), 'config'),
- '-include rte_config.h']
- foreach k:kmods
- subdir(join_paths('freebsd', k))
- custom_target(k,
- input: [files('freebsd/BSDmakefile.meson'), sources],
- output: k + '.ko',
- command: ['make', '-f', '@INPUT0@',
- 'KMOD_SRC=@INPUT1@',
- 'KMOD=' + k,
- 'KMOD_CFLAGS=' + ' '.join(kmod_cflags)],
- build_by_default: get_option('enable_kmods'))
- endforeach
-else
- error('unsupported system type @0@'.format(hostmachine.system()))
-endif
-
-cflags += '-D_GNU_SOURCE'
-sources = common_sources + env_sources
-objs = common_objs + env_objs
-headers = common_headers + env_headers
-includes = eal_inc
+subdir(host_machine.system())