From patchwork Thu Feb 7 15:53:17 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: 50196 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 B6B5A1B56F; Thu, 7 Feb 2019 16:53:25 +0100 (CET) Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by dpdk.org (Postfix) with ESMTP id 96D001B56C for ; Thu, 7 Feb 2019 16:53:24 +0100 (CET) Received: by mail-qt1-f193.google.com with SMTP id y4so331137qtc.10 for ; Thu, 07 Feb 2019 07:53:24 -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=ktTsIytJzB9o/e9QlBVugdsbTZhvQboF9+h5D9lxR0U=; b=Vxfv4kgbFGnaMlqht3LCiVUf/wZh2DGMWpwZlYXSSM1DKmXlCNe8GKJqjzVAkQbskz snlmtKVdfK+3WJvKAHs0DEZRAPxwMkLrxTUKPQdmibhBesY2Yo6TLznTmbpNzeRLz0uX TJhC/kIkhbOn762IsLndWUht6VT0j/9SlChEc79k6KeJ/PwFFTsqIArm0W8HoKFQcfkX Zr/3O42hGiFwUjS4ij/Lnx1nJkYn1Xuwgy2qtDbjVmTEotmLg+KP7v8HuzDHZ0g75/zc V8JHu9HndJNWWTZBvr7e3HIQioUgGLreEbxprTiZ8pC5BXDVKyJzV8Jb730ORBC6Er++ YlVg== 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=ktTsIytJzB9o/e9QlBVugdsbTZhvQboF9+h5D9lxR0U=; b=CDh0JQzaDfITAljVOmGEoJckfS3DZLgQKx2aljq1IRBsXLYYQMaIHbZZ/zTYq9nwtl JWW9wm30FezHUBrvj1xheCBADIHP+8K9sqX1BvUIxIebONko0Aq/gphtAgRwCtHP9g/F AwLS0AW/K97oekVJlAKVk9t4mWKYsgtYDsUTs3xmqkC+WvTLTVq5hdYxTB62E53OCgpy wHXWuotODDZX3SLSjVYnHU5aZ5B6ppIL5X26ce5qSbD5C+pGIj67M5fzWr1UXhSty1dO 1vn706pkhfJHzzVlhkcLw/oozCsTsnW/jTzQJkGKzdfedxnhDW0iMdH1uABctH/ttuZh hMHA== X-Gm-Message-State: AHQUAuY7BEPePJCSEw4jSBjbVlAVqLYyUL9bbwUT8YnZfVYft+YjOTgI F4Jl77m7ZyI3sCHJJQZTPC5euENt X-Google-Smtp-Source: AHgI3IbdyqXnyuUZz7eLH//3YCNnI3BVsXMjwkIAWn+22LUjvkNHFDdxRPNiwy+Tw4wZ1Amj20ucYQ== X-Received: by 2002:aed:3907:: with SMTP id l7mr12626136qte.65.1549554803685; Thu, 07 Feb 2019 07:53:23 -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 32sm24482217qto.55.2019.02.07.07.53.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 07:53:22 -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, 7 Feb 2019 10:53:17 -0500 Message-Id: <20190207155318.12579-1-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] [v3, PATCH 1/2] 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..5bae08bb3 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -18,6 +18,8 @@ option('lib_musdk_dir', type: 'string', value: '', description: 'path to the MUSDK library installation directory') option('machine', type: 'string', value: 'native', description: 'set the target machine type') +option('max_ethports', type: 'string', value: '32', + description: 'maximum number of Ethernet devices in EAL') option('max_lcores', type: 'string', value: '128', description: 'maximum number of cores/threads supported by EAL') option('max_numa_nodes', type: 'string', value: '4', From patchwork Thu Feb 7 15:53:18 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: 50197 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 131AC1B578; Thu, 7 Feb 2019 16:53:29 +0100 (CET) Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by dpdk.org (Postfix) with ESMTP id CDD851B575 for ; Thu, 7 Feb 2019 16:53:26 +0100 (CET) Received: by mail-qt1-f195.google.com with SMTP id b15so349038qto.8 for ; Thu, 07 Feb 2019 07:53:26 -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=Dfz80wH8TUF2hy9dIH8gyq4lw49G28dYFAXsKVsSDZQ=; b=DOXXbD1h01RzY/IFmHoxWcCnVjZQFkRhTKiJi8WVvK1BssfZ/JK4PH5a7A0d+uF+zy meL22UmdOSsSoy6+rqwiBEp4GZK8or+GbY4KQ/aRG0MHErzfXtq7UFLtDETBjlqD/9Yc 59dTmjdHqeTWiFvfy+jzAVcjRumoXP3U8wLb2r8TMjfPummY3EQUcM9xUCZqpJE/zQhX +XHYGxY4G0swhw3Ql120R+L70xkmO/Z5vPaPKxrwFCM84VeuLUy/D2NSsmV7fVp9YL1+ L0Go0Ft1UUsilCJKxVRyDxZDeiCGKF+EHI2hYdTCXODVB1bs/ZEStnFQCB4SPTn6/Wwr xgGg== 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=Dfz80wH8TUF2hy9dIH8gyq4lw49G28dYFAXsKVsSDZQ=; b=h7+JRvQuH+8ZshnK4E7TPpC7UZ3GObgWnsrrbfR+gYp1P0TmbpNaW6T8DbPn92d4St OShkubf3r0iMkGk3ylbu06BE9IgH3TbTs+CvmTc1er9RT7T+lkZaPMJGtTdN8jRic6te Ha55OAHGZlaBW0SXzQ07/J2ALpXOmDK6BvajvCGiFi43sShP2GSPdExYwdsNbOyOK/5U 1vpF6mfIKQeQI/pirV6ivNZDquSbZZJ1t6VT4tZFmTaHY7MkkDq9g2hFBQXB1jbFsbFt mpdrmRq4LBf55pks5vyOofi28antrSUEMDXdukMXAqV8lhp1GtO4bJyDP15dqMD2qS/z /ApQ== X-Gm-Message-State: AHQUAuY8b8f0731uNc3TI9wOkhh0HULKP90RCP7atw1xwM2Uf3fafDuo kpzjfk8412pbHZvs6yYd8rDpysKg X-Google-Smtp-Source: AHgI3IaPbmuua8Jz6OQalwkgeSoZae94QLYthyo8o7cIxK2py+ARxazpWgYAnUML2aINSgrIkn7SZA== X-Received: by 2002:ac8:1185:: with SMTP id d5mr12634287qtj.117.1549554805588; Thu, 07 Feb 2019 07:53:25 -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 32sm24482217qto.55.2019.02.07.07.53.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 07:53:24 -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, 7 Feb 2019 10:53:18 -0500 Message-Id: <20190207155318.12579-2-3chas3@gmail.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190207155318.12579-1-3chas3@gmail.com> References: <20190131021858.5832-1-3chas3@gmail.com> <20190207155318.12579-1-3chas3@gmail.com> Subject: [dpdk-dev] [v3,PATCH 2/2] 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 5bae08bb3..c6454fe29 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')