xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ANDROID: mm: oom_kill: reap memory of a task that receives SIGKILL"

Browse Source 
This reverts commit a7af91adc7 ("ANDROID: mm: oom_kill: reap memory of
a task that receives SIGKILL") as this functionality is moved to vendor
hook based approach.

Bug: 189803002
Signed-off-by: Charan Teja Reddy <charante@codeaurora.org>
Change-Id: Ica0d6df22fb81bf430e9b4c7d12b36ab7d44dab8
This commit is contained in:
Charan Teja Reddy
2021-06-03 10:46:49 +05:30
committed by Suren Baghdasaryan
parent 4794cb419d
commit 3f491d10dc
4 changed files with 7 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
kernel/signal.c
View File

@@ -46,7 +46,6 @@
#include <linux/livepatch.h>
#include <linux/cgroup.h>
#include <linux/audit.h>
#include <linux/oom.h>
#define CREATE_TRACE_POINTS
#include <trace/events/signal.h>
@@ -67,18 +66,6 @@ static struct kmem_cache *sigqueue_cachep;
int print_fatal_signals __read_mostly;
static char reaper_comm[TASK_COMM_LEN];
static __init int setup_mem_reap(char *str)
{
if (!str)
return 0;
strlcpy(reaper_comm, str, TASK_COMM_LEN);
return 1;
}
__setup("reap_mem_when_killed_by=", setup_mem_reap);
static void __user *sig_handler(struct task_struct *t, int sig)
{
return t->sighand->action[sig - 1].sa.sa_handler;
@@ -1426,12 +1413,8 @@ int group_send_sig_info(int sig, struct kernel_siginfo *info,
ret = check_kill_permission(sig, info, p);
rcu_read_unlock();
if (!ret && sig) {
if (!ret && sig)
ret = do_send_sig_info(sig, info, p, type);
if (!ret && sig == SIGKILL &&
!strcmp(current->comm, reaper_comm))
add_to_oom_reaper(p);
}
return ret;
}