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

[PATCH v2 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>

--
v2: Added fixes line for the appropriate file
    Updated meson.build changes to config instead of lib
--

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/meson.build                  | 3 +++
 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 +++
 7 files changed, 18 insertions(+), 1 deletion(-)

-- 
2.13.6

[PATCH v2 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/meson.build  | 3 +++
 config/rte_config.h | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/meson.build b/config/meson.build
index 6f9228c87..b95bca018 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -100,3 +100,6 @@ dpdk_conf.set('RTE_COMPILE_TIME_CPUFLAGS', ','.join(compile_time_cpuflags))
 dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', eal_pmd_path)
 
 install_headers('rte_config.h', subdir: get_option('include_subdir_arch'))
+
+# enable VFIO only if it is linux OS
+dpdk_conf.set('RTE_EAL_VFIO', host_machine.system() == 'linux')
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 */
-- 
2.13.6

[PATCH v2 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.

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 v2 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.

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 v2 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.

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 v2 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.

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 v2 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.

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 v2 5/6] net/tap: disable tap build in FREEBSD

[Wiles, Keith]

> On Oct 3, 2018, at 9:00 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.
> 
> Signed-off-by: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan@intel.com>

Thought I acked this one already.

Acked-by: Keith Wiles <keith.wiles@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 v2 6/6] net/vdev_netvsc: disable vdev netvsc build in FREEBSD

[Stephen Hemminger]

On Wed,  3 Oct 2018 15:00:21 +0100
Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan@intel.com> 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.
> 
> 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

Acked-by: Stephen Hemmminger <sthemmin@microsoft.com>

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

[Legacy, Allain]

> -----Original Message-----
> From: Agalya Babu RadhaKrishnan
> [mailto:agalyax.babu.radhakrishnan@intel.com]
> Sent: Wednesday, October 03, 2018 10:00 AM
> To: dev@dpdk.org
> Cc: alejandro.lucero@netronome.com; Legacy, Allain;
> jasvinder.singh@intel.com; keith.wiles@intel.com; matan@mellanox.com;
> bruce.richardson@intel.com; reshma.pattan@intel.com; Agalya Babu
> RadhaKrishnan
> Subject: [PATCH v2 3/6] net/avp: disable avp build in FREEBSD
> 
> 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.
> 
> Signed-off-by: Agalya Babu RadhaKrishnan
> <agalyax.babu.radhakrishnan@intel.com>
> ---


For net/avp:

Acked-by:  Allain Legacy <allain.legacy@windriver.com>

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

[Bruce Richardson]

On Wed, Oct 03, 2018 at 02:46:21PM +0100, agalyax.babu.radhakrishnan wrote:
> From: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan@intel.com>
> 
> 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")
> 
The actual commit that introduced the offending line i.e. the RTE_EAL_VFIO
one in rte_config.h was 844514c735, eal: build with meson.

With correct fixline:

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

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

[Singh, Jasvinder]

> -----Original Message-----
> From: Babu Radhakrishnan, AgalyaX
> Sent: Wednesday, October 3, 2018 3:00 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 v2 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.
> 
> 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

Acked-by: Jasvinder Singh <jasvinder.singh@intel.com>

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

[Bruce Richardson]

On Wed, Oct 03, 2018 at 03:00:16PM +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")
> 

Wrong fixes line, see correction on other copy of V2...