From patchwork Tue Jun 13 15:33:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 128629 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 78E7442CA5; Tue, 13 Jun 2023 17:33:53 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E805941611; Tue, 13 Jun 2023 17:33:51 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id AF8E141611 for ; Tue, 13 Jun 2023 17:33:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686670430; x=1718206430; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0BBalVnbF84fjhUN5nA8WLNYM4Ib/lSdECdaO2NQLx4=; b=Vi9lKZvMPIFzvbeibWjoWc1pdwl6/9EELT8TDN6NXn0bQn0wQOu6xcpx Uo4QG4Oyr3cVtdkvTL0qjGCJ2Yy7JqtNGYHXiI2s3m2HEwqNNZd44y7en PPQQN2Q/bH2w2BnUnXNK5+GrUTWgWGtt0UpIOosj1jQyAA0gFoVYKlvn6 7/jFwHal/DSr3pTF3DNGVVMQaJM/QEtBAtNdcYBUl6G3dKx/PRvTG4eVc eLIkNVScjB6PeD7AX7VoLwfXm4WpxJbQo7WILUohgGeooP+CBwnVO9ero FldfuZ/6Mld9JgygkItHBO7+lBs1llUg/ZliDD+jUyr6MiWccn9CxZRL4 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="358366216" X-IronPort-AV: E=Sophos;i="6.00,240,1681196400"; d="scan'208";a="358366216" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2023 08:33:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="856137404" X-IronPort-AV: E=Sophos;i="6.00,240,1681196400"; d="scan'208";a="856137404" Received: from silpixa00401385.ir.intel.com ([10.237.214.11]) by fmsmga001.fm.intel.com with ESMTP; 13 Jun 2023 08:33:46 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , David Marchand Subject: [PATCH v3 1/2] build: change NUMA flag variable type to boolean Date: Tue, 13 Jun 2023 16:33:32 +0100 Message-Id: <20230613153333.164365-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230613153333.164365-1-bruce.richardson@intel.com> References: <20230612162104.170749-1-bruce.richardson@intel.com> <20230613153333.164365-1-bruce.richardson@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The has_libnuma flag was using 0 and 1 integer values, instead of the more appropriate boolean type. Change to use true/false instead. Signed-off-by: Bruce Richardson Reviewed-by: David Marchand --- config/arm/meson.build | 2 +- config/meson.build | 4 ++-- lib/eal/linux/meson.build | 2 +- lib/vhost/meson.build | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/arm/meson.build b/config/arm/meson.build index 43f6a551a2..faba5e38cf 100644 --- a/config/arm/meson.build +++ b/config/arm/meson.build @@ -592,7 +592,7 @@ if update_flags part_number = soc_config['part_number'] soc_flags = soc_config.get('flags', []) if not soc_config.get('numa', true) - has_libnuma = 0 + has_libnuma = false endif disable_drivers += ',' + soc_config.get('disable_drivers', '') diff --git a/config/meson.build b/config/meson.build index 65087ce090..8aebccbbdc 100644 --- a/config/meson.build +++ b/config/meson.build @@ -174,7 +174,7 @@ if link_lib != '' endif # check for libraries used in multiple places in DPDK -has_libnuma = 0 +has_libnuma = false find_libnuma = true if meson.is_cross_build() and not meson.get_cross_property('numa', true) # don't look for libnuma if explicitly disabled in cross build @@ -184,7 +184,7 @@ if find_libnuma numa_dep = cc.find_library('numa', required: false) if numa_dep.found() and cc.has_header('numaif.h') dpdk_conf.set10('RTE_HAS_LIBNUMA', true) - has_libnuma = 1 + has_libnuma = true add_project_link_arguments('-lnuma', language: 'c') dpdk_extra_ldflags += '-lnuma' endif diff --git a/lib/eal/linux/meson.build b/lib/eal/linux/meson.build index 1b913acc06..e99ebed256 100644 --- a/lib/eal/linux/meson.build +++ b/lib/eal/linux/meson.build @@ -20,6 +20,6 @@ sources += files( ) deps += ['kvargs', 'telemetry'] -if has_libnuma == 1 +if has_libnuma dpdk_conf.set10('RTE_EAL_NUMA_AWARE_HUGEPAGES', true) endif diff --git a/lib/vhost/meson.build b/lib/vhost/meson.build index 0d1abf6283..9e39d221a1 100644 --- a/lib/vhost/meson.build +++ b/lib/vhost/meson.build @@ -5,7 +5,7 @@ if not is_linux build = false reason = 'only supported on Linux' endif -if has_libnuma == 1 +if has_libnuma dpdk_conf.set10('RTE_LIBRTE_VHOST_NUMA', true) endif if (toolchain == 'gcc' and cc.version().version_compare('>=8.3.0')) From patchwork Tue Jun 13 15:33:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 128630 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1475842CA5; Tue, 13 Jun 2023 17:33:59 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 237F742BB1; Tue, 13 Jun 2023 17:33:55 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id 081DD427F5 for ; Tue, 13 Jun 2023 17:33:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686670434; x=1718206434; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Gku4iIrtDRINgDA2V5vO0dZirv0xjnBUppf711q90Ro=; b=cOHHL5MAkgLVpzg82PbgpjpPYDpfxNq36BXP0zn9J7cbCCf56XYxQgQ3 Q+uYoKzua35JoRkUBch2MrgiseaWVQhJFrsGcaI/AepaTVpBIhmKy0luq qUVCtdQEjSCzB9M50k5hSeTHg2mSfuPuIQMrtWPa7XmCSHkiFOz8WAEp+ JJA44CoSYxfrtXNpESXMu+5VJSjJ+DnGRgnSCpC8EDjqnTXUvrw8BCmx7 2kz1B7Uj0Bbm1GtnPFLjB1ji75u/VYo1y9obAkVlqcYJyK+WV9BBS7gTM m8Jd1QKLFDwB8loAsBMADxFnIBAArTI907NU59OBImJMoQKRPJhMtLT/h Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="358366238" X-IronPort-AV: E=Sophos;i="6.00,240,1681196400"; d="scan'208";a="358366238" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2023 08:33:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="856137410" X-IronPort-AV: E=Sophos;i="6.00,240,1681196400"; d="scan'208";a="856137410" Received: from silpixa00401385.ir.intel.com ([10.237.214.11]) by fmsmga001.fm.intel.com with ESMTP; 13 Jun 2023 08:33:48 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Subject: [PATCH v3 2/2] build: change libfdt flag variable type to boolean Date: Tue, 13 Jun 2023 16:33:33 +0100 Message-Id: <20230613153333.164365-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230613153333.164365-1-bruce.richardson@intel.com> References: <20230612162104.170749-1-bruce.richardson@intel.com> <20230613153333.164365-1-bruce.richardson@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The has_libfdt flag was using 0 and 1 integer values, instead of the more appropriate boolean type. Change to use true/false instead. Signed-off-by: Bruce Richardson Reviewed-by: David Marchand --- config/meson.build | 4 ++-- drivers/net/ipn3ke/meson.build | 2 +- drivers/raw/ifpga/meson.build | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/meson.build b/config/meson.build index 8aebccbbdc..22d7d908b7 100644 --- a/config/meson.build +++ b/config/meson.build @@ -190,11 +190,11 @@ if find_libnuma endif endif -has_libfdt = 0 +has_libfdt = false fdt_dep = cc.find_library('fdt', required: false) if fdt_dep.found() and cc.has_header('fdt.h') dpdk_conf.set10('RTE_HAS_LIBFDT', true) - has_libfdt = 1 + has_libfdt = true add_project_link_arguments('-lfdt', language: 'c') dpdk_extra_ldflags += '-lfdt' endif diff --git a/drivers/net/ipn3ke/meson.build b/drivers/net/ipn3ke/meson.build index 104d2f58e5..464bdbd8b6 100644 --- a/drivers/net/ipn3ke/meson.build +++ b/drivers/net/ipn3ke/meson.build @@ -15,7 +15,7 @@ endif # rte_eth_switch_domain_free() # -if has_libfdt == 0 +if not has_libfdt build = false reason = 'missing dependency, "libfdt"' subdir_done() diff --git a/drivers/raw/ifpga/meson.build b/drivers/raw/ifpga/meson.build index cc30dc8be7..20dea23206 100644 --- a/drivers/raw/ifpga/meson.build +++ b/drivers/raw/ifpga/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation -if has_libfdt == 0 +if not has_libfdt build = false reason = 'missing dependency, "libfdt"' subdir_done()