From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752921AbaIUPQr (ORCPT ); Sun, 21 Sep 2014 11:16:47 -0400 Received: from mx2.parallels.com ([199.115.105.18]:56727 "EHLO mx2.parallels.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752575AbaIUPQD (ORCPT ); Sun, 21 Sep 2014 11:16:03 -0400 From: Vladimir Davydov To: Andrew Morton CC: Johannes Weiner , Michal Hocko , Greg Thelen , Dave Chinner , Glauber Costa , Suleiman Souhlal , Kamezawa Hiroyuki , Tejun Heo , , , Subject: [PATCH -mm 12/14] list_lru: organize all list_lrus to list Date: Sun, 21 Sep 2014 19:14:44 +0400 Message-ID: <9e53255f042f70c7bc076009d8ee8d16581c9011.1411301245.git.vdavydov@parallels.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [81.5.99.36] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I need it for making list_lru memcg-aware. Signed-off-by: Vladimir Davydov --- include/linux/list_lru.h | 3 +++ mm/list_lru.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/include/linux/list_lru.h b/include/linux/list_lru.h index 53c1d6b78270..ee9486ac0621 100644 --- a/include/linux/list_lru.h +++ b/include/linux/list_lru.h @@ -31,6 +31,9 @@ struct list_lru_node { struct list_lru { struct list_lru_node *node; +#ifdef CONFIG_MEMCG_KMEM + struct list_head list; +#endif }; void list_lru_destroy(struct list_lru *lru); diff --git a/mm/list_lru.c b/mm/list_lru.c index 07e198c77888..53086eda7942 100644 --- a/mm/list_lru.c +++ b/mm/list_lru.c @@ -10,6 +10,33 @@ #include #include +#ifdef CONFIG_MEMCG_KMEM +static LIST_HEAD(list_lrus); +static DEFINE_SPINLOCK(list_lrus_lock); + +static void list_lru_register(struct list_lru *lru) +{ + spin_lock(&list_lrus_lock); + list_add(&lru->list, &list_lrus); + spin_unlock(&list_lrus_lock); +} + +static void list_lru_unregister(struct list_lru *lru) +{ + spin_lock(&list_lrus_lock); + list_del(&lru->list); + spin_unlock(&list_lrus_lock); +} +#else +static void list_lru_register(struct list_lru *lru) +{ +} + +static void list_lru_unregister(struct list_lru *lru) +{ +} +#endif /* CONFIG_MEMCG_KMEM */ + bool list_lru_add(struct list_lru *lru, struct list_head *item) { int nid = page_to_nid(virt_to_page(item)); @@ -137,12 +164,14 @@ int list_lru_init_key(struct list_lru *lru, struct lock_class_key *key) INIT_LIST_HEAD(&lru->node[i].list); lru->node[i].nr_items = 0; } + list_lru_register(lru); return 0; } EXPORT_SYMBOL_GPL(list_lru_init_key); void list_lru_destroy(struct list_lru *lru) { + list_lru_unregister(lru); kfree(lru->node); } EXPORT_SYMBOL_GPL(list_lru_destroy); -- 1.7.10.4