From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753388AbcBCJ5e (ORCPT ); Wed, 3 Feb 2016 04:57:34 -0500 Received: from mail-pa0-f67.google.com ([209.85.220.67]:33058 "EHLO mail-pa0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752151AbcBCJ50 (ORCPT ); Wed, 3 Feb 2016 04:57:26 -0500 From: Sergey Senozhatsky X-Google-Original-From: Sergey Senozhatsky To: Andrew Morton Cc: Johannes Weiner , Vladimir Davydov , Michal Hocko , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky , Sergey Senozhatsky Subject: [PATCH] mm/workingset: do not forget to unlock page Date: Wed, 3 Feb 2016 18:58:33 +0900 Message-Id: <1454493513-19316-1-git-send-email-sergey.senozhatsky@gmail.com> X-Mailer: git-send-email 2.7.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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