Change-Id: Ibec32c6df32f4cd9889d378e244f170c93ad295b
Signed-off-by: Damjan Marion <damarion@cisco.com>
vec_validate(mem_by_socket, c);
vec_validate(mem_by_socket, c);
- e = clib_sysfs_prealloc_hugepages(c, 2 << 10, mem_by_socket[c] / 2);
+ e = clib_sysfs_prealloc_hugepages(c, 0, mem_by_socket[c] / 2);
if (e)
clib_error_report (e);
}));
if (e)
clib_error_report (e);
}));
if (a->flags & CLIB_MEM_VM_F_HUGETLB_PREALLOC)
{
if (a->flags & CLIB_MEM_VM_F_HUGETLB_PREALLOC)
{
- err = clib_sysfs_prealloc_hugepages (a->numa_node,
- 1 << (log2_page_size - 10),
+ err = clib_sysfs_prealloc_hugepages (a->numa_node, log2_page_size,
n_pages);
if (err)
goto error;
n_pages);
if (err)
goto error;
#include <fcntl.h>
#include <dirent.h>
#include <fcntl.h>
#include <dirent.h>
+#define DEFAULT_HUGETLB_SIZE 2048
+
clib_error_t *
clib_sysfs_write (char *file_name, char *fmt, ...)
{
clib_error_t *
clib_sysfs_write (char *file_name, char *fmt, ...)
{
-clib_sysfs_set_nr_hugepages (int numa_node, int page_size, int nr)
+clib_sysfs_set_nr_hugepages (int numa_node, int log2_page_size, int nr)
{
clib_error_t *error = 0;
struct stat sb;
u8 *p = 0;
{
clib_error_t *error = 0;
struct stat sb;
u8 *p = 0;
+ int page_size = log2_page_size ? 1ULL << (log2_page_size - 10) :
+ DEFAULT_HUGETLB_SIZE;
p = format (p, "/sys/devices/system/node/node%u%c", numa_node, 0);
p = format (p, "/sys/devices/system/node/node%u%c", numa_node, 0);
static clib_error_t *
clib_sysfs_get_xxx_hugepages (char *type, int numa_node,
static clib_error_t *
clib_sysfs_get_xxx_hugepages (char *type, int numa_node,
- int page_size, int *val)
+ int log2_page_size, int *val)
{
clib_error_t *error = 0;
struct stat sb;
u8 *p = 0;
{
clib_error_t *error = 0;
struct stat sb;
u8 *p = 0;
+ int page_size = log2_page_size ? 1ULL << (log2_page_size - 10) :
+ DEFAULT_HUGETLB_SIZE;
p = format (p, "/sys/devices/system/node/node%u%c", numa_node, 0);
p = format (p, "/sys/devices/system/node/node%u%c", numa_node, 0);
-clib_sysfs_get_free_hugepages (int numa_node, int page_size, int *v)
+clib_sysfs_get_free_hugepages (int numa_node, int log2_page_size, int *v)
- return clib_sysfs_get_xxx_hugepages ("free", numa_node, page_size, v);
+ return clib_sysfs_get_xxx_hugepages ("free", numa_node, log2_page_size, v);
-clib_sysfs_get_nr_hugepages (int numa_node, int page_size, int *v)
+clib_sysfs_get_nr_hugepages (int numa_node, int log2_page_size, int *v)
- return clib_sysfs_get_xxx_hugepages ("nr", numa_node, page_size, v);
+ return clib_sysfs_get_xxx_hugepages ("nr", numa_node, log2_page_size, v);
-clib_sysfs_get_surplus_hugepages (int numa_node, int page_size, int *v)
+clib_sysfs_get_surplus_hugepages (int numa_node, int log2_page_size, int *v)
- return clib_sysfs_get_xxx_hugepages ("surplus", numa_node, page_size, v);
+ return clib_sysfs_get_xxx_hugepages ("surplus", numa_node, log2_page_size,
+ v);
-clib_sysfs_prealloc_hugepages (int numa_node, int page_size, int nr)
+clib_sysfs_prealloc_hugepages (int numa_node, int log2_page_size, int nr)
{
clib_error_t *error = 0;
int n, needed;
{
clib_error_t *error = 0;
int n, needed;
- error = clib_sysfs_get_free_hugepages (numa_node, page_size, &n);
+ int page_size = log2_page_size ? 1ULL << (log2_page_size - 10) :
+ DEFAULT_HUGETLB_SIZE;
+ error = clib_sysfs_get_free_hugepages (numa_node, log2_page_size, &n);
if (error)
return error;
needed = nr - n;
if (needed <= 0)
return 0;
if (error)
return error;
needed = nr - n;
if (needed <= 0)
return 0;
- error = clib_sysfs_get_nr_hugepages (numa_node, page_size, &n);
+ error = clib_sysfs_get_nr_hugepages (numa_node, log2_page_size, &n);
if (error)
return error;
clib_warning ("pre-allocating %u additional %uK hugepages on numa node %u",
needed, page_size, numa_node);
if (error)
return error;
clib_warning ("pre-allocating %u additional %uK hugepages on numa node %u",
needed, page_size, numa_node);
- return clib_sysfs_set_nr_hugepages (numa_node, page_size, n + needed);
+ return clib_sysfs_set_nr_hugepages (numa_node, log2_page_size, n + needed);
u8 *clib_sysfs_link_to_name (char *link);
clib_error_t *clib_sysfs_set_nr_hugepages (int numa_node,
u8 *clib_sysfs_link_to_name (char *link);
clib_error_t *clib_sysfs_set_nr_hugepages (int numa_node,
- int page_size, int nr);
+ int log2_page_size, int nr);
clib_error_t *clib_sysfs_get_nr_hugepages (int numa_node,
clib_error_t *clib_sysfs_get_nr_hugepages (int numa_node,
- int page_size, int *v);
+ int log2_page_size, int *v);
clib_error_t *clib_sysfs_get_free_hugepages (int numa_node,
clib_error_t *clib_sysfs_get_free_hugepages (int numa_node,
- int page_size, int *v);
+ int log2_page_size, int *v);
clib_error_t *clib_sysfs_get_surplus_hugepages (int numa_node,
clib_error_t *clib_sysfs_get_surplus_hugepages (int numa_node,
- int page_size, int *v);
+ int log2_page_size, int *v);
clib_error_t *clib_sysfs_prealloc_hugepages (int numa_node,
clib_error_t *clib_sysfs_prealloc_hugepages (int numa_node,
- int page_size, int nr);
+ int log2_page_size, int nr);
#endif /* included_linux_sysfs_h */
#endif /* included_linux_sysfs_h */