mm/page_isolation: fix potential warning from user
It makes sense to call the WARN_ON_ONCE(zone_idx(zone) == ZONE_MOVABLE) from start_isolate_page_range(), but should avoid triggering it from userspace, i.e, from is_mem_section_removable() because it could crash the system by a non-root user if warn_on_panic is set. While at it, simplify the code a bit by removing an unnecessary jump label. Link: http://lkml.kernel.org/r/20200120163915.1469-1-cai@lca.pw Signed-off-by: Qian Cai <cai@lca.pw> Suggested-by: Michal Hocko <mhocko@kernel.org> Acked-by: Michal Hocko <mhocko@suse.com> Reviewed-by: David Hildenbrand <david@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
@@ -54,14 +54,18 @@ static int set_migratetype_isolate(struct page *page, int migratetype, int isol_
|
||||
|
||||
out:
|
||||
spin_unlock_irqrestore(&zone->lock, flags);
|
||||
if (!ret)
|
||||
if (!ret) {
|
||||
drain_all_pages(zone);
|
||||
else if ((isol_flags & REPORT_FAILURE) && unmovable)
|
||||
/*
|
||||
* printk() with zone->lock held will guarantee to trigger a
|
||||
* lockdep splat, so defer it here.
|
||||
*/
|
||||
dump_page(unmovable, "unmovable page");
|
||||
} else {
|
||||
WARN_ON_ONCE(zone_idx(zone) == ZONE_MOVABLE);
|
||||
|
||||
if ((isol_flags & REPORT_FAILURE) && unmovable)
|
||||
/*
|
||||
* printk() with zone->lock held will likely trigger a
|
||||
* lockdep splat, so defer it here.
|
||||
*/
|
||||
dump_page(unmovable, "unmovable page");
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
Reference in New Issue
Block a user