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

Merge "lowmemorykiller: fix scan_mutex contention"

Browse source
This commit is contained in:
Linux Build Service Account 2017-04-18 13:57:03 -07:00 • committed by Gerrit - the friendly Code Review server
commit ce87c90172
1 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -217,6 +217,22 @@ static int test_task_flag(struct task_struct *p, int flag)
return 0; return 0;
} }
static int test_task_state(struct task_struct *p, int state)
{
struct task_struct *t;
for_each_thread(p, t) {
task_lock(t);
if (t->state & state) {
task_unlock(t);
return 1;
}
task_unlock(t);
}
return 0;
}
static DEFINE_MUTEX(scan_mutex); static DEFINE_MUTEX(scan_mutex);
int can_use_cma_pages(gfp_t gfp_mask) int can_use_cma_pages(gfp_t gfp_mask)
@ -404,7 +420,7 @@ static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc)
int other_free; int other_free;
int other_file; int other_file;
if (mutex_lock_interruptible(&scan_mutex) < 0) if (!mutex_trylock(&scan_mutex))
return 0; return 0;
other_free = global_page_state(NR_FREE_PAGES); other_free = global_page_state(NR_FREE_PAGES);
@ -462,8 +478,6 @@ static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc)
if (time_before_eq(jiffies, lowmem_deathpending_timeout)) { if (time_before_eq(jiffies, lowmem_deathpending_timeout)) {
if (test_task_flag(tsk, TIF_MEMDIE)) { if (test_task_flag(tsk, TIF_MEMDIE)) {
rcu_read_unlock(); rcu_read_unlock();
/* give the system time to free up the memory */
msleep_interruptible(20);
mutex_unlock(&scan_mutex); mutex_unlock(&scan_mutex);
return 0; return 0;
} }
@ -497,6 +511,17 @@ static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc)
} }
if (selected) { if (selected) {
long cache_size, cache_limit, free; long cache_size, cache_limit, free;
if (test_task_flag(selected, TIF_MEMDIE) &&
(test_task_state(selected, TASK_UNINTERRUPTIBLE))) {
lowmem_print(2, "'%s' (%d) is already killed\n",
selected->comm,
selected->pid);
rcu_read_unlock();
mutex_unlock(&scan_mutex);
return 0;
}
task_lock(selected); task_lock(selected);
send_sig(SIGKILL, selected, 0); send_sig(SIGKILL, selected, 0);
/* /*