From: Zi Yan Date: Thu, 14 Apr 2022 06:07:10 +0000 (-0700) Subject: mm-wrap-__find_buddy_pfn-with-a-necessary-buddy-page-validation-v4 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c3efde7fb8c00df58d5dc993e67d222dbccb3120;p=users%2Fjedix%2Flinux-maple.git mm-wrap-__find_buddy_pfn-with-a-necessary-buddy-page-validation-v4 updates per David Link: https://lkml.kernel.org/r/20220401230804.1658207-2-zi.yan@sent.com Link: https://lore.kernel.org/linux-mm/CAHk-=3Dwji_AmYygZMTsPMdJ7XksMt7kOur8oDfDdniBRMjm4VkQ@mail.gmail.com/ Link: https://lkml.kernel.org/r/7236E7CA-B5F1-4C04-AB85-E86FA3E9A54B@nvidia.com Suggested-by: Linus Torvalds Signed-off-by: Zi Yan Acked-by: Vlastimil Babka Acked-by: David Hildenbrand Cc: Steven Rostedt (Google) Cc: Mel Gorman Cc: Mike Rapoport Cc: Oscar Salvador Signed-off-by: Andrew Morton --- diff --git a/mm/internal.h b/mm/internal.h index 56bbae014e0e..6ec89b4f0bc8 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -252,7 +252,7 @@ static inline unsigned int buddy_order(struct page *page) * For recording page's order, we use page_private(page). */ static inline bool page_is_buddy(struct page *page, struct page *buddy, - unsigned int order) + unsigned int order) { if (!page_is_guard(buddy) && !PageBuddy(buddy)) return false; @@ -312,8 +312,8 @@ __find_buddy_pfn(unsigned long page_pfn, unsigned int order) static inline struct page *find_buddy_page_pfn(struct page *page, unsigned long pfn, unsigned int order, unsigned long *buddy_pfn) { - struct page *buddy; unsigned long __buddy_pfn = __find_buddy_pfn(pfn, order); + struct page *buddy; buddy = page + (__buddy_pfn - pfn); if (buddy_pfn) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index c6a18aabe30e..60d3009e9149 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -976,8 +976,8 @@ static inline bool buddy_merge_likely(unsigned long pfn, unsigned long buddy_pfn, struct page *page, unsigned int order) { - struct page *higher_page; unsigned long higher_page_pfn; + struct page *higher_page; if (order >= MAX_ORDER - 2) return false;