From 20f6441c639771467a9699eed177ba5e22368d37 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Tue, 27 Sep 2016 17:51:13 +0200
Subject: 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>
---
 vlib/vlib/unix/unix.h |  2 ++
 vlib/vlib/unix/util.c | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

(limited to 'vlib')

diff --git a/vlib/vlib/unix/unix.h b/vlib/vlib/unix/unix.h
index 510e3f196c5..69688a62b76 100644
--- a/vlib/vlib/unix/unix.h
+++ b/vlib/vlib/unix/unix.h
@@ -213,6 +213,8 @@ clib_error_t *vlib_sysfs_read (char *file_name, char *fmt, ...);
 
 u8 *vlib_sysfs_link_to_name (char *link);
 
+int vlib_sysfs_get_free_hugepages (unsigned int numa_node, int page_size);
+
 clib_error_t *foreach_directory_file (char *dir_name,
 				      clib_error_t * (*f) (void *arg,
 							   u8 * path_name,
diff --git a/vlib/vlib/unix/util.c b/vlib/vlib/unix/util.c
index fc243e41821..edc3e591baf 100644
--- a/vlib/vlib/unix/util.c
+++ b/vlib/vlib/unix/util.c
@@ -189,6 +189,39 @@ vlib_sysfs_link_to_name (char *link)
   return s;
 }
 
+int
+vlib_sysfs_get_free_hugepages (unsigned int numa_node, int page_size)
+{
+  struct stat sb;
+  u8 *p = 0;
+  int r = -1;
+
+  p = format (p, "/sys/devices/system/node/node%u%c", numa_node, 0);
+
+  if (stat ((char *) p, &sb) == 0)
+    {
+      if (S_ISDIR (sb.st_mode) == 0)
+	goto done;
+    }
+  else if (numa_node == 0)
+    {
+      vec_reset_length (p);
+      p = format (p, "/sys/kernel/mm%c", 0);
+      if (stat ((char *) p, &sb) < 0 || S_ISDIR (sb.st_mode) == 0)
+	goto done;
+    }
+  else
+    goto done;
+
+  _vec_len (p) -= 1;
+  p = format (p, "/hugepages/hugepages-%ukB/free_hugepages%c", page_size, 0);
+  vlib_sysfs_read ((char *) p, "%d", &r);
+
+done:
+  vec_free (p);
+  return r;
+}
+
 /*
  * fd.io coding-style-patch-verification: ON
  *
-- 
cgit 1.2.3-korg