Merge "mm: reap tasks that are killed by prekill"

This commit is contained in:
qctecmdr 2021-09-24 05:19:03 -07:00 • committed by Gerrit - the friendly Code Review server
commit aa5852b099
2 changed files with 3 additions and 1 deletions

View file

@ -136,4 +136,5 @@ extern int sysctl_reap_mem_on_sigkill;
extern void add_to_oom_reaper(struct task_struct *p);
extern void check_panic_on_foreground_kill(struct task_struct *p);
#define ULMK_MAGIC "lmkd"
#define PRE_KILL "PreKillActionT"
#endif /* _INCLUDE_LINUX_OOM_H */

View file

@ -1416,7 +1416,8 @@ int group_send_sig_info(int sig, struct kernel_siginfo *info,
check_panic_on_foreground_kill(p);
ret = do_send_sig_info(sig, info, p, type);
if (capable(CAP_KILL) && sig == SIGKILL)
if (!strcmp(current->comm, ULMK_MAGIC))
if (!strcmp(current->comm, ULMK_MAGIC) ||
!strcmp(current->comm, PRE_KILL))
add_to_oom_reaper(p);
}