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

fix: Bug for getrusage return incorrect ru_maxrss

Browse Source 
refs #1032
This commit is contained in:
Ken Sato
2018-03-07 13:09:24 +09:00
parent 642520f80c
commit a224bf648a
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/include/rusage_private.h
View File

@ -35,6 +35,7 @@ rusage_rss_add(unsigned long size)
unsigned long newval;
unsigned long oldval;
unsigned long retval;
struct process_vm *vm = cpu_local_var(current)->vm;
newval = __sync_add_and_fetch(&rusage->rss_current, size);
oldval = rusage->memory_max_usage;
@ -46,12 +47,23 @@ rusage_rss_add(unsigned long size)
}
oldval = retval;
}
/* process rss */
vm->currss += size;
if (vm->currss > vm->proc->maxrss) {
vm->proc->maxrss = vm->currss;
}
}
static inline void
rusage_rss_sub(unsigned long size)
{
struct process_vm *vm = cpu_local_var(current)->vm;
__sync_sub_and_fetch(&rusage->rss_current, size);
/* process rss */
vm->currss -= size;
}
static inline void memory_stat_rss_add(unsigned long size, int pgsize)

3
kernel/process.c
View File

@ -1942,9 +1942,6 @@ retry:
// memory_stat_rss_add() is called in downstream with !memobj check
}
flush_tlb_single(fault_addr);
vm->currss += pgsize;
if(vm->currss > vm->proc->maxrss)
vm->proc->maxrss = vm->currss;
error = 0;
page = NULL;