When there are too many negative dentries, printing a warning once may
not get the attention of the system administrator. So it is now change
to print a warning every minute until it is turned off by either writing
a 0 into fs/neg-dentry-limit or the limit is increased. After that the
system administrator can look into the reason why there are so many
negative dentries.
Note that the warning is printed when the global negative dentry free
pool is depleted even if there are space in other percpu negative dentry
counts for more.
Signed-off-by: Waiman Long <longman@xxxxxxxxxx>
---
fs/dcache.c | 35 ++++++++++++++++++++++++++++++++---
1 file changed, 32 insertions(+), 3 deletions(-)
diff --git a/fs/dcache.c b/fs/dcache.c
index 1fad368..b2c1585 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -139,6 +139,7 @@ struct dentry_stat_t dentry_stat = {
* the extra ones will be returned back to the global pool.
*/
#define NEG_DENTRY_BATCH (1 << 8)
+#define NEG_WARN_PERIOD (60 * HZ) /* Print a warning every min */
static struct static_key limit_neg_key = STATIC_KEY_INIT_FALSE;
static int neg_dentry_limit_old;
@@ -150,6 +151,7 @@ struct dentry_stat_t dentry_stat = {
static struct {
raw_spinlock_t nfree_lock;
long nfree; /* Negative dentry free pool */
+ unsigned long warn_jiffies; /* Time when last warning is printed */
} ndblk ____cacheline_aligned_in_smp;
proc_handler proc_neg_dentry_limit;
@@ -309,6 +311,7 @@ static long __neg_dentry_nfree_dec(long cnt)
static noinline void neg_dentry_inc_slowpath(struct dentry *dentry)
{
long cnt = 0, *pcnt;
+ unsigned long current_time;
/*
* Try to move some negative dentry quota from the global free
@@ -323,12 +326,38 @@ static noinline void neg_dentry_inc_slowpath(struct dentry *dentry)
}
put_cpu_ptr(&nr_dentry_neg);
+ if (cnt)
+ goto out;
+
/*
- * Put out a warning if there are too many negative dentries.
+ * Put out a warning every minute or so if there are just too many
+ * negative dentries.
*/
- if (!cnt)
- pr_warn_once("There are too many negative dentries.");
+ current_time = jiffies;
+
+ if (current_time < ndblk.warn_jiffies + NEG_WARN_PERIOD)
+ goto out;
+ /*
+ * Update the time in ndblk.warn_jiffies and print a warning
+ * if time update is successful.
+ */
+ raw_spin_lock(&ndblk.nfree_lock);
+ if (current_time < ndblk.warn_jiffies + NEG_WARN_PERIOD) {
+ raw_spin_unlock(&ndblk.nfree_lock);
+ goto out;
+ }
+ ndblk.warn_jiffies = current_time;
+ raw_spin_unlock(&ndblk.nfree_lock);
+ /*
+ * Get the current negative dentry count & print a warning.
+ */
+ cnt = get_nr_dentry_neg();
+ pr_warn("Warning: Too many negative dentries (%ld). "
+ "This warning can be disabled by writing 0 to \"fs/neg-dentry-limit\" or increasing the limit.\n",
+ cnt);
+out:
+ return;
}
/*
--
1.8.3.1
--
To unsubscribe from this list: send the line "unsubscribe linux-doc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
