Right now, we would free the extended page data if parts of a section
are offlined or if onlining is aborted, although still some pages are
online.

We can simply check if the section is online to see if we are allowed to
free. init_section_page_ext() already takes care of the allocation part
for sub sections.

Cc: Andrew Morton <[email protected]>
Cc: Michal Hocko <[email protected]>
Cc: Vlastimil Babka <[email protected]>
Cc: Oscar Salvador <[email protected]>
Cc: Kate Stewart <[email protected]>
Cc: Jaewon Kim <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Signed-off-by: David Hildenbrand <[email protected]>
---
 mm/page_ext.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/mm/page_ext.c b/mm/page_ext.c
index 5295ef331165..71a025128dac 100644
--- a/mm/page_ext.c
+++ b/mm/page_ext.c
@@ -320,7 +320,9 @@ static int __meminit online_page_ext(unsigned long 
start_pfn,
 
        /* rollback */
        for (pfn = start; pfn < end; pfn += PAGES_PER_SECTION)
-               __free_page_ext(pfn);
+               /* still online? nothing to do then */
+               if (!online_section_nr(pfn_to_section_nr(pfn)))
+                       __free_page_ext(pfn);
 
        return -ENOMEM;
 }
@@ -334,7 +336,10 @@ static int __meminit offline_page_ext(unsigned long 
start_pfn,
        end = SECTION_ALIGN_UP(start_pfn + nr_pages);
 
        for (pfn = start; pfn < end; pfn += PAGES_PER_SECTION)
-               __free_page_ext(pfn);
+               /* still online? nothing to do then */
+               if (!online_section_nr(pfn_to_section_nr(pfn)))
+                       __free_page_ext(pfn);
+
        return 0;
 
 }
-- 
2.17.0

Reply via email to