From patchwork Thu Apr 30 18:27:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shakeel Butt X-Patchwork-Id: 11521137 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 F176414B4 for ; Thu, 30 Apr 2020 18:27:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BD4DC20873 for ; Thu, 30 Apr 2020 18:27:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="iErXb3iy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BD4DC20873 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 EFBCC8E0005; Thu, 30 Apr 2020 14:27:50 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E84728E0001; Thu, 30 Apr 2020 14:27:50 -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 D4C968E0005; Thu, 30 Apr 2020 14:27:50 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0172.hostedemail.com [216.40.44.172]) by kanga.kvack.org (Postfix) with ESMTP id B94568E0001 for ; Thu, 30 Apr 2020 14:27:50 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 73D5B180AD807 for ; Thu, 30 Apr 2020 18:27:50 +0000 (UTC) X-FDA: 76765355100.16.front43_27494a0d78c30 X-Spam-Summary: 2,0,0,394f320f5a0f5ca1,d41d8cd98f00b204,3prirxggkch4ujcmggndiqqing.eqonkpwz-oomxcem.qti@flex--shakeelb.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:973:988:989:1260:1277:1313:1314:1345:1437:1516:1518:1535:1543:1593:1594:1711:1730:1747:1777:1792:2198:2199:2393:2559:2562:2731:3138:3139:3140:3141:3142:3152:3354:3865:3866:3867:3868:3871:3872:4321:4605:5007:6261:6653:7903:9969:10004:10400:10450:10455:11026:11658:11914:12043:12296:12297:12438:12555:12895:14181:14394:14659:14721:19904:19999:21080:21324:21444:21451:21627:30054:30075,0,RBL:209.85.222.73:@flex--shakeelb.bounces.google.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:25,LUA_SUMMARY:none X-HE-Tag: front43_27494a0d78c30 X-Filterd-Recvd-Size: 5830 Received: from mail-ua1-f73.google.com (mail-ua1-f73.google.com [209.85.222.73]) by imf46.hostedemail.com (Postfix) with ESMTP for ; Thu, 30 Apr 2020 18:27:49 +0000 (UTC) Received: by mail-ua1-f73.google.com with SMTP id r6so3039798uak.16 for ; Thu, 30 Apr 2020 11:27:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=Jd1/haHiGLsB9DtO70aA7TDJJ8F7SbAfwTGIrfE2+1I=; b=iErXb3iypgOLBQLKzSmwYHMdYYIq4FQ/Fs5O99JN5OVPg/URrWQYpUpa4kY7FYf/BC XiR39ubKq+M9XC9dm4+/NQtJp45w0zaUOcxMguhS1TnX7J/535wLELSBBjUKWJ1dWqE6 iO6IpODegKvCUHTwKkjF0rYnv7hlPTcyspEUr8iVEgu2zy0g1ZGqrG9JyyK0cqlnx0xy hfdzksqUkq3dN7eAwinITbGyet9pI6lrH090wPE8vGhavh9k/dzJUFPKlX79cfP3D+ls gIS1rabZP18mssvRf0qDpla0A4w7qoWT35CVtPk8OJxUx9mN9fMmyxMODtpX9appu2eY Js8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=Jd1/haHiGLsB9DtO70aA7TDJJ8F7SbAfwTGIrfE2+1I=; b=SLosvhpeUK5+anBz2+fGenXtl+EVnzIYpGSUOSeIuvyYYOxPu+NnjkVHpSGlgWcgVT ErWJGbq3BjA/1mFqUQJSup9P4cpkJIeVDO6Xr/zr2Xl6jo71HoTR5sAYVdo8TW79McV/ GoglgNLXGZl0h43O5SgGw8bcxA8FQ1Zr6a58V3WnSHWK9ddNOAWFzznWtTg9+W3+8P3q h5fvF0nK1BAf59nqO0eIaXI/6J+QVSApHBjyLaSxxbxXI7gx/sARGAOkk7UmnG7bPnVP u3AEbSbBqBczxlqEkryC+1l2Epmt77zTeyITIPP0L+3A2M0qAls/vKU3bfK1nvU9z8V6 8ApQ== X-Gm-Message-State: AGi0PubV0blrKulJssXfEPBYQHOcP+IFOOZx+orutvQ4vIXXtcBF8s8d dZQWPTO2vGUX3Bg9XVmOYuCGyXEhSR3IEQ== X-Google-Smtp-Source: APiQypIJnnUciZumXRHEJORNQcdjcnFEMXOXdpW+p2iyl9bRjHAlZXre3Ldi7KIlBZPqLSNMvedoctuZFZ1Xag== X-Received: by 2002:a9f:2188:: with SMTP id 8mr8788uac.46.1588271269078; Thu, 30 Apr 2020 11:27:49 -0700 (PDT) Date: Thu, 30 Apr 2020 11:27:12 -0700 Message-Id: <20200430182712.237526-1-shakeelb@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.26.2.526.g744177e7f7-goog Subject: [PATCH] memcg: oom: ignore oom warnings from memory.max From: Shakeel Butt To: Johannes Weiner , Roman Gushchin , Michal Hocko Cc: Greg Thelen , Andrew Morton , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Shakeel Butt 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: Lowering memory.max can trigger an oom-kill if the reclaim does not succeed. However if oom-killer does not find a process for killing, it dumps a lot of warnings. Deleting a memcg does not reclaim memory from it and the memory can linger till there is a memory pressure. One normal way to proactively reclaim such memory is to set memory.max to 0 just before deleting the memcg. However if some of the memcg's memory is pinned by others, this operation can trigger an oom-kill without any process and thus can log a lot un-needed warnings. So, ignore all such warnings from memory.max. Signed-off-by: Shakeel Butt --- include/linux/oom.h | 3 +++ mm/memcontrol.c | 9 +++++---- mm/oom_kill.c | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/include/linux/oom.h b/include/linux/oom.h index c696c265f019..6345dc55df64 100644 --- a/include/linux/oom.h +++ b/include/linux/oom.h @@ -52,6 +52,9 @@ struct oom_control { /* Used to print the constraint info. */ enum oom_constraint constraint; + + /* Do not warn even if there is no process to be killed. */ + bool no_warn; }; extern struct mutex oom_lock; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 317dbbaac603..a1f00d9b9bb0 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1571,7 +1571,7 @@ unsigned long mem_cgroup_size(struct mem_cgroup *memcg) } static bool mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask, - int order) + int order, bool no_warn) { struct oom_control oc = { .zonelist = NULL, @@ -1579,6 +1579,7 @@ static bool mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask, .memcg = memcg, .gfp_mask = gfp_mask, .order = order, + .no_warn = no_warn, }; bool ret; @@ -1821,7 +1822,7 @@ static enum oom_status mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int mem_cgroup_oom_notify(memcg); mem_cgroup_unmark_under_oom(memcg); - if (mem_cgroup_out_of_memory(memcg, mask, order)) + if (mem_cgroup_out_of_memory(memcg, mask, order, false)) ret = OOM_SUCCESS; else ret = OOM_FAILED; @@ -1880,7 +1881,7 @@ bool mem_cgroup_oom_synchronize(bool handle) mem_cgroup_unmark_under_oom(memcg); finish_wait(&memcg_oom_waitq, &owait.wait); mem_cgroup_out_of_memory(memcg, current->memcg_oom_gfp_mask, - current->memcg_oom_order); + current->memcg_oom_order, false); } else { schedule(); mem_cgroup_unmark_under_oom(memcg); @@ -6106,7 +6107,7 @@ static ssize_t memory_max_write(struct kernfs_open_file *of, } memcg_memory_event(memcg, MEMCG_OOM); - if (!mem_cgroup_out_of_memory(memcg, GFP_KERNEL, 0)) + if (!mem_cgroup_out_of_memory(memcg, GFP_KERNEL, 0, true)) break; } diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 463b3d74a64a..5ace39f6fe1e 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -1098,7 +1098,7 @@ bool out_of_memory(struct oom_control *oc) select_bad_process(oc); /* Found nothing?!?! */ - if (!oc->chosen) { + if (!oc->chosen && !oc->no_warn) { dump_header(oc, NULL); pr_warn("Out of memory and no killable processes...\n"); /*