shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 12:57:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

mm: revert lmk change [1/1]

Browse Source 
PD#SWPL-23516

Problem:
lmk is too agressive for kill process

Solution:
revert lmk change in
74a35431d2

Verify:
x301

Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
Change-Id: I52ff4f32262a33c9b54802d4ab012d404c942384
This commit is contained in:
Tao Zeng
2020-04-02 15:21:06 +08:00
committed by Chris
parent 60a62ce0d9
commit 8dfe2013e3
1 changed files with 5 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/staging/android/lowmemorykiller.c
View File

@@ -139,38 +139,16 @@ static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc)
short selected_oom_score_adj;
int array_size = ARRAY_SIZE(lowmem_adj);
int other_free = global_page_state(NR_FREE_PAGES) - totalreserve_pages;
int other_file = global_node_page_state(NR_FILE_PAGES) -
global_node_page_state(NR_SHMEM) -
global_node_page_state(NR_UNEVICTABLE) -
total_swapcache_pages();
#ifdef CONFIG_AMLOGIC_CMA
int other_file;
struct zone *z = NULL;
pg_data_t *pgdat;
int free_cma = 0;
int file_cma = 0;
int cma_forbid = 0;
int zfile = 0;
int globle_file = global_node_page_state(NR_FILE_PAGES) -
global_node_page_state(NR_SHMEM) -
global_node_page_state(NR_UNEVICTABLE) -
total_swapcache_pages();
if (gfp_zone(sc->gfp_mask) == ZONE_NORMAL) {
/* using zone page state for more accurate */
pgdat = NODE_DATA(sc->nid);
z = &pgdat->node_zones[ZONE_NORMAL];
if (managed_zone(z)) {
zfile = zone_page_state(z, NR_ZONE_INACTIVE_FILE) +
zone_page_state(z, NR_ZONE_ACTIVE_FILE);
other_file = zfile -
global_node_page_state(NR_SHMEM) -
zone_page_state(z, NR_ZONE_UNEVICTABLE) -
total_swapcache_pages();
} else {
other_file = globle_file;
}
} else {
other_file = globle_file;
}
if (cma_forbidden_mask(sc->gfp_mask) &&
(!current_is_kswapd() || cma_alloc_ref())) {
if (cma_forbidden_mask(sc->gfp_mask) && !current_is_kswapd()) {
free_cma = global_page_state(NR_FREE_CMA_PAGES);
file_cma = global_page_state(NR_INACTIVE_FILE_CMA) +
global_page_state(NR_ACTIVE_FILE_CMA);
@@ -178,11 +156,6 @@ static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc)
other_file -= file_cma;
cma_forbid = 1;
}
#else
int other_file = global_node_page_state(NR_FILE_PAGES) -
global_node_page_state(NR_SHMEM) -
global_node_page_state(NR_UNEVICTABLE) -
total_swapcache_pages();
#endif /* CONFIG_AMLOGIC_CMA */
if (lowmem_adj_size < array_size)
@@ -281,12 +254,6 @@ static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc)
} else {
lowmem_deathpending_timeout = jiffies + HZ;
}
if (z)
pr_info(" zone:%s, file:%d, shmem:%ld, unevc:%ld, file_cma:%d\n",
z->name, zfile,
global_node_page_state(NR_SHMEM),
zone_page_state(z, NR_ZONE_UNEVICTABLE),
file_cma);
#else
lowmem_deathpending_timeout = jiffies + HZ;
#endif /* CONFIG_AMLOGIC_CMA */