[PATCH v2] fuse: fix 'inval_wq' parameter setting during module initialisation

[PATCH v2] fuse: fix 'inval_wq' parameter setting during module initialisation

[Luis Henriques]

If the fuse module is loaded with a 'inval_wq' parameter the inval_wq_set()
function will schedule work into dentry_tree_work.  However this worked is
not initialised at this point because fuse_dentry_tree_init() will not have
been executed yet.

This can be fixed by delaying the work scheduling until later if the module
is still being initialised.

While there, also simplify the sched/cancel by using mod_delayed_work()
instead of schedule_delayed_work().  This will result in having the period
being changed immediately instead of waiting for the next reschedule.

Fixes: ab84ad597386 ("fuse: new work queue to periodically invalidate expired dentries")
Cc: stable@vger.kernel.org
Signed-off-by: Luis Henriques <luis@igalia.com>
---
Hi!

So, here's a different approach that tries to address sashiko comments:
instead of checking the module state and going through all sort of races,
simply define a new state variable and use it instead.  Simpler.  I hope.

 fs/fuse/dir.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index da23ccd8685c..32e052dac2f1 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -35,6 +35,7 @@ struct dentry_bucket {
 #define FUSE_HASH_SIZE	(1 << FUSE_HASH_BITS)
 static struct dentry_bucket dentry_hash[FUSE_HASH_SIZE];
 static struct delayed_work dentry_tree_work;
+static bool dentry_tree_is_initialised __read_mostly;
 
 /* Minimum invalidation work queue frequency */
 #define FUSE_DENTRY_INVAL_FREQ_MIN 5
@@ -43,7 +44,6 @@ unsigned __read_mostly inval_wq;
 static int inval_wq_set(const char *val, const struct kernel_param *kp)
 {
 	unsigned int num;
-	unsigned int old = inval_wq;
 	int ret;
 
 	if (!val)
@@ -62,11 +62,13 @@ static int inval_wq_set(const char *val, const struct kernel_param *kp)
 
 	*((unsigned int *)kp->arg) = num;
 
-	if (num && !old)
-		schedule_delayed_work(&dentry_tree_work,
-				      secs_to_jiffies(num));
-	else if (!num && old)
-		cancel_delayed_work_sync(&dentry_tree_work);
+	if (READ_ONCE(dentry_tree_is_initialised)) {
+		if (num)
+			mod_delayed_work(system_percpu_wq, &dentry_tree_work,
+					 secs_to_jiffies(num));
+		else
+			cancel_delayed_work_sync(&dentry_tree_work);
+	}
 
 	return 0;
 }
@@ -217,6 +219,7 @@ void fuse_epoch_work(struct work_struct *work)
 
 void fuse_dentry_tree_init(void)
 {
+	unsigned int delay;
 	int i;
 
 	for (i = 0; i < FUSE_HASH_SIZE; i++) {
@@ -224,6 +227,14 @@ void fuse_dentry_tree_init(void)
 		dentry_hash[i].tree = RB_ROOT;
 	}
 	INIT_DELAYED_WORK(&dentry_tree_work, fuse_dentry_tree_work);
+
+	/* Start workqueue immediately if 'inval_wq' is already set */
+	delay = inval_wq;
+	if (delay)
+		schedule_delayed_work(&dentry_tree_work,
+				      secs_to_jiffies(delay));
+
+	WRITE_ONCE(dentry_tree_is_initialised, true);
 }
 
 void fuse_dentry_tree_cleanup(void)