Re: [RFC 07/16] mm/page_isolation: watch out zone range overlap

[Gioh Kim]

> diff --git a/mm/page_isolation.c b/mm/page_isolation.c
> index c8778f7..883e78d 100644
> --- a/mm/page_isolation.c
> +++ b/mm/page_isolation.c
> @@ -210,8 +210,8 @@ int undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn,
>    * Returns 1 if all pages in the range are isolated.
>    */
>   static int
> -__test_page_isolated_in_pageblock(unsigned long pfn, unsigned long end_pfn,
> -				  bool skip_hwpoisoned_pages)
> +__test_page_isolated_in_pageblock(struct zone *zone, unsigned long pfn,
> +			unsigned long end_pfn, bool skip_hwpoisoned_pages)
>   {
>   	struct page *page;
>   
> @@ -221,6 +221,9 @@ __test_page_isolated_in_pageblock(unsigned long pfn, unsigned long end_pfn,
>   			continue;
>   		}
>   		page = pfn_to_page(pfn);
> +		if (page_zone(page) != zone)
> +			break;
> +
>   		if (PageBuddy(page)) {
>   			/*
>   			 * If race between isolatation and allocation happens,
> @@ -281,7 +284,7 @@ int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn,
>   	/* Check all pages are free or marked as ISOLATED */
>   	zone = page_zone(page);
>   	spin_lock_irqsave(&zone->lock, flags);
> -	ret = __test_page_isolated_in_pageblock(start_pfn, end_pfn,
> +	ret = __test_page_isolated_in_pageblock(zone, start_pfn, end_pfn,
>   						skip_hwpoisoned_pages);
>   	spin_unlock_irqrestore(&zone->lock, flags);
>   	return ret ? 0 : -EBUSY;
> 

What about checking zone at test_pages_isolated?
It might be a little bit early and without locking zone.

@@ -273,8 +273,14 @@ int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn,
         * are not aligned to pageblock_nr_pages.
         * Then we just check migratetype first.
         */
+
+       zone = page_zone(__first_valid_page(start_pfn, pageblock_nr_pages));
+
        for (pfn = start_pfn; pfn < end_pfn; pfn += pageblock_nr_pages) {
                page = __first_valid_page(pfn, pageblock_nr_pages);
+
+               if (page_zone(page) != zone)
+                       break;
                if (page && get_pageblock_migratetype(page) != MIGRATE_ISOLATE)
                        break;
        }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/