From patchwork Thu Jan 31 02:18:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chas Williams <3chas3@gmail.com> X-Patchwork-Id: 50101 X-Patchwork-Delegate: thomas@monjalon.net 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 13D7B1B3B7; Thu, 31 Jan 2019 03:19:06 +0100 (CET) Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) by dpdk.org (Postfix) with ESMTP id 810781B3B5 for ; Thu, 31 Jan 2019 03:19:05 +0100 (CET) Received: by mail-qk1-f196.google.com with SMTP id m17so1044865qki.5 for ; Wed, 30 Jan 2019 18:19:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=L3HEEoEQXiILxBvtBkxI2RReP4mDxjke9QLBzmIpanU=; b=bJH6qznFK2QqlVZoH5Zji+vtmj7fL5dmtdsSz6+SPIOI2yAKy7PtBpJ3T8x89DgmBM ao3b+EuVGi6JFP9/fxlToLeFds0YDhGezWb+IUrY7DPzHDr1K/IYUSBc+52aHb9uyEmy yKGD86B2BcGIKwYcWyb4PTzue+r5q5k8iQdvm2M38sNothkhJHJGhz/UBNx6BLZvTWZA Oz3rALZjPUbAVJyz4KNcoet8x15EFxltleiJIwUa4Gw4tWwFsvnNUvRhr1E69h1KVYva RQy/M4Dgj66NxJvRwApYUZhjFwQALbAhYlYzcpNntrtTRUCVrVXetsIpu4JO2cI3ijUw ELeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=L3HEEoEQXiILxBvtBkxI2RReP4mDxjke9QLBzmIpanU=; b=bDyw8C/QgyKekFNDT8lAhQWOTFRvPvreff7hIg40vqTcOWAyji08Q8SZlUjVeQT1K4 PPxBfS/CApoDiy35BGa6odS14mMu1b4nkDA+m4nMzhTeqTXVJ5nO/OQhfhW066ArsKGH UHharC+F+bYx4zhtbrDft+zLcIaiP8fdvRs7BQkICIbgELTiixmn0IJ057pG3LgvMtjE yhmdgRYZU+AVasRjk0yVMAEycMtOZryyECyzlFITDEXqc8fBtKSzAG+ezat2U7aml9p7 mGRpsKZYdCJo/tCjd0q/sIDtw+8g8VMZl2jVoS/Go3uxrb5sBsHyAKZX7COW8JnUbNzu AK8A== X-Gm-Message-State: AJcUukc23zSm4grwC53B06/xQLapv874EKFv8o/7I3Fwy0veADu9W/7T RjEQR5KkuEmsIHeWpU7bl6EECI8L X-Google-Smtp-Source: ALg8bN7cfnommHXhuy/EfcekNBWQjbKjQYEy1TaJSrs1iu3GRjad2WoTlZzKTTLGINBxdwxg0yXDkQ== X-Received: by 2002:a37:aa91:: with SMTP id t139mr29429830qke.139.1548901144753; Wed, 30 Jan 2019 18:19:04 -0800 (PST) Received: from monolith.fios-router.home (pool-96-255-82-34.washdc.fios.verizon.net. [96.255.82.34]) by smtp.gmail.com with ESMTPSA id p47sm2684204qta.36.2019.01.30.18.19.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Jan 2019 18:19:04 -0800 (PST) From: Chas Williams <3chas3@gmail.com> To: dev@dpdk.org Cc: thomas@monjalon.net, bruce.richardson@intel.com, Chas Williams <3chas3@gmail.com> Date: Wed, 30 Jan 2019 21:18:58 -0500 Message-Id: <20190131021858.5832-1-3chas3@gmail.com> X-Mailer: git-send-email 2.17.2 Subject: [dpdk-dev] [PATCH] build: add option to override max ethports 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" Allow users and packagers to override the default RTE_MAX_ETHPORTS. This adds a new meson option, max_ethports which defaults to the current value. Signed-off-by: Chas Williams <3chas3@gmail.com> Acked-by: Bruce Richardson --- config/meson.build | 1 + config/rte_config.h | 1 - meson_options.txt | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config/meson.build b/config/meson.build index db32499b3..e59507065 100644 --- a/config/meson.build +++ b/config/meson.build @@ -103,6 +103,7 @@ endforeach # set other values pulled from the build options dpdk_conf.set('RTE_MAX_LCORE', get_option('max_lcores')) dpdk_conf.set('RTE_MAX_NUMA_NODES', get_option('max_numa_nodes')) +dpdk_conf.set('RTE_MAX_ETHPORTS', get_option('max_ethports')) dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet')) dpdk_conf.set('RTE_EAL_ALLOW_INV_SOCKET_ID', get_option('allow_invalid_socket_id')) # values which have defaults which may be overridden diff --git a/config/rte_config.h b/config/rte_config.h index d3732e953..7606f5d7b 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -51,7 +51,6 @@ #define RTE_PKTMBUF_HEADROOM 128 /* ether defines */ -#define RTE_MAX_ETHPORTS 32 #define RTE_MAX_QUEUES_PER_PORT 1024 #define RTE_ETHDEV_QUEUE_STAT_CNTRS 16 #define RTE_ETHDEV_RXTX_CALLBACKS 1 diff --git a/meson_options.txt b/meson_options.txt index 574054597..e54eedc66 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -28,3 +28,5 @@ option('use_hpet', type: 'boolean', value: false, description: 'use HPET timer in EAL') option('tests', type: 'boolean', value: true, description: 'build unit tests') +option('max_ethports', type: 'string', value: '32', + description: 'maximum number of Ethernet devices in EAL') From patchwork Thu Jan 31 23:59:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chas Williams <3chas3@gmail.com> X-Patchwork-Id: 50108 X-Patchwork-Delegate: thomas@monjalon.net 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 8D0911B494; Fri, 1 Feb 2019 00:59:37 +0100 (CET) Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by dpdk.org (Postfix) with ESMTP id DD42D1B48A for ; Fri, 1 Feb 2019 00:59:35 +0100 (CET) Received: by mail-qk1-f193.google.com with SMTP id x187so434040qkb.11 for ; Thu, 31 Jan 2019 15:59:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5l5I4z3TuGI7mRLsZXp6E1SuktF5ZrZ+FjQNuWIP6L8=; b=DHUQuqnyIOx3C7pErYSc/Qx2vyL+pdd4WblFY4+aSU6paM5DnE7E/xOEdVSbmc1M4s bdVyvIIUvYePzAsWd8GwBMGaCmqpe/34bSH/c8FiVS/1obobdz6OcqaBksMN4TCKEPKq 3P0tVDUfmCYHPn4+HyZAO0K7AcVMiAyCE+QYMIERRcIbIl4sWrSLTpibLvRubratiegZ mSZBFGh/2FgItxeYDIdcV+xHWW7sr7ctJ8fa8CTLgznJSFBLMcq/ABts2aawa9WunXvG Wn3QUpdDv/it/4ARRNq0BvRbILl4BCmUBmrbDJD1MLkXCVWa9OCLYPfQvVKGRq9ziOaC nVxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5l5I4z3TuGI7mRLsZXp6E1SuktF5ZrZ+FjQNuWIP6L8=; b=cD8De7IKekibqIvUEERgJ1D9XIWsiYkQZ9iqvyrseYw6RUFRC9Bs1sDAB/27Nf+PkH BsVbLlojm6W1ZIisjhG783uImxVv3nRgEpxXa0Au95KseivLTb7r1smK9qPIR7cMI0dd zuKuqaONVh/I9OYUuwASQKNzSc5wgGjV4TEW1O08Gb+5GYt6qNbCORn/xw2M1t4N9kEd 4rgpAMTy7NI2iWp4AvuyBJs02z9oqqo507ik5DUEPjdvRQddVuIBYdvt7HHGsT9mZEQe CWMbBwec7RPn3qzusZOs1QHvrs1is+z0BJjErmipRnnsLSC7+cY0ZTyQoAKjltGsGYwQ 47LQ== X-Gm-Message-State: AJcUukftDGi6/3tTxEZEwTU+UfUSzoE0vv7EZ/Coq/afTxbUxa4Vtqe4 tXXAfjdPYi3ja3Cq7FROMvzvb30D X-Google-Smtp-Source: ALg8bN5cbRJ+FsrA/qPkQG1fGCq7ugz7g9drUe8TkLzzsxZ3wQIg+Vt6m/Av62FcFMQOdgiklUzqHw== X-Received: by 2002:a37:4bd7:: with SMTP id y206mr34299973qka.167.1548979175178; Thu, 31 Jan 2019 15:59:35 -0800 (PST) Received: from monolith.fios-router.home (pool-96-255-82-34.washdc.fios.verizon.net. [96.255.82.34]) by smtp.gmail.com with ESMTPSA id o8sm3499214qkg.60.2019.01.31.15.59.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Jan 2019 15:59:34 -0800 (PST) From: Chas Williams <3chas3@gmail.com> To: dev@dpdk.org Cc: thomas@monjalon.net, bruce.richardson@intel.com, Chas Williams <3chas3@gmail.com> Date: Thu, 31 Jan 2019 18:59:20 -0500 Message-Id: <20190131235920.10823-2-3chas3@gmail.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190131021858.5832-1-3chas3@gmail.com> References: <20190131021858.5832-1-3chas3@gmail.com> Subject: [dpdk-dev] [PATCH 2/2,v2] build: fix option ordering 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" Sort the options alphabetically and make a note of the preferred order at the top of the file. Signed-off-by: Chas Williams <3chas3@gmail.com> Acked-by: Bruce Richardson --- meson_options.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index 499573ed4..db448c74e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,15 +1,17 @@ +# Please keep these options sorted alphabetically. + option('allow_invalid_socket_id', type: 'boolean', value: false, description: 'allow out-of-range NUMA socket id\'s for platforms that don\'t report the value correctly') option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-', description: 'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.') -option('ibverbs_link', type: 'combo', choices : ['shared', 'dlopen'], value: 'shared', - description: 'Linkage method (shared/dlopen) for Mellanox PMDs with ibverbs dependencies.') -option('enable_kmods', type: 'boolean', value: true, - description: 'build kernel modules') option('enable_docs', type: 'boolean', value: false, description: 'build documentation') +option('enable_kmods', type: 'boolean', value: true, + description: 'build kernel modules') option('examples', type: 'string', value: '', description: 'Comma-separated list of examples to build by default') +option('ibverbs_link', type: 'combo', choices : ['shared', 'dlopen'], value: 'shared', + description: 'Linkage method (shared/dlopen) for Mellanox PMDs with ibverbs dependencies.') option('include_subdir_arch', type: 'string', value: '', description: 'subdirectory where to install arch-dependent headers') option('kernel_dir', type: 'string', value: '', @@ -26,7 +28,7 @@ option('max_numa_nodes', type: 'string', value: '4', description: 'maximum number of NUMA nodes supported by EAL') option('per_library_versions', type: 'boolean', value: true, description: 'true: each lib gets its own version number, false: DPDK version used for each lib') -option('use_hpet', type: 'boolean', value: false, - description: 'use HPET timer in EAL') option('tests', type: 'boolean', value: true, description: 'build unit tests') +option('use_hpet', type: 'boolean', value: false, + description: 'use HPET timer in EAL')