gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rusage and ihklib: Fix out-of-memory reporting and cleanup

Browse Source 
1. Fix OOM: Count memory usage only when allocation succeeded
2. Fix OOM: Make user allocation fail when memory is running out
3. Fix OOM: Move rusage_init() before numa_init()
4. Cleanup: Rename ihkconfig/ihkosctl functions
5. Cleanup: Pass event type to eventfd()
6. Cleanup: arch/.../rusage.h --> arch/.../arch_rusage.h
This commit is contained in:
Masamichi Takagi
2017-08-23 19:39:46 +09:00
parent a1af7edd6e
commit daa7526127
18 changed files with 688 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
kernel/include/rusage.h
View File

@@ -3,6 +3,8 @@
#ifndef __RUSAGE_H
#define __RUSAGE_H
//#define RUSAGE_DEBUG
#define IHK_MAX_NUM_PGSIZES 4
#define IHK_MAX_NUM_NUMA_NODES 1024
#define IHK_MAX_NUM_CPUS 1024
@@ -13,21 +15,28 @@ struct rusage_percpu {
};
struct rusage_global {
/* Memory usage accounting */
long memory_stat_rss[IHK_MAX_NUM_PGSIZES];
long memory_stat_mapped_file[IHK_MAX_NUM_PGSIZES];
long rss_current; /* anon && user, used only for memory_max_usage */
unsigned long memory_max_usage;
unsigned long max_num_threads;
unsigned long num_threads;
long rss_current;
unsigned long memory_kmem_usage;
unsigned long memory_kmem_max_usage;
unsigned long memory_numa_stat[IHK_MAX_NUM_NUMA_NODES];
/* CPU usage accounting */
struct rusage_percpu cpu[IHK_MAX_NUM_CPUS]; /* clv[i].monitor = &cpu[i] */
/* OOM monitoring */
unsigned long total_memory;
unsigned long total_memory_usage;
unsigned long total_memory_max_usage;
#ifdef RUSAGE_DEBUG
unsigned long total_memory_max_usage_old; /* debug */
#endif
/* Used for translating results into struct mckernel_rusage */
unsigned long num_numa_nodes;
unsigned long num_processors;
unsigned long ns_per_tsc;

59
kernel/include/rusage_private.h
View File

@@ -8,18 +8,25 @@
#include <ihk/atomic.h>
#include <memobj.h>
#include <rusage.h>
#include <arch/rusage.h>
#include <ihk/ihk_monitor.h>
#include <arch_rusage.h>
#ifdef ENABLE_RUSAGE
#define RUSAGE_MEM_LIMIT (2 * 1024 * 1024) // 2MB
#define RUSAGE_OOM_MARGIN (2 * 1024 * 1024) // 2MB
extern void eventfd();
extern void eventfd(int type);
static inline void
rusage_total_memory_add(unsigned long size)
{
#ifdef RUSAGE_DEBUG
kprintf("%s: total_memory=%ld,size=%ld\n", __FUNCTION__, rusage->total_memory, size);
#endif
rusage->total_memory += size;
#ifdef RUSAGE_DEBUG
kprintf("%s: total_memory=%ld\n", __FUNCTION__, rusage->total_memory);
#endif
}
static inline void
@@ -220,6 +227,22 @@ rusage_numa_sub(int numa_id, unsigned long size)
__sync_sub_and_fetch(rusage->memory_numa_stat + numa_id, size);
}
static inline int
rusage_check_oom(int numa_id, unsigned long pages, int is_user)
{
unsigned long size = pages * PAGE_SIZE;
if (rusage->total_memory_usage + size > rusage->total_memory - RUSAGE_OOM_MARGIN) {
kprintf("%s: memory used:%ld available:%ld\n", __FUNCTION__, rusage->total_memory_usage, rusage->total_memory);
eventfd(IHK_OS_EVENTFD_TYPE_OOM);
if (is_user) {
return -ENOMEM;
}
}
return 0;
}
static inline void
rusage_page_add(int numa_id, unsigned long pages, int is_user)
{
@@ -228,6 +251,12 @@ rusage_page_add(int numa_id, unsigned long pages, int is_user)
unsigned long oldval;
unsigned long retval;
#ifdef RUSAGE_DEBUG
if (numa_id < 0 || numa_id >= rusage->num_numa_nodes) {
kprintf("%s: Error: invalid numa_id=%d\n", __FUNCTION__, numa_id);
return;
}
#endif
if (is_user)
rusage_numa_add(numa_id, size);
else
@@ -239,10 +268,12 @@ rusage_page_add(int numa_id, unsigned long pages, int is_user)
retval = __sync_val_compare_and_swap(&rusage->total_memory_max_usage,
oldval, newval);
if (retval == oldval) {
if (rusage->total_memory - newval <
RUSAGE_MEM_LIMIT) {
eventfd();
#ifdef RUSAGE_DEBUG
if (rusage->total_memory_max_usage > rusage->total_memory_max_usage_old + (1 * (1ULL << 30))) {
kprintf("%s: max(%ld) > old + 1GB,numa_id=%d\n", __FUNCTION__, rusage->total_memory_max_usage, numa_id);
rusage->total_memory_max_usage_old = rusage->total_memory_max_usage;
}
#endif
break;
}
oldval = retval;
@@ -253,7 +284,15 @@ static inline void
rusage_page_sub(int numa_id, unsigned long pages, int is_user)
{
unsigned long size = pages * PAGE_SIZE;
#ifdef RUSAGE_DEBUG
if (numa_id < 0 || numa_id >= rusage->num_numa_nodes) {
kprintf("%s: Error: invalid numa_id=%d\n", __FUNCTION__, numa_id);
return;
}
if (rusage->total_memory_usage < size) {
kprintf("%s: Error, total_memory_usage=%ld,size=%ld\n", __FUNCTION__, rusage->total_memory_max_usage, size);
}
#endif
__sync_sub_and_fetch(&rusage->total_memory_usage, size);
if (is_user)
@@ -343,9 +382,15 @@ rusage_numa_sub(int numa_id, unsigned long size)
{
}
static inline int
rusage_check_oom(int numa_id, unsigned long pages, int is_user)
{
return 0;
}
static inline void
rusage_page_add(int numa_id, unsigned long size, int is_user)
{
return;
}
static inline void

5
kernel/include/syscall.h
View File

@@ -268,6 +268,11 @@ struct ikc_scd_packet {
enum mcctrl_os_cpu_operation op;
void *resp;
};
/* SCD_MSG_EVENTFD */
struct {
int eventfd_type;
};
};
char padding[12];
};