[-next,v2] mm/vmscan: fix some -Wenum-conversion warnings
diff mbox series

Message ID 1573848697-29262-1-git-send-email-cai@lca.pw
State New
Headers show
Series
  • [-next,v2] mm/vmscan: fix some -Wenum-conversion warnings
Related show

Commit Message

Qian Cai Nov. 15, 2019, 8:11 p.m. UTC
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(-)

Comments

Johannes Weiner Nov. 18, 2019, 6:25 p.m. UTC | #1
On Fri, Nov 15, 2019 at 03:11:37PM -0500, Qian Cai wrote:
> 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>

Acked-by: Johannes Weiner <hannes@cmpxchg.org>

Thanks Qian!

Andrew, this is a fix for "mm: vmscan: enforce inactive:active ratio
at the reclaim root". Could you please fold this into that?
Johannes Weiner Nov. 18, 2019, 6:28 p.m. UTC | #2
On Mon, Nov 18, 2019 at 01:25:49PM -0500, Johannes Weiner wrote:
> On Fri, Nov 15, 2019 at 03:11:37PM -0500, Qian Cai wrote:
> > 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>
> 
> Acked-by: Johannes Weiner <hannes@cmpxchg.org>
> 
> Thanks Qian!
> 
> Andrew, this is a fix for "mm: vmscan: enforce inactive:active ratio
> at the reclaim root". Could you please fold this into that?

nvm, I see you already picked it up. Thank you!
Qian Cai Nov. 18, 2019, 8:52 p.m. UTC | #3
On Mon, 2019-11-18 at 13:28 -0500, Johannes Weiner wrote:
> On Mon, Nov 18, 2019 at 01:25:49PM -0500, Johannes Weiner wrote:
> > On Fri, Nov 15, 2019 at 03:11:37PM -0500, Qian Cai wrote:
> > > 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>
> > 
> > Acked-by: Johannes Weiner <hannes@cmpxchg.org>
> > 
> > Thanks Qian!
> > 
> > Andrew, this is a fix for "mm: vmscan: enforce inactive:active ratio
> > at the reclaim root". Could you please fold this into that?
> 
> nvm, I see you already picked it up. Thank you!

Hmm, I don't see Andrew picked it yet.
Qian Cai Nov. 18, 2019, 8:56 p.m. UTC | #4
On Mon, 2019-11-18 at 15:52 -0500, Qian Cai wrote:
> On Mon, 2019-11-18 at 13:28 -0500, Johannes Weiner wrote:
> > On Mon, Nov 18, 2019 at 01:25:49PM -0500, Johannes Weiner wrote:
> > > On Fri, Nov 15, 2019 at 03:11:37PM -0500, Qian Cai wrote:
> > > > 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>
> > > 
> > > Acked-by: Johannes Weiner <hannes@cmpxchg.org>
> > > 
> > > Thanks Qian!
> > > 
> > > Andrew, this is a fix for "mm: vmscan: enforce inactive:active ratio
> > > at the reclaim root". Could you please fold this into that?
> > 
> > nvm, I see you already picked it up. Thank you!
> 
> Hmm, I don't see Andrew picked it yet.

Ah, I saw it now. Too many emails, so I'll setup a filter.

Patch
diff mbox series

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