From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935738AbXG3O2a (ORCPT ); Mon, 30 Jul 2007 10:28:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761858AbXG3O2W (ORCPT ); Mon, 30 Jul 2007 10:28:22 -0400 Received: from e2.ny.us.ibm.com ([32.97.182.142]:42592 "EHLO e2.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760645AbXG3O2V (ORCPT ); Mon, 30 Jul 2007 10:28:21 -0400 Date: Mon, 30 Jul 2007 19:58:18 +0530 From: Gautham R Shenoy To: Dhaval Giani Cc: Balbir Singh , Andrew Morton , Peter Zijlstra , Linux Containers , YAMAMOTO Takashi , Paul Menage , Dave Hansen , Linux MM Mailing List , Vaidyanathan Srinivasan , Pavel Emelianov , Linux Kernel Mailing List , Eric W Biederman Subject: Re: [-mm PATCH 6/9] Memory controller add per container LRU and reclaim (v4) Message-ID: <20070730142818.GB22345@in.ibm.com> Reply-To: ego@in.ibm.com References: <20070727200937.31565.78623.sendpatchset@balbir-laptop> <20070727201041.31565.14803.sendpatchset@balbir-laptop> <20070730133758.GB22952@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20070730133758.GB22952@linux.vnet.ibm.com> User-Agent: Mutt/1.5.12-2006-07-14 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jul 30, 2007 at 07:07:58PM +0530, Dhaval Giani wrote: > Hi Balbir, > > > diff -puN mm/memcontrol.c~mem-control-lru-and-reclaim mm/memcontrol.c > > --- linux-2.6.23-rc1-mm1/mm/memcontrol.c~mem-control-lru-and-reclaim 2007-07-28 01:12:50.000000000 +0530 > > +++ linux-2.6.23-rc1-mm1-balbir/mm/memcontrol.c 2007-07-28 01:12:50.000000000 +0530 > > > /* > > * The memory controller data structure. The memory controller controls both > > @@ -51,6 +54,10 @@ struct mem_container { > > */ > > struct list_head active_list; > > struct list_head inactive_list; > > + /* > > + * spin_lock to protect the per container LRU > > + */ > > + spinlock_t lru_lock; > > }; > > The spinlock is not annotated by lockdep. The following patch should do > it. > > Signed-off-by: Dhaval Giani > Signed-off-by: Gautham Shenoy R ^^^^^^^^^^^^^^^^ Gautham R Shenoy > > > Index: linux-2.6.23-rc1/mm/memcontrol.c > =================================================================== > --- linux-2.6.23-rc1.orig/mm/memcontrol.c 2007-07-30 17:27:24.000000000 +0530 > +++ linux-2.6.23-rc1/mm/memcontrol.c 2007-07-30 18:43:40.000000000 +0530 > @@ -501,6 +501,9 @@ > > static struct mem_container init_mem_container; > > +/* lockdep should know about lru_lock */ > +static struct lock_class_key lru_lock_key; > + > static struct container_subsys_state * > mem_container_create(struct container_subsys *ss, struct container *cont) > { > @@ -519,6 +522,7 @@ > INIT_LIST_HEAD(&mem->active_list); > INIT_LIST_HEAD(&mem->inactive_list); > spin_lock_init(&mem->lru_lock); > + lockdep_set_class(&mem->lru_lock, &lru_lock_key); > mem->control_type = MEM_CONTAINER_TYPE_ALL; > return &mem->css; > } > -- > regards, > Dhaval > > I would like to change the world but they don't give me the source code! -- Gautham R Shenoy Linux Technology Center IBM India. "Freedom comes with a price tag of responsibility, which is still a bargain, because Freedom is priceless!"