| Message ID | 20201207220949.830352-2-yuzhao@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mm: lru related cleanups | expand |
Reviewed-by: Alex Shi <alex.shi@linux.alibaba.com> 在 2020/12/8 上午6:09, Yu Zhao 写道: > There is add_page_to_lru_list(), and move_pages_to_lru() should reuse > it, not duplicate it. > > Signed-off-by: Yu Zhao <yuzhao@google.com> > --- > mm/vmscan.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/mm/vmscan.c b/mm/vmscan.c > index 469016222cdb..a174594e40f8 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -1821,7 +1821,6 @@ static unsigned noinline_for_stack move_pages_to_lru(struct lruvec *lruvec, > 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); > @@ -1866,11 +1865,8 @@ static unsigned noinline_for_stack move_pages_to_lru(struct lruvec *lruvec, > * inhibits memcg migration). > */ > VM_BUG_ON_PAGE(!lruvec_holds_page_lru_lock(page, lruvec), page); > - lru = page_lru(page); > + add_page_to_lru_list(page, lruvec, page_lru(page)); > nr_pages = thp_nr_pages(page); > - > - update_lru_size(lruvec, lru, page_zonenum(page), nr_pages); > - list_add(&page->lru, &lruvec->lists[lru]); > nr_moved += nr_pages; > if (PageActive(page)) > workingset_age_nonresident(lruvec, nr_pages); >
diff --git a/mm/vmscan.c b/mm/vmscan.c index 469016222cdb..a174594e40f8 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1821,7 +1821,6 @@ static unsigned noinline_for_stack move_pages_to_lru(struct lruvec *lruvec, 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); @@ -1866,11 +1865,8 @@ static unsigned noinline_for_stack move_pages_to_lru(struct lruvec *lruvec, * inhibits memcg migration). */ VM_BUG_ON_PAGE(!lruvec_holds_page_lru_lock(page, lruvec), page); - lru = page_lru(page); + add_page_to_lru_list(page, lruvec, page_lru(page)); nr_pages = thp_nr_pages(page); - - update_lru_size(lruvec, lru, page_zonenum(page), nr_pages); - list_add(&page->lru, &lruvec->lists[lru]); nr_moved += nr_pages; if (PageActive(page)) workingset_age_nonresident(lruvec, nr_pages);
There is add_page_to_lru_list(), and move_pages_to_lru() should reuse it, not duplicate it. Signed-off-by: Yu Zhao <yuzhao@google.com> --- mm/vmscan.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)