mm/compaction: fix call to __isolate_lru_page_prepare()
Subsystems (3)
PATCH 2/2 mm/compaction: fix call to __isolate_lru_page_prepare()
isolate_migratepages_block() is calling __isolate_lru_page_prepare() at a point when it has not yet acquired a reference to the page, and may not yet hold the right lruvec lock: it has no hold on the page.
trylock_page() is not safe to use at this time: its setting PG_locked can race with the page being freed or allocated ("Bad page"), and can also erase flags being set by one of those "sole owners" of a freshly allocated page who use non-atomic __SetPageFlag().
Though I have tried rcu_read_lock() instead of trylock_page() there (like in page_evictable()), 054f1d1faaed ("mm/swap_state.c: simplify total_swapcache_pages() with get_swap_device()") stopped the freeing of swapper_spaces by RCU; and races against setting PageSwapCache, and the dereference of mapping->a_ops, and the lack of any page reference: all make that a more dubious approach.
Just move the call to __isolate_lru_page_prepare() after the call to get_page_unless_zero(), when using trylock_page() has become safe (safe given __isolate's check for PageLRU - unsafe without that).
---
I had envisaged this as a separate patch; but once it came down to just moving the call inside isolate_migratepages_block(), it's probably best folded into 10/16 or 12/16 (needs isolate_fail_put).
I shall probably want to come along later, to clean up or eliminate __isolate_lru_page_prepare(): which I found before to have almost nothing in common between its use by isolate_migratepages_block() and its use by isolate_lru_pages(). We can then do its safer checks before the get_page_unless_zero(). But trying that cleanup right now would just get in the way of this series.
mm/compaction.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
mm/compaction.c +3 -3
@@ -960,9 +960,6 @@ isolate_migratepages_block(struct compacif (!(cc->gfp_mask & __GFP_FS) &&page_mapping (page)) goto isolate_fail; -if (__isolate_lru_page_prepare (page, isolate_mode) !=0 ) - goto isolate_fail; -/* * Be careful not to clear PageLRU until after we're * sure the page is not being freed elsewhere -- the
@@ -971,6 +968,9 @@ isolate_migratepages_block(struct compacif (unlikely (!get_page_unless_zero (page))) goto isolate_fail; +if (__isolate_lru_page_prepare (page, isolate_mode) !=0 ) + goto isolate_fail_put; +/* Try isolate the page */ if (!TestClearPageLRU (page)) goto isolate_fail_put;