fix to count user pages

refs #864

kernel/include/cls.h

@@ -28,26 +28,6 @@ struct kmalloc_header {
 	/* 32 bytes */
 };
 
-#define IHK_OS_MONITOR_NOT_BOOT 0
-#define IHK_OS_MONITOR_IDLE 1
-#define IHK_OS_MONITOR_USER 2
-#define IHK_OS_MONITOR_KERNEL 3
-#define IHK_OS_MONITOR_KERNEL_HEAVY 4
-#define IHK_OS_MONITOR_KERNEL_OFFLOAD 5
-#define IHK_OS_MONITOR_KERNEL_FREEZING 8
-#define IHK_OS_MONITOR_KERNEL_FROZEN 9
-#define IHK_OS_MONITOR_KERNEL_THAW 10
-#define IHK_OS_MONITOR_PANIC 99
-
-struct ihk_os_monitor {
-	int status;
-	int status_bak;
-	unsigned long counter;
-	unsigned long ocounter;
-	unsigned long user_tsc;
-	unsigned long system_tsc;
-};
-
 #include <ihk/lock.h>
 #define CPU_STATUS_DISABLE	(0)
 #define CPU_STATUS_IDLE		(1)
@@ -112,7 +92,7 @@ struct cpu_local_var {
 	int no_preempt;
 	int timer_enabled;
 	int kmalloc_initialized;
-	struct ihk_os_monitor *monitor;
+	struct ihk_os_cpu_monitor *monitor;
 
 	ihk_spinlock_t smp_func_req_lock;
 	struct list_head smp_func_req_list;

kernel/include/rusage.h

@@ -2,106 +2,32 @@
 #define __RUSAGE_H
 
 #include <config.h>
-
-#define RUSAGE_DEFAULT_SIZE 10
-
-enum RUSAGE_MEMBER {
-    RUSAGE_RSS,
-    RUSAGE_CACHE,
-    RUSAGE_RSS_HUGE,
-    RUSAGE_MAPPED_FILE,
-    RUSAGE_MAX_USAGE,
-    RUSAGE_KMEM_USAGE,
-    RUSAGE_KMAX_USAGE,
-    RUSAGE_NUM_NUMA_NODES,
-    RUSAGE_NUMA_STAT,
-    RUSAGE_HUGETLB ,
-    RUSAGE_HUGETLB_MAX ,
-    RUSAGE_STAT_SYSTEM ,
-    RUSAGE_STAT_USER ,
-    RUSAGE_USAGE ,
-    RUSAGE_USAGE_PER_CPU ,
-    RUSAGE_NUM_THREADS ,
-    RUSAGE_MAX_NUM_THREADS
-};
-
-struct  r_data{
-    unsigned long pid;
-    unsigned long rss;
-    unsigned long cache;
-    unsigned long rss_huge;
-    unsigned long mapped_file;
-    unsigned long max_usage;
-    unsigned long kmem_usage;
-    unsigned long kmax_usage;
-    unsigned long hugetlb;
-    unsigned long hugetlb_max;
-    unsigned long stat_system;
-    unsigned long stat_user;
-    unsigned long usage;
-    struct r_data *next;
-} ;
-typedef struct r_data rusage_data;
-
-rusage_data *rdata[RUSAGE_DEFAULT_SIZE];
-unsigned long rusage_max_num_threads;
-unsigned long rusage_num_threads;
-
-enum ihk_os_status {
-    IHK_STATUS_INACTIVE,
-    IHK_STATUS_BOOTING,
-    IHK_STATUS_RUNNING,
-    IHK_STATUS_SHUTDOWN,
-    IHK_STATUS_PANIC,
-    IHK_STATUS_HUNGUP,
-    IHK_STATUS_FREEZING,
-    IHK_STATUS_FROZEN,
-};
-
-enum ihk_os_status os_status;
-unsigned long sys_delegate_count;
-enum sys_delegate_state_enum {
-	ENTER_KERNEL,
-	EXIT_KERNEL,
-};
-enum sys_delegate_state_enum sys_delegate_state;
-
-unsigned long rusage_rss_max;
-long rusage_rss_current;
-unsigned long rusage_kmem_usage;
-unsigned long rusage_kmem_max_usage;
-unsigned long rusage_hugetlb_usage;
-unsigned long rusage_hugetlb_max_usage;
-unsigned long rusage_numa_stat[1024];
-unsigned long rusage_max_memory;
-
-#define RUSAGE_MEM_LIMIT (2 * 1024 * 1024) // 2MB
-
-void rusage_init();
+#include <ihk/rusage.h>
 
 #ifdef ENABLE_RUSAGE
-extern void event_signal();
+#define RUSAGE_MEM_LIMIT (2 * 1024 * 1024) // 2MB
+
+extern void eventfd();
 
 static inline void
-rusage_max_memory_add(unsigned long size)
+rusage_total_memory_add(unsigned long size)
 {
-	rusage_max_memory += size;
+	monitor->rusage_total_memory += size;
 }
 
 static inline void
 rusage_rss_add(unsigned long size)
 {
-	unsigned long newval = __sync_add_and_fetch(&rusage_rss_current, size);
-	unsigned long oldval = rusage_rss_max;
+	unsigned long newval;
+	unsigned long oldval;
 	unsigned long retval;
 
+	newval = __sync_add_and_fetch(&monitor->rusage_rss_current, size);
+	oldval = monitor->rusage_rss_max;
 	while (newval > oldval) {
-		retval = __sync_val_compare_and_swap(&rusage_rss_max, oldval,
-		                                     newval);
+		retval = __sync_val_compare_and_swap(&monitor->rusage_rss_max,
+		                                     oldval, newval);
 		if (retval == oldval) {
-			if (rusage_max_memory - newval < RUSAGE_MEM_LIMIT) {
-				event_signal();
-			}
 			break;
 		}
 		oldval = retval;
@@ -111,13 +37,39 @@ rusage_rss_add(unsigned long size)
 static inline void
 rusage_rss_sub(unsigned long size)
 {
-	__sync_sub_and_fetch(&rusage_rss_current, size);
+	__sync_sub_and_fetch(&monitor->rusage_rss_current, size);
+}
+
+static inline void
+rusage_kmem_add(unsigned long size)
+{
+	unsigned long newval;
+	unsigned long oldval;
+	unsigned long retval;
+
+	newval = __sync_add_and_fetch(&monitor->rusage_kmem_usage, size);
+	oldval = monitor->rusage_kmem_max_usage;
+	while (newval > oldval) {
+		retval = __sync_val_compare_and_swap(
+		                                &monitor->rusage_kmem_max_usage,
+		                                oldval, newval);
+		if (retval == oldval) {
+			break;
+		}
+		oldval = retval;
+	}
+}
+
+static inline void
+rusage_kmem_sub(unsigned long size)
+{
+	__sync_sub_and_fetch(&monitor->rusage_kmem_usage, size);
 }
 
 static inline void
 rusage_numa_add(int numa_id, unsigned long size)
 {
-	__sync_add_and_fetch(rusage_numa_stat + numa_id, size);
+	__sync_add_and_fetch(monitor->rusage_numa_stat + numa_id, size);
 	rusage_rss_add(size);
 }
 
@@ -125,18 +77,63 @@ static inline void
 rusage_numa_sub(int numa_id, unsigned long size)
 {
 	rusage_rss_sub(size);
-	__sync_sub_and_fetch(rusage_numa_stat + numa_id, size);
+	__sync_sub_and_fetch(monitor->rusage_numa_stat + numa_id, size);
+}
+
+static inline void
+rusage_page_add(int numa_id, unsigned long pages, int is_user)
+{
+	unsigned long size = pages * PAGE_SIZE;
+	unsigned long newval;
+	unsigned long oldval;
+	unsigned long retval;
+
+	if (is_user)
+		rusage_numa_add(numa_id, size);
+	else
+		rusage_kmem_add(size);
+
+	newval = __sync_add_and_fetch(&monitor->rusage_total_memory_usage, size);
+	oldval = monitor->rusage_total_memory_max_usage;
+	while (newval > oldval) {
+		retval = __sync_val_compare_and_swap(&monitor->rusage_total_memory_max_usage,
+		                                     oldval, newval);
+		if (retval == oldval) {
+			if (monitor->rusage_total_memory - newval <
+			    RUSAGE_MEM_LIMIT) {
+				eventfd();
+			}
+			break;
+		}
+		oldval = retval;
+	}
+}
+
+static inline void
+rusage_page_sub(int numa_id, unsigned long pages, int is_user)
+{
+	unsigned long size = pages * PAGE_SIZE;
+
+	__sync_sub_and_fetch(&monitor->rusage_total_memory_usage, size);
+
+	if (is_user)
+		rusage_numa_sub(numa_id, size);
+	else
+		rusage_kmem_sub(size);
 }
 
 static inline void
 rusage_num_threads_inc()
 {
-	unsigned long newval = __sync_add_and_fetch(&rusage_num_threads, 1);
-	unsigned long oldval = rusage_max_num_threads;
+	unsigned long newval;
+	unsigned long oldval;
 	unsigned long retval;
 
+	newval = __sync_add_and_fetch(&monitor->rusage_num_threads, 1);
+	oldval = monitor->rusage_max_num_threads;
 	while (newval > oldval) {
-		retval = __sync_val_compare_and_swap(&rusage_max_num_threads,
+		retval = __sync_val_compare_and_swap(&monitor->
+		                                     rusage_max_num_threads,
 		                                     oldval, newval);
 		if (retval == oldval) {
 			break;
@@ -148,11 +145,11 @@ rusage_num_threads_inc()
 static inline void
 rusage_num_threads_dec()
 {
-	__sync_sub_and_fetch(&rusage_num_threads, 1);
+	__sync_sub_and_fetch(&monitor->rusage_num_threads, 1);
 }
 #else
 static inline void
-rusage_max_memory_add(unsigned long size)
+rusage_total_memory_add(unsigned long size)
 {
 }
 
@@ -176,6 +173,16 @@ rusage_numa_sub(int numa_id, unsigned long size)
 {
 }
 
+static inline void
+rusage_page_add(int numa_id, unsigned long size, int is_user)
+{
+}
+
+static inline void
+rusage_page_sub(int numa_id, unsigned long size, int is_user)
+{
+}
+
 static inline void
 rusage_num_threads_inc()
 {

kernel/include/syscall.h

@@ -73,7 +73,7 @@
 /* #define SCD_MSG_SYSFS_RESP_CLEANUP   0x43 */
 #define SCD_MSG_PROCFS_TID_CREATE	0x44
 #define SCD_MSG_PROCFS_TID_DELETE	0x45
-#define SCD_MSG_EVENT_SIGNAL		0x46
+#define SCD_MSG_EVENTFD			0x46
 
 #define SCD_MSG_PERF_CTRL               0x50
 #define SCD_MSG_PERF_ACK                0x51