mm-memcg-group-cgroup-v1-memcg-related-declarations.patch removed from -mm tree
The quilt patch titled
Subject: mm: memcg: group cgroup v1 memcg related declarations
has been removed from the -mm tree. Its filename was
mm-memcg-group-cgroup-v1-memcg-related-declarations.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: group cgroup v1 memcg related declarations
Date: Mon, 24 Jun 2024 17:59:04 -0700
Group all cgroup v1-related declarations at the end of memcontrol.h and mm/memcontrol-v1.h with an intention to put them all together under a config option later on. It should make things easier to follow and maintain too.
---
include/linux/memcontrol.h | 144 ++++++++++++++++++----------------- mm/memcontrol-v1.h | 87 +++++++++++---------- 2 files changed, 122 insertions(+), 109 deletions(-)
include/linux/memcontrol.h renamed from include/linux/memcontrol.h~mm-memcg-group-cgroup-v1-memcg-related-declarations +76 -68
@@ -950,39 +950,13 @@ static inline void mem_cgroup_exit_user_ current->in_user_fault =0 ; } -static inline bool task_in_memcg_oom (struct task_struct *p) -{ -return p->memcg_in_oom; -} - -bool mem_cgroup_oom_synchronize (bool wait);struct mem_cgroup *mem_cgroup_get_oom_group (struct task_struct *victim,struct mem_cgroup *oom_domain);void mem_cgroup_print_oom_group (struct mem_cgroup *memcg); -void folio_memcg_lock (struct folio *folio); -void folio_memcg_unlock (struct folio *folio); -void __mod_memcg_state (struct mem_cgroup *memcg,enum memcg_stat_item idx,int val); -/* try to stablize folio_memcg() for all the pages in a memcg */ -static inline bool mem_cgroup_trylock_pages (struct mem_cgroup *memcg) -{ -rcu_read_lock (); - -if (mem_cgroup_disabled () || !atomic_read (&memcg->moving_account)) -return true; - -rcu_read_unlock (); -return false; -} - -static inline void mem_cgroup_unlock_pages (void ) -{ -rcu_read_unlock (); -} -/* idx can be of type enum memcg_stat_item or node_stat_item */ static inline void mod_memcg_state (struct mem_cgroup *memcg,enum memcg_stat_item idx,int val)
@@ -1109,10 +1083,6 @@ static inline void memcg_memory_event_mmvoid split_page_memcg (struct page *head,int old_order,int new_order); -unsigned long memcg1_soft_limit_reclaim (pg_data_t *pgdat,int order, -gfp_t gfp_mask, -unsigned long *total_scanned); -#else /* CONFIG_MEMCG */ #define MEM_CGROUP_ID_SHIFT 0
@@ -1423,26 +1393,6 @@ mem_cgroup_print_oom_meminfo(struct mem_ { } -static inline void folio_memcg_lock (struct folio *folio) -{ -} - -static inline void folio_memcg_unlock (struct folio *folio) -{ -} - -static inline bool mem_cgroup_trylock_pages (struct mem_cgroup *memcg) -{ -/* to match folio_memcg_rcu() */ -rcu_read_lock (); -return true; -} - -static inline void mem_cgroup_unlock_pages (void ) -{ -rcu_read_unlock (); -} -static inline void mem_cgroup_handle_over_high (gfp_t gfp_mask) { }
@@ -1455,16 +1405,6 @@ static inline void mem_cgroup_exit_user_ { } -static inline bool task_in_memcg_oom (struct task_struct *p) -{ -return false; -} - -static inline bool mem_cgroup_oom_synchronize (bool wait) -{ -return false; -} -static inline struct mem_cgroup *mem_cgroup_get_oom_group (struct task_struct *victim,struct mem_cgroup *oom_domain) {
@@ -1558,14 +1498,6 @@ void count_memcg_event_mm(struct mm_strustatic inline void split_page_memcg (struct page *head,int old_order,int new_order) { } - -static inline -unsigned long memcg1_soft_limit_reclaim (pg_data_t *pgdat,int order, -gfp_t gfp_mask, -unsigned long *total_scanned) -{ -return 0 ; -}#endif /* CONFIG_MEMCG */ /*
@@ -1916,4 +1848,80 @@ static inline bool mem_cgroup_zswap_writ }#endif + +/* Cgroup v1-related declarations */ + +#ifdef CONFIG_MEMCG +unsigned long memcg1_soft_limit_reclaim (pg_data_t *pgdat,int order, +gfp_t gfp_mask, +unsigned long *total_scanned); + +bool mem_cgroup_oom_synchronize (bool wait); + +static inline bool task_in_memcg_oom (struct task_struct *p) +{ +return p->memcg_in_oom; +} + +void folio_memcg_lock (struct folio *folio); +void folio_memcg_unlock (struct folio *folio); + +/* try to stablize folio_memcg() for all the pages in a memcg */ +static inline bool mem_cgroup_trylock_pages (struct mem_cgroup *memcg) +{ +rcu_read_lock (); + +if (mem_cgroup_disabled () || !atomic_read (&memcg->moving_account)) +return true; + +rcu_read_unlock (); +return false; +} + +static inline void mem_cgroup_unlock_pages (void ) +{ +rcu_read_unlock (); +} + +#else /* CONFIG_MEMCG */ +static inline +unsigned long memcg1_soft_limit_reclaim (pg_data_t *pgdat,int order, +gfp_t gfp_mask, +unsigned long *total_scanned) +{ +return 0 ; +} + +static inline void folio_memcg_lock (struct folio *folio) +{ +} + +static inline void folio_memcg_unlock (struct folio *folio) +{ +} + +static inline bool mem_cgroup_trylock_pages (struct mem_cgroup *memcg) +{ +/* to match folio_memcg_rcu() */ +rcu_read_lock (); +return true; +} + +static inline void mem_cgroup_unlock_pages (void ) +{ +rcu_read_unlock (); +} + +static inline bool task_in_memcg_oom (struct task_struct *p) +{ +return false; +} + +static inline bool mem_cgroup_oom_synchronize (bool wait) +{ +return false; +} + +#endif /* CONFIG_MEMCG */ +#endif /* _LINUX_MEMCONTROL_H */
mm/memcontrol-v1.h renamed from mm/memcontrol-v1.h~mm-memcg-group-cgroup-v1-memcg-related-declarations +46 -41
121 lines not on this page · raw message
_
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