From patchwork Mon Aug 24 15:30:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 11733527 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F3B13138A for ; Mon, 24 Aug 2020 15:31:08 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A91F020838 for ; Mon, 24 Aug 2020 15:31:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="Nd+9Myp1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A91F020838 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id AC40E8D0002; Mon, 24 Aug 2020 11:31:07 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A74D66B0030; Mon, 24 Aug 2020 11:31:07 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9648E8D0002; Mon, 24 Aug 2020 11:31:07 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0040.hostedemail.com [216.40.44.40]) by kanga.kvack.org (Postfix) with ESMTP id 80AEB6B002F for ; Mon, 24 Aug 2020 11:31:07 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 3D910824805A for ; Mon, 24 Aug 2020 15:31:07 +0000 (UTC) X-FDA: 77185850574.16.birds56_5606d2027054 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin16.hostedemail.com (Postfix) with ESMTP id AFA8A100E54AB for ; Mon, 24 Aug 2020 15:30:42 +0000 (UTC) X-Spam-Summary: 1,0,0,fc4d4e0691877d47,d41d8cd98f00b204,3id1dxwykcooegdqznsaasxq.oayxuzgj-yywhmow.ads@flex--surenb.bounces.google.com,,RULES_HIT:1:2:41:152:355:379:541:800:960:966:967:973:982:988:989:1260:1277:1313:1314:1345:1437:1516:1518:1593:1594:1605:1730:1747:1777:1792:2196:2198:2199:2200:2393:2525:2559:2564:2682:2685:2859:2895:2900:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3865:3866:3867:3868:3870:3871:3872:3874:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4050:4250:4321:4385:4605:5007:6117:6119:6261:6653:6742:6743:7875:7903:7974:9025:9969:11026:11232:11473:11658:11914:12043:12291:12296:12297:12438:12555:12663:12679:12895:12986:13146:13221:13229:13230:13255:13845:14096:14097:14394:14659:14877:21067:21080:21324:21444:21451:21627:21740:21749:21790:21811:21990:30034:30051:30054:30070:30079,0,RBL:209.85.219.202:@flex--surenb.bounces.google.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100;04yfu6sjtygd3eh6ggar6cbh35t3iycyguofe5mgfxzptmt gc8mxb7m X-HE-Tag: birds56_5606d2027054 X-Filterd-Recvd-Size: 10236 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf25.hostedemail.com (Postfix) with ESMTP for ; Mon, 24 Aug 2020 15:30:41 +0000 (UTC) Received: by mail-yb1-f202.google.com with SMTP id a75so10926980ybg.15 for ; Mon, 24 Aug 2020 08:30:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:message-id:mime-version:subject:from:to:cc; bh=+avLgv90UsYeFWNAt4hvz2Oc3MIYyDgj8egBk5cmplo=; b=Nd+9Myp1QSnpafkLxmE4tbmUPvSVFvz0zMU6TVAsHVjvkcvqNrwG+bYFiKmUGoJAiR /RqCRh+8ojJzQ3stSx+RDXD31zLY1AdreoJbupD19jBCg+c8Wwn3tKXz24RbGOKLQOo3 VXMJfYpI+WVlV8sBV69AxQIQq7a3qklZocZN814u4bPHejZys7qtuyeVr8LPXGcO+/wr iO0JPmFeH9OdELK8JY1wACdUEn5jXCGw6qf1agndXNUyE7hkYwKb/2j03J/7OJ8bMNEO DIN/RtEVAWGplwTv8G6hrmJRChWWl5uxScy+9FHLHODKy8m81QbD3kLI4cKH2OGlcY7c WIvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:message-id:mime-version:subject:from :to:cc; bh=+avLgv90UsYeFWNAt4hvz2Oc3MIYyDgj8egBk5cmplo=; b=GMTAxnvgRHYoNTML376ri8+QgHCLuRp35zh5Ayw9hAK3XzH95iKvuJyfaWpK4TIJ4b KaaNBkR0JoMjGNs4eMkhvxRc1w0X8CG4hrVt1c2PLAvcQA6hTyH0CkqVhovrpVsGO1PP b1EW0oXAvw3tZFYXCK/Vd0MXT+F0Q6e6RhwWUu8t5d1kUAiwPommRerRpN4oK2xVTWf0 +AFJKDunCqASQKEjYvQ45BnXyULfPrsKEAdmD12DRTLY5TPNf4sYvYnZR+T30aQQNjHo oix5QLFvmhlT9bb8yRUlwUhmC+NV90yYNaCk0ULpb8UGxbGYAY/N/P0IudB8h073MhzU 3ACQ== X-Gm-Message-State: AOAM532UkQF0zYcf2APGk10iy4mA71XnfMWHMso14Ll8n4ObyU8G/In9 PZIOaes7deT6GllJ0HmUXrIsb8LytkY= X-Google-Smtp-Source: ABdhPJxoylM9PVXXmgZQVgskc2p1xsXSL9ERXxVrtDjqxHHj9H9O7Gal+QN6HscqTIeaBhdi5zScg7jFnSA= X-Received: from surenb1.mtv.corp.google.com ([2620:15c:211:0:f693:9fff:fef4:2055]) (user=surenb job=sendgmr) by 2002:a25:3789:: with SMTP id e131mr8597588yba.406.1598283041067; Mon, 24 Aug 2020 08:30:41 -0700 (PDT) Date: Mon, 24 Aug 2020 08:30:36 -0700 Message-Id: <20200824153036.3201505-1-surenb@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.28.0.297.g1956fa8f8d-goog Subject: [PATCH v2 1/1] mm, oom_adj: don't loop through tasks in __set_oom_adj when not necessary From: Suren Baghdasaryan To: surenb@google.com Cc: mhocko@suse.com, christian.brauner@ubuntu.com, mingo@kernel.org, peterz@infradead.org, tglx@linutronix.de, esyr@redhat.com, christian@kellner.me, areber@redhat.com, shakeelb@google.com, cyphar@cyphar.com, oleg@redhat.com, adobriyan@gmail.com, akpm@linux-foundation.org, ebiederm@xmission.com, gladkov.alexey@gmail.com, walken@google.com, daniel.m.jordan@oracle.com, avagin@gmail.com, bernd.edlinger@hotmail.de, john.johansen@canonical.com, laoar.shao@gmail.com, timmurray@google.com, minchan@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, stable@vger.kernel.org, linux-mm@kvack.org, Michal Hocko X-Rspamd-Queue-Id: AFA8A100E54AB X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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_PROC_SHARED flag bit when task is created with (CLONE_VM && !CLONE_THREAD && !CLONE_VFORK). Change __set_oom_adj to use MMF_PROC_SHARED 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 and it is renamed into oom_adj_lock for naming consistency with oom_lock. 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_lock and setting MMF_PROC_SHARED when CLONE_VFORK is specified. Clearing the MMF_PROC_SHARED 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. Fixes: 44a70adec910 ("mm, oom_adj: make sure processes sharing mm have same view of oom_score_adj") Reported-by: Tim Murray Debugged-by: Minchan Kim Suggested-by: Michal Hocko Signed-off-by: Suren Baghdasaryan Acked-by: Christian Brauner Acked-by: Michal Hocko --- v2: - Implemented proposal from Michal Hocko in: https://lore.kernel.org/linux-fsdevel/20200820124109.GI5033@dhcp22.suse.cz/ - Updated description to reflect the change v1: - https://lore.kernel.org/linux-mm/20200820002053.1424000-1-surenb@google.com/ fs/proc/base.c | 7 +++---- include/linux/oom.h | 1 + include/linux/sched/coredump.h | 1 + kernel/fork.c | 21 +++++++++++++++++++++ mm/oom_kill.c | 2 ++ 5 files changed, 28 insertions(+), 4 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index 617db4e0faa0..cff1a58a236c 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1055,7 +1055,6 @@ static ssize_t oom_adj_read(struct file *file, char __user *buf, size_t count, static int __set_oom_adj(struct file *file, int oom_adj, bool legacy) { - static DEFINE_MUTEX(oom_adj_mutex); struct mm_struct *mm = NULL; struct task_struct *task; int err = 0; @@ -1064,7 +1063,7 @@ static int __set_oom_adj(struct file *file, int oom_adj, bool legacy) if (!task) return -ESRCH; - mutex_lock(&oom_adj_mutex); + mutex_lock(&oom_adj_lock); if (legacy) { if (oom_adj < task->signal->oom_score_adj && !capable(CAP_SYS_RESOURCE)) { @@ -1095,7 +1094,7 @@ static int __set_oom_adj(struct file *file, int oom_adj, bool legacy) struct task_struct *p = find_lock_task_mm(task); if (p) { - if (atomic_read(&p->mm->mm_users) > 1) { + if (test_bit(MMF_PROC_SHARED, &p->mm->flags)) { mm = p->mm; mmgrab(mm); } @@ -1132,7 +1131,7 @@ static int __set_oom_adj(struct file *file, int oom_adj, bool legacy) mmdrop(mm); } err_unlock: - mutex_unlock(&oom_adj_mutex); + mutex_unlock(&oom_adj_lock); put_task_struct(task); return err; } diff --git a/include/linux/oom.h b/include/linux/oom.h index f022f581ac29..861f22bd4706 100644 --- a/include/linux/oom.h +++ b/include/linux/oom.h @@ -55,6 +55,7 @@ struct oom_control { }; extern struct mutex oom_lock; +extern struct mutex oom_adj_lock; static inline void set_current_oom_origin(void) { diff --git a/include/linux/sched/coredump.h b/include/linux/sched/coredump.h index ecdc6542070f..070629b722df 100644 --- a/include/linux/sched/coredump.h +++ b/include/linux/sched/coredump.h @@ -72,6 +72,7 @@ static inline int get_dumpable(struct mm_struct *mm) #define MMF_DISABLE_THP 24 /* disable THP for all VMAs */ #define MMF_OOM_VICTIM 25 /* mm is the oom victim */ #define MMF_OOM_REAP_QUEUED 26 /* mm was queued for oom_reaper */ +#define MMF_PROC_SHARED 27 /* mm is shared while sighand is not */ #define MMF_DISABLE_THP_MASK (1 << MMF_DISABLE_THP) #define MMF_INIT_MASK (MMF_DUMPABLE_MASK | MMF_DUMP_FILTER_MASK |\ diff --git a/kernel/fork.c b/kernel/fork.c index 4d32190861bd..6fce8ffa9b8b 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1809,6 +1809,25 @@ static __always_inline void delayed_free_task(struct task_struct *tsk) free_task(tsk); } +static void copy_oom_score_adj(u64 clone_flags, struct task_struct *tsk) +{ + /* Skip if kernel thread */ + if (!tsk->mm) + return; + + /* Skip if spawning a thread or using vfork */ + if ((clone_flags & (CLONE_VM | CLONE_THREAD | CLONE_VFORK)) != CLONE_VM) + return; + + /* We need to synchronize with __set_oom_adj */ + mutex_lock(&oom_adj_lock); + set_bit(MMF_PROC_SHARED, &tsk->mm->flags); + /* Update the values in case they were changed after copy_signal */ + tsk->signal->oom_score_adj = current->signal->oom_score_adj; + tsk->signal->oom_score_adj_min = current->signal->oom_score_adj_min; + mutex_unlock(&oom_adj_lock); +} + /* * This creates a new process as a copy of the old one, * but does not actually start it yet. @@ -2281,6 +2300,8 @@ static __latent_entropy struct task_struct *copy_process( trace_task_newtask(p, clone_flags); uprobe_copy_process(p, clone_flags); + copy_oom_score_adj(clone_flags, p); + return p; bad_fork_cancel_cgroup: diff --git a/mm/oom_kill.c b/mm/oom_kill.c index e90f25d6385d..c22f07c986cb 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -64,6 +64,8 @@ int sysctl_oom_dump_tasks = 1; * and mark_oom_victim */ DEFINE_MUTEX(oom_lock); +/* Serializes oom_score_adj and oom_score_adj_min updates */ +DEFINE_MUTEX(oom_adj_lock); static inline bool is_memcg_oom(struct oom_control *oc) {