diff options
author | 2016-09-27 17:51:13 +0200 | |
---|---|---|
committer | 2016-09-27 19:39:46 +0000 | |
commit | 20f6441c639771467a9699eed177ba5e22368d37 (patch) | |
tree | 9a6e726f8448cf9bef178fc71ec95c90ec4e2811 /vnet/vnet/devices | |
parent | c08a1ed69639a7ee0579c6e41f8e21f8fc595530 (diff) |
Fix hugepage detection issue
Per-numa free hugepages number was not read correctly due
to wrong sysfs path.
Change-Id: I889111027d7f93c42e2e4673d8d4e8f75ae065b6
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'vnet/vnet/devices')
-rw-r--r-- | vnet/vnet/devices/dpdk/init.c | 45 |
1 files changed, 5 insertions, 40 deletions
diff --git a/vnet/vnet/devices/dpdk/init.c b/vnet/vnet/devices/dpdk/init.c index 44b4dc31097..433d1d584fb 100644 --- a/vnet/vnet/devices/dpdk/init.c +++ b/vnet/vnet/devices/dpdk/init.c @@ -1199,57 +1199,22 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) /* *INDENT-OFF* */ clib_bitmap_foreach (c, tm->cpu_socket_bitmap, ( { - u32 pages_avail, page_size, mem; - u8 *s = 0; - u8 *p = 0; - char * numa_path = "/sys/devices/system/node/node%u/"; - char * nonnuma_path = "/sys/kernel/mm/"; - char * suffix = "hugepages/hugepages-%ukB/free_hugepages%c"; - char * path = NULL; - struct stat sb_numa, sb_nonnuma; - - p = format(p, numa_path, c); - if (stat(numa_path, &sb_numa) < 0) - sb_numa.st_mode = 0; - - if (stat(nonnuma_path, &sb_nonnuma) < 0) - sb_nonnuma.st_mode = 0; - - if (S_ISDIR(sb_numa.st_mode)) { - path = (char*)format((u8*)path, "%s%s", p, suffix); - } else if (S_ISDIR(sb_nonnuma.st_mode)) { - path = (char*)format((u8*)path, "%s%s", nonnuma_path, suffix); - } else { - use_1g = 0; - use_2m = 0; - vec_free(p); - break; - } + int pages_avail, page_size, mem; vec_validate(mem_by_socket, c); mem = mem_by_socket[c]; page_size = 1024; - pages_avail = 0; - s = format (s, path, page_size * 1024, 0); - vlib_sysfs_read ((char *) s, "%u", &pages_avail); - vec_reset_length (s); + pages_avail = vlib_sysfs_get_free_hugepages(c, page_size * 1024); - if (page_size * pages_avail < mem) + if (pages_avail < 0 || page_size * pages_avail < mem) use_1g = 0; page_size = 2; - pages_avail = 0; - s = format (s, path, page_size * 1024, 0); - vlib_sysfs_read ((char *) s, "%u", &pages_avail); - vec_reset_length (s); + pages_avail = vlib_sysfs_get_free_hugepages(c, page_size * 1024); - if (page_size * pages_avail < mem) + if (pages_avail < 0 || page_size * pages_avail < mem) use_2m = 0; - - vec_free(s); - vec_free(p); - vec_free(path); })); /* *INDENT-ON* */ |