[PATCH v7 1/3] mm/page_alloc: free_prepared_contig_range() takes fpi_t

[Jiaqi Yan]

A future commit introducing free_has_hwpoisoned() to be called within
__free_pages_prepare() will need to pass specific fpi_t flags when
freeing a contiguous range of pages. Currently,
free_prepared_contig_range() hardcodes the FPI_PREPARED flag and
does not accept any caller-provided flags.

Refactor free_prepared_contig_range() to accept an fpi_t argument.
It bitwise ORs the new argument with FPI_PREPARED when calling
into __free_frozen_pages(). Update all current invocation sites
in __free_contig_range_common() to pass FPI_NONE.

This is a preparatory commit with no functional changes.

Reviewed-by: Miaohe Lin <linmiaohe@xxxxxxxxxx>
Reviewed-by: Vlastimil Babka (SUSE) <vbabka@xxxxxxxxxx>
Signed-off-by: Jiaqi Yan <jiaqiyan@xxxxxxxxxx>
---
 mm/page_alloc.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 15ff5c1feef4..93dc29480ba1 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -7043,7 +7043,7 @@ void __init page_alloc_sysctl_init(void)
 }
 
 static void free_prepared_contig_range(struct page *page,
-		unsigned long nr_pages)
+		unsigned long nr_pages, fpi_t fpi_flags)
 {
 	unsigned long pfn = page_to_pfn(page);
 
@@ -7060,7 +7060,7 @@ static void free_prepared_contig_range(struct page *page,
 		 * Free the chunk as a single block. Our caller has already
 		 * called free_pages_prepare() for each order-0 page.
 		 */
-		__free_frozen_pages(page, order, FPI_PREPARED);
+		__free_frozen_pages(page, order, fpi_flags | FPI_PREPARED);
 
 		pfn += 1UL << order;
 		page += 1UL << order;
@@ -7097,14 +7097,14 @@ static void __free_contig_range_common(unsigned long pfn, unsigned long nr_pages
 
 		if (!can_free) {
 			if (start) {
-				free_prepared_contig_range(start, i - nr_start);
+				free_prepared_contig_range(start, i - nr_start, FPI_NONE);
 				start = NULL;
 			}
 			continue;
 		}
 
 		if (start && memdesc_section(&page->flags) != start_sec) {
-			free_prepared_contig_range(start, i - nr_start);
+			free_prepared_contig_range(start, i - nr_start, FPI_NONE);
 			start = page;
 			nr_start = i;
 			start_sec = memdesc_section(&page->flags);
@@ -7116,7 +7116,7 @@ static void __free_contig_range_common(unsigned long pfn, unsigned long nr_pages
 	}
 
 	if (start)
-		free_prepared_contig_range(start, nr_pages - nr_start);
+		free_prepared_contig_range(start, nr_pages - nr_start, FPI_NONE);
 }
 
 /**
-- 
2.56.0.506.g506a7eabc5-goog