Skip to contentSkip to conversation

mm: use add_page_to_lru_list()/page_lru()/page_off_lru()

PATCH In review Yu Zhao 2 participants 6 messages Aug 31, 2020 – Sep 4, 2020

Subsystems (4)
lore
Share & tools
lore

Yu Zhao

author
#0 lore raw

PATCH v2 1/2 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).

[ I was under false impression that page_off_lru() clears PG_lru;
Alex Shi <[email protected]> pointed that out. So in v2, we keep __ClearPageLRU(). ]

---
 mm/swap.c   |  4 +---
 mm/vmscan.c | 13 ++++---------
 2 files changed, 5 insertions(+), 12 deletions(-)
mm/swap.c +1 -3
index 40bf20a75278..2735ecf0f566 100644
@@ -597,11 +597,9 @@ static void lru_lazyfree_fn(struct page *page, struct lruvec *lruvec,
 {
 	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);
 		/*
mm/vmscan.c +4 -9
index 99e1796eb833..1b871c3987e7 100644
@@ -1845,13 +1845,12 @@ 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);
 		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);
@@ -1860,16 +1859,11 @@ static unsigned noinline_for_stack move_pages_to_lru(struct lruvec *lruvec,
 		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);
@@ -1878,6 +1872,7 @@ static unsigned noinline_for_stack move_pages_to_lru(struct lruvec *lruvec,
 			} 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);
Signature · 1 line
2.28.0.402.g5ffc5be6b7-goog
author
#1 lore raw

PATCH v2 2/2 mm: use self-explanatory macros rather than "2"

This is a trivial clean-up patch. Take it or leave it.

---
 include/linux/mmzone.h | 12 ++++++++----
 include/linux/vmstat.h |  2 +-
 mm/vmscan.c            |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)
include/linux/mmzone.h +8 -4
index 8379432f4f2f..be1cdbf8317f 100644
@@ -266,6 +266,8 @@ static inline bool is_active_lru(enum lru_list lru)
 	return (lru == LRU_ACTIVE_ANON || lru == LRU_ACTIVE_FILE);
 }
 
+#define ANON_AND_FILE 2
+
 enum lruvec_flags {
 	LRUVEC_CONGESTED,		/* lruvec has many dirty pages
 					 * backed by a congested BDI
@@ -283,8 +285,8 @@ struct lruvec {
 	unsigned long			file_cost;
 	/* Non-resident age, driven by LRU movement */
 	atomic_long_t			nonresident_age;
-	/* Refaults at the time of last reclaim cycle, anon=0, file=1 */
-	unsigned long			refaults[2];
+	/* Refaults at the time of last reclaim cycle */
+	unsigned long			refaults[ANON_AND_FILE];
 	/* Various lruvec state flags (enum lruvec_flags) */
 	unsigned long			flags;
 #ifdef CONFIG_MEMCG
@@ -406,6 +408,8 @@ enum zone_type {
 
 #ifndef __GENERATING_BOUNDS_H
 
+#define ASYNC_AND_SYNC 2
+
 struct zone {
 	/* Read-mostly fields */
 
@@ -525,8 +529,8 @@ struct zone {
 #if defined CONFIG_COMPACTION || defined CONFIG_CMA
 	/* pfn where compaction free scanner should start */
 	unsigned long		compact_cached_free_pfn;
-	/* pfn where async and sync compaction migration scanner should start */
-	unsigned long		compact_cached_migrate_pfn[2];
+	/* pfn where compaction migration scanner should start */
+	unsigned long		compact_cached_migrate_pfn[ASYNC_AND_SYNC];
 	unsigned long		compact_init_migrate_pfn;
 	unsigned long		compact_init_free_pfn;
 #endif
include/linux/vmstat.h +1 -1
index 91220ace31da..d5431c1bf6e5 100644
@@ -28,7 +28,7 @@ struct reclaim_stat {
 	unsigned nr_writeback;
 	unsigned nr_immediate;
 	unsigned nr_pageout;
-	unsigned nr_activate[2];
+	unsigned nr_activate[ANON_AND_FILE];
 	unsigned nr_ref_keep;
 	unsigned nr_unmap_fail;
 	unsigned nr_lazyfree_fail;
mm/vmscan.c +1 -1
index 1b871c3987e7..b454cc17e5a3 100644
@@ -2232,7 +2232,7 @@ static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc,
 	struct mem_cgroup *memcg = lruvec_memcg(lruvec);
 	unsigned long anon_cost, file_cost, total_cost;
 	int swappiness = mem_cgroup_swappiness(memcg);
-	u64 fraction[2];
+	u64 fraction[ANON_AND_FILE];
 	u64 denominator = 0;	/* gcc */
 	enum scan_balance scan_balance;
 	unsigned long ap, fp;
Signature · 1 line
2.28.0.402.g5ffc5be6b7-goog
reviewer
#2 lore raw
In reply to Yu Zhao

On Mon 31-08-20 11:50:41, Yu Zhao wrote:
[...]

Quoted 4 lines
mm/vmscan.c +0 -0
@@ -1860,16 +1859,11 @@ static unsigned noinline_for_stack move_pages_to_lru(struct lruvec *lruvec,
 		lruvec = mem_cgroup_page_lruvec(page, pgdat);
 
 		SetPageLRU(page);

mm/vmscan.c static unsigned noinline_for_stack move_pages_to_lru(struct lruvec *lruvec, · line 1871

Quoted 10 lines
mm/vmscan.c +1 -6
-		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);

This should go into its own patch. The rest is a mechanical and clear. This one needs some head scratching. E.g. Is it correct for all compound pages. I believe it should be but few words on why would be better.

Quoted 16 lines
mm/vmscan.c +2 -1
-			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);
@@ -1878,6 +1872,7 @@ static unsigned noinline_for_stack move_pages_to_lru(struct lruvec *lruvec,
 			} 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);
Signature · 1 line
2.28.0.402.g5ffc5be6b7-goog
Signature · 2 lines
Michal Hocko
SUSE Labs
author
#3 lore raw
Quoted 13 lines · Michal Hocko

On Mon 31-08-20 11:50:41, Yu Zhao wrote:
[...]

Quoted 11 lines
mm/vmscan.c +1 -5
@@ -1860,16 +1859,11 @@ static unsigned noinline_for_stack move_pages_to_lru(struct lruvec *lruvec,
 		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));
 
Quoted 5 lines

mm/vmscan.c static unsigned noinline_for_stack move_pages_to_lru(struct lruvec *lruvec, · line 1871

Quoted 3 lines
mm/vmscan.c +0 -1
 		if (put_page_testzero(page)) {
 			__ClearPageLRU(page);
-			__ClearPageActive(page);

This should go into its own patch. The rest is a mechanical and clear.

Thanks for reviewing.

I assume you are worrying about PG_unevictable being set on the page because page_off_lru() checks it first. Well, if this can happen, wouldn't it have been triggering bad_page()? PG_unevictable is in PAGE_FLAGS_CHECK_AT_FREE.

Quoted 2 lines

This one needs some head scratching. E.g. Is it correct for all compound pages. I believe it should be but few words on why would be better.

It seems nothing special here when compared with other places that follow the same pattern. So I'm not sure what the concern is.

Quoted 20 lines
Quoted 16 lines
mm/vmscan.c +2 -1
-			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);
@@ -1878,6 +1872,7 @@ static unsigned noinline_for_stack move_pages_to_lru(struct lruvec *lruvec,
 			} 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);
Signature · 1 line
2.28.0.402.g5ffc5be6b7-goog
Signature · 2 lines
Michal Hocko
SUSE Labs
reviewer
#4 lore raw
Quoted 20 lines · Yu Zhao
Quoted 13 lines · Michal Hocko

On Mon 31-08-20 11:50:41, Yu Zhao wrote:
[...]

Quoted 11 lines
mm/vmscan.c +1 -5
@@ -1860,16 +1859,11 @@ static unsigned noinline_for_stack move_pages_to_lru(struct lruvec *lruvec,
 		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));
 
Quoted 5 lines

mm/vmscan.c static unsigned noinline_for_stack move_pages_to_lru(struct lruvec *lruvec, · line 1871

Quoted 3 lines
mm/vmscan.c +0 -1
 		if (put_page_testzero(page)) {
 			__ClearPageLRU(page);
-			__ClearPageActive(page);

This should go into its own patch. The rest is a mechanical and clear.

Quoted 4 lines

Thanks for reviewing.

I assume you are worrying about PG_unevictable being set on the page because page_off_lru() checks it first.

No, I was referring to __ClearPageActive. You are right that this is cleared in page_off_lru but that is hidden in a release path and e.g. compound pages are released via their destructor which for some might not involve releasing the page - e.g. hugetlb pages. This should be fine because hugetlb pages are not on LRU so as I've said this is fine but it belongs to its own patch because it is not a pure mechanical change like the rest of the patch.

Signature · 2 lines
Michal Hocko
SUSE Labs
author
#5 lore raw
Quoted 26 lines · Michal Hocko
Quoted 20 lines · Yu Zhao
Quoted 13 lines · Michal Hocko

On Mon 31-08-20 11:50:41, Yu Zhao wrote:
[...]

Quoted 11 lines
mm/vmscan.c +1 -5
@@ -1860,16 +1859,11 @@ static unsigned noinline_for_stack move_pages_to_lru(struct lruvec *lruvec,
 		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));
 
Quoted 5 lines

mm/vmscan.c static unsigned noinline_for_stack move_pages_to_lru(struct lruvec *lruvec, · line 1871

Quoted 3 lines
mm/vmscan.c +0 -1
 		if (put_page_testzero(page)) {
 			__ClearPageLRU(page);
-			__ClearPageActive(page);

This should go into its own patch. The rest is a mechanical and clear.

Quoted 4 lines

Thanks for reviewing.

I assume you are worrying about PG_unevictable being set on the page because page_off_lru() checks it first.

Quoted 7 lines

No, I was referring to __ClearPageActive. You are right that this is cleared in page_off_lru but that is hidden in a release path and e.g. compound pages are released via their destructor which for some might not involve releasing the page - e.g. hugetlb pages. This should be fine because hugetlb pages are not on LRU so as I've said this is fine but it belongs to its own patch because it is not a pure mechanical change like the rest of the patch.

Please bear with me. This is the change in question:

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))) {

If the PageUnevictable() check in page_off_lru() is not a concern, I'm trying to understand what else is different between them:

	Before this path:		After this patch:

					page_off_lru()
	__ClearPageActive()			__ClearPageActive()
	add_page_to_lru_list()		add_page_to_lru_list()

And why is page_off_lru() hidden in a release path?