When we try to allocate more than the limit (with the percpu_counter
accuracy) the dcache is shrunk. If no dentries can be shrunk the
allocation is failed.
This is just to introduce the dcache_mem_check routine. The actual
limit imposed on the overall dcache size is set to 80Mb. The API for
limit configuration is to be discussed, and thus I made this hard
coded not to introduce some fancy API that will have to be changed.
The amount of dentries to shrink before reallocating the new one is
hard coded to limit/64, not to introduce the not yet discussed
configuration API.
Signed-off-by: Pavel Emelyanov <xemul@xxxxxxxxxx>
---
fs/dcache.c | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/fs/dcache.c b/fs/dcache.c
index fa5b7fa..c5179c3 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -124,6 +124,7 @@ struct dentry_stat_t dentry_stat = {
};
static struct percpu_counter nr_dentry __cacheline_aligned_in_smp;
+static unsigned long nr_dentry_max;
#if defined(CONFIG_SYSCTL) && defined(CONFIG_PROC_FS)
int proc_nr_dentry(ctl_table *table, int write, void __user *buffer,
@@ -759,7 +760,7 @@ static void shrink_dcache_subtree(struct dentry *root, int with_root)
*
* This may fail if locks cannot be acquired no problem, just try again.
*/
-static void try_prune_one_dentry(struct dentry *dentry)
+static int try_prune_one_dentry(struct dentry *dentry)
__releases(dentry->d_lock)
{
struct dentry *parent;
@@ -776,9 +777,9 @@ static void try_prune_one_dentry(struct dentry *dentry)
* fragmentation.
*/
if (!parent)
- return;
+ return 1;
if (parent == dentry)
- return;
+ return 0;
/* Prune ancestors. */
dentry = parent;
@@ -787,15 +788,18 @@ static void try_prune_one_dentry(struct dentry *dentry)
if (dentry->d_count > 1) {
dentry->d_count--;
spin_unlock(&dentry->d_lock);
- return;
+ return 1;
}
dentry = dentry_kill(dentry, 1);
}
+
+ return 1;
}
-static void shrink_dentry_list(struct list_head *list)
+static int shrink_dentry_list(struct list_head *list)
{
struct dentry *dentry;
+ int did_progress = 0;
rcu_read_lock();
for (;;) {
@@ -821,11 +825,13 @@ static void shrink_dentry_list(struct list_head *list)
rcu_read_unlock();
- try_prune_one_dentry(dentry);
+ did_progress |= try_prune_one_dentry(dentry);
rcu_read_lock();
}
rcu_read_unlock();
+
+ return did_progress;
}
/**
@@ -838,7 +844,7 @@ static void shrink_dentry_list(struct list_head *list)
* This function may fail to free any resources if all the dentries are in use.
*/
-static void prune_dcache(int count)
+static int prune_dcache(int count)
{
/* called from prune_dcache() and shrink_dcache_parent() */
struct dentry *dentry;
@@ -877,7 +883,7 @@ relock:
list_splice(&referenced, &dentry_lru);
spin_unlock(&dcache_lru_lock);
- shrink_dentry_list(&tmp);
+ return shrink_dentry_list(&tmp);
}
/**
@@ -1065,6 +1071,19 @@ static struct shrinker dcache_shrinker = {
.seeks = DEFAULT_SEEKS,
};
+static int dcache_mem_check(void)
+{
+ if (percpu_counter_read_positive(&nr_dentry) <= nr_dentry_max)
+ return 0;
+
+ do {
+ if (percpu_counter_sum_positive(&nr_dentry) <= nr_dentry_max)
+ return 0;
+ } while (prune_dcache(nr_dentry_max >> 6) > 0);
+
+ return -ENOMEM;
+}
+
/**
* d_alloc - allocate a dcache entry
* @parent: parent of entry to allocate
@@ -1080,6 +1099,9 @@ struct dentry *d_alloc(struct dentry * parent, const struct qstr *name)
struct dentry *dentry;
char *dname;
+ if (dcache_mem_check())
+ return NULL;
+
dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
if (!dentry)
return NULL;
@@ -2839,6 +2861,9 @@ static void __init dcache_init(void)
int loop;
percpu_counter_init(&nr_dentry, 0);
+ nr_dentry_max = 80 * 1024 * 1024 / sizeof(struct dentry);
+ printk("nr_dentry_max = %lu\n", nr_dentry_max);
+
/*
* A constructor could be added for stable state like the lists,
* but it is probably not worth it because of the cache nature
--
1.5.5.6
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
