linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mm: page_isolation: use compound_nr() correctly in isolate_single_pageblock()
@ 2022-05-31  2:44 Zi Yan
  2022-05-31  3:12 ` Anshuman Khandual
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Zi Yan @ 2022-05-31  2:44 UTC (permalink / raw)
  To: Andrew Morton, David Hildenbrand, linux-mm
  Cc: linux-kernel, Qian Cai, Vlastimil Babka, Mel Gorman, Eric Ren,
	Mike Rapoport, Oscar Salvador, Christophe Leroy, Zi Yan,
	Anshuman Khandual

From: Zi Yan <ziy@nvidia.com>

When compound_nr(page) was used, page was not guaranteed to be the head
of the compound page and it could cause an infinite loop. Fix it by calling
it on the head page.

Fixes: b2c9e2fbba32 ("mm: make alloc_contig_range work at pageblock granularity")
Reported-by: Anshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/linux-mm/20220530115027.123341-1-anshuman.khandual@arm.com/
Signed-off-by: Zi Yan <ziy@nvidia.com>
---
 mm/page_isolation.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/page_isolation.c b/mm/page_isolation.c
index 6021f8444b5a..d200d41ad0d3 100644
--- a/mm/page_isolation.c
+++ b/mm/page_isolation.c
@@ -385,9 +385,9 @@ static int isolate_single_pageblock(unsigned long boundary_pfn, int flags,
 		 * above do the rest. If migration is not possible, just fail.
 		 */
 		if (PageCompound(page)) {
-			unsigned long nr_pages = compound_nr(page);
 			struct page *head = compound_head(page);
 			unsigned long head_pfn = page_to_pfn(head);
+			unsigned long nr_pages = compound_nr(head);
 
 			if (head_pfn + nr_pages <= boundary_pfn) {
 				pfn = head_pfn + nr_pages;
-- 
2.35.1



^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2022-05-31  9:05 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-31  2:44 [PATCH] mm: page_isolation: use compound_nr() correctly in isolate_single_pageblock() Zi Yan
2022-05-31  3:12 ` Anshuman Khandual
2022-05-31  5:40 ` Muchun Song
2022-05-31  8:56 ` Oscar Salvador
2022-05-31  9:05 ` Miaohe Lin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox