[dpdk-dev] [PATCH] build: add option to override max ethports

[dpdk-dev] [PATCH] build: add option to override max ethports

[Chas Williams]

Allow users and packagers to override the default RTE_MAX_ETHPORTS.
This adds a new meson option, max_ethports which defaults to the
current value.

Signed-off-by: Chas Williams <3chas3@gmail.com>
---
 config/meson.build  | 1 +
 config/rte_config.h | 1 -
 meson_options.txt   | 2 ++
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/meson.build b/config/meson.build
index db32499b3..e59507065 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -103,6 +103,7 @@ endforeach
 # set other values pulled from the build options
 dpdk_conf.set('RTE_MAX_LCORE', get_option('max_lcores'))
 dpdk_conf.set('RTE_MAX_NUMA_NODES', get_option('max_numa_nodes'))
+dpdk_conf.set('RTE_MAX_ETHPORTS', get_option('max_ethports'))
 dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet'))
 dpdk_conf.set('RTE_EAL_ALLOW_INV_SOCKET_ID', get_option('allow_invalid_socket_id'))
 # values which have defaults which may be overridden
diff --git a/config/rte_config.h b/config/rte_config.h
index d3732e953..7606f5d7b 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -51,7 +51,6 @@
 #define RTE_PKTMBUF_HEADROOM 128
 
 /* ether defines */
-#define RTE_MAX_ETHPORTS 32
 #define RTE_MAX_QUEUES_PER_PORT 1024
 #define RTE_ETHDEV_QUEUE_STAT_CNTRS 16
 #define RTE_ETHDEV_RXTX_CALLBACKS 1
diff --git a/meson_options.txt b/meson_options.txt
index 574054597..e54eedc66 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -28,3 +28,5 @@ option('use_hpet', type: 'boolean', value: false,
 	description: 'use HPET timer in EAL')
 option('tests', type: 'boolean', value: true,
 	description: 'build unit tests')
+option('max_ethports', type: 'string', value: '32',
+	description: 'maximum number of Ethernet devices in EAL')
-- 
2.17.2

Re: [dpdk-dev] [PATCH] build: add option to override max ethports

[Bruce Richardson]

On Wed, Jan 30, 2019 at 09:18:58PM -0500, Chas Williams wrote:
> Allow users and packagers to override the default RTE_MAX_ETHPORTS.
> This adds a new meson option, max_ethports which defaults to the
> current value.
> 
> Signed-off-by: Chas Williams <3chas3@gmail.com>

Agree with the idea. Just one small comment below re alphabetical order.

Otherwise:
Acked-by: Bruce Richardson <bruce.richardson@intel.com>

> ---
>  config/meson.build  | 1 +
>  config/rte_config.h | 1 -
>  meson_options.txt   | 2 ++
>  3 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/config/meson.build b/config/meson.build
> index db32499b3..e59507065 100644
> --- a/config/meson.build
> +++ b/config/meson.build
> @@ -103,6 +103,7 @@ endforeach
>  # set other values pulled from the build options
>  dpdk_conf.set('RTE_MAX_LCORE', get_option('max_lcores'))
>  dpdk_conf.set('RTE_MAX_NUMA_NODES', get_option('max_numa_nodes'))
> +dpdk_conf.set('RTE_MAX_ETHPORTS', get_option('max_ethports'))
>  dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet'))
>  dpdk_conf.set('RTE_EAL_ALLOW_INV_SOCKET_ID', get_option('allow_invalid_socket_id'))
>  # values which have defaults which may be overridden
> diff --git a/config/rte_config.h b/config/rte_config.h
> index d3732e953..7606f5d7b 100644
> --- a/config/rte_config.h
> +++ b/config/rte_config.h
> @@ -51,7 +51,6 @@
>  #define RTE_PKTMBUF_HEADROOM 128
>  
>  /* ether defines */
> -#define RTE_MAX_ETHPORTS 32
>  #define RTE_MAX_QUEUES_PER_PORT 1024
>  #define RTE_ETHDEV_QUEUE_STAT_CNTRS 16
>  #define RTE_ETHDEV_RXTX_CALLBACKS 1
> diff --git a/meson_options.txt b/meson_options.txt
> index 574054597..e54eedc66 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -28,3 +28,5 @@ option('use_hpet', type: 'boolean', value: false,
>  	description: 'use HPET timer in EAL')
>  option('tests', type: 'boolean', value: true,
>  	description: 'build unit tests')
> +option('max_ethports', type: 'string', value: '32',
> +	description: 'maximum number of Ethernet devices in EAL')
> -- 

We are trying to keep the options in alphabetical order, so this setting
should be just before "max_lcores" rather than at the end.

Interestingly, I see that since 0.45 there is now the option of an
"integer" option type. We should probably switch to use that once we bump
our minimum meson version. [Luca, perhaps another change for your set?]
Ref: http://mesonbuild.com/Build-options.html#integers

Re: [dpdk-dev] [PATCH] build: add option to override max ethports

[Chas Williams]

On 1/31/19 4:32 AM, Bruce Richardson wrote:
> On Wed, Jan 30, 2019 at 09:18:58PM -0500, Chas Williams wrote:
>> Allow users and packagers to override the default RTE_MAX_ETHPORTS.
>> This adds a new meson option, max_ethports which defaults to the
>> current value.
>>
>> Signed-off-by: Chas Williams <3chas3@gmail.com>
> 
> Agree with the idea. Just one small comment below re alphabetical order.
> 
> Otherwise:
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> 
...
> 
> We are trying to keep the options in alphabetical order, so this setting
> should be just before "max_lcores" rather than at the end.

If you look at the last few lines in this file:

	option('use_hpet', type: 'boolean', value: false,
		description: 'use HPET timer in EAL')
	option('tests', type: 'boolean', value: true,
		description: 'build unit tests')

I couldn't detect any ordering so I just appended.  I can submit a v2.

> Interestingly, I see that since 0.45 there is now the option of an
> "integer" option type. We should probably switch to use that once we bump
> our minimum meson version. [Luca, perhaps another change for your set?]
> Ref: http://mesonbuild.com/Build-options.html#integers

I just followed along with what everyone else was doing.

[dpdk-dev] [PATCH 1/2 v2] build: add option to override max ethports

[Chas Williams]

Allow users and packagers to override the default RTE_MAX_ETHPORTS.
This adds a new meson option, max_ethports which defaults to the
current value.

Signed-off-by: Chas Williams <3chas3@gmail.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
 config/meson.build  | 1 +
 config/rte_config.h | 1 -
 meson_options.txt   | 2 ++
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/meson.build b/config/meson.build
index db32499b3..e59507065 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -103,6 +103,7 @@ endforeach
 # set other values pulled from the build options
 dpdk_conf.set('RTE_MAX_LCORE', get_option('max_lcores'))
 dpdk_conf.set('RTE_MAX_NUMA_NODES', get_option('max_numa_nodes'))
+dpdk_conf.set('RTE_MAX_ETHPORTS', get_option('max_ethports'))
 dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet'))
 dpdk_conf.set('RTE_EAL_ALLOW_INV_SOCKET_ID', get_option('allow_invalid_socket_id'))
 # values which have defaults which may be overridden
diff --git a/config/rte_config.h b/config/rte_config.h
index d3732e953..7606f5d7b 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -51,7 +51,6 @@
 #define RTE_PKTMBUF_HEADROOM 128
 
 /* ether defines */
-#define RTE_MAX_ETHPORTS 32
 #define RTE_MAX_QUEUES_PER_PORT 1024
 #define RTE_ETHDEV_QUEUE_STAT_CNTRS 16
 #define RTE_ETHDEV_RXTX_CALLBACKS 1
diff --git a/meson_options.txt b/meson_options.txt
index 574054597..499573ed4 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -18,6 +18,8 @@ option('lib_musdk_dir', type: 'string', value: '',
 	description: 'path to the MUSDK library installation directory')
 option('machine', type: 'string', value: 'native',
 	description: 'set the target machine type')
+option('max_ethports', type: 'string', value: '64',
+	description: 'maximum number of Ethernet devices in EAL')
 option('max_lcores', type: 'string', value: '128',
 	description: 'maximum number of cores/threads supported by EAL')
 option('max_numa_nodes', type: 'string', value: '4',
-- 
2.17.2

[dpdk-dev] [PATCH 2/2,v2] build: fix option ordering

[Chas Williams]

Sort the options alphabetically and make a note of the preferred
order at the top of the file.

Signed-off-by: Chas Williams <3chas3@gmail.com>
---
 meson_options.txt | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/meson_options.txt b/meson_options.txt
index 499573ed4..db448c74e 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,15 +1,17 @@
+# Please keep these options sorted alphabetically.
+
 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('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-<VERSION>',
 	description: 'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.')
-option('ibverbs_link', type: 'combo', choices : ['shared', 'dlopen'], value: 'shared',
-	description: 'Linkage method (shared/dlopen) for Mellanox PMDs with ibverbs dependencies.')
-option('enable_kmods', type: 'boolean', value: true,
-	description: 'build kernel modules')
 option('enable_docs', type: 'boolean', value: false,
 	description: 'build documentation')
+option('enable_kmods', type: 'boolean', value: true,
+	description: 'build kernel modules')
 option('examples', type: 'string', value: '',
 	description: 'Comma-separated list of examples to build by default')
+option('ibverbs_link', type: 'combo', choices : ['shared', 'dlopen'], value: 'shared',
+	description: 'Linkage method (shared/dlopen) for Mellanox PMDs with ibverbs dependencies.')
 option('include_subdir_arch', type: 'string', value: '',
 	description: 'subdirectory where to install arch-dependent headers')
 option('kernel_dir', type: 'string', value: '',
@@ -26,7 +28,7 @@ option('max_numa_nodes', type: 'string', value: '4',
 	description: 'maximum number of NUMA nodes supported by EAL')
 option('per_library_versions', type: 'boolean', value: true,
 	description: 'true: each lib gets its own version number, false: DPDK version used for each lib')
-option('use_hpet', type: 'boolean', value: false,
-	description: 'use HPET timer in EAL')
 option('tests', type: 'boolean', value: true,
 	description: 'build unit tests')
+option('use_hpet', type: 'boolean', value: false,
+	description: 'use HPET timer in EAL')
-- 
2.17.2

Re: [dpdk-dev] [PATCH] build: add option to override max ethports

[Bruce Richardson]

On Thu, Jan 31, 2019 at 06:26:41PM -0500, Chas Williams wrote:
> 
> 
> On 1/31/19 4:32 AM, Bruce Richardson wrote:
> > On Wed, Jan 30, 2019 at 09:18:58PM -0500, Chas Williams wrote:
> > > Allow users and packagers to override the default RTE_MAX_ETHPORTS.
> > > This adds a new meson option, max_ethports which defaults to the
> > > current value.
> > > 
> > > Signed-off-by: Chas Williams <3chas3@gmail.com>
> > 
> > Agree with the idea. Just one small comment below re alphabetical order.
> > 
> > Otherwise:
> > Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> > 
> ...
> > 
> > We are trying to keep the options in alphabetical order, so this setting
> > should be just before "max_lcores" rather than at the end.
> 
> If you look at the last few lines in this file:
> 
> 	option('use_hpet', type: 'boolean', value: false,
> 		description: 'use HPET timer in EAL')
> 	option('tests', type: 'boolean', value: true,
> 		description: 'build unit tests')
> 
> I couldn't detect any ordering so I just appended.  I can submit a v2.

Yes, that was an oversight that was missed when we were adding those
options, or I just got my alphabet scrambled in my mind. :-) Thanks for the
v2.

> 
> > Interestingly, I see that since 0.45 there is now the option of an
> > "integer" option type. We should probably switch to use that once we bump
> > our minimum meson version. [Luca, perhaps another change for your set?]
> > Ref: http://mesonbuild.com/Build-options.html#integers
> 
> I just followed along with what everyone else was doing.

Yep, no problem here. Since we still support from 0.41 onwards we can't use
integer anyway, so what you did is perfectly correct.

Re: [dpdk-dev] [PATCH 1/2 v2] build: add option to override max ethports

[Bruce Richardson]

On Thu, Jan 31, 2019 at 06:53:25PM -0500, Chas Williams wrote:
> Allow users and packagers to override the default RTE_MAX_ETHPORTS.
> This adds a new meson option, max_ethports which defaults to the
> current value.
> 

Actually in this v2, you have changed it to 64 from 32. :-) Otherwise all
fine, but perhaps this can be fixed on apply if no v3.

> Signed-off-by: Chas Williams <3chas3@gmail.com>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
>  config/meson.build  | 1 +
>  config/rte_config.h | 1 -
>  meson_options.txt   | 2 ++
>  3 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/config/meson.build b/config/meson.build
> index db32499b3..e59507065 100644
> --- a/config/meson.build
> +++ b/config/meson.build
> @@ -103,6 +103,7 @@ endforeach
>  # set other values pulled from the build options
>  dpdk_conf.set('RTE_MAX_LCORE', get_option('max_lcores'))
>  dpdk_conf.set('RTE_MAX_NUMA_NODES', get_option('max_numa_nodes'))
> +dpdk_conf.set('RTE_MAX_ETHPORTS', get_option('max_ethports'))
>  dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet'))
>  dpdk_conf.set('RTE_EAL_ALLOW_INV_SOCKET_ID', get_option('allow_invalid_socket_id'))
>  # values which have defaults which may be overridden
> diff --git a/config/rte_config.h b/config/rte_config.h
> index d3732e953..7606f5d7b 100644
> --- a/config/rte_config.h
> +++ b/config/rte_config.h
> @@ -51,7 +51,6 @@
>  #define RTE_PKTMBUF_HEADROOM 128
>  
>  /* ether defines */
> -#define RTE_MAX_ETHPORTS 32
>  #define RTE_MAX_QUEUES_PER_PORT 1024
>  #define RTE_ETHDEV_QUEUE_STAT_CNTRS 16
>  #define RTE_ETHDEV_RXTX_CALLBACKS 1
> diff --git a/meson_options.txt b/meson_options.txt
> index 574054597..499573ed4 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -18,6 +18,8 @@ option('lib_musdk_dir', type: 'string', value: '',
>  	description: 'path to the MUSDK library installation directory')
>  option('machine', type: 'string', value: 'native',
>  	description: 'set the target machine type')
> +option('max_ethports', type: 'string', value: '64',
> +	description: 'maximum number of Ethernet devices in EAL')
>  option('max_lcores', type: 'string', value: '128',
>  	description: 'maximum number of cores/threads supported by EAL')
>  option('max_numa_nodes', type: 'string', value: '4',
> -- 
> 2.17.2
> 

Re: [dpdk-dev] [PATCH 2/2,v2] build: fix option ordering

[Bruce Richardson]

On Thu, Jan 31, 2019 at 06:59:20PM -0500, Chas Williams wrote:
> Sort the options alphabetically and make a note of the preferred
> order at the top of the file.
> 
> Signed-off-by: Chas Williams <3chas3@gmail.com>
> ---
>  meson_options.txt | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
> 
Thanks for the cleanup.

Acked-by: Bruce Richardson <bruce.richardson@intel.com>

Re: [dpdk-dev] [PATCH 1/2 v2] build: add option to override max ethports

[Chas Williams]

On 2/4/19 4:49 AM, Bruce Richardson wrote:
> On Thu, Jan 31, 2019 at 06:53:25PM -0500, Chas Williams wrote:
>> Allow users and packagers to override the default RTE_MAX_ETHPORTS.
>> This adds a new meson option, max_ethports which defaults to the
>> current value.
>>
> 
> Actually in this v2, you have changed it to 64 from 32. :-) Otherwise all
> fine, but perhaps this can be fixed on apply if no v3.

Oops. I can make it 32 again.

> 
>> Signed-off-by: Chas Williams <3chas3@gmail.com>
>> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
>> ---
>>   config/meson.build  | 1 +
>>   config/rte_config.h | 1 -
>>   meson_options.txt   | 2 ++
>>   3 files changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/config/meson.build b/config/meson.build
>> index db32499b3..e59507065 100644
>> --- a/config/meson.build
>> +++ b/config/meson.build
>> @@ -103,6 +103,7 @@ endforeach
>>   # set other values pulled from the build options
>>   dpdk_conf.set('RTE_MAX_LCORE', get_option('max_lcores'))
>>   dpdk_conf.set('RTE_MAX_NUMA_NODES', get_option('max_numa_nodes'))
>> +dpdk_conf.set('RTE_MAX_ETHPORTS', get_option('max_ethports'))
>>   dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet'))
>>   dpdk_conf.set('RTE_EAL_ALLOW_INV_SOCKET_ID', get_option('allow_invalid_socket_id'))
>>   # values which have defaults which may be overridden
>> diff --git a/config/rte_config.h b/config/rte_config.h
>> index d3732e953..7606f5d7b 100644
>> --- a/config/rte_config.h
>> +++ b/config/rte_config.h
>> @@ -51,7 +51,6 @@
>>   #define RTE_PKTMBUF_HEADROOM 128
>>   
>>   /* ether defines */
>> -#define RTE_MAX_ETHPORTS 32
>>   #define RTE_MAX_QUEUES_PER_PORT 1024
>>   #define RTE_ETHDEV_QUEUE_STAT_CNTRS 16
>>   #define RTE_ETHDEV_RXTX_CALLBACKS 1
>> diff --git a/meson_options.txt b/meson_options.txt
>> index 574054597..499573ed4 100644
>> --- a/meson_options.txt
>> +++ b/meson_options.txt
>> @@ -18,6 +18,8 @@ option('lib_musdk_dir', type: 'string', value: '',
>>   	description: 'path to the MUSDK library installation directory')
>>   option('machine', type: 'string', value: 'native',
>>   	description: 'set the target machine type')
>> +option('max_ethports', type: 'string', value: '64',
>> +	description: 'maximum number of Ethernet devices in EAL')
>>   option('max_lcores', type: 'string', value: '128',
>>   	description: 'maximum number of cores/threads supported by EAL')
>>   option('max_numa_nodes', type: 'string', value: '4',
>> -- 
>> 2.17.2
>>

Re: [dpdk-dev] [PATCH] build: add option to override max ethports

[Luca Boccassi]

On Thu, 2019-01-31 at 09:32 +0000, Bruce Richardson wrote:
> On Wed, Jan 30, 2019 at 09:18:58PM -0500, Chas Williams wrote:
> > Allow users and packagers to override the default RTE_MAX_ETHPORTS.
> > This adds a new meson option, max_ethports which defaults to the
> > current value.
> > 
> > Signed-off-by: Chas Williams <3chas3@gmail.com>
> 
> Agree with the idea. Just one small comment below re alphabetical
> order.
> 
> Otherwise:
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> 
> > ---
> >  config/meson.build  | 1 +
> >  config/rte_config.h | 1 -
> >  meson_options.txt   | 2 ++
> >  3 files changed, 3 insertions(+), 1 deletion(-)
> > 
> > diff --git a/config/meson.build b/config/meson.build
> > index db32499b3..e59507065 100644
> > --- a/config/meson.build
> > +++ b/config/meson.build
> > @@ -103,6 +103,7 @@ endforeach
> >  # set other values pulled from the build options
> >  dpdk_conf.set('RTE_MAX_LCORE', get_option('max_lcores'))
> >  dpdk_conf.set('RTE_MAX_NUMA_NODES', get_option('max_numa_nodes'))
> > +dpdk_conf.set('RTE_MAX_ETHPORTS', get_option('max_ethports'))
> >  dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet'))
> >  dpdk_conf.set('RTE_EAL_ALLOW_INV_SOCKET_ID',
> > get_option('allow_invalid_socket_id'))
> >  # values which have defaults which may be overridden
> > diff --git a/config/rte_config.h b/config/rte_config.h
> > index d3732e953..7606f5d7b 100644
> > --- a/config/rte_config.h
> > +++ b/config/rte_config.h
> > @@ -51,7 +51,6 @@
> >  #define RTE_PKTMBUF_HEADROOM 128
> >  
> >  /* ether defines */
> > -#define RTE_MAX_ETHPORTS 32
> >  #define RTE_MAX_QUEUES_PER_PORT 1024
> >  #define RTE_ETHDEV_QUEUE_STAT_CNTRS 16
> >  #define RTE_ETHDEV_RXTX_CALLBACKS 1
> > diff --git a/meson_options.txt b/meson_options.txt
> > index 574054597..e54eedc66 100644
> > --- a/meson_options.txt
> > +++ b/meson_options.txt
> > @@ -28,3 +28,5 @@ option('use_hpet', type: 'boolean', value: false,
> >  	description: 'use HPET timer in EAL')
> >  option('tests', type: 'boolean', value: true,
> >  	description: 'build unit tests')
> > +option('max_ethports', type: 'string', value: '32',
> > +	description: 'maximum number of Ethernet devices in EAL')
> > -- 
> 
> We are trying to keep the options in alphabetical order, so this
> setting
> should be just before "max_lcores" rather than at the end.
> 
> Interestingly, I see that since 0.45 there is now the option of an
> "integer" option type. We should probably switch to use that once we
> bump
> our minimum meson version. [Luca, perhaps another change for your
> set?]
> Ref: http://mesonbuild.com/Build-options.html#integers

Sounds good, I've added this change in v6 of the series

-- 
Kind regards,
Luca Boccassi

[dpdk-dev] [v3, PATCH 1/2] build: add option to override max ethports

[Chas Williams]

Allow users and packagers to override the default RTE_MAX_ETHPORTS.
This adds a new meson option, max_ethports which defaults to the
current value.

Signed-off-by: Chas Williams <3chas3@gmail.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
 config/meson.build  | 1 +
 config/rte_config.h | 1 -
 meson_options.txt   | 2 ++
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/meson.build b/config/meson.build
index db32499b3..e59507065 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -103,6 +103,7 @@ endforeach
 # set other values pulled from the build options
 dpdk_conf.set('RTE_MAX_LCORE', get_option('max_lcores'))
 dpdk_conf.set('RTE_MAX_NUMA_NODES', get_option('max_numa_nodes'))
+dpdk_conf.set('RTE_MAX_ETHPORTS', get_option('max_ethports'))
 dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet'))
 dpdk_conf.set('RTE_EAL_ALLOW_INV_SOCKET_ID', get_option('allow_invalid_socket_id'))
 # values which have defaults which may be overridden
diff --git a/config/rte_config.h b/config/rte_config.h
index d3732e953..7606f5d7b 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -51,7 +51,6 @@
 #define RTE_PKTMBUF_HEADROOM 128
 
 /* ether defines */
-#define RTE_MAX_ETHPORTS 32
 #define RTE_MAX_QUEUES_PER_PORT 1024
 #define RTE_ETHDEV_QUEUE_STAT_CNTRS 16
 #define RTE_ETHDEV_RXTX_CALLBACKS 1
diff --git a/meson_options.txt b/meson_options.txt
index 574054597..5bae08bb3 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -18,6 +18,8 @@ option('lib_musdk_dir', type: 'string', value: '',
 	description: 'path to the MUSDK library installation directory')
 option('machine', type: 'string', value: 'native',
 	description: 'set the target machine type')
+option('max_ethports', type: 'string', value: '32',
+	description: 'maximum number of Ethernet devices in EAL')
 option('max_lcores', type: 'string', value: '128',
 	description: 'maximum number of cores/threads supported by EAL')
 option('max_numa_nodes', type: 'string', value: '4',
-- 
2.17.2

[dpdk-dev] [v3,PATCH 2/2] build: fix option ordering

[Chas Williams]

Sort the options alphabetically and make a note of the preferred
order at the top of the file.

Signed-off-by: Chas Williams <3chas3@gmail.com>
---
 meson_options.txt | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/meson_options.txt b/meson_options.txt
index 5bae08bb3..c6454fe29 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,15 +1,17 @@
+# Please keep these options sorted alphabetically.
+
 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('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-<VERSION>',
 	description: 'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.')
-option('ibverbs_link', type: 'combo', choices : ['shared', 'dlopen'], value: 'shared',
-	description: 'Linkage method (shared/dlopen) for Mellanox PMDs with ibverbs dependencies.')
-option('enable_kmods', type: 'boolean', value: true,
-	description: 'build kernel modules')
 option('enable_docs', type: 'boolean', value: false,
 	description: 'build documentation')
+option('enable_kmods', type: 'boolean', value: true,
+	description: 'build kernel modules')
 option('examples', type: 'string', value: '',
 	description: 'Comma-separated list of examples to build by default')
+option('ibverbs_link', type: 'combo', choices : ['shared', 'dlopen'], value: 'shared',
+	description: 'Linkage method (shared/dlopen) for Mellanox PMDs with ibverbs dependencies.')
 option('include_subdir_arch', type: 'string', value: '',
 	description: 'subdirectory where to install arch-dependent headers')
 option('kernel_dir', type: 'string', value: '',
@@ -26,7 +28,7 @@ option('max_numa_nodes', type: 'string', value: '4',
 	description: 'maximum number of NUMA nodes supported by EAL')
 option('per_library_versions', type: 'boolean', value: true,
 	description: 'true: each lib gets its own version number, false: DPDK version used for each lib')
-option('use_hpet', type: 'boolean', value: false,
-	description: 'use HPET timer in EAL')
 option('tests', type: 'boolean', value: true,
 	description: 'build unit tests')
+option('use_hpet', type: 'boolean', value: false,
+	description: 'use HPET timer in EAL')
-- 
2.17.2

Re: [dpdk-dev] [v3,PATCH 2/2] build: fix option ordering

[Bruce Richardson]

On Thu, Feb 07, 2019 at 10:53:18AM -0500, Chas Williams wrote:
> Sort the options alphabetically and make a note of the preferred
> order at the top of the file.
> 
> Signed-off-by: Chas Williams <3chas3@gmail.com>
> ---
Acked-by: Bruce Richardson <bruce.richardson@intel.com>

Re: [dpdk-dev] [v3, PATCH 1/2] build: add option to override max ethports

[Thomas Monjalon]

07/02/2019 16:53, Chas Williams:
> Allow users and packagers to override the default RTE_MAX_ETHPORTS.
> This adds a new meson option, max_ethports which defaults to the
> current value.
> 
> Signed-off-by: Chas Williams <3chas3@gmail.com>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
> --- a/meson_options.txt
> +++ b/meson_options.txt
> +option('max_ethports', type: 'string', value: '32',
> +	description: 'maximum number of Ethernet devices in EAL')

Removing (while applying) "in EAL" because it is in ethdev lib.

Re: [dpdk-dev] [v3,PATCH 2/2] build: fix option ordering

[Thomas Monjalon]

07/02/2019 17:35, Bruce Richardson:
> On Thu, Feb 07, 2019 at 10:53:18AM -0500, Chas Williams wrote:
> > Sort the options alphabetically and make a note of the preferred
> > order at the top of the file.
> > 
> > Signed-off-by: Chas Williams <3chas3@gmail.com>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>

Series applied with a small fix in the meson description.