From patchwork Tue Feb 11 23:57:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 65743 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A0C3AA0530; Wed, 12 Feb 2020 00:57:38 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5A9272B89; Wed, 12 Feb 2020 00:57:35 +0100 (CET) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by dpdk.org (Postfix) with ESMTP id 772AC2B87 for ; Wed, 12 Feb 2020 00:57:34 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id C556620D2B; Tue, 11 Feb 2020 18:57:33 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Tue, 11 Feb 2020 18:57:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=HG70+k3H5c NCKd+gHrIJWhp3xrh/ngeY2BPw9JJIkpw=; b=HickmI9deIwcDx2+8m6yCDzVjo v5nOn/Os0b12Qe3/QmA3Xvro+xTGJVQ5Wb15RqX65h7zUHolUjCF0fs8OcdONio9 wt3B8bU3bHm7wu057fQ6cgsG2IGplCSormCKMp7okggN8o7oC8jYENzqRTd0IVS0 xS9t6XqOVZ3mg/e5o= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=HG70+k3H5cNCKd+gHrIJWhp3xrh/ngeY2BPw9JJIkpw=; b=OOKb+eLo CrPbGmGx+p4WOzyOqDnN35tnaTf0Cy4DVgGzKIkrn22QCJCr5PsSIBLe/l6W3FAS G4GZMKAkbyDsqlc08hYeXH2sFo2ijCwzJjFbJNxhd03AVUd1DrVMtw/ELuI3FKN5 5W3NJqZNAh9/gtH8I3IAN01+4KveqO3tl8zfpnIMN0tGzOrfkX3l1Ga9mQ/5UKLx Sc6n46HKPypnIBRfyrW3Dp3UjzAmOl0nmubeh7ilJOYHFEJ/8G9VEXy61mj5Cszu Il33AzLXVH4zHgoU/2KfoW9H8QTYmwAfya9QyJRG6Mb/dDzSU8A6+C0PnAX3MgTz 4B2/AWufeuTeWg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrieeggddutdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpefvhhhomhgrshcuofhonhhjrghlohhnuceothhhohhmrghssehm ohhnjhgrlhhonhdrnhgvtheqnecukfhppeejjedrudefgedrvddtfedrudekgeenucevlh hushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehthhhomhgrshes mhhonhhjrghlohhnrdhnvght X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id AAEF230606FB for ; Tue, 11 Feb 2020 18:57:32 -0500 (EST) From: Thomas Monjalon To: dev@dpdk.org Date: Wed, 12 Feb 2020 00:57:23 +0100 Message-Id: <20200211235724.2970097-2-thomas@monjalon.net> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200211235724.2970097-1-thomas@monjalon.net> References: <20200211235724.2970097-1-thomas@monjalon.net> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 1/2] config: deduplicate options X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 Acked-by: David Marchand --- 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 From patchwork Tue Feb 11 23:57:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 65744 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8DA4EA0530; Wed, 12 Feb 2020 00:57:48 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 44A5C2B87; Wed, 12 Feb 2020 00:57:44 +0100 (CET) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by dpdk.org (Postfix) with ESMTP id 1963E293C for ; Wed, 12 Feb 2020 00:57:43 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id B141121B01; Tue, 11 Feb 2020 18:57:42 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Tue, 11 Feb 2020 18:57:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=PfyX+tK5gM rBvuS8lXTY2jmTOtDAKb10oxUPIfr8i10=; b=pBbOBKg89OY+nFgxl9EEJQLbG1 iMsWDBWazwXBvX6K6yPoNFBuwVFn4mVbmbAdIqzn53wc7s4+TDdZspOtaJsFZHb8 pPwEt2zh+on4upak2ZnerguLtVpxKa679vxA8fv4e55Cac9kXRqDiDnEu/+7YgEN wL7Sl68BgOQ4M+wM4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=PfyX+tK5gMrBvuS8lXTY2jmTOtDAKb10oxUPIfr8i10=; b=jXMr4Mj5 cCdXdwekgO5VW8Alpg5HWWoxobfqoZXUJIQ5a2h03lRhu1COvziI/xtX8n/G6Fay rZ6MOaE5HMxjFj8gZJuSBdeVS7fS8gbwzUGgkvZTUQAYywqQp3FhYz7NDOcsjvRw TNEgzg2uMHRkowLBGLQw33F030pA4i+fj2z/2oAnqmU+d9A9fvC2HRYh3Ar9AGvz wV0L2BH2O90eWuGFbQsCydly17Cs1Uj1tmelRTrw2/EJjnkY/fvOR75h5d5SPeyr QRrXyqOfzJe5I85YLi01+n2sxF29poWZ4TZWbzfnENmOKHuPKEBFBBgRn1Q5gsPs 55pLOdg1bKgqNA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrieeggddutdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepvfhhohhmrghs ucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenucfkph epjeejrddufeegrddvtdefrddukeegnecuvehluhhsthgvrhfuihiivgepudenucfrrghr rghmpehmrghilhhfrhhomhepthhhohhmrghssehmohhnjhgrlhhonhdrnhgvth X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 6F3123060A88; Tue, 11 Feb 2020 18:57:38 -0500 (EST) From: Thomas Monjalon To: dev@dpdk.org Cc: Jerin Jacob , Viacheslav Ovsiienko , Maxime Coquelin , Matan Azrad , Gavin Hu , Pavan Nikhilesh , Konstantin Ananyev , David Marchand , Phil Yang Date: Wed, 12 Feb 2020 00:57:24 +0100 Message-Id: <20200211235724.2970097-3-thomas@monjalon.net> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200211235724.2970097-1-thomas@monjalon.net> References: <20200211235724.2970097-1-thomas@monjalon.net> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 2/2] devtools: enable more config options in build test X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 Acked-by: David Marchand --- 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 () # # 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 () # 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 () # 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 || \