mm-memcg-rename-soft-limit-reclaim-related-functions.patch removed from -mm tree
The quilt patch titled
Subject: mm: memcg: rename soft limit reclaim-related functions
has been removed from the -mm tree. Its filename was
mm-memcg-rename-soft-limit-reclaim-related-functions.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Roman Gushchin <[email protected]>
Subject: mm: memcg: rename soft limit reclaim-related functions
Date: Mon, 24 Jun 2024 17:58:55 -0700
Rename exported function related to the softlimit reclaim to have memcg1_ prefix.
---
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(-)
include/linux/memcontrol.h renamed from include/linux/memcontrol.h~mm-memcg-rename-soft-limit-reclaim-related-functions +6 -6
@@ -1121,9 +1121,9 @@ static inline void memcg_memory_event_mmvoid 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 */
@@ -1572,9 +1572,9 @@ static inline void split_page_memcg(stru }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 ; }
mm/memcontrol.c renamed from mm/memcontrol.c~mm-memcg-rename-soft-limit-reclaim-related-functions +2 -2
@@ -1011,7 +1011,7 @@ static void memcg_check_events(struct me MEM_CGROUP_TARGET_SOFTLIMIT);mem_cgroup_threshold (memcg);if (unlikely (do_softlimit)) -mem_cgroup_update_tree (memcg, nid); +memcg1_update_tree (memcg, nid); } }
@@ -5608,7 +5608,7 @@ static void mem_cgroup_css_free(struct cvmpressure_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); }
mm/memcontrol-v1.c renamed from mm/memcontrol-v1.c~mm-memcg-rename-soft-limit-reclaim-related-functions +3 -3
@@ -100,7 +100,7 @@ static unsigned long soft_limit_excess(sreturn 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_c } } -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(strucreturn 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) {
mm/memcontrol-v1.h renamed from mm/memcontrol-v1.h~mm-memcg-rename-soft-limit-reclaim-related-functions +2 -2
@@ -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) {
mm/vmscan.c renamed from mm/vmscan.c~mm-memcg-rename-soft-limit-reclaim-related-functions +5 -5
@@ -6169,9 +6169,9 @@ static void shrink_zones(struct zonelist* 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() */
@@ -6933,8 +6933,8 @@ restart:/* 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;/*
_
Patches currently in -mm which might be from [email protected] are
mm-memcg-drop-obsolete-cache-line-padding-in-struct-mem_cgroup.patch mm-memcg-add-cache-line-padding-to-mem_cgroup_per_node.patch