Thomas Monjalon (2): config: deduplicate options devtools: enable more config options in build test config/common_armv8a_linux | 2 -- config/common_linux | 6 ------ config/defconfig_arm-armv7a-linuxapp-gcc | 9 --------- config/defconfig_arm64-octeontx2-linuxapp-gcc | 4 ---- config/defconfig_arm64-stingray-linuxapp-gcc | 2 -- config/defconfig_arm64-thunderx-linuxapp-gcc | 1 - devtools/test-build.sh | 12 +++++++++++- 7 files changed, 11 insertions(+), 25 deletions(-) -- 2.25.0
Some config options are overwritten with the same value as the one inherited from its template parent. Such duplicates which have no meaningful comments are removed. Signed-off-by: Thomas Monjalon <thomas@monjalon.net> --- config/common_armv8a_linux | 2 -- config/common_linux | 6 ------ config/defconfig_arm-armv7a-linuxapp-gcc | 9 --------- config/defconfig_arm64-octeontx2-linuxapp-gcc | 4 ---- config/defconfig_arm64-stingray-linuxapp-gcc | 2 -- config/defconfig_arm64-thunderx-linuxapp-gcc | 1 - 6 files changed, 24 deletions(-) diff --git a/config/common_armv8a_linux b/config/common_armv8a_linux index 433e66c7d8..020f8f006c 100644 --- a/config/common_armv8a_linux +++ b/config/common_armv8a_linux @@ -41,5 +41,3 @@ CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV=n # NXP PFE PMD Driver # CONFIG_RTE_LIBRTE_PFE_PMD=y - -CONFIG_RTE_SCHED_VECTOR=n diff --git a/config/common_linux b/config/common_linux index 583efadc7d..816810671a 100644 --- a/config/common_linux +++ b/config/common_linux @@ -66,9 +66,3 @@ CONFIG_RTE_LIBRTE_HINIC_PMD=y # Hisilicon HNS3 PMD driver # CONFIG_RTE_LIBRTE_HNS3_PMD=y - -# -# Compile PMD for Intel FPGA raw device -# To compile, CONFIG_RTE_EAL_VFIO should be enabled. -# -CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV=n diff --git a/config/defconfig_arm-armv7a-linuxapp-gcc b/config/defconfig_arm-armv7a-linuxapp-gcc index 6ac7f47e47..9ecc2a526c 100644 --- a/config/defconfig_arm-armv7a-linuxapp-gcc +++ b/config/defconfig_arm-armv7a-linuxapp-gcc @@ -30,14 +30,7 @@ CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=n # KNI is not supported on 32-bit CONFIG_RTE_LIBRTE_KNI=n -# PCI is usually not used on ARM -CONFIG_RTE_EAL_IGB_UIO=n - -# fails to compile on ARM -CONFIG_RTE_SCHED_VECTOR=n - # cannot use those on ARM -CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_LIBRTE_ARK_PMD=n CONFIG_RTE_LIBRTE_EM_PMD=n CONFIG_RTE_LIBRTE_IGB_PMD=n @@ -47,9 +40,7 @@ CONFIG_RTE_LIBRTE_ENIC_PMD=n CONFIG_RTE_LIBRTE_FM10K_PMD=n CONFIG_RTE_LIBRTE_I40E_PMD=n CONFIG_RTE_LIBRTE_IXGBE_PMD=n -CONFIG_RTE_LIBRTE_MLX4_PMD=n CONFIG_RTE_LIBRTE_VMXNET3_PMD=n -CONFIG_RTE_LIBRTE_BNX2X_PMD=n CONFIG_RTE_LIBRTE_QEDE_PMD=n CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n CONFIG_RTE_LIBRTE_AVP_PMD=n diff --git a/config/defconfig_arm64-octeontx2-linuxapp-gcc b/config/defconfig_arm64-octeontx2-linuxapp-gcc index 7687dbec8d..7cfb81872c 100644 --- a/config/defconfig_arm64-octeontx2-linuxapp-gcc +++ b/config/defconfig_arm64-octeontx2-linuxapp-gcc @@ -6,7 +6,6 @@ CONFIG_RTE_MACHINE="octeontx2" -CONFIG_RTE_CACHE_LINE_SIZE=128 CONFIG_RTE_MAX_NUMA_NODES=1 CONFIG_RTE_MAX_LCORE=24 CONFIG_RTE_ARM_FEATURE_ATOMICS=y @@ -15,8 +14,5 @@ CONFIG_RTE_ARM_FEATURE_ATOMICS=y CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n CONFIG_RTE_LIBRTE_VHOST_NUMA=n -# Recommend to use VFIO as co-processors needs SMMU/IOMMU -CONFIG_RTE_EAL_IGB_UIO=n - # Max supported NIX LFs CONFIG_RTE_MAX_VFIO_GROUPS=128 diff --git a/config/defconfig_arm64-stingray-linuxapp-gcc b/config/defconfig_arm64-stingray-linuxapp-gcc index 7b33aa7afb..2a6f6cee28 100644 --- a/config/defconfig_arm64-stingray-linuxapp-gcc +++ b/config/defconfig_arm64-stingray-linuxapp-gcc @@ -5,7 +5,6 @@ #include "defconfig_arm64-armv8a-linux-gcc" # Broadcom - Stingray -CONFIG_RTE_MACHINE="armv8a" CONFIG_RTE_ARCH_ARM_TUNE="cortex-a72" # Doesn't support NUMA @@ -13,4 +12,3 @@ CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n CONFIG_RTE_LIBRTE_VHOST_NUMA=n CONFIG_RTE_EAL_IGB_UIO=y -CONFIG_RTE_KNI_KMOD=n diff --git a/config/defconfig_arm64-thunderx-linuxapp-gcc b/config/defconfig_arm64-thunderx-linuxapp-gcc index a52f066510..946906b67a 100644 --- a/config/defconfig_arm64-thunderx-linuxapp-gcc +++ b/config/defconfig_arm64-thunderx-linuxapp-gcc @@ -6,7 +6,6 @@ CONFIG_RTE_MACHINE="thunderx" -CONFIG_RTE_CACHE_LINE_SIZE=128 CONFIG_RTE_USE_C11_MEM_MODEL=n CONFIG_RTE_MAX_NUMA_NODES=2 CONFIG_RTE_MAX_LCORE=96 -- 2.25.0
The Linux kernel modules kni and igb_uio were disabled by default so they need a new option (+kmods) for testing compilation. Some recent features were not enabled in compilation testing: - mlx5 vDPA (depends on libibverbs) - ifpga (depends on libfdt) - ipn3ke (depends on libfdt) - Arm WFE Check on libfdt availability is added, and not considered as a fix. Fixes: 91a861e54164 ("config: disable Linux kernel modules by default") Fixes: 95276abaaf0a ("vdpa/mlx5: introduce Mellanox vDPA driver") Fixes: 1be7855d7739 ("eal: add wait until equal API") Signed-off-by: Thomas Monjalon <thomas@monjalon.net> --- devtools/test-build.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/devtools/test-build.sh b/devtools/test-build.sh index 330133e692..e6e40588c6 100755 --- a/devtools/test-build.sh +++ b/devtools/test-build.sh @@ -14,6 +14,7 @@ default_path=$PATH # - DPDK_DEP_BPF (y/[n]) # - DPDK_DEP_CFLAGS # - DPDK_DEP_ELF (y/[n]) +# - DPDK_DEP_FDT (y/[n]) # - DPDK_DEP_ISAL (y/[n]) # - DPDK_DEP_JSON (y/[n]) # - DPDK_DEP_LDFLAGS @@ -108,6 +109,7 @@ reset_env () unset DPDK_DEP_BPF unset DPDK_DEP_CFLAGS unset DPDK_DEP_ELF + unset DPDK_DEP_FDT unset DPDK_DEP_ISAL unset DPDK_DEP_JSON unset DPDK_DEP_LDFLAGS @@ -140,6 +142,8 @@ config () # <directory> <target> <options> # Built-in options (lowercase) ! echo $3 | grep -q '+default' || \ sed -ri="" 's,(RTE_MACHINE=")native,\1default,' $1/.config + ! echo $3 | grep -q '+kmods' || \ + sed -ri="" 's,(IGB_UIO=|KNI_KMOD=)n,\1y,' $1/.config echo $3 | grep -q '+next' || \ sed -ri="" 's,(NEXT_ABI=)y,\1n,' $1/.config ! echo $3 | grep -q '+shared' || \ @@ -151,6 +155,8 @@ config () # <directory> <target> <options> sed -ri="" 's,(TEST_PMD_RECORD_.*=)n,\1y,' $1/.config ) # Automatic configuration + ! echo $2 | grep -q 'arm64' || \ + sed -ri="" 's,(ARM_USE_WFE=)n,\1y,' $1/.config test "$DPDK_DEP_NUMA" != n || \ sed -ri="" 's,(NUMA.*=)y,\1n,' $1/.config sed -ri="" 's,(LIBRTE_IEEE1588=)n,\1y,' $1/.config @@ -159,10 +165,14 @@ config () # <directory> <target> <options> sed -ri="" 's,(RESOURCE_TAR=)n,\1y,' $1/.config test "$DPDK_DEP_BPF" != y || \ sed -ri="" 's,(PMD_AF_XDP=)n,\1y,' $1/.config + test "$DPDK_DEP_FDT" != y || \ + sed -ri="" 's,(PMD_IFPGA_RAWDEV=)n,\1y,' $1/.config + test "$DPDK_DEP_FDT" != y || \ + sed -ri="" 's,(IPN3KE_PMD=)n,\1y,' $1/.config test "$DPDK_DEP_ISAL" != y || \ sed -ri="" 's,(PMD_ISAL=)n,\1y,' $1/.config test "$DPDK_DEP_MLX" != y || \ - sed -ri="" 's,(MLX._PMD=)n,\1y,' $1/.config + sed -ri="" 's,(MLX.*_PMD=)n,\1y,' $1/.config test "$DPDK_DEP_NFB" != y || \ sed -ri="" 's,(NFB_PMD=)n,\1y,' $1/.config test "$DPDK_DEP_SZE" != y || \ -- 2.25.0
On Wed, Feb 12, 2020 at 12:57 AM Thomas Monjalon <thomas@monjalon.net> wrote:
>
> Some config options are overwritten with the same value
> as the one inherited from its template parent.
> Such duplicates which have no meaningful comments are removed.
>
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> ---
> config/common_armv8a_linux | 2 --
> config/common_linux | 6 ------
> config/defconfig_arm-armv7a-linuxapp-gcc | 9 ---------
> config/defconfig_arm64-octeontx2-linuxapp-gcc | 4 ----
> config/defconfig_arm64-stingray-linuxapp-gcc | 2 --
> config/defconfig_arm64-thunderx-linuxapp-gcc | 1 -
> 6 files changed, 24 deletions(-)
>
> diff --git a/config/common_armv8a_linux b/config/common_armv8a_linux
> index 433e66c7d8..020f8f006c 100644
> --- a/config/common_armv8a_linux
> +++ b/config/common_armv8a_linux
> @@ -41,5 +41,3 @@ CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV=n
> # NXP PFE PMD Driver
> #
> CONFIG_RTE_LIBRTE_PFE_PMD=y
> -
> -CONFIG_RTE_SCHED_VECTOR=n
> diff --git a/config/common_linux b/config/common_linux
> index 583efadc7d..816810671a 100644
> --- a/config/common_linux
> +++ b/config/common_linux
> @@ -66,9 +66,3 @@ CONFIG_RTE_LIBRTE_HINIC_PMD=y
> # Hisilicon HNS3 PMD driver
> #
> CONFIG_RTE_LIBRTE_HNS3_PMD=y
> -
> -#
> -# Compile PMD for Intel FPGA raw device
> -# To compile, CONFIG_RTE_EAL_VFIO should be enabled.
> -#
> -CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV=n
> diff --git a/config/defconfig_arm-armv7a-linuxapp-gcc b/config/defconfig_arm-armv7a-linuxapp-gcc
> index 6ac7f47e47..9ecc2a526c 100644
> --- a/config/defconfig_arm-armv7a-linuxapp-gcc
> +++ b/config/defconfig_arm-armv7a-linuxapp-gcc
> @@ -30,14 +30,7 @@ CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=n
> # KNI is not supported on 32-bit
> CONFIG_RTE_LIBRTE_KNI=n
>
> -# PCI is usually not used on ARM
> -CONFIG_RTE_EAL_IGB_UIO=n
> -
> -# fails to compile on ARM
> -CONFIG_RTE_SCHED_VECTOR=n
> -
> # cannot use those on ARM
> -CONFIG_RTE_KNI_KMOD=n
> CONFIG_RTE_LIBRTE_ARK_PMD=n
> CONFIG_RTE_LIBRTE_EM_PMD=n
> CONFIG_RTE_LIBRTE_IGB_PMD=n
> @@ -47,9 +40,7 @@ CONFIG_RTE_LIBRTE_ENIC_PMD=n
> CONFIG_RTE_LIBRTE_FM10K_PMD=n
> CONFIG_RTE_LIBRTE_I40E_PMD=n
> CONFIG_RTE_LIBRTE_IXGBE_PMD=n
> -CONFIG_RTE_LIBRTE_MLX4_PMD=n
> CONFIG_RTE_LIBRTE_VMXNET3_PMD=n
> -CONFIG_RTE_LIBRTE_BNX2X_PMD=n
> CONFIG_RTE_LIBRTE_QEDE_PMD=n
> CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n
> CONFIG_RTE_LIBRTE_AVP_PMD=n
> diff --git a/config/defconfig_arm64-octeontx2-linuxapp-gcc b/config/defconfig_arm64-octeontx2-linuxapp-gcc
> index 7687dbec8d..7cfb81872c 100644
> --- a/config/defconfig_arm64-octeontx2-linuxapp-gcc
> +++ b/config/defconfig_arm64-octeontx2-linuxapp-gcc
> @@ -6,7 +6,6 @@
>
> CONFIG_RTE_MACHINE="octeontx2"
>
> -CONFIG_RTE_CACHE_LINE_SIZE=128
> CONFIG_RTE_MAX_NUMA_NODES=1
> CONFIG_RTE_MAX_LCORE=24
> CONFIG_RTE_ARM_FEATURE_ATOMICS=y
> @@ -15,8 +14,5 @@ CONFIG_RTE_ARM_FEATURE_ATOMICS=y
> CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n
> CONFIG_RTE_LIBRTE_VHOST_NUMA=n
>
> -# Recommend to use VFIO as co-processors needs SMMU/IOMMU
> -CONFIG_RTE_EAL_IGB_UIO=n
> -
> # Max supported NIX LFs
> CONFIG_RTE_MAX_VFIO_GROUPS=128
> diff --git a/config/defconfig_arm64-stingray-linuxapp-gcc b/config/defconfig_arm64-stingray-linuxapp-gcc
> index 7b33aa7afb..2a6f6cee28 100644
> --- a/config/defconfig_arm64-stingray-linuxapp-gcc
> +++ b/config/defconfig_arm64-stingray-linuxapp-gcc
> @@ -5,7 +5,6 @@
> #include "defconfig_arm64-armv8a-linux-gcc"
>
> # Broadcom - Stingray
> -CONFIG_RTE_MACHINE="armv8a"
> CONFIG_RTE_ARCH_ARM_TUNE="cortex-a72"
>
> # Doesn't support NUMA
> @@ -13,4 +12,3 @@ CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n
> CONFIG_RTE_LIBRTE_VHOST_NUMA=n
>
> CONFIG_RTE_EAL_IGB_UIO=y
> -CONFIG_RTE_KNI_KMOD=n
> diff --git a/config/defconfig_arm64-thunderx-linuxapp-gcc b/config/defconfig_arm64-thunderx-linuxapp-gcc
> index a52f066510..946906b67a 100644
> --- a/config/defconfig_arm64-thunderx-linuxapp-gcc
> +++ b/config/defconfig_arm64-thunderx-linuxapp-gcc
> @@ -6,7 +6,6 @@
>
> CONFIG_RTE_MACHINE="thunderx"
>
> -CONFIG_RTE_CACHE_LINE_SIZE=128
> CONFIG_RTE_USE_C11_MEM_MODEL=n
> CONFIG_RTE_MAX_NUMA_NODES=2
> CONFIG_RTE_MAX_LCORE=96
> --
> 2.25.0
>
We have some duplications (RTE_SCHED_VECTOR and RTE_EAL_IGB_UIO) on
the meson side, but this patch lgtm.
Acked-by: David Marchand <david.marchand@redhat.com>
--
David Marchand
On Wed, Feb 12, 2020 at 12:57 AM Thomas Monjalon <thomas@monjalon.net> wrote:
>
> The Linux kernel modules kni and igb_uio were disabled by default
> so they need a new option (+kmods) for testing compilation.
>
> Some recent features were not enabled in compilation testing:
> - mlx5 vDPA (depends on libibverbs)
> - ifpga (depends on libfdt)
> - ipn3ke (depends on libfdt)
> - Arm WFE
>
> Check on libfdt availability is added, and not considered as a fix.
>
> Fixes: 91a861e54164 ("config: disable Linux kernel modules by default")
> Fixes: 95276abaaf0a ("vdpa/mlx5: introduce Mellanox vDPA driver")
> Fixes: 1be7855d7739 ("eal: add wait until equal API")
>
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> ---
> devtools/test-build.sh | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/devtools/test-build.sh b/devtools/test-build.sh
> index 330133e692..e6e40588c6 100755
> --- a/devtools/test-build.sh
> +++ b/devtools/test-build.sh
> @@ -14,6 +14,7 @@ default_path=$PATH
> # - DPDK_DEP_BPF (y/[n])
> # - DPDK_DEP_CFLAGS
> # - DPDK_DEP_ELF (y/[n])
> +# - DPDK_DEP_FDT (y/[n])
> # - DPDK_DEP_ISAL (y/[n])
> # - DPDK_DEP_JSON (y/[n])
> # - DPDK_DEP_LDFLAGS
> @@ -108,6 +109,7 @@ reset_env ()
> unset DPDK_DEP_BPF
> unset DPDK_DEP_CFLAGS
> unset DPDK_DEP_ELF
> + unset DPDK_DEP_FDT
> unset DPDK_DEP_ISAL
> unset DPDK_DEP_JSON
> unset DPDK_DEP_LDFLAGS
> @@ -140,6 +142,8 @@ config () # <directory> <target> <options>
> # Built-in options (lowercase)
> ! echo $3 | grep -q '+default' || \
> sed -ri="" 's,(RTE_MACHINE=")native,\1default,' $1/.config
> + ! echo $3 | grep -q '+kmods' || \
> + sed -ri="" 's,(IGB_UIO=|KNI_KMOD=)n,\1y,' $1/.config
> echo $3 | grep -q '+next' || \
> sed -ri="" 's,(NEXT_ABI=)y,\1n,' $1/.config
> ! echo $3 | grep -q '+shared' || \
> @@ -151,6 +155,8 @@ config () # <directory> <target> <options>
> sed -ri="" 's,(TEST_PMD_RECORD_.*=)n,\1y,' $1/.config )
>
> # Automatic configuration
> + ! echo $2 | grep -q 'arm64' || \
> + sed -ri="" 's,(ARM_USE_WFE=)n,\1y,' $1/.config
> test "$DPDK_DEP_NUMA" != n || \
> sed -ri="" 's,(NUMA.*=)y,\1n,' $1/.config
> sed -ri="" 's,(LIBRTE_IEEE1588=)n,\1y,' $1/.config
> @@ -159,10 +165,14 @@ config () # <directory> <target> <options>
> sed -ri="" 's,(RESOURCE_TAR=)n,\1y,' $1/.config
> test "$DPDK_DEP_BPF" != y || \
> sed -ri="" 's,(PMD_AF_XDP=)n,\1y,' $1/.config
> + test "$DPDK_DEP_FDT" != y || \
> + sed -ri="" 's,(PMD_IFPGA_RAWDEV=)n,\1y,' $1/.config
> + test "$DPDK_DEP_FDT" != y || \
> + sed -ri="" 's,(IPN3KE_PMD=)n,\1y,' $1/.config
> test "$DPDK_DEP_ISAL" != y || \
> sed -ri="" 's,(PMD_ISAL=)n,\1y,' $1/.config
> test "$DPDK_DEP_MLX" != y || \
> - sed -ri="" 's,(MLX._PMD=)n,\1y,' $1/.config
> + sed -ri="" 's,(MLX.*_PMD=)n,\1y,' $1/.config
> test "$DPDK_DEP_NFB" != y || \
> sed -ri="" 's,(NFB_PMD=)n,\1y,' $1/.config
> test "$DPDK_DEP_SZE" != y || \
> --
> 2.25.0
>
Acked-by: David Marchand <david.marchand@redhat.com>
--
David Marchand
On Wed, Feb 12, 2020 at 12:57 AM Thomas Monjalon <thomas@monjalon.net> wrote:
>
> Thomas Monjalon (2):
> config: deduplicate options
> devtools: enable more config options in build test
>
> config/common_armv8a_linux | 2 --
> config/common_linux | 6 ------
> config/defconfig_arm-armv7a-linuxapp-gcc | 9 ---------
> config/defconfig_arm64-octeontx2-linuxapp-gcc | 4 ----
> config/defconfig_arm64-stingray-linuxapp-gcc | 2 --
> config/defconfig_arm64-thunderx-linuxapp-gcc | 1 -
> devtools/test-build.sh | 12 +++++++++++-
> 7 files changed, 11 insertions(+), 25 deletions(-)
Series applied, thanks.
--
David Marchand