[3/3] build: support disabling drivers with meson
Checks
Commit Message
Add support for a new build option to turn off certain drivers. Any other
drivers which depend on the one being disabled will also be disabled with a
suitable debug message.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/meson.build | 16 ++++++++++++----
meson_options.txt | 2 ++
2 files changed, 14 insertions(+), 4 deletions(-)
Comments
> From: Bruce Richardson [mailto:bruce.richardson@intel.com]
> Sent: Wednesday, 25 September 2019 16.56
>
> Add support for a new build option to turn off certain drivers. Any
> other
> drivers which depend on the one being disabled will also be disabled
> with a
> suitable debug message.
>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Hi Bruce,
I was trying something along the lines of:
meson configure -Ddisable_drivers=net/* -Denable_drivers=net/i40e
But it seems that enable_drivers does not override disable_drivers. Ninja says:
[...]
net/hinic: not in enabled drivers build config
net/hns3: not in enabled drivers build config
net/i40e: explicitly disabled via build config
net/iavf: not in enabled drivers build config
[...]
Could you please fix that?
Also, since all sorts of exotic libraries are continuously being added to DPDK, it would be nice to have a similar Meson option for libs, i.e. enable_libs to override disable_libs=*.
Med venlig hilsen / Kind regards,
-Morten Brørup
06/01/2022 09:23, Morten Brørup:
> > From: Bruce Richardson [mailto:bruce.richardson@intel.com]
> > Sent: Wednesday, 25 September 2019 16.56
> >
> > Add support for a new build option to turn off certain drivers. Any
> > other
> > drivers which depend on the one being disabled will also be disabled
> > with a
> > suitable debug message.
> >
> > Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
>
> Hi Bruce,
>
> I was trying something along the lines of:
>
> meson configure -Ddisable_drivers=net/* -Denable_drivers=net/i40e
>
> But it seems that enable_drivers does not override disable_drivers. Ninja says:
It is the opposite logic. "disable" overrides "enable":
if not enable_drivers.contains(drv_path)
build = false
reason = 'not in enabled drivers build config'
elif disable_drivers.contains(drv_path)
if always_enable.contains(drv_path)
message('Driver @0@ cannot be disabled, not disabling.'.format(drv_path))
else
build = false
reason = 'explicitly disabled via build config'
endif
endif
In this case, you don't need to disable everything because of this:
if enable_drivers.length() == 0
enable_drivers = run_command(list_dir_globs, '*/*', check: true).stdout().split()
endif
> From: Thomas Monjalon [mailto:thomas@monjalon.net]
> Sent: Thursday, 6 January 2022 10.49
>
> 06/01/2022 09:23, Morten Brørup:
> > > From: Bruce Richardson [mailto:bruce.richardson@intel.com]
> > > Sent: Wednesday, 25 September 2019 16.56
> > >
> > > Add support for a new build option to turn off certain drivers. Any
> > > other
> > > drivers which depend on the one being disabled will also be
> disabled
> > > with a
> > > suitable debug message.
> > >
> > > Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> >
> > Hi Bruce,
> >
> > I was trying something along the lines of:
> >
> > meson configure -Ddisable_drivers=net/* -Denable_drivers=net/i40e
> >
> > But it seems that enable_drivers does not override disable_drivers.
> Ninja says:
>
> It is the opposite logic. "disable" overrides "enable":
>
> if not enable_drivers.contains(drv_path)
> build = false
> reason = 'not in enabled drivers build config'
> elif disable_drivers.contains(drv_path)
> if always_enable.contains(drv_path)
> message('Driver @0@ cannot be disabled, not
> disabling.'.format(drv_path))
> else
> build = false
> reason = 'explicitly disabled via build config'
> endif
> endif
>
> In this case, you don't need to disable everything because of this:
>
> if enable_drivers.length() == 0
> enable_drivers = run_command(list_dir_globs, '*/*', check:
> true).stdout().split()
> endif
>
Thank you, @Thomas! That solved the drivers part of my question.
@Bruce:
If you have too much time on your hands, and want to experiment with set theory on Meson, you could implement a "longest prefix match" for this, making the narrower selection take precedence. Just kidding! Enabling/disabling drivers as Thomas described works great.
Still, a similar Meson option for selecting libraries would be nice.
On Thu, Jan 06, 2022 at 11:10:27AM +0100, Morten Brørup wrote:
> > From: Thomas Monjalon [mailto:thomas@monjalon.net]
> > Sent: Thursday, 6 January 2022 10.49
> >
> > 06/01/2022 09:23, Morten Brørup:
> > > > From: Bruce Richardson [mailto:bruce.richardson@intel.com]
> > > > Sent: Wednesday, 25 September 2019 16.56
> > > >
> > > > Add support for a new build option to turn off certain drivers. Any
> > > > other
> > > > drivers which depend on the one being disabled will also be
> > disabled
> > > > with a
> > > > suitable debug message.
> > > >
> > > > Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> > >
> > > Hi Bruce,
> > >
> > > I was trying something along the lines of:
> > >
> > > meson configure -Ddisable_drivers=net/* -Denable_drivers=net/i40e
> > >
> > > But it seems that enable_drivers does not override disable_drivers.
> > Ninja says:
> >
> > It is the opposite logic. "disable" overrides "enable":
> >
> > if not enable_drivers.contains(drv_path)
> > build = false
> > reason = 'not in enabled drivers build config'
> > elif disable_drivers.contains(drv_path)
> > if always_enable.contains(drv_path)
> > message('Driver @0@ cannot be disabled, not
> > disabling.'.format(drv_path))
> > else
> > build = false
> > reason = 'explicitly disabled via build config'
> > endif
> > endif
> >
> > In this case, you don't need to disable everything because of this:
> >
> > if enable_drivers.length() == 0
> > enable_drivers = run_command(list_dir_globs, '*/*', check:
> > true).stdout().split()
> > endif
> >
>
> Thank you, @Thomas! That solved the drivers part of my question.
>
> @Bruce:
>
> If you have too much time on your hands, and want to experiment with set theory on Meson, you could implement a "longest prefix match" for this, making the narrower selection take precedence. Just kidding! Enabling/disabling drivers as Thomas described works great.
>
> Still, a similar Meson option for selecting libraries would be nice.
>
Yes, I understand. I have a few concerns about implementing this just now
though. David previously posted a patch[1] to do what you are looking for, and
please see the discussion in that thread [2].
[1] http://inbox.dpdk.org/dev/20211110164814.5231-6-david.marchand@redhat.com/
[2] http://inbox.dpdk.org/dev/YYwCj0voYVUUYVMf@bricha3-MOBL.ger.corp.intel.com/
@@ -16,6 +16,8 @@ dpdk_driver_classes = ['common',
'baseband', # depends on common and bus.
'raw'] # depends on common, bus, mempool, net and event.
+disabled_drivers = get_option('disable_drivers').split(',')
+
default_cflags = machine_args
if cc.has_argument('-Wno-format-truncation')
default_cflags += '-Wno-format-truncation'
@@ -59,17 +61,23 @@ foreach class:dpdk_driver_classes
# pull in driver directory which should assign to each of the above
subdir(drv_path)
- if build
+ if drv_path in disabled_drivers
+ build = false
+ reason = 'Explicitly disabled via build config'
+ elif build
# get dependency objs from strings
shared_deps = ext_deps
static_deps = ext_deps
foreach d:deps
if not is_variable('shared_rte_' + d)
- error('Missing internal dependency "@0@" for @1@ [@2@]'
+ build = false
+ reason = 'Missing internal dependency, "@0@"'.format(d)
+ message('Disabling @1@ [@2@]: missing internal dependency "@0@"'
.format(d, name, 'drivers/' + drv_path))
+ else
+ shared_deps += [get_variable('shared_rte_' + d)]
+ static_deps += [get_variable('static_rte_' + d)]
endif
- shared_deps += [get_variable('shared_rte_' + d)]
- static_deps += [get_variable('static_rte_' + d)]
endforeach
endif
@@ -2,6 +2,8 @@
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('disable_drivers', type: 'string', value: '',
+ description: 'Comma-separated list of drivers to explicitly disable.')
option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-<VERSION>',
description: 'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.')
option('enable_docs', type: 'boolean', value: false,