From patchwork Tue May 28 20:20:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Gushchin X-Patchwork-Id: 13677351 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 2F31AC25B78 for ; Tue, 28 May 2024 20:21:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AD9076B009B; Tue, 28 May 2024 16:21:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A14206B009D; Tue, 28 May 2024 16:21:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 865886B009E; Tue, 28 May 2024 16:21:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 60B606B009B for ; Tue, 28 May 2024 16:21:40 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 187BBA01BE for ; Tue, 28 May 2024 20:21:40 +0000 (UTC) X-FDA: 82168925160.14.3710442 Received: from out-188.mta1.migadu.com (out-188.mta1.migadu.com [95.215.58.188]) by imf08.hostedemail.com (Postfix) with ESMTP id EC212160015 for ; Tue, 28 May 2024 20:21:37 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=ijO+FHfZ; spf=pass (imf08.hostedemail.com: domain of roman.gushchin@linux.dev designates 95.215.58.188 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=1716927698; 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=y/IyRDssHrMHkNOV40XaGNGgjC7h+E/txgZ4e1RmFhI=; b=dk/Cs/BARco+wcUGHWNVerM59rv9I15MHB4q/KEOlj9TApSX+68f/vnGj5/lRaK3lzss62 X7C667PtmQgo5XJYu9/+eodVKslHEZdFFQ+o0UVvvMVxGoCUNuhtlfDIzVgcG6AoTTdRL2 /XZKtavHbWvPTTcWjaDjAe51uYzdNWI= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=ijO+FHfZ; spf=pass (imf08.hostedemail.com: domain of roman.gushchin@linux.dev designates 95.215.58.188 as permitted sender) smtp.mailfrom=roman.gushchin@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716927698; a=rsa-sha256; cv=none; b=VkMMq0b/F/Rz3nxM0jm8a5uv7gwkbnr5t3Nrz6DclOfwkWWo9D1pfHwpKiYYr7mnk9xQ65 hi9JFiIt/vLdjE/nyVs5Nmd/IU2PJQFPjQO/ilKClHRQBfFMF2AWyQZaNIpk1Kca0Ogybw uWrmsxwXIHeRZUbUmP14/W0f97Lg24o= X-Envelope-To: akpm@linux-foundation.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1716927696; 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=y/IyRDssHrMHkNOV40XaGNGgjC7h+E/txgZ4e1RmFhI=; b=ijO+FHfZzox6CnufXeEk7CPNoA3O1/MQLRzOj+KdMN4dJyyPjH9cMVVMna/IaQ5LOeHr4S FOlE9zJiodlgVj+FbbHzxKpLryUFAN2kQiR+MeQEKCAPIqA4cYLjZAwfVHcAfeqsGNoM0k m3nCL38Tpi4loQmhNfcMUkph7RmTW74= 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 03/14] mm: memcg: rename soft limit reclaim-related functions Date: Tue, 28 May 2024 13:20:55 -0700 Message-ID: <20240528202101.3099300-4-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-Stat-Signature: r8m5qjopecymsky9684zbkcpr8t54se9 X-Rspamd-Queue-Id: EC212160015 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1716927697-684530 X-HE-Meta: U2FsdGVkX19fwWDyWnPaLi0zoAuKTjgBUxUNXE4Zi7AwiK2Ej2oYJFbAgcpw2qyJgDgFBVtjnivP8s82W0ZpOyrHzM81GXl8x+e/NDmqFuBVloXUGbQrONC22ducwf70707ClJxcg0mwD3AcSe1o4PK+IYzLcLLCceGa2QPjUMEMg31zlfaEFMhNcLbqoO0cm3ejEfiyz/ChCsgMq0Z9zDmzTZjiJ0QfV4K1v0K7amsocC+ILWzjbkww1Qt6vFl77PdnHMqushQXKQJyFruClW/gu7IyoAc2fWy+YNSMd0q24u8HrLwqxpFevwce9UJuzkbIbjIAZRv9tETaxD7yq+Na+d2gpenda2e54nlZK/amHOLekwtmiuxgJlKqiPOgqgWvwL0j+nlwu7AWEMsUlD9TeDzwafIZZpideJiywroGEkByl1NrQ8+Pc6EcPY8rt+gRnZhAuWhkgZI55dSGO4quXL6ipwVyBDz53liornRbQfQE+xsg/TJecoYnnBaJdHbKcVSYV1Iuk8diT8/K8uMg92HF8sQf16P+yUyx44P8RgdZEB5Bt7zQWrVkkP3alc0eCho92QQPToPuxIRXwJtfU/o31RqkIuXYcKWzZ4+JrCO0n6bH0Q+Ku1M6/f0IyU42gh59MPOUceCwXwvIaKgfDFkzwFCKffsL/qWoAO3ZnvRpXkbly4xhhlKr9piNmggjEGiySpK9aaVCC4s79A85D9HH89SuK8RmO2S+/3DIqWF7tacCyoBJSpBJWLgP5c7tuqhXYxBvS8fkp6r/vTWBEIYOjVN86QQ+w9W6uyCEk1ZiL7HvfClcfqr5rs8M6dTYLF2VHHwbkPG6d1fONMK6TRVRJj68xEaom+jvuIKwF3ysNQ10qnSnfSLzAa9VMvodUxrHcPeZyETawLx5mUJ2+gKjq2rBL8of9KW6X5T/WSvHPPUrXl/Js0LkeX1+yZoQvD+ARD1RcC5CG3M 6xeRVetK 27NBbt6f0OUkTQgfI56fKlUVJvyUdL6UAC0a9U63aopxkTgXw+VDHNSELlImS7ayouzhchljU48B0Xoc= 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 exported function related to the softlimit reclaim to have memcg1_ prefix. Signed-off-by: Roman Gushchin Acked-by: Shakeel Butt --- include/linux/memcontrol.h | 12 ++++++------ mm/memcontrol-v1.c | 6 +++--- mm/memcontrol-v1.h | 4 ++-- mm/memcontrol.c | 4 ++-- mm/vmscan.c | 10 +++++----- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 3d1599146afe4..04f9f7b0e7c2f 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1115,9 +1115,9 @@ static inline void memcg_memory_event_mm(struct mm_struct *mm, void split_page_memcg(struct page *head, int old_order, int new_order); -unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order, - gfp_t gfp_mask, - unsigned long *total_scanned); +unsigned long memcg1_soft_limit_reclaim(pg_data_t *pgdat, int order, + gfp_t gfp_mask, + unsigned long *total_scanned); #else /* CONFIG_MEMCG */ @@ -1566,9 +1566,9 @@ static inline void split_page_memcg(struct page *head, int old_order, int new_or } static inline -unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order, - gfp_t gfp_mask, - unsigned long *total_scanned) +unsigned long memcg1_soft_limit_reclaim(pg_data_t *pgdat, int order, + gfp_t gfp_mask, + unsigned long *total_scanned) { return 0; } diff --git a/mm/memcontrol-v1.c b/mm/memcontrol-v1.c index 2ccb8406fa84e..68e2f1a718d36 100644 --- a/mm/memcontrol-v1.c +++ b/mm/memcontrol-v1.c @@ -100,7 +100,7 @@ static unsigned long soft_limit_excess(struct mem_cgroup *memcg) return excess; } -void mem_cgroup_update_tree(struct mem_cgroup *memcg, int nid) +void memcg1_update_tree(struct mem_cgroup *memcg, int nid) { unsigned long excess; struct mem_cgroup_per_node *mz; @@ -143,7 +143,7 @@ void mem_cgroup_update_tree(struct mem_cgroup *memcg, int nid) } } -void mem_cgroup_remove_from_trees(struct mem_cgroup *memcg) +void memcg1_remove_from_trees(struct mem_cgroup *memcg) { struct mem_cgroup_tree_per_node *mctz; struct mem_cgroup_per_node *mz; @@ -243,7 +243,7 @@ static int mem_cgroup_soft_reclaim(struct mem_cgroup *root_memcg, return total; } -unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order, +unsigned long memcg1_soft_limit_reclaim(pg_data_t *pgdat, int order, gfp_t gfp_mask, unsigned long *total_scanned) { diff --git a/mm/memcontrol-v1.h b/mm/memcontrol-v1.h index 4da6fa561c6d4..e37bc7e8d9558 100644 --- a/mm/memcontrol-v1.h +++ b/mm/memcontrol-v1.h @@ -3,8 +3,8 @@ #ifndef __MM_MEMCONTROL_V1_H #define __MM_MEMCONTROL_V1_H -void mem_cgroup_update_tree(struct mem_cgroup *memcg, int nid); -void mem_cgroup_remove_from_trees(struct mem_cgroup *memcg); +void memcg1_update_tree(struct mem_cgroup *memcg, int nid); +void memcg1_remove_from_trees(struct mem_cgroup *memcg); static inline void memcg1_soft_limit_reset(struct mem_cgroup *memcg) { diff --git a/mm/memcontrol.c b/mm/memcontrol.c index fa1df6e894787..0fbc4e518222e 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1012,7 +1012,7 @@ static void memcg_check_events(struct mem_cgroup *memcg, int nid) MEM_CGROUP_TARGET_SOFTLIMIT); mem_cgroup_threshold(memcg); if (unlikely(do_softlimit)) - mem_cgroup_update_tree(memcg, nid); + memcg1_update_tree(memcg, nid); } } @@ -5612,7 +5612,7 @@ static void mem_cgroup_css_free(struct cgroup_subsys_state *css) vmpressure_cleanup(&memcg->vmpressure); cancel_work_sync(&memcg->high_work); - mem_cgroup_remove_from_trees(memcg); + memcg1_remove_from_trees(memcg); free_shrinker_info(memcg); mem_cgroup_free(memcg); } diff --git a/mm/vmscan.c b/mm/vmscan.c index b9170f767353d..3833b11c96f9b 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -6187,9 +6187,9 @@ static void shrink_zones(struct zonelist *zonelist, struct scan_control *sc) * and balancing, not for a memcg's limit. */ nr_soft_scanned = 0; - nr_soft_reclaimed = mem_cgroup_soft_limit_reclaim(zone->zone_pgdat, - sc->order, sc->gfp_mask, - &nr_soft_scanned); + nr_soft_reclaimed = memcg1_soft_limit_reclaim(zone->zone_pgdat, + sc->order, sc->gfp_mask, + &nr_soft_scanned); sc->nr_reclaimed += nr_soft_reclaimed; sc->nr_scanned += nr_soft_scanned; /* need some check for avoid more shrink_zone() */ @@ -6952,8 +6952,8 @@ static int balance_pgdat(pg_data_t *pgdat, int order, int highest_zoneidx) /* Call soft limit reclaim before calling shrink_node. */ sc.nr_scanned = 0; nr_soft_scanned = 0; - nr_soft_reclaimed = mem_cgroup_soft_limit_reclaim(pgdat, sc.order, - sc.gfp_mask, &nr_soft_scanned); + nr_soft_reclaimed = memcg1_soft_limit_reclaim(pgdat, sc.order, + sc.gfp_mask, &nr_soft_scanned); sc.nr_reclaimed += nr_soft_reclaimed; /*