Skip to content

Commit 67197a4

Browse files
surenbaghdasaryantorvalds
authored andcommitted
mm, oom_adj: don't loop through tasks in __set_oom_adj when not necessary
Currently __set_oom_adj loops through all processes in the system to keep oom_score_adj and oom_score_adj_min in sync between processes sharing their mm. This is done for any task with more that one mm_users, which includes processes with multiple threads (sharing mm and signals). However for such processes the loop is unnecessary because their signal structure is shared as well. Android updates oom_score_adj whenever a tasks changes its role (background/foreground/...) or binds to/unbinds from a service, making it more/less important. Such operation can happen frequently. We noticed that updates to oom_score_adj became more expensive and after further investigation found out that the patch mentioned in "Fixes" introduced a regression. Using Pixel 4 with a typical Android workload, write time to oom_score_adj increased from ~3.57us to ~362us. Moreover this regression linearly depends on the number of multi-threaded processes running on the system. Mark the mm with a new MMF_MULTIPROCESS flag bit when task is created with (CLONE_VM && !CLONE_THREAD && !CLONE_VFORK). Change __set_oom_adj to use MMF_MULTIPROCESS instead of mm_users to decide whether oom_score_adj update should be synchronized between multiple processes. To prevent races between clone() and __set_oom_adj(), when oom_score_adj of the process being cloned might be modified from userspace, we use oom_adj_mutex. Its scope is changed to global. The combination of (CLONE_VM && !CLONE_THREAD) is rarely used except for the case of vfork(). To prevent performance regressions of vfork(), we skip taking oom_adj_mutex and setting MMF_MULTIPROCESS when CLONE_VFORK is specified. Clearing the MMF_MULTIPROCESS flag (when the last process sharing the mm exits) is left out of this patch to keep it simple and because it is believed that this threading model is rare. Should there ever be a need for optimizing that case as well, it can be done by hooking into the exit path, likely following the mm_update_next_owner pattern. With the combination of (CLONE_VM && !CLONE_THREAD && !CLONE_VFORK) being quite rare, the regression is gone after the change is applied. [surenb@google.com: v3] Link: https://lkml.kernel.org/r/20200902012558.2335613-1-surenb@google.com Fixes: 44a70ad ("mm, oom_adj: make sure processes sharing mm have same view of oom_score_adj") Reported-by: Tim Murray <timmurray@google.com> Suggested-by: Michal Hocko <mhocko@kernel.org> Signed-off-by: Suren Baghdasaryan <surenb@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Acked-by: Christian Brauner <christian.brauner@ubuntu.com> Acked-by: Michal Hocko <mhocko@suse.com> Acked-by: Oleg Nesterov <oleg@redhat.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Eugene Syromiatnikov <esyr@redhat.com> Cc: Christian Kellner <christian@kellner.me> Cc: Adrian Reber <areber@redhat.com> Cc: Shakeel Butt <shakeelb@google.com> Cc: Aleksa Sarai <cyphar@cyphar.com> Cc: Alexey Dobriyan <adobriyan@gmail.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Alexey Gladkov <gladkov.alexey@gmail.com> Cc: Michel Lespinasse <walken@google.com> Cc: Daniel Jordan <daniel.m.jordan@oracle.com> Cc: Andrei Vagin <avagin@gmail.com> Cc: Bernd Edlinger <bernd.edlinger@hotmail.de> Cc: John Johansen <john.johansen@canonical.com> Cc: Yafang Shao <laoar.shao@gmail.com> Link: https://lkml.kernel.org/r/20200824153036.3201505-1-surenb@google.com Debugged-by: Minchan Kim <minchan@kernel.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent cc6de16 commit 67197a4

5 files changed

Lines changed: 26 additions & 2 deletions

File tree

fs/proc/base.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,7 +1055,6 @@ static ssize_t oom_adj_read(struct file *file, char __user *buf, size_t count,
10551055

10561056
static int __set_oom_adj(struct file *file, int oom_adj, bool legacy)
10571057
{
1058-
static DEFINE_MUTEX(oom_adj_mutex);
10591058
struct mm_struct *mm = NULL;
10601059
struct task_struct *task;
10611060
int err = 0;
@@ -1095,7 +1094,7 @@ static int __set_oom_adj(struct file *file, int oom_adj, bool legacy)
10951094
struct task_struct *p = find_lock_task_mm(task);
10961095

10971096
if (p) {
1098-
if (atomic_read(&p->mm->mm_users) > 1) {
1097+
if (test_bit(MMF_MULTIPROCESS, &p->mm->flags)) {
10991098
mm = p->mm;
11001099
mmgrab(mm);
11011100
}

include/linux/oom.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ struct oom_control {
5555
};
5656

5757
extern struct mutex oom_lock;
58+
extern struct mutex oom_adj_mutex;
5859

5960
static inline void set_current_oom_origin(void)
6061
{

include/linux/sched/coredump.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ static inline int get_dumpable(struct mm_struct *mm)
7272
#define MMF_DISABLE_THP 24 /* disable THP for all VMAs */
7373
#define MMF_OOM_VICTIM 25 /* mm is the oom victim */
7474
#define MMF_OOM_REAP_QUEUED 26 /* mm was queued for oom_reaper */
75+
#define MMF_MULTIPROCESS 27 /* mm is shared between processes */
7576
#define MMF_DISABLE_THP_MASK (1 << MMF_DISABLE_THP)
7677

7778
#define MMF_INIT_MASK (MMF_DUMPABLE_MASK | MMF_DUMP_FILTER_MASK |\

kernel/fork.c

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1812,6 +1812,25 @@ static __always_inline void delayed_free_task(struct task_struct *tsk)
18121812
free_task(tsk);
18131813
}
18141814

1815+
static void copy_oom_score_adj(u64 clone_flags, struct task_struct *tsk)
1816+
{
1817+
/* Skip if kernel thread */
1818+
if (!tsk->mm)
1819+
return;
1820+
1821+
/* Skip if spawning a thread or using vfork */
1822+
if ((clone_flags & (CLONE_VM | CLONE_THREAD | CLONE_VFORK)) != CLONE_VM)
1823+
return;
1824+
1825+
/* We need to synchronize with __set_oom_adj */
1826+
mutex_lock(&oom_adj_mutex);
1827+
set_bit(MMF_MULTIPROCESS, &tsk->mm->flags);
1828+
/* Update the values in case they were changed after copy_signal */
1829+
tsk->signal->oom_score_adj = current->signal->oom_score_adj;
1830+
tsk->signal->oom_score_adj_min = current->signal->oom_score_adj_min;
1831+
mutex_unlock(&oom_adj_mutex);
1832+
}
1833+
18151834
/*
18161835
* This creates a new process as a copy of the old one,
18171836
* but does not actually start it yet.
@@ -2288,6 +2307,8 @@ static __latent_entropy struct task_struct *copy_process(
22882307
trace_task_newtask(p, clone_flags);
22892308
uprobe_copy_process(p, clone_flags);
22902309

2310+
copy_oom_score_adj(clone_flags, p);
2311+
22912312
return p;
22922313

22932314
bad_fork_cancel_cgroup:

mm/oom_kill.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ int sysctl_oom_dump_tasks = 1;
6464
* and mark_oom_victim
6565
*/
6666
DEFINE_MUTEX(oom_lock);
67+
/* Serializes oom_score_adj and oom_score_adj_min updates */
68+
DEFINE_MUTEX(oom_adj_mutex);
6769

6870
static inline bool is_memcg_oom(struct oom_control *oc)
6971
{

0 commit comments

Comments
 (0)