* [PATCH v2 0/2] fuse: schedule dentry_tree_work only between dentry tree init and cleanup
@ 2026-11-20 15:00 Sang-Heon Jeon
2026-11-20 15:00 ` [PATCH v2 1/2] fuse: defer dentry_tree_work until fuse_dentry_tree_init() Sang-Heon Jeon
2026-11-20 15:00 ` [PATCH v2 2/2] fuse: do not schedule dentry_tree_work after fuse_dentry_tree_cleanup() Sang-Heon Jeon
0 siblings, 2 replies; 3+ messages in thread
From: Sang-Heon Jeon @ 2026-11-20 15:00 UTC (permalink / raw)
To: Miklos Szeredi; +Cc: fuse-devel, linux-kernel, Luis Henriques, Miklos Szeredi
Hello,
inval_wq_set() schedules dentry_tree_work when inval_wq is enabled, but
it can be called before fuse_dentry_tree_init() and after
fuse_dentry_tree_cleanup(). This series makes inval_wq_set() schedule
the work only between the two.
Patch 1 defers scheduling the work until fuse_dentry_tree_init() sets
it up.
Patch 2 does not schedule the work after fuse_dentry_tree_cleanup()
cancels it.
Both patches hold kernel_param_lock(), because a sysfs write can call
inval_wq_set() at the same time.
---
Changes from v1 [1]
- Hold kernel_param_lock() in fuse_dentry_tree_init()
- Add patch 2 to not schedule the work after fuse_dentry_tree_cleanup()
[1] https://lore.kernel.org/all/20261110150250.71520-1-ekffu200098@gmail.com/
---
Sang-Heon Jeon (2):
fuse: defer dentry_tree_work until fuse_dentry_tree_init()
fuse: do not schedule dentry_tree_work after
fuse_dentry_tree_cleanup()
fs/fuse/dir.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
base-commit: ab9787d7e66ac7e6e94fc975b37c5b56fff98ca9
--
2.53.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v2 1/2] fuse: defer dentry_tree_work until fuse_dentry_tree_init()
2026-11-20 15:00 [PATCH v2 0/2] fuse: schedule dentry_tree_work only between dentry tree init and cleanup Sang-Heon Jeon
@ 2026-11-20 15:00 ` Sang-Heon Jeon
2026-11-20 15:00 ` [PATCH v2 2/2] fuse: do not schedule dentry_tree_work after fuse_dentry_tree_cleanup() Sang-Heon Jeon
1 sibling, 0 replies; 3+ messages in thread
From: Sang-Heon Jeon @ 2026-11-20 15:00 UTC (permalink / raw)
To: Miklos Szeredi
Cc: fuse-devel, linux-kernel, Luis Henriques, Miklos Szeredi, stable
inval_wq_set() schedules dentry_tree_work when inval_wq is enabled.
But inval_wq_set() can be called at boot or module load before
fuse_dentry_tree_init() initializes the work, so __queue_delayed_work()
warns and the work never starts.
So defer scheduling the work until fuse_dentry_tree_init() sets it up.
Also hold kernel_param_lock() in fuse_dentry_tree_init(), because a
sysfs write can call inval_wq_set() at the same time.
Fixes: ab84ad597386 ("fuse: new work queue to periodically invalidate expired dentries")
Cc: stable@vger.kernel.org
Signed-off-by: Sang-Heon Jeon <ekffu200098@gmail.com>
---
fs/fuse/dir.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index da23ccd8685c..0d5d04df477b 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -39,6 +39,7 @@ static struct delayed_work dentry_tree_work;
/* Minimum invalidation work queue frequency */
#define FUSE_DENTRY_INVAL_FREQ_MIN 5
+static bool inval_wq_ready;
unsigned __read_mostly inval_wq;
static int inval_wq_set(const char *val, const struct kernel_param *kp)
{
@@ -62,6 +63,10 @@ static int inval_wq_set(const char *val, const struct kernel_param *kp)
*((unsigned int *)kp->arg) = num;
+ /* Defer the work until fuse_dentry_tree_init() sets it up. */
+ if (!inval_wq_ready)
+ return 0;
+
if (num && !old)
schedule_delayed_work(&dentry_tree_work,
secs_to_jiffies(num));
@@ -224,6 +229,14 @@ void fuse_dentry_tree_init(void)
dentry_hash[i].tree = RB_ROOT;
}
INIT_DELAYED_WORK(&dentry_tree_work, fuse_dentry_tree_work);
+
+ kernel_param_lock(THIS_MODULE);
+ inval_wq_ready = true;
+
+ if (inval_wq)
+ schedule_delayed_work(&dentry_tree_work,
+ secs_to_jiffies(inval_wq));
+ kernel_param_unlock(THIS_MODULE);
}
void fuse_dentry_tree_cleanup(void)
--
2.53.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v2 2/2] fuse: do not schedule dentry_tree_work after fuse_dentry_tree_cleanup()
2026-11-20 15:00 [PATCH v2 0/2] fuse: schedule dentry_tree_work only between dentry tree init and cleanup Sang-Heon Jeon
2026-11-20 15:00 ` [PATCH v2 1/2] fuse: defer dentry_tree_work until fuse_dentry_tree_init() Sang-Heon Jeon
@ 2026-11-20 15:00 ` Sang-Heon Jeon
1 sibling, 0 replies; 3+ messages in thread
From: Sang-Heon Jeon @ 2026-11-20 15:00 UTC (permalink / raw)
To: Miklos Szeredi
Cc: fuse-devel, linux-kernel, Luis Henriques, Miklos Szeredi, stable
fuse_dentry_tree_cleanup() cancels dentry_tree_work at module unload.
But a sysfs write can call inval_wq_set() after that and schedule the
work again, leading to use-after-free.
So do not schedule the work in inval_wq_set() after
fuse_dentry_tree_cleanup() cancels it. Also hold kernel_param_lock()
in fuse_dentry_tree_cleanup(), because a sysfs write can call
inval_wq_set() at the same time.
Fixes: ab84ad597386 ("fuse: new work queue to periodically invalidate expired dentries")
Cc: stable@vger.kernel.org
Signed-off-by: Sang-Heon Jeon <ekffu200098@gmail.com>
---
fs/fuse/dir.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 0d5d04df477b..04ca6c9be2bf 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -63,7 +63,10 @@ static int inval_wq_set(const char *val, const struct kernel_param *kp)
*((unsigned int *)kp->arg) = num;
- /* Defer the work until fuse_dentry_tree_init() sets it up. */
+ /*
+ * Do not touch the work before fuse_dentry_tree_init() or after
+ * fuse_dentry_tree_cleanup().
+ */
if (!inval_wq_ready)
return 0;
@@ -243,8 +246,11 @@ void fuse_dentry_tree_cleanup(void)
{
int i;
+ kernel_param_lock(THIS_MODULE);
+ inval_wq_ready = false;
inval_wq = 0;
cancel_delayed_work_sync(&dentry_tree_work);
+ kernel_param_unlock(THIS_MODULE);
for (i = 0; i < FUSE_HASH_SIZE; i++)
WARN_ON_ONCE(!RB_EMPTY_ROOT(&dentry_hash[i].tree));
--
2.53.0
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-11-20 15:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-20 15:00 [PATCH v2 0/2] fuse: schedule dentry_tree_work only between dentry tree init and cleanup Sang-Heon Jeon
2026-11-20 15:00 ` [PATCH v2 1/2] fuse: defer dentry_tree_work until fuse_dentry_tree_init() Sang-Heon Jeon
2026-11-20 15:00 ` [PATCH v2 2/2] fuse: do not schedule dentry_tree_work after fuse_dentry_tree_cleanup() Sang-Heon Jeon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®