fuse: add kernel-enforced request timeout option
Subsystems (3)
v10 cover fuse: add kernel-enforced request timeout option
There are situations where fuse servers can become unresponsive or stuck, for example if the server is in a deadlock. Currently, there's no good way to detect if a server is stuck and needs to be killed manually.
This patchset adds a timeout option where if the server does not reply to a request by the time the timeout elapses, the connection will be aborted. This patchset also adds two dynamically configurable fuse sysctls "default_request_timeout" and "max_request_timeout" for controlling/enforcing timeout behavior system-wide.
Existing systems running fuse servers will not be affected unless they explicitly opt into the timeout.
v9:
https://lore.kernel.org/linux-fsdevel/[email protected]/
Changes from v9 -> v10:
* Use delayed workqueues instead of timers (Sergey and Jeff)
* Change granularity to seconds instead of minutes (Sergey and Jeff)
* Use time_after() api for checking jiffies expiration (Sergey)
* Change timer check to run every 15 secs instead of every min
* Update documentation wording to be more clear
v8:
https://lore.kernel.org/linux-fsdevel/[email protected]/
Changes from v8 -> v9:
* Fix comment for u16 fs_parse_result, ULONG_MAX instead of U32_MAX, fix spacing (Bernd)
v7:
https://lore.kernel.org/linux-fsdevel/[email protected]/
Changes from v7 -> v8:
* Use existing lists for checking expirations (Miklos)
v6:
https://lore.kernel.org/linux-fsdevel/[email protected]/
Changes from v6 -> v7:
- Make timer per-connection instead of per-request (Miklos)
- Make default granularity of time minutes instead of seconds
- Removed the reviewed-bys since the interface of this has changed (now minutes, instead of seconds)
v5:
https://lore.kernel.org/linux-fsdevel/[email protected]/
Changes from v5 -> v6:
- Gate sysctl.o behind CONFIG_SYSCTL in makefile (kernel test robot)
- Reword/clarify last sentence in cover letter (Miklos)
v4:
https://lore.kernel.org/linux-fsdevel/[email protected]/
Changes from v4 -> v5:
- Change timeout behavior from aborting request to aborting connection (Miklos)
- Clarify wording for sysctl documentation (Jingbo)
v3:
https://lore.kernel.org/linux-fsdevel/[email protected]/
Changes from v3 -> v4:
- Fix wording on some comments to make it more clear
- Use simpler logic for timer (eg remove extra if checks, use mod timer API) (Josef)
- Sanity-check should be on FR_FINISHING not FR_FINISHED (Jingbo)
- Fix comment for "processing queue", add req->fpq = NULL safeguard (Bernd)
v2:
https://lore.kernel.org/linux-fsdevel/[email protected]/
Changes from v2 -> v3:
- Disarm / rearm timer in dev_do_read to handle race conditions (Bernrd)
- Disarm timer in error handling for fatal interrupt (Yafang)
- Clean up do_fuse_request_end (Jingbo)
- Add timer for notify retrieve requests
- Fix kernel test robot errors for #define no-op functions
v1:
https://lore.kernel.org/linux-fsdevel/[email protected]/
Changes from v1 -> v2:
- Add timeout for background requests
- Handle resend race condition
- Add sysctls
Joanne Koong (2):
fuse: add kernel-enforced timeout option for requests
fuse: add default_request_timeout and max_request_timeout sysctls
Documentation/admin-guide/sysctl/fs.rst | 25 ++++++++ fs/fuse/dev.c | 83 +++++++++++++++++++++++++ fs/fuse/fuse_i.h | 32 ++++++++++ fs/fuse/inode.c | 35 +++++++++++ fs/fuse/sysctl.c | 14 +++++ 5 files changed, 189 insertions(+)
Signature · 1 line
2.43.5
PATCH v10 1/2 fuse: add kernel-enforced timeout option for requests
There are situations where fuse servers can become unresponsive or stuck, for example if the server is deadlocked. Currently, there's no good way to detect if a server is stuck and needs to be killed manually.
This commit adds an option for enforcing a timeout (in seconds) for requests where if the timeout elapses without the server responding to the request, the connection will be automatically aborted.
Please note that these timeouts are not 100% precise. For example, the request may take roughly an extra FUSE_TIMEOUT_TIMER_FREQ seconds beyond the requested timeout due to internal implementation, in order to mitigate overhead.
--- fs/fuse/dev.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/fuse/fuse_i.h | 22 +++++++++++++ fs/fuse/inode.c | 23 ++++++++++++++ 3 files changed, 128 insertions(+)
fs/fuse/dev.c +83 -0
@@ -45,6 +45,85 @@ static struct fuse_dev *fuse_get_dev(struct file *file)return READ_ONCE (file->private_data); } +static bool request_expired (struct fuse_conn *fc,struct fuse_req *req) +{ +return time_is_before_jiffies (req->create_time + fc->timeout.req_timeout); +} + +/* +* Check if any requests aren't being completed by the time the request timeout +* elapses. To do so, we: +* - check the fiq pending list +* - check the bg queue +* - check the fpq io and processing lists +* +* To make this fast, we only check against the head request on each list since +* these are generally queued in order of creation time (eg newer requests get +* queued to the tail). We might miss a few edge cases (eg requests transitioning +* between lists, re-sent requests at the head of the pending list having a +* later creation time than other requests on that list, etc.) but that is fine +* since if the request never gets fulfilled, it will eventually be caught. +*/ +void fuse_check_timeout (struct work_struct *work) +{ +struct delayed_work *dwork =to_delayed_work (work); + struct fuse_conn *fc = container_of(dwork, struct fuse_conn, + timeout.work); +struct fuse_iqueue *fiq = &fc->iq; +struct fuse_req *req; +struct fuse_dev *fud; +struct fuse_pqueue *fpq; +bool expired = false; +int i; + +spin_lock (&fiq->lock); + req = list_first_entry_or_null(&fiq->pending, struct fuse_req, list); +if (req) + expired =request_expired (fc, req); +spin_unlock (&fiq->lock); +if (expired) + goto abort_conn; + +spin_lock (&fc->bg_lock); + req = list_first_entry_or_null(&fc->bg_queue, struct fuse_req, list); +if (req) + expired =request_expired (fc, req); +spin_unlock (&fc->bg_lock); +if (expired) + goto abort_conn; + +spin_lock (&fc->lock); +if (!fc->connected) { +spin_unlock (&fc->lock); +return ; + } +list_for_each_entry (fud, &fc->devices, entry) { + fpq = &fud->pq; +spin_lock (&fpq->lock); + req = list_first_entry_or_null(&fpq->io, struct fuse_req, list); +if (req &&request_expired (fc, req)) + goto fpq_abort; + +for (i =0 ; i <FUSE_PQ_HASH_SIZE ; i++) { + req = list_first_entry_or_null(&fpq->processing[i], struct fuse_req, list); +if (req &&request_expired (fc, req)) + goto fpq_abort; + } +spin_unlock (&fpq->lock); + } +spin_unlock (&fc->lock); + +queue_delayed_work (system_wq, &fc->timeout.work, +secs_to_jiffies (FUSE_TIMEOUT_TIMER_FREQ )); +return ; + +fpq_abort: +spin_unlock (&fpq->lock); +spin_unlock (&fc->lock); +abort_conn: +fuse_abort_conn (fc); +} +static void fuse_request_init (struct fuse_mount *fm,struct fuse_req *req) {INIT_LIST_HEAD (&req->list);
@@ -53,6 +132,7 @@ static void fuse_request_init(struct fuse_mount *fm, struct fuse_req *req)refcount_set (&req->count,1 );__set_bit (FR_PENDING , &req->flags); req->fm = fm; + req->create_time = jiffies; }static struct fuse_req *fuse_request_alloc (struct fuse_mount *fm,gfp_t flags)
@@ -2308,6 +2388,9 @@ void fuse_abort_conn(struct fuse_conn *fc)spin_unlock (&fc->lock);end_requests (&to_end); + +if (fc->timeout.req_timeout) +cancel_delayed_work (&fc->timeout.work); }else {spin_unlock (&fc->lock); }
fs/fuse/fuse_i.h +22 -0
@@ -438,6 +438,9 @@ struct fuse_req {/** fuse_mount this request belongs to */ struct fuse_mount *fm; + +/** When (in jiffies) the request was created */ +unsigned long create_time; };struct fuse_iqueue ;
@@ -528,6 +531,17 @@ struct fuse_pqueue {struct list_head io; }; +/* Frequency (in seconds) of request timeout checks, if opted into */ +#define FUSE_TIMEOUT_TIMER_FREQ 15 + +struct fuse_timeout { +/* Worker for checking if any requests have timed out */ +struct delayed_work work; + +/* Request timeout (in jiffies). 0 = no timeout */ +unsigned long req_timeout; +}; +/** * Fuse device instance */
@@ -574,6 +588,8 @@ struct fuse_fs_context {enum fuse_dax_mode dax_mode;unsigned int max_read;unsigned int blksize; +/* Request timeout (in seconds). 0 = no timeout (infinite wait) */ +unsigned int req_timeout;const char *subtype;/* DAX device, may be NULL */
@@ -923,6 +939,9 @@ struct fuse_conn {/** IDR for backing files ids */ struct idr backing_files_map;#endif + +/** Only used if the connection enforces request timeouts */ +struct fuse_timeout timeout; };/*
@@ -1191,6 +1210,9 @@ void fuse_request_end(struct fuse_req *req);void fuse_abort_conn (struct fuse_conn *fc);void fuse_wait_aborted (struct fuse_conn *fc); +/* Check if any requests timed out */ +void fuse_check_timeout (struct work_struct *work); +/** * Invalidate inode attributes */
fs/fuse/inode.c +23 -0
@@ -765,6 +765,7 @@ enum {OPT_ALLOW_OTHER ,OPT_MAX_READ ,OPT_BLKSIZE , +OPT_REQUEST_TIMEOUT , OPT_ERR };
@@ -779,6 +780,7 @@ static const struct fs_parameter_spec fuse_fs_parameters[] = {fsparam_u32 ("max_read" ,OPT_MAX_READ ),fsparam_u32 ("blksize" ,OPT_BLKSIZE ),fsparam_string ("subtype" ,OPT_SUBTYPE ), + fsparam_u32 ("request_timeout", OPT_REQUEST_TIMEOUT), {} };
@@ -874,6 +876,10 @@ static int fuse_parse_param(struct fs_context *fsc, struct fs_parameter *param) ctx->blksize = result.uint_32;break ; +case OPT_REQUEST_TIMEOUT : + ctx->req_timeout = result.uint_32; +break ; +default :return -EINVAL ; }
@@ -1004,6 +1010,8 @@ void fuse_conn_put(struct fuse_conn *fc)if (IS_ENABLED (CONFIG_FUSE_DAX ))fuse_dax_conn_free (fc); +if (fc->timeout.req_timeout) +cancel_delayed_work_sync (&fc->timeout.work);if (fiq->ops->release) fiq->ops->release (fiq);put_pid_ns (fc->pid_ns);
@@ -1723,6 +1731,20 @@ int fuse_init_fs_context_submount(struct fs_context *fsc) }EXPORT_SYMBOL_GPL (fuse_init_fs_context_submount); +static void fuse_init_fc_timeout (struct fuse_conn *fc,struct fuse_fs_context *ctx) +{ +if (ctx->req_timeout) { +if (check_mul_overflow (ctx->req_timeout,HZ , &fc->timeout.req_timeout)) + fc->timeout.req_timeout =ULONG_MAX ; + +INIT_DELAYED_WORK (&fc->timeout.work, fuse_check_timeout); +queue_delayed_work (system_wq, &fc->timeout.work, +secs_to_jiffies (FUSE_TIMEOUT_TIMER_FREQ )); + }else { + fc->timeout.req_timeout =0 ; + } +} +int fuse_fill_super_common (struct super_block *sb,struct fuse_fs_context *ctx) {struct fuse_dev *fud =NULL ;
@@ -1785,6 +1807,7 @@ int fuse_fill_super_common(struct super_block *sb, struct fuse_fs_context *ctx) fc->destroy = ctx->destroy; fc->no_control = ctx->no_control; fc->no_force_umount = ctx->no_force_umount; +fuse_init_fc_timeout (fc, ctx); err = -ENOMEM ; root =fuse_get_root_inode (sb, ctx->rootmode);
Signature · 1 line
2.43.5
Re: [PATCH v10 1/2] fuse: add kernel-enforced timeout option for requests
Quoted 6 lines · Joanne Koong
fs/fuse/dev.c +6
-0+void fuse_check_timeout (struct work_struct *work) +{ +struct delayed_work *dwork =to_delayed_work (work); + struct fuse_conn *fc = container_of(dwork, struct fuse_conn, + timeout.work); +struct fuse_iqueue *fiq = &fc->iq;
fs/fuse/dev.c static struct fuse_dev *fuse_get_dev(struct file *file) · line 82
Quoted 10 lines
fs/fuse/dev.c +10
-0+struct fuse_req *req; +struct fuse_dev *fud; +struct fuse_pqueue *fpq; +bool expired = false; +int i; + +spin_lock (&fiq->lock); + req = list_first_entry_or_null(&fiq->pending, struct fuse_req, list); +if (req) + expired =request_expired (fc, req);
A nit: you can factor these out into a small helper
static bool request_expired(struct fuse_conn *fc, struct list_head *list)
{
struct fuse_req *req;
req = list_first_entry_or_null(list, struct fuse_req, list);
if (!req)
return false;
return time_after(jiffies, req->create_time + fuse_watchdog_timeout());
}and just call it passing the corresponding list pointer
abort = request_expired(fc, &fiq->pending);
kinda makes the function look less busy.
[..]
fs/fuse/dev.c void fuse_abort_conn(struct fuse_conn *fc) · line 2393
Quoted 7 lines
fs/fuse/dev.c +3
-0@@ -2308,6 +2388,9 @@ void fuse_abort_conn(struct fuse_conn *fc)spin_unlock (&fc->lock);end_requests (&to_end); + +if (fc->timeout.req_timeout) +cancel_delayed_work (&fc->timeout.work);
When fuse_abort_conn() is called not from fuse_check_timeout(), but from somewhere else, should this use cancel_delayed_work_sync()?
Re: [PATCH v10 1/2] fuse: add kernel-enforced timeout option for requests
Quoted 31 lines · Sergey Senozhatsky
Quoted 6 lines · Joanne Koong
fs/fuse/dev.c +6
-0+void fuse_check_timeout (struct work_struct *work) +{ +struct delayed_work *dwork =to_delayed_work (work); + struct fuse_conn *fc = container_of(dwork, struct fuse_conn, + timeout.work); +struct fuse_iqueue *fiq = &fc->iq;fs/fuse/dev.c static struct fuse_dev *fuse_get_dev(struct file *file) · line 82
Quoted 10 lines
fs/fuse/dev.c +10
-0+struct fuse_req *req; +struct fuse_dev *fud; +struct fuse_pqueue *fpq; +bool expired = false; +int i; + +spin_lock (&fiq->lock); + req = list_first_entry_or_null(&fiq->pending, struct fuse_req, list); +if (req) + expired =request_expired (fc, req);A nit: you can factor these out into a small helper
static bool
request_expired(struct fuse_conn *fc, struct list_head *list){ struct fuse_req *req; req = list_first_entry_or_null(list, struct fuse_req, list); if (!req) return false; return time_after(jiffies, req->create_time + fuse_watchdog_timeout()); }
Quoted 5 lines
and just call it passing the corresponding list pointer
abort = request_expired(fc, &fiq->pending);kinda makes the function look less busy.
Good idea! I'll do this refactoring as part of v11.
Quoted 5 lines
[..]
Quoted 3 lines
fs/fuse/dev.c +0
-0@@ -2308,6 +2388,9 @@ void fuse_abort_conn(struct fuse_conn *fc)spin_unlock (&fc->lock);
Quoted 7 lines
fs/fuse/dev.c void fuse_abort_conn(struct fuse_conn *fc) · line 2393
Quoted 4 lines
fs/fuse/dev.c +3
-0end_requests (&to_end); + +if (fc->timeout.req_timeout) +cancel_delayed_work (&fc->timeout.work);When
fuse_abort_conn()is called not fromfuse_check_timeout(), but from somewhere else, should this usecancel_delayed_work_sync()?
I left a comment about this under the reply to Jeff.
Thanks,
Joanne
Re: [PATCH v10 1/2] fuse: add kernel-enforced timeout option for requests
In reply to Joanne KoongQuoted 119 lines · Joanne Koong
There are situations where fuse servers can become unresponsive or stuck, for example if the server is deadlocked. Currently, there's no good way to detect if a server is stuck and needs to be killed manually.
This commit adds an option for enforcing a timeout (in seconds) for requests where if the timeout elapses without the server responding to the request, the connection will be automatically aborted.
Please note that these timeouts are not 100% precise. For example, the request may take roughly an extra
FUSE_TIMEOUT_TIMER_FREQseconds beyond the requested timeout due to internal implementation, in order to mitigate overhead.Signed-off-by Joanne Koong <[email protected]>--- fs/fuse/dev.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/fuse/fuse_i.h | 22 +++++++++++++ fs/fuse/inode.c | 23 ++++++++++++++ 3 files changed, 128 insertions(+)fs/fuse/dev.c +80
-0@@ -45,6 +45,85 @@ static struct fuse_dev *fuse_get_dev(struct file *file)return READ_ONCE (file->private_data); } +static bool request_expired (struct fuse_conn *fc,struct fuse_req *req) +{ +return time_is_before_jiffies (req->create_time + fc->timeout.req_timeout); +} + +/* +* Check if any requests aren't being completed by the time the request timeout +* elapses. To do so, we: +* - check the fiq pending list +* - check the bg queue +* - check the fpq io and processing lists +* +* To make this fast, we only check against the head request on each list since +* these are generally queued in order of creation time (eg newer requests get +* queued to the tail). We might miss a few edge cases (eg requests transitioning +* between lists, re-sent requests at the head of the pending list having a +* later creation time than other requests on that list, etc.) but that is fine +* since if the request never gets fulfilled, it will eventually be caught. +*/ +void fuse_check_timeout (struct work_struct *work) +{ +struct delayed_work *dwork =to_delayed_work (work); + struct fuse_conn *fc = container_of(dwork, struct fuse_conn, + timeout.work); +struct fuse_iqueue *fiq = &fc->iq; +struct fuse_req *req; +struct fuse_dev *fud; +struct fuse_pqueue *fpq; +bool expired = false; +int i; + +spin_lock (&fiq->lock); + req = list_first_entry_or_null(&fiq->pending, struct fuse_req, list); +if (req) + expired =request_expired (fc, req); +spin_unlock (&fiq->lock); +if (expired) + goto abort_conn; + +spin_lock (&fc->bg_lock); + req = list_first_entry_or_null(&fc->bg_queue, struct fuse_req, list); +if (req) + expired =request_expired (fc, req); +spin_unlock (&fc->bg_lock); +if (expired) + goto abort_conn; + +spin_lock (&fc->lock); +if (!fc->connected) { +spin_unlock (&fc->lock); +return ; + } +list_for_each_entry (fud, &fc->devices, entry) { + fpq = &fud->pq; +spin_lock (&fpq->lock); + req = list_first_entry_or_null(&fpq->io, struct fuse_req, list); +if (req &&request_expired (fc, req)) + goto fpq_abort; + +for (i =0 ; i <FUSE_PQ_HASH_SIZE ; i++) { + req = list_first_entry_or_null(&fpq->processing[i], struct fuse_req, list); +if (req &&request_expired (fc, req)) + goto fpq_abort; + } +spin_unlock (&fpq->lock); + } +spin_unlock (&fc->lock); + +queue_delayed_work (system_wq, &fc->timeout.work, +secs_to_jiffies (FUSE_TIMEOUT_TIMER_FREQ )); +return ; + +fpq_abort: +spin_unlock (&fpq->lock); +spin_unlock (&fc->lock); +abort_conn: +fuse_abort_conn (fc); +} +static void fuse_request_init (struct fuse_mount *fm,struct fuse_req *req) {INIT_LIST_HEAD (&req->list);@@ -53,6 +132,7 @@ static void fuse_request_init(struct fuse_mount *fm, struct fuse_req *req)refcount_set (&req->count,1 );__set_bit (FR_PENDING , &req->flags); req->fm = fm; + req->create_time = jiffies; }static struct fuse_req *fuse_request_alloc (struct fuse_mount *fm,gfp_t flags)
fs/fuse/dev.c void fuse_abort_conn(struct fuse_conn *fc) · line 2393
Quoted 6 lines
fs/fuse/dev.c +3
-0@@ -2308,6 +2388,9 @@ void fuse_abort_conn(struct fuse_conn *fc)spin_unlock (&fc->lock);end_requests (&to_end); + +if (fc->timeout.req_timeout) +cancel_delayed_work (&fc->timeout.work);
As Sergey pointed out, this should be a cancel_delayed_work_sync(). The workqueue job can still be running after cancel_delayed_work(), and since it requeues itself, this might not be enough to kill it completely.
Also, I'd probably do this at the start of fuse_abort_conn() instead of waiting until the end. By the time you're in that function, you're killing the connection anyway, and you probably don't want the workqueue job running at the same time. They'll just end up competing for the same locks.
Quoted 133 lines
fs/fuse/dev.c +0
-0}else {spin_unlock (&fc->lock); }fs/fuse/fuse_i.h +22
-0@@ -438,6 +438,9 @@ struct fuse_req {/** fuse_mount this request belongs to */ struct fuse_mount *fm; + +/** When (in jiffies) the request was created */ +unsigned long create_time; };struct fuse_iqueue ;@@ -528,6 +531,17 @@ struct fuse_pqueue {struct list_head io; }; +/* Frequency (in seconds) of request timeout checks, if opted into */ +#define FUSE_TIMEOUT_TIMER_FREQ 15 + +struct fuse_timeout { +/* Worker for checking if any requests have timed out */ +struct delayed_work work; + +/* Request timeout (in jiffies). 0 = no timeout */ +unsigned long req_timeout; +}; +/** * Fuse device instance */ @@ -574,6 +588,8 @@ struct fuse_fs_context {enum fuse_dax_mode dax_mode;unsigned int max_read;unsigned int blksize; +/* Request timeout (in seconds). 0 = no timeout (infinite wait) */ +unsigned int req_timeout;const char *subtype;/* DAX device, may be NULL */ @@ -923,6 +939,9 @@ struct fuse_conn {/** IDR for backing files ids */ struct idr backing_files_map;#endif + +/** Only used if the connection enforces request timeouts */ +struct fuse_timeout timeout; };/* @@ -1191,6 +1210,9 @@ void fuse_request_end(struct fuse_req *req);void fuse_abort_conn (struct fuse_conn *fc);void fuse_wait_aborted (struct fuse_conn *fc); +/* Check if any requests timed out */ +void fuse_check_timeout (struct work_struct *work); +/** * Invalidate inode attributes */ fs/fuse/inode.c +23
-0@@ -765,6 +765,7 @@ enum {OPT_ALLOW_OTHER ,OPT_MAX_READ ,OPT_BLKSIZE , +OPT_REQUEST_TIMEOUT , OPT_ERR };@@ -779,6 +780,7 @@ static const struct fs_parameter_spec fuse_fs_parameters[] = {fsparam_u32 ("max_read" ,OPT_MAX_READ ),fsparam_u32 ("blksize" ,OPT_BLKSIZE ),fsparam_string ("subtype" ,OPT_SUBTYPE ), + fsparam_u32 ("request_timeout", OPT_REQUEST_TIMEOUT), {} };@@ -874,6 +876,10 @@ static int fuse_parse_param(struct fs_context *fsc, struct fs_parameter *param) ctx->blksize = result.uint_32;break ; +case OPT_REQUEST_TIMEOUT : + ctx->req_timeout = result.uint_32; +break ; +default :return -EINVAL ; }@@ -1004,6 +1010,8 @@ void fuse_conn_put(struct fuse_conn *fc)if (IS_ENABLED (CONFIG_FUSE_DAX ))fuse_dax_conn_free (fc); +if (fc->timeout.req_timeout) +cancel_delayed_work_sync (&fc->timeout.work);if (fiq->ops->release) fiq->ops->release (fiq);put_pid_ns (fc->pid_ns);@@ -1723,6 +1731,20 @@ int fuse_init_fs_context_submount(struct fs_context *fsc) }EXPORT_SYMBOL_GPL (fuse_init_fs_context_submount); +static void fuse_init_fc_timeout (struct fuse_conn *fc,struct fuse_fs_context *ctx) +{ +if (ctx->req_timeout) { +if (check_mul_overflow (ctx->req_timeout,HZ , &fc->timeout.req_timeout)) + fc->timeout.req_timeout =ULONG_MAX ; + +INIT_DELAYED_WORK (&fc->timeout.work, fuse_check_timeout); +queue_delayed_work (system_wq, &fc->timeout.work, +secs_to_jiffies (FUSE_TIMEOUT_TIMER_FREQ )); + }else { + fc->timeout.req_timeout =0 ; + } +} +int fuse_fill_super_common (struct super_block *sb,struct fuse_fs_context *ctx) {struct fuse_dev *fud =NULL ;@@ -1785,6 +1807,7 @@ int fuse_fill_super_common(struct super_block *sb, struct fuse_fs_context *ctx) fc->destroy = ctx->destroy; fc->no_control = ctx->no_control; fc->no_force_umount = ctx->no_force_umount; +fuse_init_fc_timeout (fc, ctx); err = -ENOMEM ; root =fuse_get_root_inode (sb, ctx->rootmode);
Signature · 1 line
Jeff Layton <[email protected]>
Re: [PATCH v10 1/2] fuse: add kernel-enforced timeout option for requests
Quoted 12 lines · Jeff Layton
Quoted 12 lines
fs/fuse/dev.c +12
-0+void fuse_check_timeout (struct work_struct *work) +{ +struct delayed_work *dwork =to_delayed_work (work); + struct fuse_conn *fc = container_of(dwork, struct fuse_conn, + timeout.work); +struct fuse_iqueue *fiq = &fc->iq; +struct fuse_req *req; +struct fuse_dev *fud; +struct fuse_pqueue *fpq; +bool expired = false; +int i; +
[..]
Quoted 11 lines
Quoted 11 lines
fs/fuse/dev.c +8
-0+ +fpq_abort: +spin_unlock (&fpq->lock); +spin_unlock (&fc->lock); +abort_conn: +fuse_abort_conn (fc); +} +@@ -2308,6 +2388,9 @@ void fuse_abort_conn(struct fuse_conn *fc)spin_unlock (&fc->lock);
Quoted 6 lines
fs/fuse/dev.c void fuse_abort_conn(struct fuse_conn *fc) · line 2393
Quoted 4 lines
fs/fuse/dev.c +3
-0end_requests (&to_end); + +if (fc->timeout.req_timeout) +cancel_delayed_work (&fc->timeout.work);As Sergey pointed out, this should be a
cancel_delayed_work_sync().
My worry here is that fuse_abort_conn() can also be called from the deferred work handler, I'm not sure if we can cancel_delayed_work_sync() from within the same WQ context, sounds deadlock-ish:
WQ -> fuse_check_timeout() -> fuse_abort_conn() -> cancel_delayed_work_sync()
When fuse_abort_conn() is called from somewhere else (umount, etc.) then we can safely sync(), but fuse_check_timeout() is different.
Maybe fuse_abort_conn() can become __fuse_abort_conn(), which fuse_check_timeout() will call directly, for the rest fuse_abort_conn() can be something like:
static void __fuse_abort_conn()
{
....
}
void fuse_abort_conn()
{
cancel_delayed_work_sync()
__fuse_abort_conn();
}Re: [PATCH v10 1/2] fuse: add kernel-enforced timeout option for requests
Quoted 32 lines · Sergey Senozhatsky
Quoted 12 lines · Jeff Layton
Quoted 12 lines
fs/fuse/dev.c +12
-0+void fuse_check_timeout (struct work_struct *work) +{ +struct delayed_work *dwork =to_delayed_work (work); + struct fuse_conn *fc = container_of(dwork, struct fuse_conn, + timeout.work); +struct fuse_iqueue *fiq = &fc->iq; +struct fuse_req *req; +struct fuse_dev *fud; +struct fuse_pqueue *fpq; +bool expired = false; +int i; +[..]
Quoted 11 lines
Quoted 11 lines
fs/fuse/dev.c +8
-0+ +fpq_abort: +spin_unlock (&fpq->lock); +spin_unlock (&fc->lock); +abort_conn: +fuse_abort_conn (fc); +} +@@ -2308,6 +2388,9 @@ void fuse_abort_conn(struct fuse_conn *fc)spin_unlock (&fc->lock);Quoted 6 lines
fs/fuse/dev.c void fuse_abort_conn(struct fuse_conn *fc) · line 2393
Quoted 4 lines
fs/fuse/dev.c +3
-0end_requests (&to_end); + +if (fc->timeout.req_timeout) +cancel_delayed_work (&fc->timeout.work);As Sergey pointed out, this should be a
cancel_delayed_work_sync().
Quoted 9 lines
My worry here is that
fuse_abort_conn()can also be called from the deferred work handler, I'm not sure if we cancancel_delayed_work_sync()from within the same WQ context, sounds deadlock-ish:WQ ->
fuse_check_timeout()->fuse_abort_conn()->cancel_delayed_work_sync()When
fuse_abort_conn()is called from somewhere else (umount, etc.) then we can safelysync(), butfuse_check_timeout()is different.
Very good point.
Quoted 4 lines
Maybe
fuse_abort_conn()can become__fuse_abort_conn(), whichfuse_check_timeout()will call directly, for the restfuse_abort_conn()can be something like:
Quoted 10 lines
static void __fuse_abort_conn()
{
....
}
void fuse_abort_conn()
{
cancel_delayed_work_sync()
__fuse_abort_conn();
}That seems like a reasonable solution. It already doesn't requeue the job when calling fuse_abort_conn(), so that should work.
Signature · 1 line
Jeff Layton <[email protected]>
Re: [PATCH v10 1/2] fuse: add kernel-enforced timeout option for requests
Quoted 61 lines · Jeff Layton
Quoted 32 lines · Sergey Senozhatsky
Quoted 12 lines · Jeff Layton
Quoted 12 lines
fs/fuse/dev.c +12
-0+void fuse_check_timeout (struct work_struct *work) +{ +struct delayed_work *dwork =to_delayed_work (work); + struct fuse_conn *fc = container_of(dwork, struct fuse_conn, + timeout.work); +struct fuse_iqueue *fiq = &fc->iq; +struct fuse_req *req; +struct fuse_dev *fud; +struct fuse_pqueue *fpq; +bool expired = false; +int i; +[..]
Quoted 11 lines
Quoted 11 lines
fs/fuse/dev.c +8
-0+ +fpq_abort: +spin_unlock (&fpq->lock); +spin_unlock (&fc->lock); +abort_conn: +fuse_abort_conn (fc); +} +@@ -2308,6 +2388,9 @@ void fuse_abort_conn(struct fuse_conn *fc)spin_unlock (&fc->lock);Quoted 6 lines
fs/fuse/dev.c void fuse_abort_conn(struct fuse_conn *fc) · line 2393
Quoted 4 lines
fs/fuse/dev.c +3
-0end_requests (&to_end); + +if (fc->timeout.req_timeout) +cancel_delayed_work (&fc->timeout.work);As Sergey pointed out, this should be a
cancel_delayed_work_sync().Quoted 9 lines
My worry here is that
fuse_abort_conn()can also be called from the deferred work handler, I'm not sure if we cancancel_delayed_work_sync()from within the same WQ context, sounds deadlock-ish:WQ ->
fuse_check_timeout()->fuse_abort_conn()->cancel_delayed_work_sync()When
fuse_abort_conn()is called from somewhere else (umount, etc.) then we can safelysync(), butfuse_check_timeout()is different.Very good point.
Quoted 4 lines
Maybe
fuse_abort_conn()can become__fuse_abort_conn(), whichfuse_check_timeout()will call directly, for the restfuse_abort_conn()can be something like:Quoted 10 lines
static void __fuse_abort_conn() { .... } void fuse_abort_conn() { cancel_delayed_work_sync() __fuse_abort_conn(); }
Quoted 4 lines
That seems like a reasonable solution. It already doesn't requeue the job when calling
fuse_abort_conn(), so that should work. --
Jeff Layton <[email protected]>
I'm not sure this is going to work either.
What happens if say fuse_check_timeout() is running and is about to requeue the work and
at the same time umount->fuse_abort_conn->cancel_delayed_work_sync() comes. The cancel will correctly wait for the actual work to finish but won't prevent it from getting
queued again no?
thanks,
Etienne
Re: [PATCH v10 1/2] fuse: add kernel-enforced timeout option for requests
Quoted 11 lines · Etienne Martineau
Quoted 10 lines
Quoted 5 lines
void fuse_abort_conn() { cancel_delayed_work_sync() __fuse_abort_conn(); }That seems like a reasonable solution. It already doesn't requeue the job when calling
fuse_abort_conn(), so that should work. --
Jeff Layton <[email protected]>
Quoted 4 lines
I'm not sure this is going to work either.
What happens if sayfuse_check_timeout()is running and is about to requeue the work and
at the same timeumount->fuse_abort_conn->cancel_delayed_work_sync()comes.
Good point. Perhaps a flag to make en-queueing conditional then, which will be set/cleared before cancel_delayed_work_sync()?
Re: [PATCH v10 1/2] fuse: add kernel-enforced timeout option for requests
In reply to Jeff LaytonQuoted 31 lines · Jeff Layton
Quoted 29 lines · Joanne Koong
There are situations where fuse servers can become unresponsive or stuck, for example if the server is deadlocked. Currently, there's no good way to detect if a server is stuck and needs to be killed manually.
This commit adds an option for enforcing a timeout (in seconds) for requests where if the timeout elapses without the server responding to the request, the connection will be automatically aborted.
Please note that these timeouts are not 100% precise. For example, the request may take roughly an extra
FUSE_TIMEOUT_TIMER_FREQseconds beyond the requested timeout due to internal implementation, in order to mitigate overhead.Signed-off-by Joanne Koong <[email protected]>--- fs/fuse/dev.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/fuse/fuse_i.h | 22 +++++++++++++ fs/fuse/inode.c | 23 ++++++++++++++ 3 files changed, 128 insertions(+)fs/fuse/dev.c +0
-0static struct fuse_req *fuse_request_alloc (struct fuse_mount *fm,gfp_t flags)@@ -2308,6 +2388,9 @@ void fuse_abort_conn(struct fuse_conn *fc)spin_unlock (&fc->lock);
Quoted 9 lines
fs/fuse/dev.c void fuse_abort_conn(struct fuse_conn *fc) · line 2393
Quoted 4 lines
fs/fuse/dev.c +3
-0end_requests (&to_end); + +if (fc->timeout.req_timeout) +cancel_delayed_work (&fc->timeout.work);As Sergey pointed out, this should be a
cancel_delayed_work_sync(). The workqueue job can still be running aftercancel_delayed_work(), and since it requeues itself, this might not be enough to kill it completely.
I don't think we need to synchronously cancel it when a connection is aborted. The fuse_check_timeout() workqueue job can be simultaneously running when cancel_delayed_work() is called and can requeue itself, but then on the next trigger of the job, it will check whether the connection was aborted (eg the if (!fc->connected)... return; lines in fuse_check_timeout()) and will not requeue itself if the connection was aborted. This seemed like the simplest / cleanest approach to me.
Quoted 6 lines
Also, I'd probably do this at the start of
fuse_abort_conn()instead of waiting until the end. By the time you're in that function, you're killing the connection anyway, and you probably don't want the workqueue job running at the same time. They'll just end up competing for the same locks.
Sounds good, I'll move this to be called right after the "if (fc->connected)" line.
Thanks,
Joanne
Quoted 7 lines
fs/fuse/dev.c void fuse_abort_conn(struct fuse_conn *fc) · line 2396
Quoted 4 lines
fs/fuse/dev.c +0
-0}else {spin_unlock (&fc->lock); }--
Jeff Layton <[email protected]>
Re: [PATCH v10 1/2] fuse: add kernel-enforced timeout option for requests
Quoted 43 lines · Joanne Koong
Quoted 31 lines · Jeff Layton
Quoted 29 lines · Joanne Koong
There are situations where fuse servers can become unresponsive or stuck, for example if the server is deadlocked. Currently, there's no good way to detect if a server is stuck and needs to be killed manually.
This commit adds an option for enforcing a timeout (in seconds) for requests where if the timeout elapses without the server responding to the request, the connection will be automatically aborted.
Please note that these timeouts are not 100% precise. For example, the request may take roughly an extra
FUSE_TIMEOUT_TIMER_FREQseconds beyond the requested timeout due to internal implementation, in order to mitigate overhead.Signed-off-by Joanne Koong <[email protected]>--- fs/fuse/dev.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/fuse/fuse_i.h | 22 +++++++++++++ fs/fuse/inode.c | 23 ++++++++++++++ 3 files changed, 128 insertions(+)fs/fuse/dev.c +0
-0static struct fuse_req *fuse_request_alloc (struct fuse_mount *fm,gfp_t flags)@@ -2308,6 +2388,9 @@ void fuse_abort_conn(struct fuse_conn *fc)spin_unlock (&fc->lock);Quoted 9 lines
fs/fuse/dev.c void fuse_abort_conn(struct fuse_conn *fc) · line 2393
Quoted 4 lines
fs/fuse/dev.c +3
-0end_requests (&to_end); + +if (fc->timeout.req_timeout) +cancel_delayed_work (&fc->timeout.work);As Sergey pointed out, this should be a
cancel_delayed_work_sync(). The workqueue job can still be running aftercancel_delayed_work(), and since it requeues itself, this might not be enough to kill it completely.
Quoted 8 lines
I don't think we need to synchronously cancel it when a connection is aborted. The
fuse_check_timeout()workqueue job can be simultaneously running whencancel_delayed_work()is called and can requeue itself, but then on the next trigger of the job, it will check whether the connection was aborted (eg the if (!fc->connected)... return; lines infuse_check_timeout()) and will not requeue itself if the connection was aborted. This seemed like the simplest / cleanest approach to me.
Is there a scenario where the next trigger of the job dereference struct fuse_conn *fc which already got freed because say the FUSE server has terminated?
Thanks,
Etienne
Re: [PATCH v10 1/2] fuse: add kernel-enforced timeout option for requests
Quoted 53 lines · Etienne Martineau
Quoted 43 lines · Joanne Koong
Quoted 31 lines · Jeff Layton
Quoted 29 lines · Joanne Koong
There are situations where fuse servers can become unresponsive or stuck, for example if the server is deadlocked. Currently, there's no good way to detect if a server is stuck and needs to be killed manually.
This commit adds an option for enforcing a timeout (in seconds) for requests where if the timeout elapses without the server responding to the request, the connection will be automatically aborted.
Please note that these timeouts are not 100% precise. For example, the request may take roughly an extra
FUSE_TIMEOUT_TIMER_FREQseconds beyond the requested timeout due to internal implementation, in order to mitigate overhead.Signed-off-by Joanne Koong <[email protected]>--- fs/fuse/dev.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/fuse/fuse_i.h | 22 +++++++++++++ fs/fuse/inode.c | 23 ++++++++++++++ 3 files changed, 128 insertions(+)fs/fuse/dev.c +0
-0static struct fuse_req *fuse_request_alloc (struct fuse_mount *fm,gfp_t flags)@@ -2308,6 +2388,9 @@ void fuse_abort_conn(struct fuse_conn *fc)spin_unlock (&fc->lock);Quoted 9 lines
fs/fuse/dev.c void fuse_abort_conn(struct fuse_conn *fc) · line 2393
Quoted 4 lines
fs/fuse/dev.c +3
-0end_requests (&to_end); + +if (fc->timeout.req_timeout) +cancel_delayed_work (&fc->timeout.work);As Sergey pointed out, this should be a
cancel_delayed_work_sync(). The workqueue job can still be running aftercancel_delayed_work(), and since it requeues itself, this might not be enough to kill it completely.Quoted 8 lines
I don't think we need to synchronously cancel it when a connection is aborted. The
fuse_check_timeout()workqueue job can be simultaneously running whencancel_delayed_work()is called and can requeue itself, but then on the next trigger of the job, it will check whether the connection was aborted (eg the if (!fc->connected)... return; lines infuse_check_timeout()) and will not requeue itself if the connection was aborted. This seemed like the simplest / cleanest approach to me.
Quoted 3 lines
Is there a scenario where the next trigger of the job dereference struct
fuse_conn*fc which already got freed because say the FUSE server has terminated?
This isn't possible because the struct fuse_conn *fc gets freed only after the call to "cancel_delayed_work_sync(&fc->timeout.work);" that synchronously cancels the workqueue job. This happens in the fuse_conn_put() function.
Thanks,
Joanne
Quoted 2 lines
Thanks,
Etienne
Re: [PATCH v10 1/2] fuse: add kernel-enforced timeout option for requests
Quoted 56 lines · Joanne Koong
Quoted 53 lines · Etienne Martineau
Quoted 51 lines · Joanne Koong
Quoted 31 lines · Jeff Layton
Quoted 29 lines · Joanne Koong
There are situations where fuse servers can become unresponsive or stuck, for example if the server is deadlocked. Currently, there's no good way to detect if a server is stuck and needs to be killed manually.
This commit adds an option for enforcing a timeout (in seconds) for requests where if the timeout elapses without the server responding to the request, the connection will be automatically aborted.
Please note that these timeouts are not 100% precise. For example, the request may take roughly an extra
FUSE_TIMEOUT_TIMER_FREQseconds beyond the requested timeout due to internal implementation, in order to mitigate overhead.Signed-off-by Joanne Koong <[email protected]>--- fs/fuse/dev.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/fuse/fuse_i.h | 22 +++++++++++++ fs/fuse/inode.c | 23 ++++++++++++++ 3 files changed, 128 insertions(+)fs/fuse/dev.c +0
-0static struct fuse_req *fuse_request_alloc (struct fuse_mount *fm,gfp_t flags)@@ -2308,6 +2388,9 @@ void fuse_abort_conn(struct fuse_conn *fc)spin_unlock (&fc->lock);Quoted 9 lines
fs/fuse/dev.c void fuse_abort_conn(struct fuse_conn *fc) · line 2393
Quoted 4 lines
fs/fuse/dev.c +3
-0end_requests (&to_end); + +if (fc->timeout.req_timeout) +cancel_delayed_work (&fc->timeout.work);As Sergey pointed out, this should be a
cancel_delayed_work_sync(). The workqueue job can still be running aftercancel_delayed_work(), and since it requeues itself, this might not be enough to kill it completely.I don't think we need to synchronously cancel it when a connection is aborted. The
fuse_check_timeout()workqueue job can be simultaneously running whencancel_delayed_work()is called and can requeue itself, but then on the next trigger of the job, it will check whether the connection was aborted (eg the if (!fc->connected)... return; lines infuse_check_timeout()) and will not requeue itself if the connection was aborted. This seemed like the simplest / cleanest approach to me.
Quoted 9 lines
Quoted 3 lines
Is there a scenario where the next trigger of the job dereference struct
fuse_conn*fc which already got freed because say the FUSE server has terminated?This isn't possible because the struct
fuse_conn*fc gets freed only after the call to "cancel_delayed_work_sync(&fc->timeout.work);" that synchronously cancels the workqueue job. This happens in thefuse_conn_put()function.
cancel_delayed_work_sync() won't prevent the work from re-queuing itself if it's already running.
I think we need some flag like Sergey pointed out here
https://lore.kernel.org/linux-fsdevel/CAMHPp_S2ANAguT6fYfNcXjTZxU14nh2Zv=5=8dG8qUnD3F8e7A@mail.gmail.com/T/#m543550031f31a9210996ccf815d5bc2a4290f540
Maybe we don't requeue when fc->count becomes 0? Thanks,
Etienne
Quoted 4 lines
Thanks,
Joanne
Re: [PATCH v10 1/2] fuse: add kernel-enforced timeout option for requests
Quoted 67 lines · Etienne Martineau
Quoted 56 lines · Joanne Koong
Quoted 53 lines · Etienne Martineau
Quoted 51 lines · Joanne Koong
Quoted 31 lines · Jeff Layton
Quoted 29 lines · Joanne Koong
There are situations where fuse servers can become unresponsive or stuck, for example if the server is deadlocked. Currently, there's no good way to detect if a server is stuck and needs to be killed manually.
This commit adds an option for enforcing a timeout (in seconds) for requests where if the timeout elapses without the server responding to the request, the connection will be automatically aborted.
Please note that these timeouts are not 100% precise. For example, the request may take roughly an extra
FUSE_TIMEOUT_TIMER_FREQseconds beyond the requested timeout due to internal implementation, in order to mitigate overhead.Signed-off-by Joanne Koong <[email protected]>--- fs/fuse/dev.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/fuse/fuse_i.h | 22 +++++++++++++ fs/fuse/inode.c | 23 ++++++++++++++ 3 files changed, 128 insertions(+)fs/fuse/dev.c +0
-0static struct fuse_req *fuse_request_alloc (struct fuse_mount *fm,gfp_t flags)@@ -2308,6 +2388,9 @@ void fuse_abort_conn(struct fuse_conn *fc)spin_unlock (&fc->lock);Quoted 9 lines
fs/fuse/dev.c void fuse_abort_conn(struct fuse_conn *fc) · line 2393
Quoted 4 lines
fs/fuse/dev.c +3
-0end_requests (&to_end); + +if (fc->timeout.req_timeout) +cancel_delayed_work (&fc->timeout.work);As Sergey pointed out, this should be a
cancel_delayed_work_sync(). The workqueue job can still be running aftercancel_delayed_work(), and since it requeues itself, this might not be enough to kill it completely.I don't think we need to synchronously cancel it when a connection is aborted. The
fuse_check_timeout()workqueue job can be simultaneously running whencancel_delayed_work()is called and can requeue itself, but then on the next trigger of the job, it will check whether the connection was aborted (eg the if (!fc->connected)... return; lines infuse_check_timeout()) and will not requeue itself if the connection was aborted. This seemed like the simplest / cleanest approach to me.Quoted 9 lines
Quoted 3 lines
Is there a scenario where the next trigger of the job dereference struct
fuse_conn*fc which already got freed because say the FUSE server has terminated?This isn't possible because the struct
fuse_conn*fc gets freed only after the call to "cancel_delayed_work_sync(&fc->timeout.work);" that synchronously cancels the workqueue job. This happens in thefuse_conn_put()function.
Quoted 5 lines
cancel_delayed_work_sync()won't prevent the work from re-queuing itself if it's already running.
I think we need some flag like Sergey pointed out here
https://lore.kernel.org/linux-fsdevel/CAMHPp_S2ANAguT6fYfNcXjTZxU14nh2Zv=5=8dG8qUnD3F8e7A@mail.gmail.com/T/#m543550031f31a9210996ccf815d5bc2a4290f540
Maybe we don't requeue whenfc->countbecomes 0?
The connection will have been aborted when cancel_delayed_work_sync() is called (otherwise we will have a lot of memory crashes/leaks). If the fuse_check_timeout() workqueue job is running while cancel_delayed_work_sync() is called, there's the "if (!fc->connected) { ... return; }" path that returns and avoids requeueing.
Thanks,
Joanne
Quoted 6 lines
Thanks,
EtienneQuoted 4 lines
Thanks,
Joanne
Re: [PATCH v10 1/2] fuse: add kernel-enforced timeout option for requests
Quoted 76 lines · Joanne Koong
Quoted 67 lines · Etienne Martineau
Quoted 56 lines · Joanne Koong
Quoted 53 lines · Etienne Martineau
Quoted 51 lines · Joanne Koong
Quoted 31 lines · Jeff Layton
Quoted 29 lines · Joanne Koong
There are situations where fuse servers can become unresponsive or stuck, for example if the server is deadlocked. Currently, there's no good way to detect if a server is stuck and needs to be killed manually.
This commit adds an option for enforcing a timeout (in seconds) for requests where if the timeout elapses without the server responding to the request, the connection will be automatically aborted.
Please note that these timeouts are not 100% precise. For example, the request may take roughly an extra
FUSE_TIMEOUT_TIMER_FREQseconds beyond the requested timeout due to internal implementation, in order to mitigate overhead.Signed-off-by Joanne Koong <[email protected]>--- fs/fuse/dev.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/fuse/fuse_i.h | 22 +++++++++++++ fs/fuse/inode.c | 23 ++++++++++++++ 3 files changed, 128 insertions(+)fs/fuse/dev.c +0
-0static struct fuse_req *fuse_request_alloc (struct fuse_mount *fm,gfp_t flags)@@ -2308,6 +2388,9 @@ void fuse_abort_conn(struct fuse_conn *fc)spin_unlock (&fc->lock);Quoted 9 lines
fs/fuse/dev.c void fuse_abort_conn(struct fuse_conn *fc) · line 2393
Quoted 4 lines
fs/fuse/dev.c +3
-0end_requests (&to_end); + +if (fc->timeout.req_timeout) +cancel_delayed_work (&fc->timeout.work);As Sergey pointed out, this should be a
cancel_delayed_work_sync(). The workqueue job can still be running aftercancel_delayed_work(), and since it requeues itself, this might not be enough to kill it completely.I don't think we need to synchronously cancel it when a connection is aborted. The
fuse_check_timeout()workqueue job can be simultaneously running whencancel_delayed_work()is called and can requeue itself, but then on the next trigger of the job, it will check whether the connection was aborted (eg the if (!fc->connected)... return; lines infuse_check_timeout()) and will not requeue itself if the connection was aborted. This seemed like the simplest / cleanest approach to me.Quoted 9 lines
Quoted 3 lines
Is there a scenario where the next trigger of the job dereference struct
fuse_conn*fc which already got freed because say the FUSE server has terminated?This isn't possible because the struct
fuse_conn*fc gets freed only after the call to "cancel_delayed_work_sync(&fc->timeout.work);" that synchronously cancels the workqueue job. This happens in thefuse_conn_put()function.Quoted 5 lines
cancel_delayed_work_sync()won't prevent the work from re-queuing itself if it's already running.
I think we need some flag like Sergey pointed out here
https://lore.kernel.org/linux-fsdevel/CAMHPp_S2ANAguT6fYfNcXjTZxU14nh2Zv=5=8dG8qUnD3F8e7A@mail.gmail.com/T/#m543550031f31a9210996ccf815d5bc2a4290f540
Maybe we don't requeue whenfc->countbecomes 0?
Quoted 6 lines
The connection will have been aborted when
cancel_delayed_work_sync()is called (otherwise we will have a lot of memory crashes/leaks). If thefuse_check_timeout()workqueue job is running whilecancel_delayed_work_sync()is called, there's the "if (!fc->connected) { ... return; }" path that returns and avoids requeueing.
I ran some tests and from what I see, calling cancel_delayed_work_sync() on a workqueue that is currently running and re-queueing itself is enough to kill it completely. For that reason I believe we don't even need the cancel_delayed_work() in fuse_abort_conn() because everything is taken care of by fuse_conn_put();
thanks,
Etienne
Quoted 3 lines
Thanks,
Joanne
Re: [PATCH v10 1/2] fuse: add kernel-enforced timeout option for requests
Quoted 84 lines · Etienne Martineau
Quoted 76 lines · Joanne Koong
Quoted 67 lines · Etienne Martineau
Quoted 56 lines · Joanne Koong
Quoted 53 lines · Etienne Martineau
Quoted 51 lines · Joanne Koong
Quoted 31 lines · Jeff Layton
Quoted 29 lines · Joanne Koong
There are situations where fuse servers can become unresponsive or stuck, for example if the server is deadlocked. Currently, there's no good way to detect if a server is stuck and needs to be killed manually.
This commit adds an option for enforcing a timeout (in seconds) for requests where if the timeout elapses without the server responding to the request, the connection will be automatically aborted.
Please note that these timeouts are not 100% precise. For example, the request may take roughly an extra
FUSE_TIMEOUT_TIMER_FREQseconds beyond the requested timeout due to internal implementation, in order to mitigate overhead.Signed-off-by Joanne Koong <[email protected]>--- fs/fuse/dev.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/fuse/fuse_i.h | 22 +++++++++++++ fs/fuse/inode.c | 23 ++++++++++++++ 3 files changed, 128 insertions(+)fs/fuse/dev.c +0
-0static struct fuse_req *fuse_request_alloc (struct fuse_mount *fm,gfp_t flags)@@ -2308,6 +2388,9 @@ void fuse_abort_conn(struct fuse_conn *fc)spin_unlock (&fc->lock);Quoted 9 lines
fs/fuse/dev.c void fuse_abort_conn(struct fuse_conn *fc) · line 2393
Quoted 4 lines
fs/fuse/dev.c +3
-0end_requests (&to_end); + +if (fc->timeout.req_timeout) +cancel_delayed_work (&fc->timeout.work);As Sergey pointed out, this should be a
cancel_delayed_work_sync(). The workqueue job can still be running aftercancel_delayed_work(), and since it requeues itself, this might not be enough to kill it completely.I don't think we need to synchronously cancel it when a connection is aborted. The
fuse_check_timeout()workqueue job can be simultaneously running whencancel_delayed_work()is called and can requeue itself, but then on the next trigger of the job, it will check whether the connection was aborted (eg the if (!fc->connected)... return; lines infuse_check_timeout()) and will not requeue itself if the connection was aborted. This seemed like the simplest / cleanest approach to me.Quoted 9 lines
Quoted 3 lines
Is there a scenario where the next trigger of the job dereference struct
fuse_conn*fc which already got freed because say the FUSE server has terminated?This isn't possible because the struct
fuse_conn*fc gets freed only after the call to "cancel_delayed_work_sync(&fc->timeout.work);" that synchronously cancels the workqueue job. This happens in thefuse_conn_put()function.Quoted 5 lines
cancel_delayed_work_sync()won't prevent the work from re-queuing itself if it's already running.
I think we need some flag like Sergey pointed out here
https://lore.kernel.org/linux-fsdevel/CAMHPp_S2ANAguT6fYfNcXjTZxU14nh2Zv=5=8dG8qUnD3F8e7A@mail.gmail.com/T/#m543550031f31a9210996ccf815d5bc2a4290f540
Maybe we don't requeue whenfc->countbecomes 0?Quoted 6 lines
The connection will have been aborted when
cancel_delayed_work_sync()is called (otherwise we will have a lot of memory crashes/leaks). If thefuse_check_timeout()workqueue job is running whilecancel_delayed_work_sync()is called, there's the "if (!fc->connected) { ... return; }" path that returns and avoids requeueing.
Quoted 6 lines
I ran some tests and from what I see, calling
cancel_delayed_work_sync()on a workqueue that is currently running and re-queueing itself is enough to kill it completely. For that reason I believe we don't even need thecancel_delayed_work()infuse_abort_conn()because everything is taken care of byfuse_conn_put();
I think the cancel_delayed_work() in fuse_abort_conn() would still be good to have. There are some instances where the connection gets aborted but the connection doesn't get freed (eg user forgets to unmount the fuse filesystem or the unmount only happens a lot later). When the connection is aborted however, this will automatically cancel the workqueue job on the next run (on the next run, the job won't requeue itself if it sees that the connection was aborted) so we technically don't need the cancel_delayed_work() because of this, but imo it'd be good to minimize the number of workqueue jobs that get run and canceling it asap is preferable.
Thanks,
Joanne
Quoted 6 lines
thanks,
EtienneQuoted 3 lines
Thanks,
Joanne
Re: [PATCH v10 1/2] fuse: add kernel-enforced timeout option for requests
Quoted 94 lines · Joanne Koong
Quoted 84 lines · Etienne Martineau
Quoted 76 lines · Joanne Koong
Quoted 67 lines · Etienne Martineau
Quoted 56 lines · Joanne Koong
Quoted 53 lines · Etienne Martineau
Quoted 51 lines · Joanne Koong
Quoted 31 lines · Jeff Layton
Quoted 29 lines · Joanne Koong
There are situations where fuse servers can become unresponsive or stuck, for example if the server is deadlocked. Currently, there's no good way to detect if a server is stuck and needs to be killed manually.
This commit adds an option for enforcing a timeout (in seconds) for requests where if the timeout elapses without the server responding to the request, the connection will be automatically aborted.
Please note that these timeouts are not 100% precise. For example, the request may take roughly an extra
FUSE_TIMEOUT_TIMER_FREQseconds beyond the requested timeout due to internal implementation, in order to mitigate overhead.Signed-off-by Joanne Koong <[email protected]>--- fs/fuse/dev.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/fuse/fuse_i.h | 22 +++++++++++++ fs/fuse/inode.c | 23 ++++++++++++++ 3 files changed, 128 insertions(+)fs/fuse/dev.c +0
-0static struct fuse_req *fuse_request_alloc (struct fuse_mount *fm,gfp_t flags)@@ -2308,6 +2388,9 @@ void fuse_abort_conn(struct fuse_conn *fc)spin_unlock (&fc->lock);Quoted 9 lines
fs/fuse/dev.c void fuse_abort_conn(struct fuse_conn *fc) · line 2393
Quoted 4 lines
fs/fuse/dev.c +3
-0end_requests (&to_end); + +if (fc->timeout.req_timeout) +cancel_delayed_work (&fc->timeout.work);As Sergey pointed out, this should be a
cancel_delayed_work_sync(). The workqueue job can still be running aftercancel_delayed_work(), and since it requeues itself, this might not be enough to kill it completely.I don't think we need to synchronously cancel it when a connection is aborted. The
fuse_check_timeout()workqueue job can be simultaneously running whencancel_delayed_work()is called and can requeue itself, but then on the next trigger of the job, it will check whether the connection was aborted (eg the if (!fc->connected)... return; lines infuse_check_timeout()) and will not requeue itself if the connection was aborted. This seemed like the simplest / cleanest approach to me.Quoted 9 lines
Quoted 3 lines
Is there a scenario where the next trigger of the job dereference struct
fuse_conn*fc which already got freed because say the FUSE server has terminated?This isn't possible because the struct
fuse_conn*fc gets freed only after the call to "cancel_delayed_work_sync(&fc->timeout.work);" that synchronously cancels the workqueue job. This happens in thefuse_conn_put()function.Quoted 5 lines
cancel_delayed_work_sync()won't prevent the work from re-queuing itself if it's already running.
I think we need some flag like Sergey pointed out here
https://lore.kernel.org/linux-fsdevel/CAMHPp_S2ANAguT6fYfNcXjTZxU14nh2Zv=5=8dG8qUnD3F8e7A@mail.gmail.com/T/#m543550031f31a9210996ccf815d5bc2a4290f540
Maybe we don't requeue whenfc->countbecomes 0?Quoted 6 lines
The connection will have been aborted when
cancel_delayed_work_sync()is called (otherwise we will have a lot of memory crashes/leaks). If thefuse_check_timeout()workqueue job is running whilecancel_delayed_work_sync()is called, there's the "if (!fc->connected) { ... return; }" path that returns and avoids requeueing.Quoted 6 lines
I ran some tests and from what I see, calling
cancel_delayed_work_sync()on a workqueue that is currently running and re-queueing itself is enough to kill it completely. For that reason I believe we don't even need thecancel_delayed_work()infuse_abort_conn()because everything is taken care of byfuse_conn_put();
Quoted 11 lines
I think the
cancel_delayed_work()infuse_abort_conn()would still be good to have. There are some instances where the connection gets aborted but the connection doesn't get freed (eg user forgets to unmount the fuse filesystem or the unmount only happens a lot later). When the connection is aborted however, this will automatically cancel the workqueue job on the next run (on the next run, the job won't requeue itself if it sees that the connection was aborted) so we technically don't need thecancel_delayed_work()because of this, but imo it'd be good to minimize the number of workqueue jobs that get run and canceling it asap is preferable.
Ok, it makes sense.
Also in fuse_check_timeout() does it make sense to leverage fc->num_waiting to save some cycle in the function? Something like:
fs/fuse/dev.c +5 -0
@@ -97,6 +97,10 @@ void fuse_check_timeout(struct work_struct *work)spin_unlock (&fc->lock);return ; } +if (!fc->num_waiting){ +spin_unlock (&fc->lock); + goto out; + }list_for_each_entry (fud, &fc->devices, entry) { fpq = &fud->pq;spin_lock (&fpq->lock);
@@ -113,6 +117,7 @@ void fuse_check_timeout(struct work_struct *work) }spin_unlock (&fc->lock); +out:queue_delayed_work (system_wq, &fc->timeout.work,secs_to_jiffies (FUSE_TIMEOUT_TIMER_FREQ ));return ;
thanks
Etienne
Quoted 4 lines
Thanks,
Joanne
Re: [PATCH v10 1/2] fuse: add kernel-enforced timeout option for requests
Quoted 129 lines · Etienne Martineau
Quoted 94 lines · Joanne Koong
Quoted 84 lines · Etienne Martineau
Quoted 76 lines · Joanne Koong
Quoted 67 lines · Etienne Martineau
Quoted 56 lines · Joanne Koong
Quoted 53 lines · Etienne Martineau
Quoted 51 lines · Joanne Koong
Quoted 31 lines · Jeff Layton
Quoted 29 lines · Joanne Koong
There are situations where fuse servers can become unresponsive or stuck, for example if the server is deadlocked. Currently, there's no good way to detect if a server is stuck and needs to be killed manually.
This commit adds an option for enforcing a timeout (in seconds) for requests where if the timeout elapses without the server responding to the request, the connection will be automatically aborted.
Please note that these timeouts are not 100% precise. For example, the request may take roughly an extra
FUSE_TIMEOUT_TIMER_FREQseconds beyond the requested timeout due to internal implementation, in order to mitigate overhead.Signed-off-by Joanne Koong <[email protected]>--- fs/fuse/dev.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/fuse/fuse_i.h | 22 +++++++++++++ fs/fuse/inode.c | 23 ++++++++++++++ 3 files changed, 128 insertions(+)fs/fuse/dev.c +0
-0static struct fuse_req *fuse_request_alloc (struct fuse_mount *fm,gfp_t flags)@@ -2308,6 +2388,9 @@ void fuse_abort_conn(struct fuse_conn *fc)spin_unlock (&fc->lock);Quoted 9 lines
fs/fuse/dev.c void fuse_abort_conn(struct fuse_conn *fc) · line 2393
Quoted 4 lines
fs/fuse/dev.c +3
-0end_requests (&to_end); + +if (fc->timeout.req_timeout) +cancel_delayed_work (&fc->timeout.work);As Sergey pointed out, this should be a
cancel_delayed_work_sync(). The workqueue job can still be running aftercancel_delayed_work(), and since it requeues itself, this might not be enough to kill it completely.I don't think we need to synchronously cancel it when a connection is aborted. The
fuse_check_timeout()workqueue job can be simultaneously running whencancel_delayed_work()is called and can requeue itself, but then on the next trigger of the job, it will check whether the connection was aborted (eg the if (!fc->connected)... return; lines infuse_check_timeout()) and will not requeue itself if the connection was aborted. This seemed like the simplest / cleanest approach to me.Quoted 9 lines
Quoted 3 lines
Is there a scenario where the next trigger of the job dereference struct
fuse_conn*fc which already got freed because say the FUSE server has terminated?This isn't possible because the struct
fuse_conn*fc gets freed only after the call to "cancel_delayed_work_sync(&fc->timeout.work);" that synchronously cancels the workqueue job. This happens in thefuse_conn_put()function.Quoted 5 lines
cancel_delayed_work_sync()won't prevent the work from re-queuing itself if it's already running.
I think we need some flag like Sergey pointed out here
https://lore.kernel.org/linux-fsdevel/CAMHPp_S2ANAguT6fYfNcXjTZxU14nh2Zv=5=8dG8qUnD3F8e7A@mail.gmail.com/T/#m543550031f31a9210996ccf815d5bc2a4290f540
Maybe we don't requeue whenfc->countbecomes 0?Quoted 6 lines
The connection will have been aborted when
cancel_delayed_work_sync()is called (otherwise we will have a lot of memory crashes/leaks). If thefuse_check_timeout()workqueue job is running whilecancel_delayed_work_sync()is called, there's the "if (!fc->connected) { ... return; }" path that returns and avoids requeueing.Quoted 6 lines
I ran some tests and from what I see, calling
cancel_delayed_work_sync()on a workqueue that is currently running and re-queueing itself is enough to kill it completely. For that reason I believe we don't even need thecancel_delayed_work()infuse_abort_conn()because everything is taken care of byfuse_conn_put();Quoted 11 lines
I think the
cancel_delayed_work()infuse_abort_conn()would still be good to have. There are some instances where the connection gets aborted but the connection doesn't get freed (eg user forgets to unmount the fuse filesystem or the unmount only happens a lot later). When the connection is aborted however, this will automatically cancel the workqueue job on the next run (on the next run, the job won't requeue itself if it sees that the connection was aborted) so we technically don't need thecancel_delayed_work()because of this, but imo it'd be good to minimize the number of workqueue jobs that get run and canceling it asap is preferable.Ok, it makes sense.
Also infuse_check_timeout()does it make sense to leveragefc->num_waitingto save some cycle in the function? Something like:fs/fuse/dev.c +4
-0@@ -97,6 +97,10 @@ void fuse_check_timeout(struct work_struct *work)spin_unlock (&fc->lock);return ; } +if (!fc->num_waiting){ +spin_unlock (&fc->lock); + goto out; + }list_for_each_entry (fud, &fc->devices, entry) { fpq = &fud->pq;spin_lock (&fpq->lock);
fs/fuse/dev.c void fuse_check_timeout(struct work_struct *work) · line 123
Quoted 7 lines
fs/fuse/dev.c +1
-0@@ -113,6 +117,7 @@ void fuse_check_timeout(struct work_struct *work) }spin_unlock (&fc->lock); +out:queue_delayed_work (system_wq, &fc->timeout.work,secs_to_jiffies (FUSE_TIMEOUT_TIMER_FREQ ));return ;
I like this idea and it makes sense to me. I think "fc->num_waiting" needs to be atomically read though, which doesn't depend on holding the fc lock, so we could do this check at the top of the function before grabbing the fiq lock and checking any expirations. I'll incorporate this into v11.
Thanks,
Joanne
Quoted 7 lines
thanks
EtienneQuoted 4 lines
Thanks,
Joanne
Re: [PATCH v10 1/2] fuse: add kernel-enforced timeout option for requests
In reply to Etienne MartineauQuoted 62 lines · Etienne Martineau
Quoted 60 lines · Joanne Koong
Quoted 56 lines · Etienne Martineau
Quoted 43 lines · Joanne Koong
Quoted 31 lines · Jeff Layton
Quoted 29 lines · Joanne Koong
There are situations where fuse servers can become unresponsive or stuck, for example if the server is deadlocked. Currently, there's no good way to detect if a server is stuck and needs to be killed manually.
This commit adds an option for enforcing a timeout (in seconds) for requests where if the timeout elapses without the server responding to the request, the connection will be automatically aborted.
Please note that these timeouts are not 100% precise. For example, the request may take roughly an extra
FUSE_TIMEOUT_TIMER_FREQseconds beyond the requested timeout due to internal implementation, in order to mitigate overhead.Signed-off-by Joanne Koong <[email protected]>--- fs/fuse/dev.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/fuse/fuse_i.h | 22 +++++++++++++ fs/fuse/inode.c | 23 ++++++++++++++ 3 files changed, 128 insertions(+)fs/fuse/dev.c +0
-0static struct fuse_req *fuse_request_alloc (struct fuse_mount *fm,gfp_t flags)@@ -2308,6 +2388,9 @@ void fuse_abort_conn(struct fuse_conn *fc)spin_unlock (&fc->lock);Quoted 9 lines
fs/fuse/dev.c void fuse_abort_conn(struct fuse_conn *fc) · line 2393
Quoted 4 lines
fs/fuse/dev.c +3
-0end_requests (&to_end); + +if (fc->timeout.req_timeout) +cancel_delayed_work (&fc->timeout.work);As Sergey pointed out, this should be a
cancel_delayed_work_sync(). The workqueue job can still be running aftercancel_delayed_work(), and since it requeues itself, this might not be enough to kill it completely.Quoted 8 lines
I don't think we need to synchronously cancel it when a connection is aborted. The
fuse_check_timeout()workqueue job can be simultaneously running whencancel_delayed_work()is called and can requeue itself, but then on the next trigger of the job, it will check whether the connection was aborted (eg the if (!fc->connected)... return; lines infuse_check_timeout()) and will not requeue itself if the connection was aborted. This seemed like the simplest / cleanest approach to me.Is there a scenario where the next trigger of the job dereference struct
fuse_conn*fc which already got freed because say the FUSE server has terminated?
Quoted 7 lines
Quoted 5 lines
This isn't possible because the struct
fuse_conn*fc gets freed only after the call to "cancel_delayed_work_sync(&fc->timeout.work);" that synchronously cancels the workqueue job. This happens in thefuse_conn_put()function.
cancel_delayed_work_sync()won't prevent the work from re-queuing itself if it's already running.
Also btw, I think cancel_delayed_work_sync() does actually prevent the work from re-queuing itself if it's already running. The api comment (in kernel/workqueue.c) says:
* Cancel @work and wait for its execution to finish. This function can be used
* even if the work re-queues itself or migrates to another workqueue. On return
* from this function, @work is guaranteed to be not pending or executing on any
* CPU as long as there aren't racing enqueues.
Quoted 9 lines
I think we need some flag like Sergey pointed out here
https://lore.kernel.org/linux-fsdevel/CAMHPp_S2ANAguT6fYfNcXjTZxU14nh2Zv=5=8dG8qUnD3F8e7A@mail.gmail.com/T/#m543550031f31a9210996ccf815d5bc2a4290f540
Maybe we don't requeue whenfc->countbecomes 0? Thanks,
EtienneQuoted 4 lines
Thanks,
Joanne
Re: [PATCH v10 1/2] fuse: add kernel-enforced timeout option for requests
In reply to Joanne KoongQuoted 74 lines · Joanne Koong
There are situations where fuse servers can become unresponsive or stuck, for example if the server is deadlocked. Currently, there's no good way to detect if a server is stuck and needs to be killed manually.
This commit adds an option for enforcing a timeout (in seconds) for requests where if the timeout elapses without the server responding to the request, the connection will be automatically aborted.
Please note that these timeouts are not 100% precise. For example, the request may take roughly an extra
FUSE_TIMEOUT_TIMER_FREQseconds beyond the requested timeout due to internal implementation, in order to mitigate overhead.Signed-off-by Joanne Koong <[email protected]>--- fs/fuse/dev.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/fuse/fuse_i.h | 22 +++++++++++++ fs/fuse/inode.c | 23 ++++++++++++++ 3 files changed, 128 insertions(+)fs/fuse/dev.c +45
-0@@ -45,6 +45,85 @@ static struct fuse_dev *fuse_get_dev(struct file *file)return READ_ONCE (file->private_data); } +static bool request_expired (struct fuse_conn *fc,struct fuse_req *req) +{ +return time_is_before_jiffies (req->create_time + fc->timeout.req_timeout); +} + +/* +* Check if any requests aren't being completed by the time the request timeout +* elapses. To do so, we: +* - check the fiq pending list +* - check the bg queue +* - check the fpq io and processing lists +* +* To make this fast, we only check against the head request on each list since +* these are generally queued in order of creation time (eg newer requests get +* queued to the tail). We might miss a few edge cases (eg requests transitioning +* between lists, re-sent requests at the head of the pending list having a +* later creation time than other requests on that list, etc.) but that is fine +* since if the request never gets fulfilled, it will eventually be caught. +*/ +void fuse_check_timeout (struct work_struct *work) +{ +struct delayed_work *dwork =to_delayed_work (work); + struct fuse_conn *fc = container_of(dwork, struct fuse_conn, + timeout.work); +struct fuse_iqueue *fiq = &fc->iq; +struct fuse_req *req; +struct fuse_dev *fud; +struct fuse_pqueue *fpq; +bool expired = false; +int i; + +spin_lock (&fiq->lock); + req = list_first_entry_or_null(&fiq->pending, struct fuse_req, list); +if (req) + expired =request_expired (fc, req); +spin_unlock (&fiq->lock); +if (expired) + goto abort_conn; + +spin_lock (&fc->bg_lock); + req = list_first_entry_or_null(&fc->bg_queue, struct fuse_req, list); +if (req) + expired =request_expired (fc, req); +spin_unlock (&fc->bg_lock); +if (expired)
fs/fuse/dev.c static struct fuse_dev *fuse_get_dev(struct file *file) · line 102
Quoted 10 lines
fs/fuse/dev.c +10
-0+ goto abort_conn; + +spin_lock (&fc->lock); +if (!fc->connected) { +spin_unlock (&fc->lock); +return ; + } +list_for_each_entry (fud, &fc->devices, entry) { + fpq = &fud->pq; +spin_lock (&fpq->lock);
Can fuse_dev_release() run concurrently to this path here? If yes say fuse_dev_release() comes in first, grab the fpq->lock and splice the
fpq->processing[i] list into &to_end and release the fpq->lock which unblock this
path.
Then here we start checking req off the fpq->processing[i] list which is getting evicted on the other side by fuse_dev_release->end_requests(&to_end);
Maybe we need a cancel_delayed_work_sync() at the beginning of fuse_dev_release ?
Thanks
Etienne
Quoted 24 lines
fs/fuse/dev.c +24
-0+ req = list_first_entry_or_null(&fpq->io, struct fuse_req, list); +if (req &&request_expired (fc, req)) + goto fpq_abort; + +for (i =0 ; i <FUSE_PQ_HASH_SIZE ; i++) { + req = list_first_entry_or_null(&fpq->processing[i], struct fuse_req, list); +if (req &&request_expired (fc, req)) + goto fpq_abort; + } +spin_unlock (&fpq->lock); + } +spin_unlock (&fc->lock); + +queue_delayed_work (system_wq, &fc->timeout.work, +secs_to_jiffies (FUSE_TIMEOUT_TIMER_FREQ )); +return ; + +fpq_abort: +spin_unlock (&fpq->lock); +spin_unlock (&fc->lock); +abort_conn: +fuse_abort_conn (fc); +} +
Re: [PATCH v10 1/2] fuse: add kernel-enforced timeout option for requests
Quoted 94 lines · Etienne Martineau
Quoted 74 lines · Joanne Koong
There are situations where fuse servers can become unresponsive or stuck, for example if the server is deadlocked. Currently, there's no good way to detect if a server is stuck and needs to be killed manually.
This commit adds an option for enforcing a timeout (in seconds) for requests where if the timeout elapses without the server responding to the request, the connection will be automatically aborted.
Please note that these timeouts are not 100% precise. For example, the request may take roughly an extra
FUSE_TIMEOUT_TIMER_FREQseconds beyond the requested timeout due to internal implementation, in order to mitigate overhead.Signed-off-by Joanne Koong <[email protected]>--- fs/fuse/dev.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/fuse/fuse_i.h | 22 +++++++++++++ fs/fuse/inode.c | 23 ++++++++++++++ 3 files changed, 128 insertions(+)fs/fuse/dev.c +45
-0@@ -45,6 +45,85 @@ static struct fuse_dev *fuse_get_dev(struct file *file)return READ_ONCE (file->private_data); } +static bool request_expired (struct fuse_conn *fc,struct fuse_req *req) +{ +return time_is_before_jiffies (req->create_time + fc->timeout.req_timeout); +} + +/* +* Check if any requests aren't being completed by the time the request timeout +* elapses. To do so, we: +* - check the fiq pending list +* - check the bg queue +* - check the fpq io and processing lists +* +* To make this fast, we only check against the head request on each list since +* these are generally queued in order of creation time (eg newer requests get +* queued to the tail). We might miss a few edge cases (eg requests transitioning +* between lists, re-sent requests at the head of the pending list having a +* later creation time than other requests on that list, etc.) but that is fine +* since if the request never gets fulfilled, it will eventually be caught. +*/ +void fuse_check_timeout (struct work_struct *work) +{ +struct delayed_work *dwork =to_delayed_work (work); + struct fuse_conn *fc = container_of(dwork, struct fuse_conn, + timeout.work); +struct fuse_iqueue *fiq = &fc->iq; +struct fuse_req *req; +struct fuse_dev *fud; +struct fuse_pqueue *fpq; +bool expired = false; +int i; + +spin_lock (&fiq->lock); + req = list_first_entry_or_null(&fiq->pending, struct fuse_req, list); +if (req) + expired =request_expired (fc, req); +spin_unlock (&fiq->lock); +if (expired) + goto abort_conn; + +spin_lock (&fc->bg_lock); + req = list_first_entry_or_null(&fc->bg_queue, struct fuse_req, list); +if (req) + expired =request_expired (fc, req); +spin_unlock (&fc->bg_lock); +if (expired)fs/fuse/dev.c static struct fuse_dev *fuse_get_dev(struct file *file) · line 102
Quoted 10 lines
fs/fuse/dev.c +10
-0+ goto abort_conn; + +spin_lock (&fc->lock); +if (!fc->connected) { +spin_unlock (&fc->lock); +return ; + } +list_for_each_entry (fud, &fc->devices, entry) { + fpq = &fud->pq; +spin_lock (&fpq->lock);Can
fuse_dev_release()run concurrently to this path here? If yes sayfuse_dev_release()comes in first, grab thefpq->lockand splice the
fpq->processing[i] list into&to_endand release thefpq->lockwhich unblock this
path.
Quoted 5 lines
Then here we start checking req off the fpq->processing[i] list which is getting evicted on the other side by
fuse_dev_release->end_requests(&to_end);Maybe we need a
cancel_delayed_work_sync()at the beginning offuse_dev_release?
Yes, fuse_dev_release() can run concurrently to this path here. If fuse_dev_release() comes in first, grabs the fpq->lock and splices the fpq->processing[i] lists into &to_end, then releases the fpq->lock, and then this fuse_check_timeout() grabs the fpq->lock, it'll see no requests on the fpq->processing[i] lists. When the requests are spliced onto the to_end list in fuse_dev_release(), they are removed from the &fpq->processing[i] list.
For that reason I don't think we need a cancel_delayed_work_sync() at the beginning of fuse_dev_release(), but also a connection can have multiple devs associated with it and the workqueue job is per-connection and not per-device.
Thanks,
Joanne
Quoted 27 lines
Thanks
EtienneQuoted 24 lines
fs/fuse/dev.c +24
-0+ req = list_first_entry_or_null(&fpq->io, struct fuse_req, list); +if (req &&request_expired (fc, req)) + goto fpq_abort; + +for (i =0 ; i <FUSE_PQ_HASH_SIZE ; i++) { + req = list_first_entry_or_null(&fpq->processing[i], struct fuse_req, list); +if (req &&request_expired (fc, req)) + goto fpq_abort; + } +spin_unlock (&fpq->lock); + } +spin_unlock (&fc->lock); + +queue_delayed_work (system_wq, &fc->timeout.work, +secs_to_jiffies (FUSE_TIMEOUT_TIMER_FREQ )); +return ; + +fpq_abort: +spin_unlock (&fpq->lock); +spin_unlock (&fc->lock); +abort_conn: +fuse_abort_conn (fc); +} +
Re: [PATCH v10 1/2] fuse: add kernel-enforced timeout option for requests
Quoted 103 lines · Joanne Koong
Quoted 94 lines · Etienne Martineau
Quoted 74 lines · Joanne Koong
There are situations where fuse servers can become unresponsive or stuck, for example if the server is deadlocked. Currently, there's no good way to detect if a server is stuck and needs to be killed manually.
This commit adds an option for enforcing a timeout (in seconds) for requests where if the timeout elapses without the server responding to the request, the connection will be automatically aborted.
Please note that these timeouts are not 100% precise. For example, the request may take roughly an extra
FUSE_TIMEOUT_TIMER_FREQseconds beyond the requested timeout due to internal implementation, in order to mitigate overhead.Signed-off-by Joanne Koong <[email protected]>--- fs/fuse/dev.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/fuse/fuse_i.h | 22 +++++++++++++ fs/fuse/inode.c | 23 ++++++++++++++ 3 files changed, 128 insertions(+)fs/fuse/dev.c +45
-0@@ -45,6 +45,85 @@ static struct fuse_dev *fuse_get_dev(struct file *file)return READ_ONCE (file->private_data); } +static bool request_expired (struct fuse_conn *fc,struct fuse_req *req) +{ +return time_is_before_jiffies (req->create_time + fc->timeout.req_timeout); +} + +/* +* Check if any requests aren't being completed by the time the request timeout +* elapses. To do so, we: +* - check the fiq pending list +* - check the bg queue +* - check the fpq io and processing lists +* +* To make this fast, we only check against the head request on each list since +* these are generally queued in order of creation time (eg newer requests get +* queued to the tail). We might miss a few edge cases (eg requests transitioning +* between lists, re-sent requests at the head of the pending list having a +* later creation time than other requests on that list, etc.) but that is fine +* since if the request never gets fulfilled, it will eventually be caught. +*/ +void fuse_check_timeout (struct work_struct *work) +{ +struct delayed_work *dwork =to_delayed_work (work); + struct fuse_conn *fc = container_of(dwork, struct fuse_conn, + timeout.work); +struct fuse_iqueue *fiq = &fc->iq; +struct fuse_req *req; +struct fuse_dev *fud; +struct fuse_pqueue *fpq; +bool expired = false; +int i; + +spin_lock (&fiq->lock); + req = list_first_entry_or_null(&fiq->pending, struct fuse_req, list); +if (req) + expired =request_expired (fc, req); +spin_unlock (&fiq->lock); +if (expired) + goto abort_conn; + +spin_lock (&fc->bg_lock); + req = list_first_entry_or_null(&fc->bg_queue, struct fuse_req, list); +if (req) + expired =request_expired (fc, req); +spin_unlock (&fc->bg_lock); +if (expired)fs/fuse/dev.c static struct fuse_dev *fuse_get_dev(struct file *file) · line 102
Quoted 10 lines
fs/fuse/dev.c +10
-0+ goto abort_conn; + +spin_lock (&fc->lock); +if (!fc->connected) { +spin_unlock (&fc->lock); +return ; + } +list_for_each_entry (fud, &fc->devices, entry) { + fpq = &fud->pq; +spin_lock (&fpq->lock);Can
fuse_dev_release()run concurrently to this path here? If yes sayfuse_dev_release()comes in first, grab thefpq->lockand splice the
fpq->processing[i] list into&to_endand release thefpq->lockwhich unblock this
path.Quoted 5 lines
Then here we start checking req off the fpq->processing[i] list which is getting evicted on the other side by
fuse_dev_release->end_requests(&to_end);Maybe we need a
cancel_delayed_work_sync()at the beginning offuse_dev_release?
Quoted 7 lines
Yes,
fuse_dev_release()can run concurrently to this path here. Iffuse_dev_release()comes in first, grabs thefpq->lockand splices the fpq->processing[i] lists into&to_end, then releases thefpq->lock, and then thisfuse_check_timeout()grabs thefpq->lock, it'll see no requests on the fpq->processing[i] lists. When the requests are spliced onto theto_endlist infuse_dev_release(), they are removed from the &fpq->processing[i] list.
Yes, good point about list splice. After all, I realized that the same locking sequence is present in fuse_abort_conn() which is proven to work. ( otherwise we would have heard about race issues coming from fuse_dev_release() against concurrent fuse_conn_abort_write() )
Quoted 4 lines
For that reason I don't think we need a
cancel_delayed_work_sync()at the beginning offuse_dev_release(), but also a connection can have multiple devs associated with it and the workqueue job is per-connection and not per-device.
Ok got it.
Thanks,
Etienne
Quoted 32 lines
Thanks,
JoanneQuoted 27 lines
Thanks
EtienneQuoted 24 lines
fs/fuse/dev.c +24
-0+ req = list_first_entry_or_null(&fpq->io, struct fuse_req, list); +if (req &&request_expired (fc, req)) + goto fpq_abort; + +for (i =0 ; i <FUSE_PQ_HASH_SIZE ; i++) { + req = list_first_entry_or_null(&fpq->processing[i], struct fuse_req, list); +if (req &&request_expired (fc, req)) + goto fpq_abort; + } +spin_unlock (&fpq->lock); + } +spin_unlock (&fc->lock); + +queue_delayed_work (system_wq, &fc->timeout.work, +secs_to_jiffies (FUSE_TIMEOUT_TIMER_FREQ )); +return ; + +fpq_abort: +spin_unlock (&fpq->lock); +spin_unlock (&fc->lock); +abort_conn: +fuse_abort_conn (fc); +} +
PATCH v10 2/2 fuse: add default_request_timeout and max_request_timeout sysctls
In reply to Joanne KoongIntroduce two new sysctls, "default_request_timeout" and "max_request_timeout". These control how long (in seconds) a server can take to reply to a request. If the server does not reply by the timeout, then the connection will be aborted. The upper bound on these sysctl values is U32_MAX.
"default_request_timeout" sets the default timeout if no timeout is specified by the fuse server on mount. 0 (default) indicates no default timeout should be enforced. If the server did specify a timeout, then default_request_timeout will be ignored.
"max_request_timeout" sets the max amount of time the server may take to reply to a request. 0 (default) indicates no maximum timeout. If max_request_timeout is set and the fuse server attempts to set a timeout greater than max_request_timeout, the system will use max_request_timeout as the timeout. Similarly, if default_request_timeout is greater than max_request_timeout, the system will use max_request_timeout as the timeout. If the server does not request a timeout and default_request_timeout is set to 0 but max_request_timeout is set, then the timeout will be max_request_timeout.
Please note that these timeouts are not 100% precise. The request may take roughly an extra FUSE_TIMEOUT_TIMER_FREQ seconds beyond the set max timeout due to how it's internally implemented.
$ sysctl -a | grep fuse.default_request_timeout fs.fuse.default_request_timeout = 0
$ echo 4294967296 | sudo tee /proc/sys/fs/fuse/default_request_timeout tee: /proc/sys/fs/fuse/default_request_timeout: Invalid argument
$ echo 4294967295 | sudo tee /proc/sys/fs/fuse/default_request_timeout 4294967295
$ sysctl -a | grep fuse.default_request_timeout fs.fuse.default_request_timeout = 4294967295
$ echo 0 | sudo tee /proc/sys/fs/fuse/default_request_timeout 0
$ sysctl -a | grep fuse.default_request_timeout fs.fuse.default_request_timeout = 0
--- Documentation/admin-guide/sysctl/fs.rst | 25 +++++++++++++++++++++++++ fs/fuse/fuse_i.h | 10 ++++++++++ fs/fuse/inode.c | 16 ++++++++++++++-- fs/fuse/sysctl.c | 14 ++++++++++++++ 4 files changed, 63 insertions(+), 2 deletions(-)
Documentation/admin-guide/sysctl/fs.rst +25 -0
@@ -347,3 +347,28 @@ filesystems: ``/proc/sys/fs/fuse/max_pages_limit`` is a read/write file for setting/getting the maximum number of pages that can be used for servicing requests in FUSE. + +``/proc/sys/fs/fuse/default_request_timeout`` is a read/write file for +setting/getting the default timeout (in seconds) for a fuse server to +reply to a kernel-issued request in the event where the server did not +specify a timeout at mount. If the server set a timeout, +then default_request_timeout will be ignored. The default +"default_request_timeout" is set to 0. 0 indicates no default timeout. +The maximum value that can be set is U32_MAX. + +``/proc/sys/fs/fuse/max_request_timeout`` is a read/write file for +setting/getting the maximum timeout (in seconds) for a fuse server to +reply to a kernel-issued request. A value greater than 0 automatically opts +the server into a timeout that will be set to at most "max_request_timeout", +even if the server did not specify a timeout and default_request_timeout is +set to 0. If max_request_timeout is greater than 0 and the server set a timeout +greater than max_request_timeout or default_request_timeout is set to a value +greater than max_request_timeout, the system will use max_request_timeout as the +timeout. 0 indicates no max request timeout. The maximum value that can be set +is U32_MAX. + +For the timeouts, if the server does not respond to the request by the time +the set timeout elapses, then the connection to the fuse server will be aborted. +Please note that the timeouts are not 100% precise (eg you may set 60 seconds but +the timeout may kick in after 70 seconds). The upper margin of error for the +timeout is roughly FUSE_TIMEOUT_TIMER_FREQ seconds.
fs/fuse/fuse_i.h +10 -0
@@ -46,6 +46,16 @@/** Maximum of max_pages received in init_out */ extern unsigned int fuse_max_pages_limit; +/* +* Default timeout (in seconds) for the server to reply to a request +* before the connection is aborted, if no timeout was specified on mount. +*/ +extern unsigned int fuse_default_req_timeout; +/* +* Max timeout (in seconds) for the server to reply to a request before +* the connection is aborted. +*/ +extern unsigned int fuse_max_req_timeout;/** List of active connections */ extern struct list_head fuse_conn_list;
fs/fuse/inode.c +14 -2
@@ -36,6 +36,9 @@ DEFINE_MUTEX(fuse_mutex);static int set_global_limit (const char *val,const struct kernel_param *kp);unsigned int fuse_max_pages_limit =256 ; +/* default is no timeout */ +unsigned int fuse_default_req_timeout =0 ; +unsigned int fuse_max_req_timeout =0 ;unsigned max_user_bgreq; module_param_call(max_user_bgreq, set_global_limit, param_get_uint,
@@ -1733,8 +1736,17 @@ EXPORT_SYMBOL_GPL(fuse_init_fs_context_submount);static void fuse_init_fc_timeout (struct fuse_conn *fc,struct fuse_fs_context *ctx) { -if (ctx->req_timeout) { -if (check_mul_overflow (ctx->req_timeout,HZ , &fc->timeout.req_timeout)) +unsigned int timeout = ctx->req_timeout ?: fuse_default_req_timeout; + +if (fuse_max_req_timeout) { +if (!timeout) + timeout = fuse_max_req_timeout; +else + timeout =min (timeout, fuse_max_req_timeout); + } + +if (timeout) { +if (check_mul_overflow (timeout,HZ , &fc->timeout.req_timeout)) fc->timeout.req_timeout =ULONG_MAX ;INIT_DELAYED_WORK (&fc->timeout.work, fuse_check_timeout);
fs/fuse/sysctl.c +14 -0
@@ -23,6 +23,20 @@ static struct ctl_table fuse_sysctl_table[] = { .extra1 = SYSCTL_ONE, .extra2 = &sysctl_fuse_max_pages_limit, }, + { + .procname = "default_request_timeout", + .data = &fuse_default_req_timeout, + .maxlen = sizeof(fuse_default_req_timeout), + .mode = 0644, + .proc_handler = proc_douintvec, + }, + { + .procname = "max_request_timeout", + .data = &fuse_max_req_timeout, + .maxlen = sizeof(fuse_max_req_timeout), + .mode = 0644, + .proc_handler = proc_douintvec, + }, };int fuse_sysctl_register (void )
Signature · 1 line
2.43.5