Skip to content

Commit

Permalink
mm/compaction: remove rcu_read_lock during page compaction
Browse files Browse the repository at this point in the history
isolate_migratepages_block() used rcu_read_lock() with the intention of
safeguarding against the mem_cgroup being destroyed concurrently; but
its TestClearPageLRU already protects against that.  Delete the
unnecessary rcu_read_lock() and _unlock().

Hugh Dickins helped on commit log polishing, Thanks!

Link: https://lkml.kernel.org/r/1608614453-10739-3-git-send-email-alex.shi@linux.alibaba.com
Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com>
Acked-by: Hugh Dickins <hughd@google.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
alexshi authored and torvalds committed Feb 24, 2021
1 parent c457cd9 commit d99fd5f
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions mm/compaction.c
Original file line number Diff line number Diff line change
Expand Up @@ -995,7 +995,6 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
if (!TestClearPageLRU(page))
goto isolate_fail_put;

rcu_read_lock();
lruvec = mem_cgroup_page_lruvec(page, pgdat);

/* If we already hold the lock, we can skip some rechecking */
Expand All @@ -1005,7 +1004,6 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,

compact_lock_irqsave(&lruvec->lru_lock, &flags, cc);
locked = lruvec;
rcu_read_unlock();

lruvec_memcg_debug(lruvec, page);

Expand All @@ -1026,8 +1024,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
SetPageLRU(page);
goto isolate_fail_put;
}
} else
rcu_read_unlock();
}

/* The whole page is taken off the LRU; skip the tail pages. */
if (PageCompound(page))
Expand Down

0 comments on commit d99fd5f

Please sign in to comment.