From patchwork Tue May 28 20:21:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Gushchin X-Patchwork-Id: 13677357 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0AF25C25B78 for ; Tue, 28 May 2024 20:22:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 315F06B00A6; Tue, 28 May 2024 16:21:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2C0496B00A7; Tue, 28 May 2024 16:21:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1398F6B00A8; Tue, 28 May 2024 16:21:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id E18286B00A6 for ; Tue, 28 May 2024 16:21:54 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 5F04A120441 for ; Tue, 28 May 2024 20:21:54 +0000 (UTC) X-FDA: 82168925748.02.A2A293E Received: from out-187.mta1.migadu.com (out-187.mta1.migadu.com [95.215.58.187]) by imf02.hostedemail.com (Postfix) with ESMTP id 4865F80012 for ; Tue, 28 May 2024 20:21:52 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=LkZenzNv; spf=pass (imf02.hostedemail.com: domain of roman.gushchin@linux.dev designates 95.215.58.187 as permitted sender) smtp.mailfrom=roman.gushchin@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716927712; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=OeFsCVicsmIcJz/F7rjSxNev8T0hhwq0eN6+J3Y4BM8=; b=sgblG7oYBYyRvfakbBtgG90HCe5v/SNHoq+vw468yLTrnAfs8U9g3cHl4t4X2vj9/Ldee1 RBNxHEP91Nvme9Wv+/Jh2uIvG9XeGsEpThSRHaUZm5j0cEsYivHyCxaqUiri3k4htiQHBd Sk3q4FCWMdGXEqAoh1kQ/DJyOLR+csE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716927712; a=rsa-sha256; cv=none; b=7kJl/CSvitKT9xYfFRyJqqQoy8uvNoDX9y4TbxgEvgY93xD8n2XMZL0qyEPtWqO4Ox1kvG OBhzeGLqegr9xM/kK4SFLDrnZQRYIrFJTqsyyPtFOIgEyj1+XxrhsdtsJwo4HFzVIjff2w 3nE5kQX3b+0Pq0qak5cA/rmp4S1McYQ= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=LkZenzNv; spf=pass (imf02.hostedemail.com: domain of roman.gushchin@linux.dev designates 95.215.58.187 as permitted sender) smtp.mailfrom=roman.gushchin@linux.dev; dmarc=pass (policy=none) header.from=linux.dev X-Envelope-To: akpm@linux-foundation.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1716927711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OeFsCVicsmIcJz/F7rjSxNev8T0hhwq0eN6+J3Y4BM8=; b=LkZenzNvmfsJgfDdOHnpDbqf2Na0D38sAL9OmxSR8fBqCjbiSMP/ZL3nHkm6LHssps2b4X 4Bv/L0c++DrNIfkFSX9UOfULUTn4B1FArCAXQ4nGirdw2AxLiILByzklAeAPwjKF2Tmvz5 JSqzJmTzj5EF9CN5CPuGrnstZlmh8as= X-Envelope-To: muchun.song@linux.dev X-Envelope-To: hannes@cmpxchg.org X-Envelope-To: mhocko@kernel.org X-Envelope-To: shakeel.butt@linux.dev X-Envelope-To: willy@infradead.org X-Envelope-To: linux-mm@kvack.org X-Envelope-To: linux-kernel@vger.kernel.org X-Envelope-To: roman.gushchin@linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Roman Gushchin To: Andrew Morton Cc: Muchun Song , Johannes Weiner , Michal Hocko , Shakeel Butt , Matthew Wilcox , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Roman Gushchin Subject: [PATCH v1 09/14] mm: memcg: rename memcg_oom_recover() Date: Tue, 28 May 2024 13:21:01 -0700 Message-ID: <20240528202101.3099300-10-roman.gushchin@linux.dev> In-Reply-To: <20240528202101.3099300-1-roman.gushchin@linux.dev> References: <20240528202101.3099300-1-roman.gushchin@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Stat-Signature: 4s5yajnjc8za1ofnoizqzdac5zjmyww6 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 4865F80012 X-HE-Tag: 1716927712-535344 X-HE-Meta: U2FsdGVkX19ZXngd5mYXtJRSbcKk4F+3ovkTP3RvCJZgpOYmUcOYkG7d7ikxDre5EF7aHr4PScEPGtC3a3vVKUVGEzN2lIJCYfuL4QwHWZ0/wlgnaGGspABI4F1IdQvjZVaKtJoBFqsuXraTySLt226E4gO2MOHxhAjyebH36pP61FZYFCddE5RnhrPhHydzJCdGpsQyyOgS8hS5Iu4nWxlp3KnPq4zBSO8eFENC5BQ7xSqQ8SJIrnoVPdup6K8H2ZcKmMarbEBnJNGpzYRtkY2Cr3XPX8mc09kTTtSY5ipE8hrOUvMljB6xuYJ8np4BE5pKxVAW9I3mUkziaRCH7IfPU//zlPQhyP0safmQCdOAW3QlZomgoh8JAnFt0G1KUX+Plwe+YB0GU7dmlzakdjIQQyi6BCLCY0gxW44D/vDnIAx0hd+d+RBbEEfxGor1R01G/GEWW/Rboz1Fu4QALS9jW4mLVJASGW/uuy2KIJtt0OgBPVkl+WukneKuz7Ql9t6kL+W9PIeT2TGAhsHmyLY2t5TWjKKK+g5MrZMVrGaRGLJUPkBiWGNgnkpls73eiI+tgvl23kfb4GR1EKjUP3XeDvw1/l13Y/4YPskcKlpQz3WewUK/phBW/Pi/nXdbb4iezwY8e54cbCU7Z7VkeIic42kO7EEwGC9AyOhoLWYNKNuEdQtOL4hL81EIa9EPjdI211U80I53fWvuZ6agBx6gw4CqvBBi8yuixI0lLZdVOwApMHkWQU/mY97FzUBUmKUYBXbPSenS//iJnNBewMac9IehnVIr3I5byUybgUtWEHcnhj1EBfVLQVHy8k3Y7s4nTPFqc8HghOsSVDQRgM4Cstk+sPGXcQVKueVgAWoUi4iYvQSKX7ee/SxRdcITuflPXK7FStTFnj3uv9OstfYo4a9jegPiCstNJkOtVT0a/e82MqPpSQLzQkRepjlhIV1aJYCC0jtUsh/zMf4 Lrj8AvFz b2EuQwhsnoZz7MR3o79ZAiyoW7MrkW5GgoM+0Mz872gciJhOLxWuJHaVYCYVoSJfKtCjNFltWh5BWdFCm8iaVDg4d9qazBs8qKivEmuYrfZM6TOMqpbfxSeHV7DaDaQOA1DfT 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: List-Subscribe: List-Unsubscribe: Rename memcg_oom_recover() into memcg1_oom_recover() for consistency with other memory cgroup v1-related functions. Move the declaration in mm/memcontrol-v1.h to be nearby other memcg v1 oom handling functions. Signed-off-by: Roman Gushchin Acked-by: Shakeel Butt --- mm/memcontrol-v1.c | 6 +++--- mm/memcontrol-v1.h | 2 +- mm/memcontrol.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mm/memcontrol-v1.c b/mm/memcontrol-v1.c index 6188b33ba03db..f73551ff8b2d1 100644 --- a/mm/memcontrol-v1.c +++ b/mm/memcontrol-v1.c @@ -1090,8 +1090,8 @@ static void __mem_cgroup_clear_mc(void) mc.moved_swap = 0; } - memcg_oom_recover(from); - memcg_oom_recover(to); + memcg1_oom_recover(from); + memcg1_oom_recover(to); wake_up_all(&mc.waitq); } @@ -2067,7 +2067,7 @@ static int memcg_oom_wake_function(wait_queue_entry_t *wait, return autoremove_wake_function(wait, mode, sync, arg); } -void memcg_oom_recover(struct mem_cgroup *memcg) +void memcg1_oom_recover(struct mem_cgroup *memcg) { /* * For the following lockless ->under_oom test, the only required diff --git a/mm/memcontrol-v1.h b/mm/memcontrol-v1.h index 3de956b2422f1..972c493a8ae32 100644 --- a/mm/memcontrol-v1.h +++ b/mm/memcontrol-v1.h @@ -13,7 +13,6 @@ static inline void memcg1_soft_limit_reset(struct mem_cgroup *memcg) void mem_cgroup_charge_statistics(struct mem_cgroup *memcg, int nr_pages); void memcg1_check_events(struct mem_cgroup *memcg, int nid); -void memcg_oom_recover(struct mem_cgroup *memcg); int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask, unsigned int nr_pages); @@ -92,5 +91,6 @@ ssize_t memcg_write_event_control(struct kernfs_open_file *of, bool memcg1_oom_prepare(struct mem_cgroup *memcg, bool *locked); void memcg1_oom_finish(struct mem_cgroup *memcg, bool locked); +void memcg1_oom_recover(struct mem_cgroup *memcg); #endif /* __MM_MEMCONTROL_V1_H */ diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 3b088e0078821..1622086cab274 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3169,7 +3169,7 @@ static int mem_cgroup_resize_max(struct mem_cgroup *memcg, } while (true); if (!ret && enlarge) - memcg_oom_recover(memcg); + memcg1_oom_recover(memcg); return ret; } @@ -3754,7 +3754,7 @@ static int mem_cgroup_oom_control_write(struct cgroup_subsys_state *css, WRITE_ONCE(memcg->oom_kill_disable, val); if (!val) - memcg_oom_recover(memcg); + memcg1_oom_recover(memcg); return 0; } @@ -5481,7 +5481,7 @@ static void uncharge_batch(const struct uncharge_gather *ug) page_counter_uncharge(&ug->memcg->memsw, ug->nr_memory); if (ug->nr_kmem) memcg_account_kmem(ug->memcg, -ug->nr_kmem); - memcg_oom_recover(ug->memcg); + memcg1_oom_recover(ug->memcg); } local_irq_save(flags);