mm/swap.c: don't pass "enum lru_list" to del_page_from_lru_list()

The parameter is redundant in the sense that it can be potentially
extracted from the "struct page" parameter by page_lru(). We need to
make sure that existing PageActive() or PageUnevictable() remains
until the function returns. A few places don't conform, and simple
reordering fixes them.

This patch may have left page_off_lru() seemingly odd, and we'll take
care of it in the next patch.

Link: https://lore.kernel.org/linux-mm/20201207220949.830352-6-yuzhao@google.com/
Link: https://lkml.kernel.org/r/20210122220600.906146-6-yuzhao@google.com
Signed-off-by: Yu Zhao <yuzhao@google.com>
Cc: Alex Shi <alex.shi@linux.alibaba.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Roman Gushchin <guro@fb.com>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h
index 130ba3201d3fe9a49917d88be90a4b66ed3be4c2..ffacc6273678a32ac2edec47d5a7e3e0dae20663 100644 (file)
--- a/include/linux/mm_inline.h
+++ b/include/linux/mm_inline.h
@@ -124,9 +124,10 @@ static __always_inline void add_page_to_lru_list_tail(struct page *page,
 }
 
 static __always_inline void del_page_from_lru_list(struct page *page,
-                               struct lruvec *lruvec, enum lru_list lru)
+                               struct lruvec *lruvec)
 {
        list_del(&page->lru);
-       update_lru_size(lruvec, lru, page_zonenum(page), -thp_nr_pages(page));
+       update_lru_size(lruvec, page_lru(page), page_zonenum(page),
+                       -thp_nr_pages(page));
 }
 #endif

diff --git a/mm/compaction.c b/mm/compaction.c
index 8f52532675a918125faab95e4bddb9c21f772649..3aef10c61d0eca330b383f336ecc3570ed0b2a1f 100644 (file)
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -1034,7 +1034,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
                        low_pfn += compound_nr(page) - 1;
 
                /* Successfully isolated */
-               del_page_from_lru_list(page, lruvec, page_lru(page));
+               del_page_from_lru_list(page, lruvec);
                mod_node_page_state(page_pgdat(page),
                                NR_ISOLATED_ANON + page_is_file_lru(page),
                                thp_nr_pages(page));

diff --git a/mm/mlock.c b/mm/mlock.c
index 55b3b3672977be1e3841c07e2b55b3cfc12709b0..73960bb3464d00d91347f1f9696d29363aef0f5e 100644 (file)
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -278,8 +278,7 @@ static void __munlock_pagevec(struct pagevec *pvec, struct zone *zone)
                         */
                        if (TestClearPageLRU(page)) {
                                lruvec = relock_page_lruvec_irq(page, lruvec);
-                               del_page_from_lru_list(page, lruvec,
-                                                       page_lru(page));
+                               del_page_from_lru_list(page, lruvec);
                                continue;
                        } else
                                __munlock_isolation_failed(page);

diff --git a/mm/swap.c b/mm/swap.c
index a26e3a4fe17bb99cd7fd433f44e69d985c100d93..ff910f636df2d04b49f4f5d14211ae15f09ca82a 100644 (file)
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -85,7 +85,8 @@ static void __page_cache_release(struct page *page)
                lruvec = lock_page_lruvec_irqsave(page, &flags);
                VM_BUG_ON_PAGE(!PageLRU(page), page);
                __ClearPageLRU(page);
-               del_page_from_lru_list(page, lruvec, page_off_lru(page));
+               del_page_from_lru_list(page, lruvec);
+               page_off_lru(page);
                unlock_page_lruvec_irqrestore(lruvec, flags);
        }
        __ClearPageWaiters(page);
@@ -229,7 +230,7 @@ static void pagevec_lru_move_fn(struct pagevec *pvec,
 static void pagevec_move_tail_fn(struct page *page, struct lruvec *lruvec)
 {
        if (!PageUnevictable(page)) {
-               del_page_from_lru_list(page, lruvec, page_lru(page));
+               del_page_from_lru_list(page, lruvec);
                ClearPageActive(page);
                add_page_to_lru_list_tail(page, lruvec);
                __count_vm_events(PGROTATED, thp_nr_pages(page));
@@ -308,10 +309,9 @@ void lru_note_cost_page(struct page *page)
 static void __activate_page(struct page *page, struct lruvec *lruvec)
 {
        if (!PageActive(page) && !PageUnevictable(page)) {
-               int lru = page_lru_base_type(page);
                int nr_pages = thp_nr_pages(page);
 
-               del_page_from_lru_list(page, lruvec, lru);
+               del_page_from_lru_list(page, lruvec);
                SetPageActive(page);
                add_page_to_lru_list(page, lruvec);
                trace_mm_lru_activate(page);
@@ -518,8 +518,7 @@ void lru_cache_add_inactive_or_unevictable(struct page *page,
  */
 static void lru_deactivate_file_fn(struct page *page, struct lruvec *lruvec)
 {
-       int lru;
-       bool active;
+       bool active = PageActive(page);
        int nr_pages = thp_nr_pages(page);
 
        if (PageUnevictable(page))
@@ -529,10 +528,7 @@ static void lru_deactivate_file_fn(struct page *page, struct lruvec *lruvec)
        if (page_mapped(page))
                return;
 
-       active = PageActive(page);
-       lru = page_lru_base_type(page);
-
-       del_page_from_lru_list(page, lruvec, lru + active);
+       del_page_from_lru_list(page, lruvec);
        ClearPageActive(page);
        ClearPageReferenced(page);
 
@@ -563,10 +559,9 @@ static void lru_deactivate_file_fn(struct page *page, struct lruvec *lruvec)
 static void lru_deactivate_fn(struct page *page, struct lruvec *lruvec)
 {
        if (PageActive(page) && !PageUnevictable(page)) {
-               int lru = page_lru_base_type(page);
                int nr_pages = thp_nr_pages(page);
 
-               del_page_from_lru_list(page, lruvec, lru + LRU_ACTIVE);
+               del_page_from_lru_list(page, lruvec);
                ClearPageActive(page);
                ClearPageReferenced(page);
                add_page_to_lru_list(page, lruvec);
@@ -581,11 +576,9 @@ static void lru_lazyfree_fn(struct page *page, struct lruvec *lruvec)
 {
        if (PageAnon(page) && PageSwapBacked(page) &&
            !PageSwapCache(page) && !PageUnevictable(page)) {
-               bool active = PageActive(page);
                int nr_pages = thp_nr_pages(page);
 
-               del_page_from_lru_list(page, lruvec,
-                                      LRU_INACTIVE_ANON + active);
+               del_page_from_lru_list(page, lruvec);
                ClearPageActive(page);
                ClearPageReferenced(page);
                /*
@@ -919,7 +912,8 @@ void release_pages(struct page **pages, int nr)
 
                        VM_BUG_ON_PAGE(!PageLRU(page), page);
                        __ClearPageLRU(page);
-                       del_page_from_lru_list(page, lruvec, page_off_lru(page));
+                       del_page_from_lru_list(page, lruvec);
+                       page_off_lru(page);
                }
 
                __ClearPageWaiters(page);

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 09e4f97488c9328b39ed950757f093c50764378a..7c65d47e6612ebae0ba77dd39d5da5655bffa0eb 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1766,7 +1766,7 @@ int isolate_lru_page(struct page *page)
 
                get_page(page);
                lruvec = lock_page_lruvec_irq(page);
-               del_page_from_lru_list(page, lruvec, page_lru(page));
+               del_page_from_lru_list(page, lruvec);
                unlock_page_lruvec_irq(lruvec);
                ret = 0;
        }
@@ -4283,8 +4283,8 @@ void check_move_unevictable_pages(struct pagevec *pvec)
                lruvec = relock_page_lruvec_irq(page, lruvec);
                if (page_evictable(page) && PageUnevictable(page)) {
                        VM_BUG_ON_PAGE(PageActive(page), page);
+                       del_page_from_lru_list(page, lruvec);
                        ClearPageUnevictable(page);
-                       del_page_from_lru_list(page, lruvec, LRU_UNEVICTABLE);
                        add_page_to_lru_list(page, lruvec);
                        pgrescued += nr_pages;
                }