The patch titled
Subject: mm: use add_page_to_lru_list()/page_lru()/page_off_lru()
has been removed from the -mm tree. Its filename was
mm-use-add_page_to_lru_list-page_lru-page_off_lru.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Yu Zhao <yuzhao@xxxxxxxxxx>
Subject: mm: use add_page_to_lru_list()/page_lru()/page_off_lru()
This is a trivial but worth having clean-up patch. There should be no
side effects except page->lru is temporarily poisoned after it's deleted
but before it's added to the new list in move_pages_to_lru() (which is not
a problem).
Link: http://lkml.kernel.org/r/20200831175042.3527153-1-yuzhao@xxxxxxxxxx
Signed-off-by: Yu Zhao <yuzhao@xxxxxxxxxx>
Cc: Alex Shi <alex.shi@xxxxxxxxxxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/swap.c | 4 +---
mm/vmscan.c | 13 ++++---------
2 files changed, 5 insertions(+), 12 deletions(-)
--- a/mm/swap.c~mm-use-add_page_to_lru_list-page_lru-page_off_lru
+++ a/mm/swap.c
@@ -596,11 +596,9 @@ static void lru_lazyfree_fn(struct page
{
if (PageLRU(page) && 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, page_lru(page));
ClearPageActive(page);
ClearPageReferenced(page);
/*
--- a/mm/vmscan.c~mm-use-add_page_to_lru_list-page_lru-page_off_lru
+++ a/mm/vmscan.c
@@ -1847,13 +1847,12 @@ static unsigned noinline_for_stack move_
int nr_pages, nr_moved = 0;
LIST_HEAD(pages_to_free);
struct page *page;
- enum lru_list lru;
while (!list_empty(list)) {
page = lru_to_page(list);
VM_BUG_ON_PAGE(PageLRU(page), page);
+ list_del(&page->lru);
if (unlikely(!page_evictable(page))) {
- list_del(&page->lru);
spin_unlock_irq(&pgdat->lru_lock);
putback_lru_page(page);
spin_lock_irq(&pgdat->lru_lock);
@@ -1862,16 +1861,11 @@ static unsigned noinline_for_stack move_
lruvec = mem_cgroup_page_lruvec(page, pgdat);
SetPageLRU(page);
- lru = page_lru(page);
-
- nr_pages = thp_nr_pages(page);
- update_lru_size(lruvec, lru, page_zonenum(page), nr_pages);
- list_move(&page->lru, &lruvec->lists[lru]);
+ add_page_to_lru_list(page, lruvec, page_lru(page));
if (put_page_testzero(page)) {
__ClearPageLRU(page);
- __ClearPageActive(page);
- del_page_from_lru_list(page, lruvec, lru);
+ del_page_from_lru_list(page, lruvec, page_off_lru(page));
if (unlikely(PageCompound(page))) {
spin_unlock_irq(&pgdat->lru_lock);
@@ -1880,6 +1874,7 @@ static unsigned noinline_for_stack move_
} else
list_add(&page->lru, &pages_to_free);
} else {
+ nr_pages = thp_nr_pages(page);
nr_moved += nr_pages;
if (PageActive(page))
workingset_age_nonresident(lruvec, nr_pages);
_
Patches currently in -mm which might be from yuzhao@xxxxxxxxxx are
mm-remove-activate_page-from-unuse_pte.patch
mm-remove-superfluous-__clearpageactive.patch
mm-use-self-explanatory-macros-rather-than-2.patch
