[PATCH 0/6] fix for meson builds in freebsd

[PATCH 0/6] fix for meson builds in freebsd

[Agalya Babu RadhaKrishnan]

Compilation issues were observed in FreeBSD when built via meson.
VFIO flags are enabled/disabled based on linux/freebsd.
Changes are done in meson.build files to ensure
the build of drivers are enabled/disabled based on platform.

1/6: set/unset of vfio flags based on platforms
2/6: updated net/nfp meson build
3/6: updated net/avp meson build
4/6: updated net/softnic meson build
5/6: updated net/tap meson build
6/6: updated net/vdev_netvsc meson build 

Signed-off-by: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan@intel.com>

Agalya Babu RadhaKrishnan (6):
  build: fix for FREEBSD build via meson
  net/nfp: disable nfp build in FREEBSD
  net/avp: disable avp build in FREEBSD
  net/softnic: disable softnic build in FREEBSD
  net/tap: disable tap build in FREEBSD
  net/vdev_netvsc: disable vdev netvsc build in FREEBSD

 config/rte_config.h                 | 1 -
 drivers/net/avp/meson.build         | 3 +++
 drivers/net/nfp/meson.build         | 3 +++
 drivers/net/softnic/meson.build     | 3 +++
 drivers/net/tap/meson.build         | 3 +++
 drivers/net/vdev_netvsc/meson.build | 3 +++
 lib/meson.build                     | 6 ++++++
 7 files changed, 21 insertions(+), 1 deletion(-)

-- 
2.13.6

[PATCH 1/6] build: fix for FREEBSD build via meson

[Agalya Babu RadhaKrishnan]

FreeBSD compilation was failing through meson build.
RTE_EAL_VFIO is not supported in FreeBSD.
But RTE_EAL_VFIO was enabled for both linux and freebsd.
So RTE_EAL_VFIO is removed from config/rte_config.h and
based on the platform RTE_EAL_VFIO flag is enabled/disabled appropriately.

Fixes: 6e8a721044 ("vfio: export functions even when disabled")

Signed-off-by: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan@intel.com>
---
 config/rte_config.h | 1 -
 lib/meson.build     | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/config/rte_config.h b/config/rte_config.h
index 567051b9c..53c568929 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -34,7 +34,6 @@
 #define RTE_MAX_TAILQ 32
 #define RTE_LOG_DP_LEVEL RTE_LOG_INFO
 #define RTE_BACKTRACE 1
-#define RTE_EAL_VFIO 1
 #define RTE_MAX_VFIO_CONTAINERS 64
 
 /* bsd module defines */
diff --git a/lib/meson.build b/lib/meson.build
index 3acc67e6e..1b20027a5 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -31,6 +31,12 @@ if cc.has_argument('-Wno-format-truncation')
 	default_cflags += '-Wno-format-truncation'
 endif
 
+if host_machine.system() == 'linux'
+	dpdk_conf.set('RTE_EAL_VFIO', true)
+else
+	dpdk_conf.set('RTE_EAL_VFIO', false)
+endif
+
 enabled_libs = [] # used to print summary at the end
 foreach l:libraries
 	build = true
-- 
2.13.6

[PATCH 2/6] net/nfp: disable nfp build in FREEBSD

[Agalya Babu RadhaKrishnan]

Disabled nfp build in FreeBSD because it is not supported
Added changes to enable NFP build if it is Linux OS and
disable in FreeBSD.

Fixes: 6e8a721044 ("vfio: export functions even when disabled")

Signed-off-by: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan@intel.com>
---
 drivers/net/nfp/meson.build | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build
index 3ba37e279..a8f29f986 100644
--- a/drivers/net/nfp/meson.build
+++ b/drivers/net/nfp/meson.build
@@ -1,6 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Intel Corporation
 
+if host_machine.system() != 'linux'
+        build = false
+endif
 sources = files('nfpcore/nfp_cpp_pcie_ops.c',
 	'nfpcore/nfp_nsp.c',
 	'nfpcore/nfp_cppcore.c',
-- 
2.13.6

[PATCH 3/6] net/avp: disable avp build in FREEBSD

[Agalya Babu RadhaKrishnan]

Disabled avp build in FreeBSD because it is not supported.
Added changes to enable avp build if it is Linux OS and
disable in FreeBSD.

Fixes: 6e8a721044 ("vfio: export functions even when disabled")

Signed-off-by: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan@intel.com>
---
 drivers/net/avp/meson.build | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/avp/meson.build b/drivers/net/avp/meson.build
index 6076c31b9..b7ffdfc80 100644
--- a/drivers/net/avp/meson.build
+++ b/drivers/net/avp/meson.build
@@ -1,5 +1,8 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Intel Corporation
 
+if host_machine.system() != 'linux'
+        build = false
+endif
 sources = files('avp_ethdev.c')
 install_headers('rte_avp_common.h', 'rte_avp_fifo.h')
-- 
2.13.6

[PATCH 4/6] net/softnic: disable softnic build in FREEBSD

[Agalya Babu RadhaKrishnan]

Disabled softnic build in FreeBSD because it is not supported
Added changes to enable softnic build if it is Linux OS and
disable in FreeBSD.

Fixes: 6e8a721044 ("vfio: export functions even when disabled")

Signed-off-by: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan@intel.com>
---
 drivers/net/softnic/meson.build | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/softnic/meson.build b/drivers/net/softnic/meson.build
index ff9822747..673d2cee8 100644
--- a/drivers/net/softnic/meson.build
+++ b/drivers/net/softnic/meson.build
@@ -1,6 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Intel Corporation
 
+if host_machine.system() != 'linux'
+        build = false
+endif
 allow_experimental_apis = true
 install_headers('rte_eth_softnic.h')
 sources = files('rte_eth_softnic_tm.c',
-- 
2.13.6

[PATCH 5/6] net/tap: disable tap build in FREEBSD

[Agalya Babu RadhaKrishnan]

Disabled tap build in FreeBSD because it is not supported
Added changes to enable tap build if it is Linux OS and
disable in FreeBSD.

Fixes: 6e8a721044 ("vfio: export functions even when disabled")

Signed-off-by: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan@intel.com>
---
 drivers/net/tap/meson.build | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/tap/meson.build b/drivers/net/tap/meson.build
index 37f65b75c..5d30cd52d 100644
--- a/drivers/net/tap/meson.build
+++ b/drivers/net/tap/meson.build
@@ -1,6 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2018 Luca Boccassi <bluca@debian.org>
 
+if host_machine.system() != 'linux'
+        build = false
+endif
 sources = files(
 	'rte_eth_tap.c',
 	'tap_bpf_api.c',
-- 
2.13.6

[PATCH 6/6] net/vdev_netvsc: disable vdev netvsc build in FREEBSD

[Agalya Babu RadhaKrishnan]

Disabled vdev_netvsc build in FreeBSD because it is not supported
Added changes to enable vdev_netvsc build if it is Linux OS and
disable in FreeBSD.

Fixes: 6e8a721044 ("vfio: export functions even when disabled")

Signed-off-by: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan@intel.com>
---
 drivers/net/vdev_netvsc/meson.build | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/vdev_netvsc/meson.build b/drivers/net/vdev_netvsc/meson.build
index cc956e7b2..d3ada878a 100644
--- a/drivers/net/vdev_netvsc/meson.build
+++ b/drivers/net/vdev_netvsc/meson.build
@@ -1,6 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
+if host_machine.system() != 'linux'
+        build = false
+endif
 sources = files('vdev_netvsc.c')
 
 allow_experimental_apis = true
-- 
2.13.6

Re: [PATCH 6/6] net/vdev_netvsc: disable vdev netvsc build in FREEBSD

[Luca Boccassi]

On Thu, 2018-09-27 at 14:24 +0100, Agalya Babu RadhaKrishnan wrote:
> Disabled vdev_netvsc build in FreeBSD because it is not supported
> Added changes to enable vdev_netvsc build if it is Linux OS and
> disable in FreeBSD.
> 
> Fixes: 6e8a721044 ("vfio: export functions even when disabled")
> 
> Signed-off-by: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan@
> intel.com>
> ---

Hi,

I don't think these "Fixes" lines in this set are correct - for
example, the vdev_netvsc pmd only got the Meson file recently, but the
mentioned commit was back in 18.05. This would cause this individual
patch to be picked for the 18.08.1 stable release, even though it
shouldn't as the Meson file would be new in 18.11. Same might be true
for the other patches.

-- 
Kind regards,
Luca Boccassi

Re: [PATCH 5/6] net/tap: disable tap build in FREEBSD

[Wiles, Keith]

> On Sep 27, 2018, at 8:24 AM, Babu Radhakrishnan, AgalyaX <agalyax.babu.radhakrishnan@intel.com> wrote:
> 
> Disabled tap build in FreeBSD because it is not supported
> Added changes to enable tap build if it is Linux OS and
> disable in FreeBSD.

Good, the old build system restricted tap to Linux only.

Acked-by: Keith Wiles <keith.wiles@intel.com>
> 
> Fixes: 6e8a721044 ("vfio: export functions even when disabled")
> 
> Signed-off-by: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan@intel.com>
> ---
> drivers/net/tap/meson.build | 3 +++
> 1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/net/tap/meson.build b/drivers/net/tap/meson.build
> index 37f65b75c..5d30cd52d 100644
> --- a/drivers/net/tap/meson.build
> +++ b/drivers/net/tap/meson.build
> @@ -1,6 +1,9 @@
> # SPDX-License-Identifier: BSD-3-Clause
> # Copyright 2018 Luca Boccassi <bluca@debian.org>
> 
> +if host_machine.system() != 'linux'
> +        build = false
> +endif
> sources = files(
> 	'rte_eth_tap.c',
> 	'tap_bpf_api.c',
> -- 
> 2.13.6
> 

Regards,
Keith

Re: [PATCH 4/6] net/softnic: disable softnic build in FREEBSD

[Singh, Jasvinder]

> -----Original Message-----
> From: Babu Radhakrishnan, AgalyaX
> Sent: Thursday, September 27, 2018 2:24 PM
> To: dev@dpdk.org
> Cc: alejandro.lucero@netronome.com; allain.legacy@windriver.com; Singh,
> Jasvinder <jasvinder.singh@intel.com>; Wiles, Keith <keith.wiles@intel.com>;
> matan@mellanox.com; Richardson, Bruce <bruce.richardson@intel.com>;
> Pattan, Reshma <reshma.pattan@intel.com>; Babu Radhakrishnan, AgalyaX
> <agalyax.babu.radhakrishnan@intel.com>
> Subject: [PATCH 4/6] net/softnic: disable softnic build in FREEBSD
> 
> Disabled softnic build in FreeBSD because it is not supported Added changes to
> enable softnic build if it is Linux OS and disable in FreeBSD.
> 
> Fixes: 6e8a721044 ("vfio: export functions even when disabled")
> 
Above fixes line isn't correct.

Re: [PATCH 1/6] build: fix for FREEBSD build via meson

[Bruce Richardson]

On Thu, Sep 27, 2018 at 02:24:07PM +0100, Agalya Babu RadhaKrishnan wrote:
> FreeBSD compilation was failing through meson build.
> RTE_EAL_VFIO is not supported in FreeBSD.
> But RTE_EAL_VFIO was enabled for both linux and freebsd.
> So RTE_EAL_VFIO is removed from config/rte_config.h and
> based on the platform RTE_EAL_VFIO flag is enabled/disabled appropriately.
> 
> Fixes: 6e8a721044 ("vfio: export functions even when disabled")
> 
> Signed-off-by: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan@intel.com>
> ---
>  config/rte_config.h | 1 -
>  lib/meson.build     | 6 ++++++
>  2 files changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/config/rte_config.h b/config/rte_config.h
> index 567051b9c..53c568929 100644
> --- a/config/rte_config.h
> +++ b/config/rte_config.h
> @@ -34,7 +34,6 @@
>  #define RTE_MAX_TAILQ 32
>  #define RTE_LOG_DP_LEVEL RTE_LOG_INFO
>  #define RTE_BACKTRACE 1
> -#define RTE_EAL_VFIO 1
>  #define RTE_MAX_VFIO_CONTAINERS 64
>  
>  /* bsd module defines */
> diff --git a/lib/meson.build b/lib/meson.build
> index 3acc67e6e..1b20027a5 100644
> --- a/lib/meson.build
> +++ b/lib/meson.build
> @@ -31,6 +31,12 @@ if cc.has_argument('-Wno-format-truncation')
>  	default_cflags += '-Wno-format-truncation'
>  endif
>  
> +if host_machine.system() == 'linux'
> +	dpdk_conf.set('RTE_EAL_VFIO', true)
> +else
> +	dpdk_conf.set('RTE_EAL_VFIO', false)
> +endif
> +

I think this can be shortened in a number of ways. If we don't have vfio, I
don't think you need to set it to false, so the else leg can be removed.
Even shorter again could be:

dpdk_conf.set('RTE_EAL_VFIO', host_machine.system() == 'linux')

/Bruce

Re: [PATCH 1/6] build: fix for FREEBSD build via meson

[Bruce Richardson]

On Thu, Sep 27, 2018 at 02:24:07PM +0100, Agalya Babu RadhaKrishnan wrote:
> FreeBSD compilation was failing through meson build.
> RTE_EAL_VFIO is not supported in FreeBSD.
> But RTE_EAL_VFIO was enabled for both linux and freebsd.
> So RTE_EAL_VFIO is removed from config/rte_config.h and
> based on the platform RTE_EAL_VFIO flag is enabled/disabled appropriately.
> 
> Fixes: 6e8a721044 ("vfio: export functions even when disabled")
> 
> Signed-off-by: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan@intel.com>
> ---
>  config/rte_config.h | 1 -
>  lib/meson.build     | 6 ++++++
>  2 files changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/config/rte_config.h b/config/rte_config.h
> index 567051b9c..53c568929 100644
> --- a/config/rte_config.h
> +++ b/config/rte_config.h
> @@ -34,7 +34,6 @@
>  #define RTE_MAX_TAILQ 32
>  #define RTE_LOG_DP_LEVEL RTE_LOG_INFO
>  #define RTE_BACKTRACE 1
> -#define RTE_EAL_VFIO 1
>  #define RTE_MAX_VFIO_CONTAINERS 64
>  
>  /* bsd module defines */
> diff --git a/lib/meson.build b/lib/meson.build
> index 3acc67e6e..1b20027a5 100644
> --- a/lib/meson.build
> +++ b/lib/meson.build
> @@ -31,6 +31,12 @@ if cc.has_argument('-Wno-format-truncation')
>  	default_cflags += '-Wno-format-truncation'
>  endif
>  
> +if host_machine.system() == 'linux'
> +	dpdk_conf.set('RTE_EAL_VFIO', true)
> +else
> +	dpdk_conf.set('RTE_EAL_VFIO', false)
> +endif
> +

This should also go in config/meson.build not lib/meson.build