[dpdk-dev] [PATCH 1/3] meson: fix minimum required meson version

[dpdk-dev] [PATCH 1/3] meson: fix minimum required meson version

[Gabriel Ganne]

WARNING: Project targetting '>= 0.47.1' but tried to use feature introduced
         in '0.48.0': console arg in custom_target

console argument is used within kernel/linux/kni/meson.build

Signed-off-by: Gabriel Ganne <gabriel.ganne@6wind.com>
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 7778e18200a9..65c46f051365 100644
--- a/meson.build
+++ b/meson.build
@@ -8,7 +8,7 @@ project('DPDK', 'C',
 		files('VERSION')).stdout().strip(),
 	license: 'BSD',
 	default_options: ['buildtype=release', 'default_library=static'],
-	meson_version: '>= 0.47.1'
+	meson_version: '>= 0.48.0'
 )
 
 # set up some global vars for compiler, platform, configuration, etc.
-- 
2.29.2

[dpdk-dev] [PATCH 2/3] meson: use threads dependency as provided by meson

[Gabriel Ganne]

meson guarantees this is portable, so this also allows us to remove a
is_windows switch.

Link: https://mesonbuild.com/howtox.html#enable-threads
Signed-off-by: Gabriel Ganne <gabriel.ganne@6wind.com>
---
 config/meson.build               | 5 +----
 lib/librte_metrics/meson.build   | 2 ++
 lib/librte_telemetry/meson.build | 2 ++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/config/meson.build b/config/meson.build
index 3cf560b8a3f5..0fb7e1b27a0f 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -113,10 +113,7 @@ if not is_windows
 endif
 
 # use pthreads if available for the platform
-if not is_windows
-	add_project_link_arguments('-pthread', language: 'c')
-	dpdk_extra_ldflags += '-pthread'
-endif
+threads_dep = dependency('threads')
 
 # on some OS, maths functions are in a separate library
 if cc.find_library('m', required : false).found()
diff --git a/lib/librte_metrics/meson.build b/lib/librte_metrics/meson.build
index d5be6a214530..29d922eded53 100644
--- a/lib/librte_metrics/meson.build
+++ b/lib/librte_metrics/meson.build
@@ -4,6 +4,8 @@
 sources = files('rte_metrics.c', 'rte_metrics_telemetry.c')
 headers = files('rte_metrics.h', 'rte_metrics_telemetry.h')
 
+ext_deps += threads_dep
+
 jansson = dependency('jansson', required: false, method: 'pkg-config')
 if jansson.found()
 	dpdk_conf.set('RTE_HAS_JANSSON', 1)
diff --git a/lib/librte_telemetry/meson.build b/lib/librte_telemetry/meson.build
index 719973ff9240..46ac9829e54b 100644
--- a/lib/librte_telemetry/meson.build
+++ b/lib/librte_telemetry/meson.build
@@ -3,6 +3,8 @@
 
 includes = [global_inc]
 
+ext_deps += threads_dep
+
 sources = files('telemetry.c', 'telemetry_data.c', 'telemetry_legacy.c')
 headers = files('rte_telemetry.h')
 includes += include_directories('../librte_metrics')
-- 
2.29.2

[dpdk-dev] [PATCH 3/3] meson: remove unnecessary explicit link to libpcap

[Gabriel Ganne]

libpcap is already found and registered as a dependency by meson, and
the dependency is already correctly used in librte_port. This line is
just unnecessary.

It also has the side effect of messing with the meson link line: dpdk
link will be declared twice: manually and then through pkg-config. If
you configure meson to prefer static linking over dynamic, this will
cause the build to fail on librte_port, since the pcap deps are not yet
seen by the linker.

Signed-off-by: Gabriel Ganne <gabriel.ganne@6wind.com>
---
 config/meson.build | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/meson.build b/config/meson.build
index 0fb7e1b27a0f..3eb90327dfcc 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -177,7 +177,6 @@ if not pcap_dep.found()
 endif
 if pcap_dep.found() and cc.has_header('pcap.h', dependencies: pcap_dep)
 	dpdk_conf.set('RTE_PORT_PCAP', 1)
-	dpdk_extra_ldflags += '-lpcap'
 endif
 
 # for clang 32-bit compiles we need libatomic for 64-bit atomic ops
-- 
2.29.2

Re: [dpdk-dev] [PATCH 1/3] meson: fix minimum required meson version

[Bruce Richardson]

On Mon, Mar 22, 2021 at 09:38:59AM +0100, Gabriel Ganne wrote:
> WARNING: Project targetting '>= 0.47.1' but tried to use feature introduced
>          in '0.48.0': console arg in custom_target
> 
> console argument is used within kernel/linux/kni/meson.build
> 
> Signed-off-by: Gabriel Ganne <gabriel.ganne@6wind.com>
> ---
>  meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meson.build b/meson.build
> index 7778e18200a9..65c46f051365 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -8,7 +8,7 @@ project('DPDK', 'C',
>  		files('VERSION')).stdout().strip(),
>  	license: 'BSD',
>  	default_options: ['buildtype=release', 'default_library=static'],
> -	meson_version: '>= 0.47.1'
> +	meson_version: '>= 0.48.0'
>  )
>  

No objection to this on my part. Rather than bumping to just 0.48, I think
we might as well jump a couple of versions. For example, 0.49 adds support
for "break" and "continue" keywords which could allow loop simplification.
Beyond that, it's a matter of how up-to-date we want to be...

Re: [dpdk-dev] [PATCH 1/3] meson: fix minimum required meson version

[David Marchand]

On Mon, Mar 22, 2021 at 9:39 AM Gabriel Ganne <gabriel.ganne@6wind.com> wrote:
>
> WARNING: Project targetting '>= 0.47.1' but tried to use feature introduced
>          in '0.48.0': console arg in custom_target
>
> console argument is used within kernel/linux/kni/meson.build
>
> Signed-off-by: Gabriel Ganne <gabriel.ganne@6wind.com>
> ---
>  meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meson.build b/meson.build
> index 7778e18200a9..65c46f051365 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -8,7 +8,7 @@ project('DPDK', 'C',
>                 files('VERSION')).stdout().strip(),
>         license: 'BSD',
>         default_options: ['buildtype=release', 'default_library=static'],
> -       meson_version: '>= 0.47.1'
> +       meson_version: '>= 0.48.0'
>  )
>
>  # set up some global vars for compiler, platform, configuration, etc.
> --
> 2.29.2
>

There are references in the docs and the CI is blocked at 0.47.1 explicitly:

.ci/linux-setup.sh:sudo python3 -m pip install --upgrade 'meson==0.47.1'
doc/guides/linux_gsg/sys_reqs.rst:*   Meson (version 0.47.1+) and ninja
doc/guides/prog_guide/build-sdk-meson.rst:3 ``pip`` tool, e.g. ``pip3
install meson``. Version 0.47.1 of meson is
doc/guides/windows_gsg/build_dpdk.rst:Recommended version is either
Meson 0.47.1 (baseline) or the latest release.


-- 
David Marchand

Re: [dpdk-dev] [PATCH 1/3] meson: fix minimum required meson version

[Dmitry Kozlyuk]

2021-03-22 09:34 (UTC+0000), Bruce Richardson:
> On Mon, Mar 22, 2021 at 09:38:59AM +0100, Gabriel Ganne wrote:
> > WARNING: Project targetting '>= 0.47.1' but tried to use feature introduced
> >          in '0.48.0': console arg in custom_target
> > 
> > console argument is used within kernel/linux/kni/meson.build
> > 
> > Signed-off-by: Gabriel Ganne <gabriel.ganne@6wind.com>
> > ---
> >  meson.build | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/meson.build b/meson.build
> > index 7778e18200a9..65c46f051365 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -8,7 +8,7 @@ project('DPDK', 'C',
> >  		files('VERSION')).stdout().strip(),
> >  	license: 'BSD',
> >  	default_options: ['buildtype=release', 'default_library=static'],
> > -	meson_version: '>= 0.47.1'
> > +	meson_version: '>= 0.48.0'
> >  )
> >    
> 
> No objection to this on my part. Rather than bumping to just 0.48, I think
> we might as well jump a couple of versions. For example, 0.49 adds support
> for "break" and "continue" keywords which could allow loop simplification.
> Beyond that, it's a matter of how up-to-date we want to be...

FYI, recalling some TODOs and which versions would allow to resolve them.

From https://mails.dpdk.org/archives/dev/2021-January/196000.html:

	A script to extract object files from library is still required.
	Meson has extract_all_objects(), but they can't be passed as inputs
	to custom_target() until 0.52.0 (commit f431cff809).

buildtools/meson.build:

	# TODO: starting from Meson 0.51.0 use
	# 	python3 = import('python').find_installation('python',
	#		modules : python3_required_modules)

config/meson.build:

	# TODO: use cc.get_linker_id() with Meson >= 0.54
	is_ms_linker = is_windows and (cc.get_id() == 'clang')

Re: [dpdk-dev] [PATCH 1/3] meson: fix minimum required meson version

[Gabriel Ganne]

Hi,

Thanks for the review.

I have some reservations about those TODO: they are about
rewriting the same functionality with a newer meson feature.
No functional change is expected. => Why not write a commit that
implements such a TODO and bumps meson version at the same time
independently ?

In any case, I aimed to set meson's required version to the lowest possible
value
so that distributions would have a chance to provide it. I know we can just
install meson using pip, but it might be nice not to need this.
Below are some versions of meson packages as of today:
  pip: 0.57.1
  rhel-8: 0.49.2
  debian-10: 0.49.2
  ubuntu-18.04: 0.45.1
  ubuntu-20.04: 0.53.2

Going over 0.49.2 will cause DPDK to lose some major distribution's stable
release,
at least out-of-the-box through their respective package manager.

I propose to bump to 0.49.2 here, and leave the TODOs to wait a little
longer.
What do you think ?

Best regards,

P.S. get_linker_id() seems to be introduced in 0.53
See:
https://mesonbuild.com/Release-notes-for-0-53-0.html#compilerget_linker_id

On Mon, Mar 22, 2021 at 4:25 PM Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
wrote:

> 2021-03-22 09:34 (UTC+0000), Bruce Richardson:
> > On Mon, Mar 22, 2021 at 09:38:59AM +0100, Gabriel Ganne wrote:
> > > WARNING: Project targetting '>= 0.47.1' but tried to use feature
> introduced
> > >          in '0.48.0': console arg in custom_target
> > >
> > > console argument is used within kernel/linux/kni/meson.build
> > >
> > > Signed-off-by: Gabriel Ganne <gabriel.ganne@6wind.com>
> > > ---
> > >  meson.build | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/meson.build b/meson.build
> > > index 7778e18200a9..65c46f051365 100644
> > > --- a/meson.build
> > > +++ b/meson.build
> > > @@ -8,7 +8,7 @@ project('DPDK', 'C',
> > >             files('VERSION')).stdout().strip(),
> > >     license: 'BSD',
> > >     default_options: ['buildtype=release', 'default_library=static'],
> > > -   meson_version: '>= 0.47.1'
> > > +   meson_version: '>= 0.48.0'
> > >  )
> > >
> >
> > No objection to this on my part. Rather than bumping to just 0.48, I
> think
> > we might as well jump a couple of versions. For example, 0.49 adds
> support
> > for "break" and "continue" keywords which could allow loop
> simplification.
> > Beyond that, it's a matter of how up-to-date we want to be...
>
> FYI, recalling some TODOs and which versions would allow to resolve them.
>
> From https://mails.dpdk.org/archives/dev/2021-January/196000.html:
>
>         A script to extract object files from library is still required.
>         Meson has extract_all_objects(), but they can't be passed as inputs
>         to custom_target() until 0.52.0 (commit f431cff809).
>
> buildtools/meson.build:
>
>         # TODO: starting from Meson 0.51.0 use
>         #       python3 = import('python').find_installation('python',
>         #               modules : python3_required_modules)
>
> config/meson.build:
>
>         # TODO: use cc.get_linker_id() with Meson >= 0.54
>         is_ms_linker = is_windows and (cc.get_id() == 'clang')
>


-- 
Gabriel Ganne

Re: [dpdk-dev] [PATCH 1/3] meson: fix minimum required meson version

[Andrew Rybchenko]

On 3/23/21 9:22 AM, Gabriel Ganne wrote:
> Hi,
> 
> Thanks for the review.
> 
> I have some reservations about those TODO: they are about
> rewriting the same functionality with a newer meson feature.
> No functional change is expected. => Why not write a commit that
> implements such a TODO and bumps meson version at the same time
> independently ?
> 
> In any case, I aimed to set meson's required version to the lowest possible
> value
> so that distributions would have a chance to provide it. I know we can just
> install meson using pip, but it might be nice not to need this.
> Below are some versions of meson packages as of today:
>   pip: 0.57.1
>   rhel-8: 0.49.2
>   debian-10: 0.49.2
>   ubuntu-18.04: 0.45.1
>   ubuntu-20.04: 0.53.2
> 
> Going over 0.49.2 will cause DPDK to lose some major distribution's stable
> release,
> at least out-of-the-box through their respective package manager.
> 
> I propose to bump to 0.49.2 here, and leave the TODOs to wait a little
> longer.
> What do you think ?

+1

> Best regards,
> 
> P.S. get_linker_id() seems to be introduced in 0.53
> See:
> https://mesonbuild.com/Release-notes-for-0-53-0.html#compilerget_linker_id
> 
> On Mon, Mar 22, 2021 at 4:25 PM Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> wrote:
> 
>> 2021-03-22 09:34 (UTC+0000), Bruce Richardson:
>>> On Mon, Mar 22, 2021 at 09:38:59AM +0100, Gabriel Ganne wrote:
>>>> WARNING: Project targetting '>= 0.47.1' but tried to use feature
>> introduced
>>>>          in '0.48.0': console arg in custom_target
>>>>
>>>> console argument is used within kernel/linux/kni/meson.build
>>>>
>>>> Signed-off-by: Gabriel Ganne <gabriel.ganne@6wind.com>
>>>> ---
>>>>  meson.build | 2 +-
>>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/meson.build b/meson.build
>>>> index 7778e18200a9..65c46f051365 100644
>>>> --- a/meson.build
>>>> +++ b/meson.build
>>>> @@ -8,7 +8,7 @@ project('DPDK', 'C',
>>>>             files('VERSION')).stdout().strip(),
>>>>     license: 'BSD',
>>>>     default_options: ['buildtype=release', 'default_library=static'],
>>>> -   meson_version: '>= 0.47.1'
>>>> +   meson_version: '>= 0.48.0'
>>>>  )
>>>>
>>>
>>> No objection to this on my part. Rather than bumping to just 0.48, I
>> think
>>> we might as well jump a couple of versions. For example, 0.49 adds
>> support
>>> for "break" and "continue" keywords which could allow loop
>> simplification.
>>> Beyond that, it's a matter of how up-to-date we want to be...
>>
>> FYI, recalling some TODOs and which versions would allow to resolve them.
>>
>> From https://mails.dpdk.org/archives/dev/2021-January/196000.html:
>>
>>         A script to extract object files from library is still required.
>>         Meson has extract_all_objects(), but they can't be passed as inputs
>>         to custom_target() until 0.52.0 (commit f431cff809).
>>
>> buildtools/meson.build:
>>
>>         # TODO: starting from Meson 0.51.0 use
>>         #       python3 = import('python').find_installation('python',
>>         #               modules : python3_required_modules)
>>
>> config/meson.build:
>>
>>         # TODO: use cc.get_linker_id() with Meson >= 0.54
>>         is_ms_linker = is_windows and (cc.get_id() == 'clang')
>>
> 
> 

Re: [dpdk-dev] [PATCH 1/3] meson: fix minimum required meson version

[Dmitry Kozlyuk]

2021-03-23 07:22 (UTC+0100), Gabriel Ganne:
> Hi,
> 
> Thanks for the review.
> 
> I have some reservations about those TODO: they are about
> rewriting the same functionality with a newer meson feature.
> No functional change is expected. => Why not write a commit that
> implements such a TODO and bumps meson version at the same time
> independently ?
> 
> In any case, I aimed to set meson's required version to the lowest possible
> value
> so that distributions would have a chance to provide it. I know we can just
> install meson using pip, but it might be nice not to need this.
> Below are some versions of meson packages as of today:
>   pip: 0.57.1
>   rhel-8: 0.49.2
>   debian-10: 0.49.2
>   ubuntu-18.04: 0.45.1
>   ubuntu-20.04: 0.53.2
> 
> Going over 0.49.2 will cause DPDK to lose some major distribution's stable
> release,
> at least out-of-the-box through their respective package manager.
> 
> I propose to bump to 0.49.2 here, and leave the TODOs to wait a little
> longer.
> What do you think ?

Yes, sounds practical.
I rather meant to recollect known TODOs then to propose solving all at once.

Re: [dpdk-dev] [PATCH 1/3] meson: fix minimum required meson version

[Bruce Richardson]

On Tue, Mar 23, 2021 at 07:22:00AM +0100, Gabriel Ganne wrote:
>    Hi,
>    Thanks for the review.
>    I have some reservations about those TODO: they are about
>    rewriting the same functionality with a newer meson feature.
>    No functional change is expected. => Why not write a commit that
>    implements such a TODO and bumps meson version at the same time
>    independently ?
>    In any case, I aimed to set meson's required version to the lowest
>    possible value
>    so that distributions would have a chance to provide it. I know we can
>    just
>    install meson using pip, but it might be nice not to need this.
>    Below are some versions of meson packages as of today:
>      pip: 0.57.1
>      rhel-8: 0.49.2
>      debian-10: 0.49.2
>      ubuntu-18.04: 0.45.1
>      ubuntu-20.04: 0.53.2
>    Going over 0.49.2 will cause DPDK to lose some major distribution's
>    stable release,
>    at least out-of-the-box through their respective package manager.
>    I propose to bump to 0.49.2 here, and leave the TODOs to wait a little
>    longer.

+1
However, I don't think we need the ".2" specifically, since new features
don't come in point releases, so I'd suggest just making "0.49" the
minimum.

Re: [dpdk-dev] [PATCH 1/3] meson: fix minimum required meson version

[Bruce Richardson]

On Tue, Mar 23, 2021 at 09:38:25AM +0000, Bruce Richardson wrote:
> On Tue, Mar 23, 2021 at 07:22:00AM +0100, Gabriel Ganne wrote:
> >    Hi,
> >    Thanks for the review.
> >    I have some reservations about those TODO: they are about
> >    rewriting the same functionality with a newer meson feature.
> >    No functional change is expected. => Why not write a commit that
> >    implements such a TODO and bumps meson version at the same time
> >    independently ?
> >    In any case, I aimed to set meson's required version to the lowest
> >    possible value
> >    so that distributions would have a chance to provide it. I know we can
> >    just
> >    install meson using pip, but it might be nice not to need this.
> >    Below are some versions of meson packages as of today:
> >      pip: 0.57.1
> >      rhel-8: 0.49.2
> >      debian-10: 0.49.2
> >      ubuntu-18.04: 0.45.1
> >      ubuntu-20.04: 0.53.2
> >    Going over 0.49.2 will cause DPDK to lose some major distribution's
> >    stable release,
> >    at least out-of-the-box through their respective package manager.
> >    I propose to bump to 0.49.2 here, and leave the TODOs to wait a little
> >    longer.
> 
> +1
> However, I don't think we need the ".2" specifically, since new features
> don't come in point releases, so I'd suggest just making "0.49" the
> minimum.

To partially contradict myself here, there is a bug[1] present in earlier
releases of meson which can affect building OVS and apps using pkg-config
for DPDK. This has been fixed[2] in 0.50 release onwards, but also backported
to meson 0.49.1. Therefore, for sanity, we may indeed want to bump the
version to 0.49.1 (or .2 if you like) rather than 0.49 as I suggested here.

/Bruce

[1] https://github.com/mesonbuild/meson/issues/4091
[2] https://github.com/mesonbuild/meson/commit/261ab9b2140005d4f7e42118ccb6598fa5b7f15d