[PATCH -mm 12/14] list_lru: organize all list_lrus to list

Vladimir Davydov
2014-09-21T15:14:44Z

I need it for making list_lru memcg-aware.

Signed-off-by: Vladimir Davydov <vdavydov@parallels.com>
---
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 <linux/list_lru.h>
#include <linux/slab.h>

+#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);