ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not use hugepages if none are available.

Browse Source 
In case socket-mem was set to <1024 and no 1G page long hupepages were
available, the condition was evaluated in unexpected manner. In other
words use_1g == 1, and that fails later in mount().
This patch makes sure this is prevented - if there are no pages_available,
do not even try to use that pagesize.

Change-Id: I30675aa017d97b99d84d5db926e62f0acb54deb6
Signed-off-by: Stefan Kobza <skobza@cisco.com>
This commit is contained in:
Stefan Kobza
2016-03-11 15:18:42 +01:00
committed by Gerrit Code Review
parent a5584254fc
commit ac26da5b53
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vnet/vnet/devices/dpdk/init.c
View File

@ -1148,11 +1148,11 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input)
u32 pages_avail;
pages_avail = get_node_free_hugepages_num(c, 1048576);
if (!(pages_avail >= pages_num_1g))
if (!pages_avail || !(pages_avail >= pages_num_1g))
use_1g = 0;
pages_avail = get_node_free_hugepages_num(c, 2048);
if (!(pages_avail >= pages_num_2m))
if (!pages_avail || !(pages_avail >= pages_num_2m))
use_2m = 0;
}
}