From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ernst.netinsight.se (ernst.netinsight.se [194.16.221.21]) by dpdk.org (Postfix) with SMTP id BADBA1288 for ; Wed, 27 May 2015 11:30:24 +0200 (CEST) Received: from miho (unverified [10.100.1.152]) by ernst.netinsight.se (EMWAC SMTPRS 0.83) with SMTP id ; Wed, 27 May 2015 11:30:16 +0200 Date: Wed, 27 May 2015 11:30:16 +0200 From: Simon Kagstrom To: dev@dpdk.org, david.marchand@6wind.com, john.mcnamara@intel.com Message-ID: <20150527113016.2c31ba7e@miho> X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.27; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: [dpdk-dev] [PATCH v2] eal: Allow combining -m and --no-huge X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 May 2015 09:30:25 -0000 Needed to run as non-root but with higher memory allocations, and removes a constraint on no-huge mode being limited to 64M. A usage example is if running with file input with the pcap PMD, which can be done as non-root after this patch via e.g., ./test-dpdk --no-huge -m 1024 -l 0,1 -n3 --vdev 'eth_pcap0,rx_pcap=/tmp/eth-rx.pcap,tx_pcap=/tmp/eth-tx.pcap' Signed-off-by: Simon Kagstrom Signed-off-by: Johan Faltstrom --- v2: * Remove unneeded parentheses and merge lines * Patch prefix now eal: * Add example and more description (from David Marchand) lib/librte_eal/common/eal_common_options.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c index 8fcb1ab..1f459ac 100644 --- a/lib/librte_eal/common/eal_common_options.c +++ b/lib/librte_eal/common/eal_common_options.c @@ -850,9 +850,8 @@ eal_check_common_options(struct internal_config *internal_cfg) "be specified at the same time\n"); return -1; } - if (internal_cfg->no_hugetlbfs && - (mem_parsed || internal_cfg->force_sockets == 1)) { - RTE_LOG(ERR, EAL, "Options -m or --"OPT_SOCKET_MEM" cannot " + if (internal_cfg->no_hugetlbfs && internal_cfg->force_sockets == 1) { + RTE_LOG(ERR, EAL, "Option --"OPT_SOCKET_MEM" cannot " "be specified together with --"OPT_NO_HUGE"\n"); return -1; } -- 1.9.1