Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 495b96bb authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "lowmemorykiller: enhance debug information"

parents 1af50ea1 ba792326

drivers/staging/android/lowmemorykiller.c

+23 −3
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <linux/delay.h>

#include <linux/swap.h>

#include <linux/fs.h>

#include <linux/cpuset.h>



#ifdef CONFIG_HIGHMEM

#define _ZONE ZONE_HIGHMEM
@@ -367,14 +368,19 @@ static int lowmem_shrink(struct shrinker *s, struct shrink_control *sc) 
		selected = p;

		selected_tasksize = tasksize;

		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);

	}

	if (selected) {

		lowmem_print(1, "Killing '%s' (%d), adj %hd,\n" \

				"   to free %ldkB on behalf of '%s' (%d) because\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_oom_score_adj,

			     selected_tasksize * (long)(PAGE_SIZE / 1024),
@@ -382,7 +388,21 @@ static int lowmem_shrink(struct shrinker *s, struct shrink_control *sc) 
			     other_file * (long)(PAGE_SIZE / 1024),

			     minfree * (long)(PAGE_SIZE / 1024),

			     min_score_adj,

			     other_free * (long)(PAGE_SIZE / 1024));

			     other_free * (long)(PAGE_SIZE / 1024),

			     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;

		send_sig(SIGKILL, selected, 0);

		set_tsk_thread_flag(selected, TIF_MEMDIE);