From: Qian Cai <cai@lca.pw>
To: akpm@linux-foundation.org
Cc: hannes@cmpxchg.org, surenb@google.com, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, Qian Cai <cai@lca.pw>
Subject: [PATCH -next v2] mm/vmscan: fix some -Wenum-conversion warnings
Date: Fri, 15 Nov 2019 15:11:37 -0500 [thread overview]
Message-ID: <1573848697-29262-1-git-send-email-cai@lca.pw> (raw)
The -next commit "mm: vmscan: enforce inactive:active ratio at the
reclaim root" [1] introduced some Clang -Wenum-conversion warnings,
mm/vmscan.c:2216:39: warning: implicit conversion from enumeration type
'enum lru_list' to different enumeration type 'enum node_stat_item'
[-Wenum-conversion]
inactive = lruvec_page_state(lruvec, inactive_lru);
~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~
mm/vmscan.c:2217:37: warning: implicit conversion from enumeration type
'enum lru_list' to different enumeration type 'enum node_stat_item'
[-Wenum-conversion]
active = lruvec_page_state(lruvec, active_lru);
~~~~~~~~~~~~~~~~~ ^~~~~~~~~~
mm/vmscan.c:2746:42: warning: implicit conversion from enumeration type
'enum lru_list' to different enumeration type 'enum node_stat_item'
[-Wenum-conversion]
file = lruvec_page_state(target_lruvec, LRU_INACTIVE_FILE);
~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~
Since it guarantees the relative order between the LRU items, fix it by
using NR_LRU_BASE for the translation.
[1] http://lkml.kernel.org/r/20191107205334.158354-4-hannes@cmpxchg.org
Signed-off-by: Qian Cai <cai@lca.pw>
---
v2: use NR_LRU_BASE/NR_INACTIVE_FILE per Johannes.
mm/vmscan.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 122b3920aaa4..c8e88f4d9932 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -2213,8 +2213,8 @@ static bool inactive_is_low(struct lruvec *lruvec, enum lru_list inactive_lru)
unsigned long inactive_ratio;
unsigned long gb;
- inactive = lruvec_page_state(lruvec, inactive_lru);
- active = lruvec_page_state(lruvec, active_lru);
+ inactive = lruvec_page_state(lruvec, NR_LRU_BASE + inactive_lru);
+ active = lruvec_page_state(lruvec, NR_LRU_BASE + active_lru);
gb = (inactive + active) >> (30 - PAGE_SHIFT);
if (gb)
@@ -2743,7 +2743,7 @@ static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc)
* thrashing, try to reclaim those first before touching
* anonymous pages.
*/
- file = lruvec_page_state(target_lruvec, LRU_INACTIVE_FILE);
+ file = lruvec_page_state(target_lruvec, NR_INACTIVE_FILE);
if (file >> sc->priority && !(sc->may_deactivate & DEACTIVATE_FILE))
sc->cache_trim_mode = 1;
else
--
1.8.3.1
next reply other threads:[~2019-11-15 20:11 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-15 20:11 Qian Cai [this message]
2019-11-18 18:25 ` [PATCH -next v2] mm/vmscan: fix some -Wenum-conversion warnings Johannes Weiner
2019-11-18 18:28 ` Johannes Weiner
2019-11-18 20:52 ` Qian Cai
2019-11-18 20:56 ` Qian Cai
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=1573848697-29262-1-git-send-email-cai@lca.pw \
--to=cai@lca.pw \
--cc=akpm@linux-foundation.org \
--cc=hannes@cmpxchg.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=surenb@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).