A small value for "dentry-dir-max", e.g. < 10, will cause excessive
dentry count checking leading to noticeable performance degradation. In
order to make this sysctl parameter more foolproof, we are not going
to allow any positive integer value less than 256.
Signed-off-by: Waiman Long <longman@xxxxxxxxxx>
---
Documentation/admin-guide/sysctl/fs.rst | 10 +++++-----
fs/dcache.c | 24 +++++++++++++++++++-----
2 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/Documentation/admin-guide/sysctl/fs.rst b/Documentation/admin-guide/sysctl/fs.rst
index 7274a7b34ee4..e09d851f9d42 100644
--- a/Documentation/admin-guide/sysctl/fs.rst
+++ b/Documentation/admin-guide/sysctl/fs.rst
@@ -71,11 +71,11 @@ in the directory. No restriction is placed on the number of positive
dentries as it is naturally limited by the number of files in the
directory.
-The default value is 0 which means there is no limit. Any non-negative
-value is allowed. However, internal tracking is done on all dentry
-types. So the value given, if non-zero, should be larger than the
-number of files in a typical large directory in order to reduce the
-tracking overhead.
+The default value is 0 which means there is no limit. Any positive
+integer value not less than 256 is also allowed. However, internal
+tracking is done on all dentry types. So the value given, if non-zero,
+should be larger than the number of files in a typical large directory
+in order to reduce the tracking overhead.
dentry-state
diff --git a/fs/dcache.c b/fs/dcache.c
index 0bd5d6974f75..f470763e7fb8 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -129,10 +129,14 @@ static DEFINE_PER_CPU(long, nr_dentry_negative);
*
* This is sysctl parameter "dentry-dir-max" which specifies a limit on
* the maximum number of negative dentries that are allowed under any
- * given directory.
+ * given directory. The allowable value of "dentry-dir-max" is either
+ * 0, which means no limit, or 256 and up. A low value of "dentry-dir-max"
+ * will cause excessive dentry count checking affecting system performance.
*/
-int dcache_dentry_dir_max_sysctl __read_mostly;
+int dcache_dentry_dir_max_sysctl;
EXPORT_SYMBOL_GPL(dcache_dentry_dir_max_sysctl);
+static int negative_dentry_dir_max __read_mostly;
+#define DENTRY_DIR_MAX_MIN 0x100
static LLIST_HEAD(negative_reclaim_list);
static DEFINE_STATIC_KEY_FALSE(negative_reclaim_enable);
@@ -206,6 +210,16 @@ int proc_dcache_dentry_dir_max(struct ctl_table *ctl, int write,
if (!write || ret || (dcache_dentry_dir_max_sysctl == old))
return ret;
+ /*
+ * A non-zero value must be >= DENTRY_DIR_MAX_MIN.
+ */
+ if (dcache_dentry_dir_max_sysctl &&
+ (dcache_dentry_dir_max_sysctl < DENTRY_DIR_MAX_MIN)) {
+ dcache_dentry_dir_max_sysctl = old;
+ return -EINVAL;
+ }
+
+ negative_dentry_dir_max = dcache_dentry_dir_max_sysctl;
if (!old && dcache_dentry_dir_max_sysctl)
static_branch_enable(&negative_reclaim_enable);
else if (old && !dcache_dentry_dir_max_sysctl)
@@ -1396,7 +1410,7 @@ static void reclaim_negative_dentry(struct dentry *parent, int *quota,
struct list_head *dispose)
{
struct dentry *child;
- int limit = READ_ONCE(dcache_dentry_dir_max_sysctl);
+ int limit = READ_ONCE(negative_dentry_dir_max);
int cnt, npositive;
lockdep_assert_held(&parent->d_lock);
@@ -1405,7 +1419,7 @@ static void reclaim_negative_dentry(struct dentry *parent, int *quota,
/*
* Compute # of negative dentries to be reclaimed
- * An extra 1/8 of dcache_dentry_dir_max_sysctl is added.
+ * An extra 1/8 of negative_dentry_dir_max is added.
*/
if (cnt <= limit)
return;
@@ -1537,7 +1551,7 @@ static void negative_reclaim_workfn(struct work_struct *work)
static void negative_reclaim_check(struct dentry *parent)
__releases(rcu)
{
- int limit = dcache_dentry_dir_max_sysctl;
+ int limit = negative_dentry_dir_max;
struct reclaim_dentry *dentry_node;
if (!limit)
--
2.18.1
