evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lowmemorykiller: enhance debug information

Browse source 
Add extra debug information to make it easier to both determine
why the lowmemorykiller killed a process and to help find the source
of memory leaks.

Also increase the debug level for "select" statements to help prevent
flooding the log.

Change-Id: I3b6876c5ecdf192ecc271aed3f37579f66d47a08
Signed-off-by: Liam Mark <lmark@codeaurora.org>
This commit is contained in:
Liam Mark 2014-06-03 13:57:47 -07:00 • committed by Jeevan Shriram
parent f47218c220
commit 2f6130c61d
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/staging/android/lowmemorykiller.c
View file

@ -46,6 +46,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/swap.h> #include <linux/swap.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/cpuset.h>
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM
#define _ZONE ZONE_HIGHMEM #define _ZONE ZONE_HIGHMEM
@ -375,7 +376,7 @@ static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc)
selected = p; selected = p;
selected_tasksize = tasksize; selected_tasksize = tasksize;
selected_oom_score_adj = oom_score_adj; selected_oom_score_adj = oom_score_adj;
lowmem_print(2, "select '%s' (%d), adj %hd, size %d, to kill\n", lowmem_print(3, "select '%s' (%d), adj %hd, size %d, to kill\n",
p->comm, p->pid, oom_score_adj, tasksize); p->comm, p->pid, oom_score_adj, tasksize);
} }
if (selected) { if (selected) {
@ -397,14 +398,33 @@ static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc)
lowmem_print(1, "Killing '%s' (%d), adj %hd,\n" \ lowmem_print(1, "Killing '%s' (%d), adj %hd,\n" \
" to free %ldkB on behalf of '%s' (%d) because\n" \ " to free %ldkB on behalf of '%s' (%d) because\n" \
" cache %ldkB is below limit %ldkB for oom_score_adj %hd\n" \ " cache %ldkB is below limit %ldkB for oom_score_adj %hd\n" \
" Free memory is %ldkB above reserved\n", " Free memory is %ldkB above reserved.\n" \
" Free CMA is %ldkB\n" \
" Total reserve is %ldkB\n" \
" Total free pages is %ldkB\n" \
" Total file cache is %ldkB\n" \
" GFP mask is 0x%x\n",
selected->comm, selected->pid, selected->comm, selected->pid,
selected_oom_score_adj, selected_oom_score_adj,
selected_tasksize * (long)(PAGE_SIZE / 1024), selected_tasksize * (long)(PAGE_SIZE / 1024),
current->comm, current->pid, current->comm, current->pid,
cache_size, cache_limit, cache_size, cache_limit,
min_score_adj, min_score_adj,
free); free,
global_page_state(NR_FREE_CMA_PAGES) *
(long)(PAGE_SIZE / 1024),
totalreserve_pages * (long)(PAGE_SIZE / 1024),
global_page_state(NR_FREE_PAGES) *
(long)(PAGE_SIZE / 1024),
global_page_state(NR_FILE_PAGES) *
(long)(PAGE_SIZE / 1024),
sc->gfp_mask);
if (lowmem_debug_level >= 2 && selected_oom_score_adj == 0) {
show_mem(SHOW_MEM_FILTER_NODES);
dump_tasks(NULL, NULL);
}
lowmem_deathpending_timeout = jiffies + HZ; lowmem_deathpending_timeout = jiffies + HZ;
rem += selected_tasksize; rem += selected_tasksize;
rcu_read_unlock(); rcu_read_unlock();