From patchwork Mon May 4 04:26:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 11524965 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 197DF1668 for ; Mon, 4 May 2020 04:26:49 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D919B20757 for ; Mon, 4 May 2020 04:26:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nlq6B0Ap" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D919B20757 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 17E6D8E0006; Mon, 4 May 2020 00:26:48 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 106178E0001; Mon, 4 May 2020 00:26:48 -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 01ACB8E0006; Mon, 4 May 2020 00:26:47 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0180.hostedemail.com [216.40.44.180]) by kanga.kvack.org (Postfix) with ESMTP id DEC128E0001 for ; Mon, 4 May 2020 00:26:47 -0400 (EDT) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 95EC1181AEF30 for ; Mon, 4 May 2020 04:26:47 +0000 (UTC) X-FDA: 76777750854.05.help61_3b4583d2ad01c X-Spam-Summary: 2,0,0,b94106e0aebdf24b,d41d8cd98f00b204,laoar.shao@gmail.com,,RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1345:1359:1437:1535:1542:1711:1730:1747:1777:1792:2198:2199:2393:2559:2562:2693:2731:3138:3139:3140:3141:3142:3353:3865:3866:3867:3868:3871:3872:3874:4321:5007:6119:6261:6653:7514:7903:9413:10004:11026:11658:11914:12043:12114:12296:12297:12438:12517:12519:12555:12895:12986:14096:14181:14394:14687:14721:21080:21324:21444:21451:21611:21627:21666:21990:30054:30064:30070,0,RBL:209.85.215.194:@gmail.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:none,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: help61_3b4583d2ad01c X-Filterd-Recvd-Size: 5372 Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by imf07.hostedemail.com (Postfix) with ESMTP for ; Mon, 4 May 2020 04:26:47 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id s18so7934268pgl.12 for ; Sun, 03 May 2020 21:26:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9lsThybE4FRTDd9m0A2GYoDH2L3an0/u0abVreqH5Bs=; b=nlq6B0ApnFTiQ0Nd1f02SEyt3vqAoHDPZzX1yYgqoumr7YgVtO5c+E3WtQg4yXpejY W6y1Wtiz0qlzuODzGPbvTCVsF9qDpd6hI7TTKeT+ByDjYdyW1Kxu7aFe7abBqJNcruAl jDv6UEKZlwedLMMGkFS8CK5rWHVBIlMHIvEJDzoxlf830eFz922nvY+8X/0YpMpxORB+ eRXan5FLj0yNa2B/KOpdCnExcHfv4kqcWr2Hdn4SYnPw0v2Uo9a4EWcFx3bMVt6Zja/K dWYanr1LYmZko2rZ8Ibl5U5gL38uKVS+2e7gHpLXK/dwbRaK1hzTx3SJ26pSciNrjJdL /ZAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9lsThybE4FRTDd9m0A2GYoDH2L3an0/u0abVreqH5Bs=; b=LCTXuWn0pioT2alh94dpdZH9WA7dBHUeTG7ArJ0UIKUi+5FWIyOQM97dJm7eOjTlnW je2Jx1Fuokf0vKXeWy0EY1h2M18PVQsg6a7fq+qWvL4GcRsR2oZStbYoSWiwWKwLZBe6 7C5crcZ7h3Ekv+OeNuT+suNpZ6sEq/hZlUjB+ADOF+wPMVibOiI4lCWfwe7kfN0QgKWv kibKazUUOdhEZuIobLmHpn40bMovUEECizkgcp+NkN+i4K7ceBCKfr3xy0XesjWCjhQR B3PAIK8Hdo8k7Bl2i0j/jBKxismGTkF6o0afbs/0ZIJPvgWYnflUmoCT3EM/7uBhn7g4 ZvfQ== X-Gm-Message-State: AGi0PuawUWx52KT9vWbUjrjIOF7uY1DGv15E5EIPD/CmrEuQRH6e+/2a zCz758SPZ4Kdc5h99z8RnlU= X-Google-Smtp-Source: APiQypK8hcT8r3pLPlZCLzA3wyR9bFA54Whmk0pVnC1k3MMj+hISdMVekqaYYyyrMQ0YSc906Jy79g== X-Received: by 2002:a63:d40a:: with SMTP id a10mr15117861pgh.71.1588566406411; Sun, 03 May 2020 21:26:46 -0700 (PDT) Received: from localhost.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id y8sm8012878pfg.216.2020.05.03.21.26.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 May 2020 21:26:45 -0700 (PDT) From: Yafang Shao To: akpm@linux-foundation.org, shakeelb@google.com Cc: hannes@cmpxchg.org, mhocko@kernel.org, guro@fb.com, gthelen@google.com, linux-mm@kvack.org, Yafang Shao Subject: [PATCH v2 1/2] mm, memcg: rename mem_cgroup_out_of_memory() Date: Mon, 4 May 2020 00:26:20 -0400 Message-Id: <20200504042621.10334-2-laoar.shao@gmail.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20200504042621.10334-1-laoar.shao@gmail.com> References: <20200504042621.10334-1-laoar.shao@gmail.com> 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: Rename mem_cgroup_out_of_memory() to mem_cgroup_oom_kill() to indicate that this function is used to try to kill a process. With this change it will cooperate better with the oom events. function memcg event mem_cgroup_oom() oom mem_cgroup_oom_kill() oom_kill Signed-off-by: Yafang Shao Reviewed-by: Shakeel Butt Cc: Johannes Weiner Cc: Michal Hocko Cc: Roman Gushchin Cc: Greg Thelen --- mm/memcontrol.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 5beea03dd58a..985edce98491 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1570,7 +1570,7 @@ unsigned long mem_cgroup_size(struct mem_cgroup *memcg) return page_counter_read(&memcg->memory); } -static bool mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask, +static bool mem_cgroup_oom_kill(struct mem_cgroup *memcg, gfp_t gfp_mask, int order) { struct oom_control oc = { @@ -1799,7 +1799,7 @@ static enum oom_status mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int * relying on the oom victim to make a forward progress and we can * invoke the oom killer here. * - * Please note that mem_cgroup_out_of_memory might fail to find a + * Please note that mem_cgroup_oom_kill might fail to find a * victim and then we have to bail out from the charge path. */ if (memcg->oom_kill_disable) { @@ -1821,7 +1821,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_oom_kill(memcg, mask, order)) ret = OOM_SUCCESS; else ret = OOM_FAILED; @@ -1879,7 +1879,7 @@ bool mem_cgroup_oom_synchronize(bool handle) if (locked && !memcg->oom_kill_disable) { mem_cgroup_unmark_under_oom(memcg); finish_wait(&memcg_oom_waitq, &owait.wait); - mem_cgroup_out_of_memory(memcg, current->memcg_oom_gfp_mask, + mem_cgroup_oom_kill(memcg, current->memcg_oom_gfp_mask, current->memcg_oom_order); } else { schedule(); @@ -6102,7 +6102,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_oom_kill(memcg, GFP_KERNEL, 0)) break; }