From patchwork Tue Oct 22 15:43:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 61666 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DA1DB1BEBC; Tue, 22 Oct 2019 17:43:20 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id D59361BE96 for ; Tue, 22 Oct 2019 17:43:15 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Oct 2019 08:43:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,216,1569308400"; d="scan'208";a="200824069" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by orsmga003.jf.intel.com with ESMTP; 22 Oct 2019 08:43:14 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Luca Boccassi Date: Tue, 22 Oct 2019 16:43:02 +0100 Message-Id: <20191022154310.41238-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191022154310.41238-1-bruce.richardson@intel.com> References: <20191014113448.7442-1-bruce.richardson@intel.com> <20191022154310.41238-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 1/9] examples/bpf: remove from list of examples to build 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 examples/bpf directory does not contain an example app, but rather example code for use with testpmd's BPF support. Therefore, we should not attempt to build it when the user requests "examples=all". This also synchronises the meson behaviour with make which similarly doesn't compile up the code. Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- examples/bpf/meson.build | 6 ------ examples/meson.build | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 examples/bpf/meson.build diff --git a/examples/bpf/meson.build b/examples/bpf/meson.build deleted file mode 100644 index 0a817aaea..000000000 --- a/examples/bpf/meson.build +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -# This contains BPF example code for use in testing BPF with testpmd, -# therefore it should not be built as part of a meson build. -build=false diff --git a/examples/meson.build b/examples/meson.build index a046b74ad..e40ab68da 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -11,7 +11,7 @@ execinfo = cc.find_library('execinfo', required: false) # list of all example apps. Keep 1-3 per line, in alphabetical order. all_examples = [ 'bbdev_app', 'bond', - 'bpf', 'cmdline', + 'cmdline', 'distributor', 'ethtool', 'eventdev_pipeline', 'exception_path', 'fips_validation', 'flow_classify', From patchwork Tue Oct 22 15:43:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 61667 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0D8D51BEEB; Tue, 22 Oct 2019 17:43:24 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 82F0D1BE96 for ; Tue, 22 Oct 2019 17:43:16 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Oct 2019 08:43:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,216,1569308400"; d="scan'208";a="200824076" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by orsmga003.jf.intel.com with ESMTP; 22 Oct 2019 08:43:15 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Luca Boccassi Date: Tue, 22 Oct 2019 16:43:03 +0100 Message-Id: <20191022154310.41238-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191022154310.41238-1-bruce.richardson@intel.com> References: <20191014113448.7442-1-bruce.richardson@intel.com> <20191022154310.41238-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 2/9] examples/ethtool: allow building as part of meson build 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" Since the code for the ethtool example was contained in subdirectories the compilation of this example is different from most of the other apps, and it had not been abled when the user requests a build with "-Dexamples=all". To simplify the build with meson, the separate ethtool library is not build separately, rather the app is built as a single entity. Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- V3: disable on non-linux --- examples/ethtool/meson.build | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/examples/ethtool/meson.build b/examples/ethtool/meson.build index c370d7476..bc7a35514 100644 --- a/examples/ethtool/meson.build +++ b/examples/ethtool/meson.build @@ -6,5 +6,15 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' -# Example app currently unsupported by meson build -build = false +build = is_linux +sources = files('lib/rte_ethtool.c', + 'ethtool-app/ethapp.c', + 'ethtool-app/main.c') +includes = include_directories('lib', 'ethtool-app') + +deps += 'bus_pci' +if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD') + deps += 'pmd_ixgbe' +endif + +allow_experimental_apis = true From patchwork Tue Oct 22 15:43:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 61668 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2E5071BEFC; Tue, 22 Oct 2019 17:43:27 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id E18751BEB1 for ; Tue, 22 Oct 2019 17:43:17 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Oct 2019 08:43:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,216,1569308400"; d="scan'208";a="200824082" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by orsmga003.jf.intel.com with ESMTP; 22 Oct 2019 08:43:16 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Luca Boccassi Date: Tue, 22 Oct 2019 16:43:04 +0100 Message-Id: <20191022154310.41238-4-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191022154310.41238-1-bruce.richardson@intel.com> References: <20191014113448.7442-1-bruce.richardson@intel.com> <20191022154310.41238-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 3/9] examples/performance-thread: remove warning disabling 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 warnings about functions not returning values can be removed from the code by just adding an attribute to the function to specifies it doesn't return. The GCC bug referenced in the makefile which prevents this from working has been fixed for >10 years according to bugzilla. Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- examples/performance-thread/l3fwd-thread/Makefile | 6 ------ examples/performance-thread/l3fwd-thread/main.c | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/examples/performance-thread/l3fwd-thread/Makefile b/examples/performance-thread/l3fwd-thread/Makefile index 1a1c95829..b14b21e30 100644 --- a/examples/performance-thread/l3fwd-thread/Makefile +++ b/examples/performance-thread/l3fwd-thread/Makefile @@ -20,10 +20,4 @@ include $(RTE_SDK)/examples/performance-thread/common/common.mk CFLAGS += -O3 -g $(USER_FLAGS) $(INCLUDES) $(WERROR_FLAGS) -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -#ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -#endif - include $(RTE_SDK)/mk/rte.extapp.mk diff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c index 122c63244..ad540fd84 100644 --- a/examples/performance-thread/l3fwd-thread/main.c +++ b/examples/performance-thread/l3fwd-thread/main.c @@ -1877,7 +1877,7 @@ process_burst(struct rte_mbuf *pkts_burst[MAX_PKT_BURST], int nb_rx, /* * CPU-load stats collector */ -static int +static int __attribute__((noreturn)) cpu_load_collector(__rte_unused void *arg) { unsigned i, j, k; uint64_t hits; @@ -2299,7 +2299,7 @@ sched_spawner(__rte_unused void *arg) { } /* main processing loop */ -static int +static int __attribute__((noreturn)) pthread_tx(void *dummy) { struct rte_mbuf *pkts_burst[MAX_PKT_BURST]; From patchwork Tue Oct 22 15:43:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 61669 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E7B971BEEA; Tue, 22 Oct 2019 17:43:30 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 889051BEB8 for ; Tue, 22 Oct 2019 17:43:19 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Oct 2019 08:43:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,216,1569308400"; d="scan'208";a="200824086" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by orsmga003.jf.intel.com with ESMTP; 22 Oct 2019 08:43:17 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Luca Boccassi Date: Tue, 22 Oct 2019 16:43:05 +0100 Message-Id: <20191022154310.41238-5-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191022154310.41238-1-bruce.richardson@intel.com> References: <20191014113448.7442-1-bruce.richardson@intel.com> <20191022154310.41238-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 4/9] examples/performance-thread: add l3fwd-thread to meson 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" Limited to x86_64 systems, as it fails to compile on any others and is disabled in the examples makefile for non-x86_64 systems. Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- examples/meson.build | 3 ++- .../l3fwd-thread/meson.build | 27 +++++++++++++++++++ examples/performance-thread/meson.build | 10 ------- 3 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 examples/performance-thread/l3fwd-thread/meson.build delete mode 100644 examples/performance-thread/meson.build diff --git a/examples/meson.build b/examples/meson.build index e40ab68da..889bb6b2c 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -31,7 +31,8 @@ all_examples = [ 'multi_process/simple_mp', 'multi_process/symmetric_mp', 'netmap_compat', 'ntb', 'packet_ordering', - 'performance-thread', 'ptpclient', + 'performance-thread/l3fwd-thread', + 'ptpclient', 'qos_meter', 'qos_sched', 'quota_watermark', 'rxtx_callbacks', 'server_node_efd', 'service_cores', diff --git a/examples/performance-thread/l3fwd-thread/meson.build b/examples/performance-thread/l3fwd-thread/meson.build new file mode 100644 index 000000000..185fa59a4 --- /dev/null +++ b/examples/performance-thread/l3fwd-thread/meson.build @@ -0,0 +1,27 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2019 Intel Corporation + +# meson file, for building this example as part of a main DPDK build. +# +# To build this example as a standalone application with an already-installed +# DPDK instance, use 'make' + +build = dpdk_conf.has('RTE_ARCH_X86_64') +deps += ['timer', 'lpm'] + +# get the performance thread (pt) architecture subdir +if dpdk_conf.has('RTE_ARCH_ARM64') + pt_arch_dir = '../common/arch/arm64' +else + pt_arch_dir = '../common/arch/x86' +endif +sources += files('main.c', + '../common/lthread.c', + '../common/lthread_cond.c', + '../common/lthread_diag.c', + '../common/lthread_mutex.c', + '../common/lthread_sched.c', + '../common/lthread_tls.c', + pt_arch_dir + '/ctx.c') + +includes += include_directories('../common', pt_arch_dir) diff --git a/examples/performance-thread/meson.build b/examples/performance-thread/meson.build deleted file mode 100644 index c370d7476..000000000 --- a/examples/performance-thread/meson.build +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -# meson file, for building this example as part of a main DPDK build. -# -# To build this example as a standalone application with an already-installed -# DPDK instance, use 'make' - -# Example app currently unsupported by meson build -build = false From patchwork Tue Oct 22 15:43:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 61670 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7A3C91BF0F; Tue, 22 Oct 2019 17:43:33 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 0E0321BEB1 for ; Tue, 22 Oct 2019 17:43:19 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Oct 2019 08:43:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,216,1569308400"; d="scan'208";a="200824090" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by orsmga003.jf.intel.com with ESMTP; 22 Oct 2019 08:43:18 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Luca Boccassi Date: Tue, 22 Oct 2019 16:43:06 +0100 Message-Id: <20191022154310.41238-6-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191022154310.41238-1-bruce.richardson@intel.com> References: <20191014113448.7442-1-bruce.richardson@intel.com> <20191022154310.41238-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 5/9] examples/performance-thread: add pthread shim to meson 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" Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- examples/meson.build | 1 + .../pthread_shim/meson.build | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 examples/performance-thread/pthread_shim/meson.build diff --git a/examples/meson.build b/examples/meson.build index 889bb6b2c..8ef81446f 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -32,6 +32,7 @@ all_examples = [ 'multi_process/symmetric_mp', 'netmap_compat', 'ntb', 'packet_ordering', 'performance-thread/l3fwd-thread', + 'performance-thread/pthread_shim', 'ptpclient', 'qos_meter', 'qos_sched', 'quota_watermark', 'rxtx_callbacks', diff --git a/examples/performance-thread/pthread_shim/meson.build b/examples/performance-thread/pthread_shim/meson.build new file mode 100644 index 000000000..393fbd122 --- /dev/null +++ b/examples/performance-thread/pthread_shim/meson.build @@ -0,0 +1,28 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2019 Intel Corporation + +# meson file, for building this example as part of a main DPDK build. +# +# To build this example as a standalone application with an already-installed +# DPDK instance, use 'make' + +build = dpdk_conf.has('RTE_ARCH_X86_64') or dpdk_conf.has('RTE_ARCH_ARM64') +deps += ['timer'] + +# get the performance thread (pt) architecture subdir +if dpdk_conf.has('RTE_ARCH_ARM64') + pt_arch_dir = '../common/arch/arm64' +else + pt_arch_dir = '../common/arch/x86' +endif +sources += files('main.c', + 'pthread_shim.c', + '../common/lthread.c', + '../common/lthread_cond.c', + '../common/lthread_diag.c', + '../common/lthread_mutex.c', + '../common/lthread_sched.c', + '../common/lthread_tls.c', + pt_arch_dir + '/ctx.c') + +includes += include_directories('../common', pt_arch_dir) From patchwork Tue Oct 22 15:43:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 61671 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0DC311BF19; Tue, 22 Oct 2019 17:43:36 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 9FBC21BEB1 for ; Tue, 22 Oct 2019 17:43:21 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Oct 2019 08:43:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,216,1569308400"; d="scan'208";a="200824094" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by orsmga003.jf.intel.com with ESMTP; 22 Oct 2019 08:43:19 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Luca Boccassi Date: Tue, 22 Oct 2019 16:43:07 +0100 Message-Id: <20191022154310.41238-7-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191022154310.41238-1-bruce.richardson@intel.com> References: <20191014113448.7442-1-bruce.richardson@intel.com> <20191022154310.41238-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 6/9] examples/server_node_efd: add node binary to meson build 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" Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- examples/meson.build | 3 ++- examples/server_node_efd/{ => node}/meson.build | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) rename examples/server_node_efd/{ => node}/meson.build (60%) diff --git a/examples/meson.build b/examples/meson.build index 8ef81446f..6f5f00ec7 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -36,7 +36,8 @@ all_examples = [ 'ptpclient', 'qos_meter', 'qos_sched', 'quota_watermark', 'rxtx_callbacks', - 'server_node_efd', 'service_cores', + 'server_node_efd/node', + 'service_cores', 'skeleton', 'tep_termination', 'timer', 'vdpa', 'vhost', 'vhost_crypto', diff --git a/examples/server_node_efd/meson.build b/examples/server_node_efd/node/meson.build similarity index 60% rename from examples/server_node_efd/meson.build rename to examples/server_node_efd/node/meson.build index c370d7476..30f28761f 100644 --- a/examples/server_node_efd/meson.build +++ b/examples/server_node_efd/node/meson.build @@ -1,10 +1,13 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation +# Copyright(c) 2019 Intel Corporation # meson file, for building this example as part of a main DPDK build. # # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' -# Example app currently unsupported by meson build -build = false +name = 'efd_node' + +deps += ['hash'] +sources += files('node.c') +includes += include_directories('../shared') From patchwork Tue Oct 22 15:43:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 61672 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9887D1BF24; Tue, 22 Oct 2019 17:43:38 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 4B45B1BECB for ; Tue, 22 Oct 2019 17:43:22 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Oct 2019 08:43:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,216,1569308400"; d="scan'208";a="200824099" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by orsmga003.jf.intel.com with ESMTP; 22 Oct 2019 08:43:20 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Luca Boccassi Date: Tue, 22 Oct 2019 16:43:08 +0100 Message-Id: <20191022154310.41238-8-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191022154310.41238-1-bruce.richardson@intel.com> References: <20191014113448.7442-1-bruce.richardson@intel.com> <20191022154310.41238-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 7/9] examples/server_node_efd: add server binary to meson build 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" When adding to the build, add in two missing includes that prevented build on freebsd, rather than just duplicating the makefile restriction. Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- V3: add in missing headers for build compilation --- examples/meson.build | 1 + examples/server_node_efd/server/main.c | 2 ++ examples/server_node_efd/server/meson.build | 13 +++++++++++++ 3 files changed, 16 insertions(+) create mode 100644 examples/server_node_efd/server/meson.build diff --git a/examples/meson.build b/examples/meson.build index 6f5f00ec7..8a15dafcf 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -37,6 +37,7 @@ all_examples = [ 'qos_meter', 'qos_sched', 'quota_watermark', 'rxtx_callbacks', 'server_node_efd/node', + 'server_node_efd/server', 'service_cores', 'skeleton', 'tep_termination', 'timer', 'vdpa', diff --git a/examples/server_node_efd/server/main.c b/examples/server_node_efd/server/main.c index 455bdc063..21c72acda 100644 --- a/examples/server_node_efd/server/main.c +++ b/examples/server_node_efd/server/main.c @@ -11,6 +11,8 @@ #include #include #include +#include +#include #include #include diff --git a/examples/server_node_efd/server/meson.build b/examples/server_node_efd/server/meson.build new file mode 100644 index 000000000..23e08d1ae --- /dev/null +++ b/examples/server_node_efd/server/meson.build @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2019 Intel Corporation + +# meson file, for building this example as part of a main DPDK build. +# +# To build this example as a standalone application with an already-installed +# DPDK instance, use 'make' + +name = 'efd_server' + +deps += 'efd' +sources += files('args.c', 'init.c', 'main.c') +includes += include_directories('../shared') From patchwork Tue Oct 22 15:43:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 61673 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9581F1BF3F; Tue, 22 Oct 2019 17:43:44 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id D36F61BEE3; Tue, 22 Oct 2019 17:43:23 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Oct 2019 08:43:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,216,1569308400"; d="scan'208";a="200824106" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by orsmga003.jf.intel.com with ESMTP; 22 Oct 2019 08:43:21 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , stable@dpdk.org Date: Tue, 22 Oct 2019 16:43:09 +0100 Message-Id: <20191022154310.41238-9-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191022154310.41238-1-bruce.richardson@intel.com> References: <20191014113448.7442-1-bruce.richardson@intel.com> <20191022154310.41238-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 8/9] examples/guest_cli: fix type of cmdline token 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" Building the example with clang gives the error: error: expression which evaluates to zero treated as a null pointer constant of type 'const char *' [-Werror,-Wnon-literal-null-conversion] lcore_id, UINT8); ^~~~~ This error is due to the wrong data type being given for the cmd_set_cpu_freq_core_num value - it was specified as string rather than numeric type. Fixes: f5e5c3347ae3 ("examples/vm_power: cli in guest") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Acked-by: David Hunt --- examples/vm_power_manager/guest_cli/vm_power_cli_guest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c index fe09b0778..610d9aeac 100644 --- a/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c +++ b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c @@ -171,7 +171,7 @@ cmd_set_cpu_freq_parsed(void *parsed_result, struct cmdline *cl, cmdline_parse_token_string_t cmd_set_cpu_freq = TOKEN_STRING_INITIALIZER(struct cmd_set_cpu_freq_result, set_cpu_freq, "set_cpu_freq"); -cmdline_parse_token_string_t cmd_set_cpu_freq_core_num = +cmdline_parse_token_num_t cmd_set_cpu_freq_core_num = TOKEN_NUM_INITIALIZER(struct cmd_set_cpu_freq_result, lcore_id, UINT8); cmdline_parse_token_string_t cmd_set_cpu_freq_cmd_cmd = From patchwork Tue Oct 22 15:43:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 61674 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6A38E1BF4F; Tue, 22 Oct 2019 17:43:46 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 9B1DD1BEF8 for ; Tue, 22 Oct 2019 17:43:24 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Oct 2019 08:43:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,216,1569308400"; d="scan'208";a="200824109" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by orsmga003.jf.intel.com with ESMTP; 22 Oct 2019 08:43:23 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Tue, 22 Oct 2019 16:43:10 +0100 Message-Id: <20191022154310.41238-10-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191022154310.41238-1-bruce.richardson@intel.com> References: <20191014113448.7442-1-bruce.richardson@intel.com> <20191022154310.41238-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 9/9] examples/guest_cli: add power manager guest cli to meson 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" Signed-off-by: Bruce Richardson Acked-by: David Hunt --- examples/meson.build | 1 + examples/vm_power_manager/guest_cli/meson.build | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/examples/meson.build b/examples/meson.build index 8a15dafcf..5a235545a 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -43,6 +43,7 @@ all_examples = [ 'timer', 'vdpa', 'vhost', 'vhost_crypto', 'vhost_scsi', 'vm_power_manager', + 'vm_power_manager/guest_cli', 'vmdq', 'vmdq_dcb', ] # install all example code on install - irrespective of whether the example in diff --git a/examples/vm_power_manager/guest_cli/meson.build b/examples/vm_power_manager/guest_cli/meson.build index 38bd8d837..2b490424f 100644 --- a/examples/vm_power_manager/guest_cli/meson.build +++ b/examples/vm_power_manager/guest_cli/meson.build @@ -6,10 +6,6 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' -# Setting the name here because the default name will conflict with the -# vm_power_manager app because of the way the directories are parsed. -name = 'guest_cli' - if not dpdk_conf.has('RTE_LIBRTE_POWER') build = false subdir_done()