From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755773AbcBDARt (ORCPT <rfc822;w@1wt.eu>);
	Wed, 3 Feb 2016 19:17:49 -0500
Received: from mail-pf0-f174.google.com ([209.85.192.174]:34998 "EHLO
	mail-pf0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752977AbcBDARr (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 3 Feb 2016 19:17:47 -0500
Date: Thu, 4 Feb 2016 09:19:00 +0900
From: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>,
        Johannes Weiner <hannes@cmpxchg.org>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>,
        Vladimir Davydov <vdavydov@virtuozzo.com>,
        Michal Hocko <mhocko@suse.cz>, cgroups@vger.kernel.org,
        linux-mm@kvack.org, linux-kernel@vger.kernel.org,
        Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Subject: Re: [PATCH] mm/workingset: do not forget to unlock page
Message-ID: <20160204001900.GB1861@swordfish>
References: <1454493513-19316-1-git-send-email-sergey.senozhatsky@gmail.com>
 <20160203104136.GA517@swordfish>
 <20160203162400.GB10440@cmpxchg.org>
 <20160203131939.1a35d9bc03f13b2b143d27c0@linux-foundation.org>
 <20160203220253.GA6859@cmpxchg.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20160203220253.GA6859@cmpxchg.org>
User-Agent: Mutt/1.5.24 (2015-08-30)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On (02/03/16 17:02), Johannes Weiner wrote:
> On Wed, Feb 03, 2016 at 01:19:39PM -0800, Andrew Morton wrote:
> > Yup.  I turned it into a fix against
> > mm-workingset-per-cgroup-cache-thrash-detection.patch, which is where
> > the bug was added.  And I did the goto thing instead, so the final
> > result will be
> > 
> > void workingset_activation(struct page *page)
> > {
> > 	struct lruvec *lruvec;
> > 
> > 	lock_page_memcg(page);
> > 	/*
> > 	 * Filter non-memcg pages here, e.g. unmap can call
> > 	 * mark_page_accessed() on VDSO pages.
> > 	 *
> > 	 * XXX: See workingset_refault() - this should return
> > 	 * root_mem_cgroup even for !CONFIG_MEMCG.
> > 	 */
> > 	if (!mem_cgroup_disabled() && !page_memcg(page))
> > 		goto out;
> > 	lruvec = mem_cgroup_zone_lruvec(page_zone(page), page_memcg(page));
> > 	atomic_long_inc(&lruvec->inactive_age);
> > out:
> > 	unlock_page_memcg(page);
> > }
> 
> LGTM, thank you.

Thanks!

	-ss