Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Feedback-ID: iccd040f4:Fastmail
From:   Zi Yan <zi.yan@sent.com>
To:     linux-mm@kvack.org
Cc:     Zi Yan <ziy@nvidia.com>, David Hildenbrand <david@redhat.com>,
        Matthew Wilcox <willy@infradead.org>,
        Vlastimil Babka <vbabka@suse.cz>,
        "Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>,
        Mike Kravetz <mike.kravetz@oracle.com>,
        John Hubbard <jhubbard@nvidia.com>,
        Yang Shi <shy828301@gmail.com>,
        David Rientjes <rientjes@google.com>,
        James Houghton <jthoughton@google.com>,
        Mike Rapoport <rppt@kernel.org>,
        Muchun Song <songmuchun@bytedance.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        linux-kernel@vger.kernel.org
Subject: [PATCH v1 02/12] mm: check page validity when find a buddy page in a non-contiguous zone
Date:   Wed, 21 Sep 2022 21:12:42 -0400
Message-Id: <20220922011252.2266780-3-zi.yan@sent.com>
In-Reply-To: <20220922011252.2266780-1-zi.yan@sent.com>
References: <20220922011252.2266780-1-zi.yan@sent.com>
Reply-To: Zi Yan <ziy@nvidia.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

From: Zi Yan <ziy@nvidia.com>

When MAX_ORDER > section size, buddy page might not be valid when the zone
is non-contiguous. Check it and return NULL if buddy page is not valid.

For PFNs that not aligned to MAX_ORDER (usually at the beginning and end
of a zone), __free_pages_memory() clamps down the order to make sure
invalid PFN will not show up as a buddy PFN.

Signed-off-by: Zi Yan <ziy@nvidia.com>
---
 mm/internal.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mm/internal.h b/mm/internal.h
index b3002e03c28f..22fb1e6e3541 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -330,12 +330,16 @@ static inline struct page *find_buddy_page_pfn(struct=
 page *page,
 			unsigned long pfn, unsigned int order, unsigned long *buddy_pfn)
 {
 	unsigned long __buddy_pfn =3D __find_buddy_pfn(pfn, order);
+	struct zone *zone =3D page_zone(page);
 	struct page *buddy;
=20
 	buddy =3D page + (__buddy_pfn - pfn);
 	if (buddy_pfn)
 		*buddy_pfn =3D __buddy_pfn;
=20
+	if (unlikely(!zone->contiguous && !pfn_valid(__buddy_pfn)))
+		return NULL;
+
 	if (page_is_buddy(page, buddy, order))
 		return buddy;
 	return NULL;
--=20
2.35.1