memcg-use-proper-type-for-mod_memcg_state.patch removed from -mm tree
The quilt patch titled
Subject: memcg: use proper type for mod_memcg_state
has been removed from the -mm tree. Its filename was
memcg-use-proper-type-for-mod_memcg_state.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: Shakeel Butt <[email protected]>
Subject: memcg: use proper type for mod_memcg_state
Date: Wed, 1 May 2024 10:26:17 -0700
The memcg stats update functions can take arbitrary integer but the only input which make sense is enum memcg_stat_item and we don't want these functions to be called with arbitrary integer, so replace the parameter type with enum memcg_stat_item and compiler will be able to warn if memcg stat update functions are called with incorrect index value.
---
include/linux/memcontrol.h | 13 +++++++------ mm/memcontrol.c | 3 ++- 2 files changed, 9 insertions(+), 7 deletions(-)
include/linux/memcontrol.h renamed from include/linux/memcontrol.h~memcg-use-proper-type-for-mod_memcg_state +7 -6
@@ -974,7 +974,8 @@ void mem_cgroup_print_oom_group(struct mvoid folio_memcg_lock (struct folio *folio);void folio_memcg_unlock (struct folio *folio); -void __mod_memcg_state (struct mem_cgroup *memcg,int idx,int val); +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)
@@ -995,7 +996,7 @@ static inline void mem_cgroup_unlock_pag/* idx can be of type enum memcg_stat_item or node_stat_item */ static inline void mod_memcg_state (struct mem_cgroup *memcg, -int idx,int val) +enum memcg_stat_item idx,int val) {unsigned long flags;
@@ -1005,7 +1006,7 @@ static inline void mod_memcg_state(struc }static inline void mod_memcg_page_state (struct page *page, -int idx,int val) +enum memcg_stat_item idx,int val) {struct mem_cgroup *memcg;
@@ -1491,19 +1492,19 @@ static inline void mem_cgroup_print_oom_ }static inline void __mod_memcg_state (struct mem_cgroup *memcg, -int idx, +enum memcg_stat_item idx,int nr) { }static inline void mod_memcg_state (struct mem_cgroup *memcg, -int idx, +enum memcg_stat_item idx,int nr) { }static inline void mod_memcg_page_state (struct page *page, -int idx,int val) +enum memcg_stat_item idx,int val) { }
mm/memcontrol.c renamed from mm/memcontrol.c~memcg-use-proper-type-for-mod_memcg_state +2 -1
@@ -955,7 +955,8 @@ static int memcg_state_val_in_pages(int* @idx: the stat item - can be enum memcg_stat_item or enum node_stat_item * @val: delta to add to the counter, can be negative */ -void __mod_memcg_state (struct mem_cgroup *memcg,int idx,int val) +void __mod_memcg_state (struct mem_cgroup *memcg,enum memcg_stat_item idx, +int val) {int i =memcg_stats_index (idx);
_
Patches currently in -mm which might be from [email protected] are