[RFC] memory-layout-free zones (for review) [3/3] fix for_each_page_in_zone

[KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>]

To remove zone_start_pfn/zone_spanned_pages, for_each_page_in_zone()
must be modified. This pacth uses pgdat instead of zones and calls
page_zone() to check page is in zone.
Maybe slower (>_<......

Signed-Off-By: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>

Index: node-hot-add2/include/linux/mm.h
===================================================================
--- node-hot-add2.orig/include/linux/mm.h
+++ node-hot-add2/include/linux/mm.h
@@ -549,6 +549,64 @@ void page_address_init(void);
 #define page_address_init()  do { } while(0)
 #endif
 
+
+/*
+ *  These inline function for for_each_page_in_zone can work
+ *  even if CONFIG_SPARSEMEM=y.
+ */
+static inline struct page *first_page_in_zone(struct zone *zone)
+{
+	struct pglist_data *pgdat;
+	unsigned long start_pfn;
+	unsigned long i = 0;
+
+	if (!populated_zone(zone))
+		return NULL;
+
+	pgdat = zone->zone_pgdat;
+	zone = pgdat->node_start_pfn;
+
+	for (i = 0; i < pgdat->zone_spanned_pages; i++) {
+		if (pfn_valid(start_pfn + i) && page_zone(page) == zone)
+			break;
+	}
+	BUG_ON(i == pgdat->node_spanned_pages); /* zone is populated */
+	return pfn_to_page(start_pfn + i);
+}
+
+static inline struct page *next_page_in_zone(struct page *page,
+					     struct zone *zone)
+{
+	struct pglist_data *pgdat;
+	unsigned long start_pfn;
+	unsigned long i;
+
+	if (!populated_zone(zone))
+		return NULL;
+	pgdat = zone->zone_pgdat;
+	start_pfn = pgdat->node_start_pfn;
+	i = page_to_pfn(page) - start_pfn;
+
+	for (i = i + 1; i < pgdat->node_spanned_pages; i++) {
+		if (pfn_vlaid(start_pfn + i) && page_zone(page) == zone)
+			break;
+	}
+	if (i == pgdat->node_spanned_pages)
+		return NULL;
+	return pfn_to_page(start_pfn + i);
+}
+
+/**
+ * for_each_page_in_zone -- helper macro to iterate over all pages in a zone.
+ * @page - pointer to page
+ * @zone - pointer to zone
+ *
+ */
+#define for_each_page_in_zone(page, zone)		\
+	for (page = (first_page_in_zone((zone)));	\
+	     page;					\
+	     page = next_page_in_zone(page, (zone)));
+
 /*
  * On an anonymous page mapped into a user virtual memory area,
  * page->mapping points to its anon_vma, not to a struct address_space;
Index: node-hot-add2/include/linux/mmzone.h
===================================================================
--- node-hot-add2.orig/include/linux/mmzone.h
+++ node-hot-add2/include/linux/mmzone.h
@@ -457,53 +457,6 @@ static inline struct zone *next_zone(str
 	     zone;					\
 	     zone = next_zone(zone))
 
-/*
- *  These inline function for for_each_page_in_zone can work
- *  even if CONFIG_SPARSEMEM=y.
- */
-static inline struct page *first_page_in_zone(struct zone *zone)
-{
-	unsigned long start_pfn = zone->zone_start_pfn;
-	unsigned long i = 0;
-
-	if (!populated_zone(zone))
-		return NULL;
-
-	for (i = 0; i < zone->zone_spanned_pages; i++) {
-		if (pfn_valid(start_pfn + i))
-			break;
-	}
-	return pfn_to_page(start_pfn + i);
-}
-
-static inline struct page *next_page_in_zone(struct page *page,
-					     struct zone *zone)
-{
-	unsigned long start_pfn = zone->zone_start_pfn;
-	unsigned long i = page_to_pfn(page) - start_pfn;
-
-	if (!populated_zone(zone))
-		return NULL;
-
-	for (i = i + 1; i < zone->zone_spanned_pages; i++) {
-		if (pfn_vlaid(start_pfn + i))
-			break;
-	}
-	if (i == zone->zone_spanned_pages)
-		return NULL;
-	return pfn_to_page(start_pfn + i);
-}
-
-/**
- * for_each_page_in_zone -- helper macro to iterate over all pages in a zone.
- * @page - pointer to page
- * @zone - pointer to zone
- *
- */
-#define for_each_page_in_zone(page, zone)		\
-	for (page = (first_page_in_zone((zone)));	\
-	     page;					\
-	     page = next_page_in_zone(page, (zone)));
 
 #ifdef CONFIG_SPARSEMEM
 #include <asm/sparsemem.h>

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>