Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit a70dcb969f64e2fa98c24f47854f20bf02ff0092

Authored by Gerald Schaefer
Committed by Linus Torvalds
1 parent c87591b719
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

memory hotplug: fix page_zone() calculation in test_pages_isolated() 

My last bugfix here (adding zone->lock) introduced a new problem: Using
page_zone(pfn_to_page(pfn)) to get the zone after the for() loop is wrong.
 pfn will then be >= end_pfn, which may be in a different zone or not
present at all.  This may lead to an addressing exception in page_zone()
or spin_lock_irqsave().

Now I use __first_valid_page() again after the loop to find a valid page
for page_zone().

Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Acked-by: Nathan Fontenot <nfont@austin.ibm.com>
Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 3 additions and 2 deletions Side-by-side Diff

... ... @@ -130,10 +130,11 @@
130 130 if (page && get_pageblock_migratetype(page) != MIGRATE_ISOLATE)
131 131 break;
132 132 }
133   - if (pfn < end_pfn)
  133 + page = __first_valid_page(start_pfn, end_pfn - start_pfn);
  134 + if ((pfn < end_pfn) || !page)
134 135 return -EBUSY;
135 136 /* Check all pages are free or Marked as ISOLATED */
136   - zone = page_zone(pfn_to_page(pfn));
  137 + zone = page_zone(page);
137 138 spin_lock_irqsave(&zone->lock, flags);
138 139 ret = __test_page_isolated_in_pageblock(start_pfn, end_pfn);
139 140 spin_unlock_irqrestore(&zone->lock, flags);