tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mm/vmscan: convert move_pages_to_lru() to use a folio

Browse Source 
Remove a few hidden calls to compound_head, saving 387 bytes of text on
my test configuration.

Link: https://lkml.kernel.org/r/20220617154248.700416-4-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Matthew Wilcox (Oracle)
2022-06-17 16:42:46 +01:00
committed by akpm
parent 166e3d3227
commit ff00a170d9
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mm/vmscan.c
+27 -27
View File
@@ -2308,8 +2308,8 @@ static int too_many_isolated(struct pglist_data *pgdat, int file,
} }
/* /*
* move_pages_to_lru() moves pages from private @list to appropriate LRU list. * move_pages_to_lru() moves folios from private @list to appropriate LRU list.
* On return, @list is reused as a list of pages to be freed by the caller. * On return, @list is reused as a list of folios to be freed by the caller.
* *
* Returns the number of pages moved to the given lruvec. * Returns the number of pages moved to the given lruvec.
*/ */
@@ -2317,42 +2317,42 @@ static unsigned int move_pages_to_lru(struct lruvec *lruvec,
struct list_head *list) struct list_head *list)
{ {
int nr_pages, nr_moved = 0; int nr_pages, nr_moved = 0;
LIST_HEAD(pages_to_free); LIST_HEAD(folios_to_free);
struct page *page;
while (!list_empty(list)) { while (!list_empty(list)) {
page = lru_to_page(list); struct folio *folio = lru_to_folio(list);
VM_BUG_ON_PAGE(PageLRU(page), page);
list_del(&page->lru); VM_BUG_ON_FOLIO(folio_test_lru(folio), folio);
if (unlikely(!page_evictable(page))) { list_del(&folio->lru);
if (unlikely(!folio_evictable(folio))) {
spin_unlock_irq(&lruvec->lru_lock); spin_unlock_irq(&lruvec->lru_lock);
putback_lru_page(page); folio_putback_lru(folio);
spin_lock_irq(&lruvec->lru_lock); spin_lock_irq(&lruvec->lru_lock);
continue; continue;
} }
/* /*
* The SetPageLRU needs to be kept here for list integrity. * The folio_set_lru needs to be kept here for list integrity.
* Otherwise: * Otherwise:
* #0 move_pages_to_lru #1 release_pages * #0 move_pages_to_lru #1 release_pages
* if !put_page_testzero * if (!folio_put_testzero())
* if (put_page_testzero()) * if (folio_put_testzero())
* !PageLRU //skip lru_lock * !lru //skip lru_lock
* SetPageLRU() * folio_set_lru()
* list_add(&page->lru,) * list_add(&folio->lru,)
* list_add(&page->lru,) * list_add(&folio->lru,)
*/ */
SetPageLRU(page); folio_set_lru(folio);
if (unlikely(put_page_testzero(page))) { if (unlikely(folio_put_testzero(folio))) {
__clear_page_lru_flags(page); __folio_clear_lru_flags(folio);
if (unlikely(PageCompound(page))) { if (unlikely(folio_test_large(folio))) {
spin_unlock_irq(&lruvec->lru_lock); spin_unlock_irq(&lruvec->lru_lock);
destroy_compound_page(page); destroy_compound_page(&folio->page);
spin_lock_irq(&lruvec->lru_lock); spin_lock_irq(&lruvec->lru_lock);
} else } else
list_add(&page->lru, &pages_to_free); list_add(&folio->lru, &folios_to_free);
continue; continue;
} }
@@ -2361,18 +2361,18 @@ static unsigned int move_pages_to_lru(struct lruvec *lruvec,
* All pages were isolated from the same lruvec (and isolation * All pages were isolated from the same lruvec (and isolation
* inhibits memcg migration). * inhibits memcg migration).
*/ */
VM_BUG_ON_PAGE(!folio_matches_lruvec(page_folio(page), lruvec), page); VM_BUG_ON_FOLIO(!folio_matches_lruvec(folio, lruvec), folio);
add_page_to_lru_list(page, lruvec); lruvec_add_folio(lruvec, folio);
nr_pages = thp_nr_pages(page); nr_pages = folio_nr_pages(folio);
nr_moved += nr_pages; nr_moved += nr_pages;
if (PageActive(page)) if (folio_test_active(folio))
workingset_age_nonresident(lruvec, nr_pages); workingset_age_nonresident(lruvec, nr_pages);
} }
/* /*
* To save our caller's stack, now use input list for pages to free. * To save our caller's stack, now use input list for pages to free.
*/ */
list_splice(&pages_to_free, list); list_splice(&folios_to_free, list);
return nr_moved; return nr_moved;
} }