linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Shakeel Butt <shakeel.butt@linux.dev>
To: Andrew Morton <akpm@linux-foundation.org>,
	Johannes Weiner <hannes@cmpxchg.org>,
	Michal Hocko <mhocko@kernel.org>,
	Roman Gushchin <roman.gushchin@linux.dev>,
	Muchun Song <muchun.song@linux.dev>,
	Yosry Ahmed <yosryahmed@google.com>,
	"T . J . Mercier" <tjmercier@google.com>
Cc: kernel-team@meta.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 8/8] memcg: use proper type for mod_memcg_state
Date: Mon, 29 Apr 2024 23:06:12 -0700	[thread overview]
Message-ID: <20240430060612.2171650-9-shakeel.butt@linux.dev> (raw)
In-Reply-To: <20240430060612.2171650-1-shakeel.butt@linux.dev>

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.

Signed-off-by: Shakeel Butt <shakeel.butt@linux.dev>
---
Change since v2:
- Fixed whitespace issue based on TJ's suggestion.

 include/linux/memcontrol.h | 13 +++++++------
 mm/memcontrol.c            |  3 ++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index ab8a6e884375..030d34e9d117 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -974,7 +974,8 @@ 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, 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_pages(void)
 
 /* 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(struct mem_cgroup *memcg,
 }
 
 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_group(struct mem_cgroup *memcg)
 }
 
 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)
 {
 }
 
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 72e36977a96e..f5fc16b918ba 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -956,7 +956,8 @@ static int memcg_state_val_in_pages(int idx, int val)
  * @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);
 
-- 
2.43.0



  parent reply	other threads:[~2024-04-30  6:06 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-30  6:06 [PATCH v3 0/8] memcg: reduce memory consumption by memcg stats Shakeel Butt
2024-04-30  6:06 ` [PATCH v3 1/8] memcg: reduce memory size of mem_cgroup_events_index Shakeel Butt
2024-04-30  8:33   ` Yosry Ahmed
2024-04-30 17:29     ` T.J. Mercier
2024-04-30  6:06 ` [PATCH v3 2/8] memcg: dynamically allocate lruvec_stats Shakeel Butt
2024-04-30 17:29   ` T.J. Mercier
2024-04-30  6:06 ` [PATCH v3 3/8] mm: memcg: account memory used for memcg vmstats and lruvec stats Shakeel Butt
2024-04-30  8:34   ` Yosry Ahmed
2024-04-30 17:30     ` T.J. Mercier
2024-04-30  6:06 ` [PATCH v3 4/8] memcg: reduce memory for the lruvec and memcg stats Shakeel Butt
2024-04-30  8:41   ` Yosry Ahmed
2024-04-30 17:37     ` Shakeel Butt
2024-04-30 17:41       ` Yosry Ahmed
2024-04-30 17:49         ` Shakeel Butt
2024-04-30 23:00         ` Shakeel Butt
2024-04-30 23:07           ` Yosry Ahmed
2024-05-01  0:50             ` Johannes Weiner
2024-04-30 17:30   ` T.J. Mercier
2024-04-30 17:45     ` Shakeel Butt
2024-04-30  6:06 ` [PATCH v3 5/8] memcg: cleanup __mod_memcg_lruvec_state Shakeel Butt
2024-04-30 17:31   ` T.J. Mercier
2024-04-30  6:06 ` [PATCH v3 6/8] mm: cleanup WORKINGSET_NODES in workingset Shakeel Butt
2024-04-30 17:32   ` T.J. Mercier
2024-04-30  6:06 ` [PATCH v3 7/8] memcg: warn for unexpected events and stats Shakeel Butt
2024-04-30  6:06 ` Shakeel Butt [this message]
2024-04-30 18:09   ` [PATCH v3 8/8] memcg: use proper type for mod_memcg_state T.J. Mercier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240430060612.2171650-9-shakeel.butt@linux.dev \
    --to=shakeel.butt@linux.dev \
    --cc=akpm@linux-foundation.org \
    --cc=hannes@cmpxchg.org \
    --cc=kernel-team@meta.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mhocko@kernel.org \
    --cc=muchun.song@linux.dev \
    --cc=roman.gushchin@linux.dev \
    --cc=tjmercier@google.com \
    --cc=yosryahmed@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).