Do not leave page locked (and RCU read side locked) when return from workingset_activation() due to disabled memcg or page not being a page_memcg().
Signed-off-by: Sergey Senozhatsky <[email protected]> --- mm/workingset.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mm/workingset.c b/mm/workingset.c index 14522ed..54138a9 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -315,8 +315,10 @@ void workingset_activation(struct page *page) * XXX: See workingset_refault() - this should return * root_mem_cgroup even for !CONFIG_MEMCG. */ - if (!mem_cgroup_disabled() && !page_memcg(page)) + if (!mem_cgroup_disabled() && !page_memcg(page)) { + unlock_page_memcg(page); return; + } lruvec = mem_cgroup_zone_lruvec(page_zone(page), page_memcg(page)); atomic_long_inc(&lruvec->inactive_age); unlock_page_memcg(page); -- 2.7.0
