| Message ID | 20181012151221.11295-1-bluca@debian.org |
|---|---|
| State | Superseded, archived |
| Delegated to: | Thomas Monjalon |
| Headers | show |
| Series |
|
| Related | show |
| Context | Check | Description |
|---|---|---|
| ci/Intel-compilation | success | Compilation OK |
| ci/checkpatch | success | coding style OK |
On Fri, Oct 12, 2018 at 04:12:21PM +0100, Luca Boccassi wrote: > A Kbuild is also included to allow users to use DKMS natively without > additional code. > > Signed-off-by: Luca Boccassi <bluca@debian.org> > --- > v2: add local directory to -I and build sources list recursively to > fix build on Fedora > Yep, now seems to build for me on Fedora. One minor suggestion is to look to use the "console" keyword on the custom_target if possible. It should help prevent noticable stalls as make runs in the background. [Unfortunately, it's meson 0.48 onward only, so if conditionals are needed, just ignore this suggestion] Also, do we want to use "make -j" for this, given the number of files? [Maybe -j4 just?] Tested-by: Bruce Richardson <bruce.richardson@intel.com> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
On Fri, 2018-10-12 at 17:29 +0100, Bruce Richardson wrote: > On Fri, Oct 12, 2018 at 04:12:21PM +0100, Luca Boccassi wrote: > > A Kbuild is also included to allow users to use DKMS natively > > without > > additional code. > > > > Signed-off-by: Luca Boccassi <bluca@debian.org> > > --- > > v2: add local directory to -I and build sources list recursively to > > fix build on Fedora > > > > Yep, now seems to build for me on Fedora. One minor suggestion is to > look > to use the "console" keyword on the custom_target if possible. It > should > help prevent noticable stalls as make runs in the background. > [Unfortunately, it's meson 0.48 onward only, so if conditionals are > needed, > just ignore this suggestion] Good idea, I just with 0.48, 0.47 and 0.41 and in all cases there are no complaints or errors, it's simply ignored in the older versions. > Also, do we want to use "make -j" for this, given the number of > files? > [Maybe -j4 just?] Yeah makes sense, added j4. Sent v3 with both changes and the ack, thanks.
> On Fri, 2018-10-12 at 17:29 +0100, Bruce Richardson wrote: >> On Fri, Oct 12, 2018 at 04:12:21PM +0100, Luca Boccassi wrote: >> > A Kbuild is also included to allow users to use DKMS natively >> > without >> > additional code. >> > >> > Signed-off-by: Luca Boccassi <bluca at debian.org> >> > --- >> > v2: add local directory to -I and build sources list recursively to >> > fix build on Fedora >> > >> >> Yep, now seems to build for me on Fedora. One minor suggestion is to >> look >> to use the "console" keyword on the custom_target if possible. It >> should >> help prevent noticable stalls as make runs in the background. >> [Unfortunately, it's meson 0.48 onward only, so if conditionals are >> needed, >> just ignore this suggestion] > > Good idea, I just with 0.48, 0.47 and 0.41 and in all cases there are > no complaints or errors, it's simply ignored in the older versions. Hmm. I have following on my Ubuntu 18.04 with dpdk v18.11-rc1: $ meson --version 0.45.1 $ meson build <...> kernel/linux/kni/meson.build:16: WARNING: Passed invalid keyword argument "console". WARNING: This will become a hard error in the future. WARNING: Unknown keyword arguments in target rte_kni: console <...> It builds, but prints above warning. Best regards, Ilya Maximets. > >> Also, do we want to use "make -j" for this, given the number of >> files? >> [Maybe -j4 just?] > > Yeah makes sense, added j4. > > Sent v3 with both changes and the ack, thanks. > > -- > Kind regards, > Luca Boccassi
On Mon, 2018-10-29 at 17:09 +0300, Ilya Maximets wrote: > > On Fri, 2018-10-12 at 17:29 +0100, Bruce Richardson wrote: > > > On Fri, Oct 12, 2018 at 04:12:21PM +0100, Luca Boccassi wrote: > > > > A Kbuild is also included to allow users to use DKMS natively > > > > without > > > > additional code. > > > > > > > > Signed-off-by: Luca Boccassi <bluca at debian.org> > > > > --- > > > > v2: add local directory to -I and build sources list > > > > recursively to > > > > fix build on Fedora > > > > > > > > > > Yep, now seems to build for me on Fedora. One minor suggestion is > > > to > > > look > > > to use the "console" keyword on the custom_target if possible. It > > > should > > > help prevent noticable stalls as make runs in the background. > > > [Unfortunately, it's meson 0.48 onward only, so if conditionals > > > are > > > needed, > > > just ignore this suggestion] > > > > Good idea, I just with 0.48, 0.47 and 0.41 and in all cases there > > are > > no complaints or errors, it's simply ignored in the older versions. > > Hmm. > I have following on my Ubuntu 18.04 with dpdk v18.11-rc1: > > $ meson --version > 0.45.1 > > $ meson build > <...> > kernel/linux/kni/meson.build:16: WARNING: Passed invalid keyword > argument "console". > WARNING: This will become a hard error in the future. > WARNING: Unknown keyword arguments in target rte_kni: console > <...> > > It builds, but prints above warning. > > Best regards, Ilya Maximets. Interesting, wonder why I didn't see that on 0.41! Anyway those warnings are fine to ignore, especially in this case.
On Mon, Oct 29, 2018 at 03:33:47PM +0000, Luca Boccassi wrote: > On Mon, 2018-10-29 at 17:09 +0300, Ilya Maximets wrote: > > > On Fri, 2018-10-12 at 17:29 +0100, Bruce Richardson wrote: > > > > On Fri, Oct 12, 2018 at 04:12:21PM +0100, Luca Boccassi wrote: > > > > > A Kbuild is also included to allow users to use DKMS natively > > > > > without > > > > > additional code. > > > > > > > > > > Signed-off-by: Luca Boccassi <bluca at debian.org> > > > > > --- > > > > > v2: add local directory to -I and build sources list > > > > > recursively to > > > > > fix build on Fedora > > > > > > > > > > > > > Yep, now seems to build for me on Fedora. One minor suggestion is > > > > to > > > > look > > > > to use the "console" keyword on the custom_target if possible. It > > > > should > > > > help prevent noticable stalls as make runs in the background. > > > > [Unfortunately, it's meson 0.48 onward only, so if conditionals > > > > are > > > > needed, > > > > just ignore this suggestion] > > > > > > Good idea, I just with 0.48, 0.47 and 0.41 and in all cases there > > > are > > > no complaints or errors, it's simply ignored in the older versions. > > > > Hmm. > > I have following on my Ubuntu 18.04 with dpdk v18.11-rc1: > > > > $ meson --version > > 0.45.1 > > > > $ meson build > > <...> > > kernel/linux/kni/meson.build:16: WARNING: Passed invalid keyword > > argument "console". > > WARNING: This will become a hard error in the future. > > WARNING: Unknown keyword arguments in target rte_kni: console > > <...> > > > > It builds, but prints above warning. > > > > Best regards, Ilya Maximets. > > Interesting, wonder why I didn't see that on 0.41! Anyway those > warnings are fine to ignore, especially in this case. > Probably because the warnings about unknown parameters only came in a later version of meson. Earlier versions just ignored them without warning. /Bruce
diff --git a/kernel/linux/kni/Kbuild b/kernel/linux/kni/Kbuild new file mode 100644 index 0000000000..de5c27f328 --- /dev/null +++ b/kernel/linux/kni/Kbuild @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <bluca@debian.org> + +ccflags-y := $(MODULE_CFLAGS) +obj-m := rte_kni.o +rte_kni-y := $(patsubst $(src)/%.c,%.o,$(wildcard $(src)/*.c)) \ + $(patsubst $(src)/%.c,%.o,$(wildcard $(src)/ethtool/ixgbe/*.c)) \ + $(patsubst $(src)/%.c,%.o,$(wildcard $(src)/ethtool/igb/*.c)) diff --git a/kernel/linux/kni/ethtool/igb/meson.build b/kernel/linux/kni/ethtool/igb/meson.build new file mode 100644 index 0000000000..2f796ac0b2 --- /dev/null +++ b/kernel/linux/kni/ethtool/igb/meson.build @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <bluca@debian.org> + +kni_igb_sources = files( + 'e1000_82575.c', + 'e1000_api.c', + 'e1000_i210.c', + 'e1000_mac.c', + 'e1000_manage.c', + 'e1000_mbx.c', + 'e1000_nvm.c', + 'e1000_phy.c', + 'igb_ethtool.c', + 'igb_main.c', + 'igb_param.c', + 'igb_vmdq.c') diff --git a/kernel/linux/kni/ethtool/ixgbe/meson.build b/kernel/linux/kni/ethtool/ixgbe/meson.build new file mode 100644 index 0000000000..73248b13e4 --- /dev/null +++ b/kernel/linux/kni/ethtool/ixgbe/meson.build @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <bluca@debian.org> + +kni_ixgbe_sources = files( + 'ixgbe_82598.c', + 'ixgbe_82599.c', + 'ixgbe_api.c', + 'ixgbe_common.c', + 'ixgbe_ethtool.c', + 'ixgbe_main.c', + 'ixgbe_phy.c', + 'ixgbe_x540.c', + 'kcompat.c') diff --git a/kernel/linux/kni/ethtool/meson.build b/kernel/linux/kni/ethtool/meson.build new file mode 100644 index 0000000000..7a8458ddcd --- /dev/null +++ b/kernel/linux/kni/ethtool/meson.build @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <bluca@debian.org> + +subdir('igb') +subdir('ixgbe') diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build new file mode 100644 index 0000000000..87469c6ca3 --- /dev/null +++ b/kernel/linux/kni/meson.build @@ -0,0 +1,33 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <bluca@debian.org> + +subdir('ethtool') + +kni_mkfile = custom_target('rte_kni_makefile', + output: 'Makefile', + command: ['touch', '@OUTPUT@']) + +kni_sources = files( + 'kni_ethtool.c', + 'kni_misc.c', + 'kni_net.c', + 'Kbuild') + +custom_target('rte_kni', + input: kni_sources + kni_igb_sources + kni_ixgbe_sources, + output: 'rte_kni.ko', + command: ['make', '-C', kernel_dir, + 'M=' + meson.current_build_dir(), + 'src=' + meson.current_source_dir(), + 'MODULE_CFLAGS=-include ' + meson.source_root() + '/config/rte_config.h' + + ' -I' + meson.source_root() + '/lib/librte_eal/common/include' + + ' -I' + meson.source_root() + '/lib/librte_eal/linuxapp/eal/include' + + ' -I' + meson.build_root() + + ' -I' + meson.current_source_dir() + + ' -I' + meson.current_source_dir() + '/ethtool/ixgbe' + + ' -I' + meson.current_source_dir() + '/ethtool/igb', + 'modules'], + depends: kni_mkfile, + install: true, + install_dir: kernel_dir + '/../extra/dpdk', + build_by_default: get_option('enable_kmods')) diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build index a924c7b6fb..5b7ec06e1d 100644 --- a/kernel/linux/meson.build +++ b/kernel/linux/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation -subdirs = ['igb_uio'] +subdirs = ['igb_uio', 'kni'] WARN_CROSS_COMPILE='Need "kernel_dir" option for kmod compilation when cross-compiling' WARN_NO_HEADERS='Cannot compile kernel modules as requested - are kernel headers installed?'
A Kbuild is also included to allow users to use DKMS natively without additional code. Signed-off-by: Luca Boccassi <bluca@debian.org> --- v2: add local directory to -I and build sources list recursively to fix build on Fedora kernel/linux/kni/Kbuild | 8 ++++++ kernel/linux/kni/ethtool/igb/meson.build | 16 +++++++++++ kernel/linux/kni/ethtool/ixgbe/meson.build | 13 +++++++++ kernel/linux/kni/ethtool/meson.build | 5 ++++ kernel/linux/kni/meson.build | 33 ++++++++++++++++++++++ kernel/linux/meson.build | 2 +- 6 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 kernel/linux/kni/Kbuild create mode 100644 kernel/linux/kni/ethtool/igb/meson.build create mode 100644 kernel/linux/kni/ethtool/ixgbe/meson.build create mode 100644 kernel/linux/kni/ethtool/meson.build create mode 100644 kernel/linux/kni/meson.build