vppinfra: make _vec_len() read-only

[vpp.git] / src / vppinfra / linux / sysfs.c

diff --git a/src/vppinfra/linux/sysfs.c b/src/vppinfra/linux/sysfs.c
index 5f611e6..a3e122c 100644 (file)
--- a/src/vppinfra/linux/sysfs.c
+++ b/src/vppinfra/linux/sysfs.c
@@ -16,13 +16,14 @@
 #include <vppinfra/clib.h>
 #include <vppinfra/clib_error.h>
 #include <vppinfra/format.h>
+#include <vppinfra/bitmap.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <dirent.h>
 
-clib_error_t *
+__clib_export clib_error_t *
 clib_sysfs_write (char *file_name, char *fmt, ...)
 {
   u8 *s;
@@ -46,7 +47,7 @@ clib_sysfs_write (char *file_name, char *fmt, ...)
   return error;
 }
 
-clib_error_t *
+__clib_export clib_error_t *
 clib_sysfs_read (char *file_name, char *fmt, ...)
 {
   unformat_input_t input;
@@ -69,7 +70,7 @@ clib_sysfs_read (char *file_name, char *fmt, ...)
       return clib_error_return_unix (0, "read `%s'", file_name);
     }
 
-  _vec_len (s) = sz;
+  vec_set_len (s, sz);
   unformat_init_vector (&input, s);
 
   va_list va;
@@ -86,7 +87,7 @@ clib_sysfs_read (char *file_name, char *fmt, ...)
   return 0;
 }
 
-u8 *
+__clib_export u8 *
 clib_sysfs_link_to_name (char *link)
 {
   char *p, buffer[64];
@@ -114,11 +115,17 @@ clib_sysfs_link_to_name (char *link)
 }
 
 clib_error_t *
-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;
+  uword page_size;
+
+  if (log2_page_size == 0)
+    log2_page_size = min_log2 (clib_mem_get_default_hugepage_size ());
+
+  page_size = 1ULL << (log2_page_size - 10);
 
   p = format (p, "/sys/devices/system/node/node%u%c", numa_node, 0);
 
@@ -147,7 +154,7 @@ clib_sysfs_set_nr_hugepages (int numa_node, int page_size, int nr)
       goto done;
     }
 
-  _vec_len (p) -= 1;
+  vec_dec_len (p, 1);
   p = format (p, "/hugepages/hugepages-%ukB/nr_hugepages%c", page_size, 0);
   clib_sysfs_write ((char *) p, "%d", nr);
 
@@ -159,12 +166,20 @@ done:
 
 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;
 
+  uword page_size;
+
+  if (log2_page_size == 0)
+    log2_page_size = min_log2 (clib_mem_get_default_hugepage_size ());
+
+  page_size = 1ULL << (log2_page_size - 10);
+
+
   p = format (p, "/sys/devices/system/node/node%u%c", numa_node, 0);
 
   if (stat ((char *) p, &sb) == 0)
@@ -192,7 +207,7 @@ clib_sysfs_get_xxx_hugepages (char *type, int numa_node,
       goto done;
     }
 
-  _vec_len (p) -= 1;
+  vec_dec_len (p, 1);
   p = format (p, "/hugepages/hugepages-%ukB/%s_hugepages%c", page_size,
              type, 0);
   error = clib_sysfs_read ((char *) p, "%d", val);
@@ -203,43 +218,77 @@ done:
 }
 
 clib_error_t *
-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_error_t *
-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_error_t *
-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_error_t *
-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;
-  error = clib_sysfs_get_free_hugepages (numa_node, page_size, &n);
+  uword page_size;
+
+  if (log2_page_size == 0)
+    log2_page_size = min_log2 (clib_mem_get_default_hugepage_size ());
+
+  page_size = 1ULL << (log2_page_size - 10);
+
+  error = clib_sysfs_get_free_hugepages (numa_node, log2_page_size, &n);
   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);
-  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);
 }
 
+__clib_export uword *
+clib_sysfs_list_to_bitmap (char *filename)
+{
+  FILE *fp;
+  uword *r = 0;
+
+  fp = fopen (filename, "r");
+
+  if (fp != NULL)
+    {
+      u8 *buffer = 0;
+      vec_validate (buffer, 256 - 1);
+      if (fgets ((char *) buffer, 256, fp))
+       {
+         unformat_input_t in;
+         unformat_init_string (&in, (char *) buffer,
+                               strlen ((char *) buffer));
+         if (unformat (&in, "%U", unformat_bitmap_list, &r) != 1)
+           clib_warning ("unformat_bitmap_list failed");
+         unformat_free (&in);
+       }
+      vec_free (buffer);
+      fclose (fp);
+    }
+  return r;
+}
 
 /*
  * fd.io coding-style-patch-verification: ON