Skip to contentSkip to conversation

mm/page_owner: fix incorrect looping in __set_page_owner_handle()

PATCH In review Miles Chen 2 participants 3 messages Oct 4, 2019

Subsystems (3)
lore
Share & tools
lore

Miles Chen

author
#0 lore raw

PATCH 1/1 mm/page_owner: fix incorrect looping in __set_page_owner_handle()

In __set_page_owner_handle(), we should loop over page [0...(1 << order) - 1] and setup their page_owner structures.

Currently, __set_page_owner_handle() update page_ext at the end of the loop, sets the page_owner of (page + 0) twice and misses the page_owner of (page + (1 << order) - 1).

Fix it by updating the page_ext at the start of the loop.

In i == 0 case:
for (i = 0; i < (1 << order); i++) {
page_owner = get_page_owner(page_ext); <- page_ext belongs to page + 0
...
page_ext = lookup_page_ext(page + i); <- lookup_page_ext(page + 0)
}

Cc Andrew Morton <[email protected]>
Cc Vlastimil Babka <[email protected]>
Cc Michal Hocko <[email protected]>
Fixes 7e2f2a0cd17c ("mm, page_owner: record page owner for each subpage")
---
 mm/page_owner.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
mm/page_owner.c +1 -2
index dee931184788..110c3e1987f2 100644
@@ -178,6 +178,7 @@ static inline void __set_page_owner_handle(struct page *page,
 	int i;
 
 	for (i = 0; i < (1 << order); i++) {
+		page_ext = lookup_page_ext(page + i);
 		page_owner = get_page_owner(page_ext);
 		page_owner->handle = handle;
 		page_owner->order = order;
@@ -185,8 +186,6 @@ static inline void __set_page_owner_handle(struct page *page,
 		page_owner->last_migrate_reason = -1;
 		__set_bit(PAGE_EXT_OWNER, &page_ext->flags);
 		__set_bit(PAGE_EXT_OWNER_ACTIVE, &page_ext->flags);
-
-		page_ext = lookup_page_ext(page + i);
 	}
 }
 
Signature · 1 line
2.18.0
#1 lore raw
Quoted 16 lines · Miles Chen

In __set_page_owner_handle(), we should loop over page [0...(1 << order) - 1] and setup their page_owner structures.

Currently, __set_page_owner_handle() update page_ext at the end of the loop, sets the page_owner of (page + 0) twice and misses the page_owner of (page + (1 << order) - 1).

Fix it by updating the page_ext at the start of the loop.

In i == 0 case:
for (i = 0; i < (1 << order); i++) {
page_owner = get_page_owner(page_ext); <- page_ext belongs to page + 0
...
page_ext = lookup_page_ext(page + i); <- lookup_page_ext(page + 0)
}

Quoted 5 lines
Cc Andrew Morton <[email protected]>
Cc Vlastimil Babka <[email protected]>
Cc Michal Hocko <[email protected]>
Fixes 7e2f2a0cd17c ("mm, page_owner: record page owner for each subpage")

Thanks. Kirill spotted it earlier and there's a fix pending:
https://lore.kernel.org/linux-mm/[email protected]/

Quoted 26 lines
---
 mm/page_owner.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
mm/page_owner.c +1 -2
index dee931184788..110c3e1987f2 100644
@@ -178,6 +178,7 @@ static inline void __set_page_owner_handle(struct page *page,
 	int i;
 
 	for (i = 0; i < (1 << order); i++) {
+		page_ext = lookup_page_ext(page + i);
 		page_owner = get_page_owner(page_ext);
 		page_owner->handle = handle;
 		page_owner->order = order;
@@ -185,8 +186,6 @@ static inline void __set_page_owner_handle(struct page *page,
 		page_owner->last_migrate_reason = -1;
 		__set_bit(PAGE_EXT_OWNER, &page_ext->flags);
 		__set_bit(PAGE_EXT_OWNER_ACTIVE, &page_ext->flags);
-
-		page_ext = lookup_page_ext(page + i);
 	}
 }
 
author
#2 lore raw
Quoted 17 lines · Vlastimil Babka
Quoted 16 lines · Miles Chen

In __set_page_owner_handle(), we should loop over page [0...(1 << order) - 1] and setup their page_owner structures.

Currently, __set_page_owner_handle() update page_ext at the end of the loop, sets the page_owner of (page + 0) twice and misses the page_owner of (page + (1 << order) - 1).

Fix it by updating the page_ext at the start of the loop.

In i == 0 case:
for (i = 0; i < (1 << order); i++) {
page_owner = get_page_owner(page_ext); <- page_ext belongs to page + 0
...
page_ext = lookup_page_ext(page + i); <- lookup_page_ext(page + 0)
}

Quoted 8 lines
Quoted 5 lines
Cc Andrew Morton <[email protected]>
Cc Vlastimil Babka <[email protected]>
Cc Michal Hocko <[email protected]>
Fixes 7e2f2a0cd17c ("mm, page_owner: record page owner for each subpage")

Thanks. Kirill spotted it earlier and there's a fix pending:
https://lore.kernel.org/linux-mm/[email protected]/

Great. thanks for the information.

Miles

Quoted 28 lines
Quoted 27 lines
---
 mm/page_owner.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
mm/page_owner.c +1 -2
index dee931184788..110c3e1987f2 100644
@@ -178,6 +178,7 @@ static inline void __set_page_owner_handle(struct page *page,
 	int i;
 
 	for (i = 0; i < (1 << order); i++) {
+		page_ext = lookup_page_ext(page + i);
 		page_owner = get_page_owner(page_ext);
 		page_owner->handle = handle;
 		page_owner->order = order;
@@ -185,8 +186,6 @@ static inline void __set_page_owner_handle(struct page *page,
 		page_owner->last_migrate_reason = -1;
 		__set_bit(PAGE_EXT_OWNER, &page_ext->flags);
 		__set_bit(PAGE_EXT_OWNER_ACTIVE, &page_ext->flags);
-
-		page_ext = lookup_page_ext(page + i);
 	}
 }