| Message ID | 20240808190110.3188039-2-joannelkoong@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | fuse: add timeout option for requests | expand |
On Thu, Aug 08, 2024 at 12:01:09PM -0700, Joanne Koong wrote: > There are situations where fuse servers can become unresponsive or take > too long to reply to a request. Currently there is no upper bound on > how long a request may take, which may be frustrating to users who get > stuck waiting for a request to complete. > > This commit adds a timeout option (in seconds) for requests. If the > timeout elapses before the server replies to the request, the request > will fail with -ETIME. > > There are 3 possibilities for a request that times out: > a) The request times out before the request has been sent to userspace > b) The request times out after the request has been sent to userspace > and before it receives a reply from the server > c) The request times out after the request has been sent to userspace > and the server replies while the kernel is timing out the request > > While a request timeout is being handled, there may be other handlers > running at the same time if: > a) the kernel is forwarding the request to the server > b) the kernel is processing the server's reply to the request > c) the request is being re-sent > d) the connection is aborting > e) the device is getting released > > Proper synchronization must be added to ensure that the request is > handled correctly in all of these cases. To this effect, there is a new > FR_FINISHING bit added to the request flags, which is set atomically by > either the timeout handler (see fuse_request_timeout()) which is invoked > after the request timeout elapses or set by the request reply handler > (see dev_do_write()), whichever gets there first. If the reply handler > and the timeout handler are executing simultaneously and the reply handler > sets FR_FINISHING before the timeout handler, then the request will be > handled as if the timeout did not elapse. If the timeout handler sets > FR_FINISHING before the reply handler, then the request will fail with > -ETIME and the request will be cleaned up. > > Currently, this is the refcount lifecycle of a request: > > Synchronous request is created: > fuse_simple_request -> allocates request, sets refcount to 1 > __fuse_request_send -> acquires refcount > queues request and waits for reply... > fuse_simple_request -> drops refcount > > Background request is created: > fuse_simple_background -> allocates request, sets refcount to 1 > > Request is replied to: > fuse_dev_do_write > fuse_request_end -> drops refcount on request > > Proper acquires on the request reference must be added to ensure that the > timeout handler does not drop the last refcount on the request while > other handlers may be operating on the request. Please note that the > timeout handler may get invoked at any phase of the request's > lifetime (eg before the request has been forwarded to userspace, etc). > > It is always guaranteed that there is a refcount on the request when the > timeout handler is executing. The timeout handler will be either > deactivated by the reply/abort/release handlers, or if the timeout > handler is concurrently executing on another CPU, the reply/abort/release > handlers will wait for the timeout handler to finish executing first before > it drops the final refcount on the request. > > Signed-off-by: Joanne Koong <joannelkoong@gmail.com> > --- > fs/fuse/dev.c | 197 +++++++++++++++++++++++++++++++++++++++++++++-- > fs/fuse/fuse_i.h | 14 ++++ > fs/fuse/inode.c | 7 ++ > 3 files changed, 210 insertions(+), 8 deletions(-) > > diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c > index 9eb191b5c4de..bcb9ff2156c0 100644 > --- a/fs/fuse/dev.c > +++ b/fs/fuse/dev.c > @@ -31,6 +31,8 @@ MODULE_ALIAS("devname:fuse"); > > static struct kmem_cache *fuse_req_cachep; > > +static void fuse_request_timeout(struct timer_list *timer); > + > static struct fuse_dev *fuse_get_dev(struct file *file) > { > /* > @@ -48,6 +50,8 @@ 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; > + if (fm->fc->req_timeout) > + timer_setup(&req->timer, fuse_request_timeout, 0); > } > > static struct fuse_req *fuse_request_alloc(struct fuse_mount *fm, gfp_t flags) > @@ -277,7 +281,7 @@ static void flush_bg_queue(struct fuse_conn *fc) > * the 'end' callback is called if given, else the reference to the > * request is released > */ > -void fuse_request_end(struct fuse_req *req) > +static void do_fuse_request_end(struct fuse_req *req) > { > struct fuse_mount *fm = req->fm; > struct fuse_conn *fc = fm->fc; > @@ -296,8 +300,6 @@ void fuse_request_end(struct fuse_req *req) > list_del_init(&req->intr_entry); > spin_unlock(&fiq->lock); > } > - WARN_ON(test_bit(FR_PENDING, &req->flags)); > - WARN_ON(test_bit(FR_SENT, &req->flags)); > if (test_bit(FR_BACKGROUND, &req->flags)) { > spin_lock(&fc->bg_lock); > clear_bit(FR_BACKGROUND, &req->flags); > @@ -329,8 +331,104 @@ void fuse_request_end(struct fuse_req *req) > put_request: > fuse_put_request(req); > } > + > +void fuse_request_end(struct fuse_req *req) > +{ > + WARN_ON(test_bit(FR_PENDING, &req->flags)); > + WARN_ON(test_bit(FR_SENT, &req->flags)); > + > + if (req->timer.function) > + timer_delete_sync(&req->timer); This becomes just timer_delete_sync(); > + > + do_fuse_request_end(req); > +} > EXPORT_SYMBOL_GPL(fuse_request_end); > > +static void timeout_inflight_req(struct fuse_req *req) > +{ > + struct fuse_conn *fc = req->fm->fc; > + struct fuse_iqueue *fiq = &fc->iq; > + struct fuse_pqueue *fpq; > + > + spin_lock(&fiq->lock); > + fpq = req->fpq; > + spin_unlock(&fiq->lock); > + > + /* > + * If fpq has not been set yet, then the request is aborting (which > + * clears FR_PENDING flag) before dev_do_read (which sets req->fpq) > + * has been called. Let the abort handler handle this request. > + */ > + if (!fpq) > + return; > + > + spin_lock(&fpq->lock); > + if (!fpq->connected || req->out.h.error == -ECONNABORTED) { > + /* > + * Connection is being aborted or the fuse_dev is being released. > + * The abort / release will clean up the request > + */ > + spin_unlock(&fpq->lock); > + return; > + } > + > + if (!test_bit(FR_PRIVATE, &req->flags)) > + list_del_init(&req->list); > + > + spin_unlock(&fpq->lock); > + > + req->out.h.error = -ETIME; > + > + do_fuse_request_end(req); > +} > + > +static void timeout_pending_req(struct fuse_req *req) > +{ > + struct fuse_conn *fc = req->fm->fc; > + struct fuse_iqueue *fiq = &fc->iq; > + bool background = test_bit(FR_BACKGROUND, &req->flags); > + > + if (background) > + spin_lock(&fc->bg_lock); > + spin_lock(&fiq->lock); > + > + if (!test_bit(FR_PENDING, &req->flags)) { > + spin_unlock(&fiq->lock); > + if (background) > + spin_unlock(&fc->bg_lock); > + timeout_inflight_req(req); > + return; > + } > + > + if (!test_bit(FR_PRIVATE, &req->flags)) > + list_del_init(&req->list); > + > + spin_unlock(&fiq->lock); > + if (background) > + spin_unlock(&fc->bg_lock); > + > + req->out.h.error = -ETIME; > + > + do_fuse_request_end(req); > +} > + > +static void fuse_request_timeout(struct timer_list *timer) > +{ > + struct fuse_req *req = container_of(timer, struct fuse_req, timer); > + > + /* > + * Request reply is being finished by the kernel right now. > + * No need to time out the request. > + */ > + if (test_and_set_bit(FR_FINISHING, &req->flags)) > + return; > + > + if (test_bit(FR_PENDING, &req->flags)) > + timeout_pending_req(req); > + else > + timeout_inflight_req(req); > +} > + > static int queue_interrupt(struct fuse_req *req) > { > struct fuse_iqueue *fiq = &req->fm->fc->iq; > @@ -393,6 +491,11 @@ static void request_wait_answer(struct fuse_req *req) > if (test_bit(FR_PENDING, &req->flags)) { > list_del(&req->list); > spin_unlock(&fiq->lock); > + if (req->timer.function) { > + bool timed_out = !timer_delete_sync(&req->timer); > + if (timed_out) > + return; > + } This can just be if (!timer_delete_sync(&req->timer)) return; > __fuse_put_request(req); > req->out.h.error = -EINTR; > return; > @@ -409,7 +512,8 @@ static void request_wait_answer(struct fuse_req *req) > > static void __fuse_request_send(struct fuse_req *req) > { > - struct fuse_iqueue *fiq = &req->fm->fc->iq; > + struct fuse_conn *fc = req->fm->fc; > + struct fuse_iqueue *fiq = &fc->iq; > > BUG_ON(test_bit(FR_BACKGROUND, &req->flags)); > spin_lock(&fiq->lock); > @@ -421,6 +525,10 @@ static void __fuse_request_send(struct fuse_req *req) > /* acquire extra reference, since request is still needed > after fuse_request_end() */ > __fuse_get_request(req); > + if (req->timer.function) { > + req->timer.expires = jiffies + fc->req_timeout; > + add_timer(&req->timer); > + } This can just be if (req->timer.function) mod_timer(&req->timer, jiffies + fc->req_timeout); > queue_request_and_unlock(fiq, req); > > request_wait_answer(req); > @@ -539,6 +647,10 @@ static bool fuse_request_queue_background(struct fuse_req *req) > if (fc->num_background == fc->max_background) > fc->blocked = 1; > list_add_tail(&req->list, &fc->bg_queue); > + if (req->timer.function) { > + req->timer.expires = jiffies + fc->req_timeout; > + add_timer(&req->timer); > + } Same comment as above. > flush_bg_queue(fc); > queued = true; > } > @@ -594,6 +706,10 @@ static int fuse_simple_notify_reply(struct fuse_mount *fm, > > spin_lock(&fiq->lock); > if (fiq->connected) { > + if (req->timer.function) { > + req->timer.expires = jiffies + fm->fc->req_timeout; > + add_timer(&req->timer); > + } Here as well. > queue_request_and_unlock(fiq, req); > } else { > err = -ENODEV; > @@ -1268,8 +1384,26 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file, > req = list_entry(fiq->pending.next, struct fuse_req, list); > clear_bit(FR_PENDING, &req->flags); > list_del_init(&req->list); > + /* Acquire a reference in case the timeout handler starts executing */ > + __fuse_get_request(req); > + req->fpq = fpq; > spin_unlock(&fiq->lock); > > + if (req->timer.function) { > + /* > + * Temporarily disable the timer on the request to avoid race > + * conditions between this code and the timeout handler. > + * > + * The timer is readded at the end of this function. > + */ > + bool timed_out = !timer_delete_sync(&req->timer); > + if (timed_out) { This can also just be if (!timer_delete_sync(&req->timer)); > + WARN_ON(!test_bit(FR_FINISHED, &req->flags)); > + fuse_put_request(req); > + goto restart; > + } > + } > + > args = req->args; > reqsize = req->in.h.len; > > @@ -1280,6 +1414,7 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file, > if (args->opcode == FUSE_SETXATTR) > req->out.h.error = -E2BIG; > fuse_request_end(req); > + fuse_put_request(req); > goto restart; > } > spin_lock(&fpq->lock); > @@ -1316,13 +1451,18 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file, > } > hash = fuse_req_hash(req->in.h.unique); > list_move_tail(&req->list, &fpq->processing[hash]); > - __fuse_get_request(req); > set_bit(FR_SENT, &req->flags); > + > + /* re-arm the original timer */ > + if (req->timer.function) > + add_timer(&req->timer); This will not change anything if the timer was already armed, do you want mod_timer_pending() here? Or maybe just mod_timer()? Thanks, Josef
On 8/9/24 3:01 AM, Joanne Koong wrote: > There are situations where fuse servers can become unresponsive or take > too long to reply to a request. Currently there is no upper bound on > how long a request may take, which may be frustrating to users who get > stuck waiting for a request to complete. > > This commit adds a timeout option (in seconds) for requests. If the > timeout elapses before the server replies to the request, the request > will fail with -ETIME. > > There are 3 possibilities for a request that times out: > a) The request times out before the request has been sent to userspace > b) The request times out after the request has been sent to userspace > and before it receives a reply from the server > c) The request times out after the request has been sent to userspace > and the server replies while the kernel is timing out the request > > While a request timeout is being handled, there may be other handlers > running at the same time if: > a) the kernel is forwarding the request to the server > b) the kernel is processing the server's reply to the request > c) the request is being re-sent > d) the connection is aborting > e) the device is getting released > > Proper synchronization must be added to ensure that the request is > handled correctly in all of these cases. To this effect, there is a new > FR_FINISHING bit added to the request flags, which is set atomically by > either the timeout handler (see fuse_request_timeout()) which is invoked > after the request timeout elapses or set by the request reply handler > (see dev_do_write()), whichever gets there first. If the reply handler > and the timeout handler are executing simultaneously and the reply handler > sets FR_FINISHING before the timeout handler, then the request will be > handled as if the timeout did not elapse. If the timeout handler sets > FR_FINISHING before the reply handler, then the request will fail with > -ETIME and the request will be cleaned up. > > Currently, this is the refcount lifecycle of a request: > > Synchronous request is created: > fuse_simple_request -> allocates request, sets refcount to 1 > __fuse_request_send -> acquires refcount > queues request and waits for reply... > fuse_simple_request -> drops refcount > > Background request is created: > fuse_simple_background -> allocates request, sets refcount to 1 > > Request is replied to: > fuse_dev_do_write > fuse_request_end -> drops refcount on request > > Proper acquires on the request reference must be added to ensure that the > timeout handler does not drop the last refcount on the request while > other handlers may be operating on the request. Please note that the > timeout handler may get invoked at any phase of the request's > lifetime (eg before the request has been forwarded to userspace, etc). > > It is always guaranteed that there is a refcount on the request when the > timeout handler is executing. The timeout handler will be either > deactivated by the reply/abort/release handlers, or if the timeout > handler is concurrently executing on another CPU, the reply/abort/release > handlers will wait for the timeout handler to finish executing first before > it drops the final refcount on the request. > > Signed-off-by: Joanne Koong <joannelkoong@gmail.com> > --- > fs/fuse/dev.c | 197 +++++++++++++++++++++++++++++++++++++++++++++-- > fs/fuse/fuse_i.h | 14 ++++ > fs/fuse/inode.c | 7 ++ > 3 files changed, 210 insertions(+), 8 deletions(-) > > diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c > index 9eb191b5c4de..bcb9ff2156c0 100644 > --- a/fs/fuse/dev.c > +++ b/fs/fuse/dev.c > @@ -31,6 +31,8 @@ MODULE_ALIAS("devname:fuse"); > > static struct kmem_cache *fuse_req_cachep; > > +static void fuse_request_timeout(struct timer_list *timer); > + > static struct fuse_dev *fuse_get_dev(struct file *file) > { > /* > @@ -48,6 +50,8 @@ 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; > + if (fm->fc->req_timeout) > + timer_setup(&req->timer, fuse_request_timeout, 0); > } > > static struct fuse_req *fuse_request_alloc(struct fuse_mount *fm, gfp_t flags) > @@ -277,7 +281,7 @@ static void flush_bg_queue(struct fuse_conn *fc) > * the 'end' callback is called if given, else the reference to the > * request is released > */ > -void fuse_request_end(struct fuse_req *req) > +static void do_fuse_request_end(struct fuse_req *req) > { > struct fuse_mount *fm = req->fm; > struct fuse_conn *fc = fm->fc; > @@ -296,8 +300,6 @@ void fuse_request_end(struct fuse_req *req) > list_del_init(&req->intr_entry); > spin_unlock(&fiq->lock); > } > - WARN_ON(test_bit(FR_PENDING, &req->flags)); > - WARN_ON(test_bit(FR_SENT, &req->flags)); > if (test_bit(FR_BACKGROUND, &req->flags)) { > spin_lock(&fc->bg_lock); > clear_bit(FR_BACKGROUND, &req->flags); > @@ -329,8 +331,104 @@ void fuse_request_end(struct fuse_req *req) > put_request: > fuse_put_request(req); > } > + > +void fuse_request_end(struct fuse_req *req) > +{ > + WARN_ON(test_bit(FR_PENDING, &req->flags)); > + WARN_ON(test_bit(FR_SENT, &req->flags)); > + > + if (req->timer.function) > + timer_delete_sync(&req->timer); > + > + do_fuse_request_end(req); > +} > EXPORT_SYMBOL_GPL(fuse_request_end); > > +static void timeout_inflight_req(struct fuse_req *req) > +{ > + struct fuse_conn *fc = req->fm->fc; > + struct fuse_iqueue *fiq = &fc->iq; > + struct fuse_pqueue *fpq; > + > + spin_lock(&fiq->lock); > + fpq = req->fpq; > + spin_unlock(&fiq->lock); > + > + /* > + * If fpq has not been set yet, then the request is aborting (which > + * clears FR_PENDING flag) before dev_do_read (which sets req->fpq) > + * has been called. Let the abort handler handle this request. > + */ > + if (!fpq) > + return; > + > + spin_lock(&fpq->lock); > + if (!fpq->connected || req->out.h.error == -ECONNABORTED) { > + /* > + * Connection is being aborted or the fuse_dev is being released. > + * The abort / release will clean up the request > + */ > + spin_unlock(&fpq->lock); > + return; > + } > + > + if (!test_bit(FR_PRIVATE, &req->flags)) > + list_del_init(&req->list); > + > + spin_unlock(&fpq->lock); > + > + req->out.h.error = -ETIME; > + > + do_fuse_request_end(req); > +} > + > +static void timeout_pending_req(struct fuse_req *req) > +{ > + struct fuse_conn *fc = req->fm->fc; > + struct fuse_iqueue *fiq = &fc->iq; > + bool background = test_bit(FR_BACKGROUND, &req->flags); > + > + if (background) > + spin_lock(&fc->bg_lock); > + spin_lock(&fiq->lock); > + > + if (!test_bit(FR_PENDING, &req->flags)) { > + spin_unlock(&fiq->lock); > + if (background) > + spin_unlock(&fc->bg_lock); > + timeout_inflight_req(req); > + return; > + } > + > + if (!test_bit(FR_PRIVATE, &req->flags)) > + list_del_init(&req->list); > + > + spin_unlock(&fiq->lock); > + if (background) > + spin_unlock(&fc->bg_lock); > + > + req->out.h.error = -ETIME; > + > + do_fuse_request_end(req); > +} > + > +static void fuse_request_timeout(struct timer_list *timer) > +{ > + struct fuse_req *req = container_of(timer, struct fuse_req, timer); > + > + /* > + * Request reply is being finished by the kernel right now. > + * No need to time out the request. > + */ > + if (test_and_set_bit(FR_FINISHING, &req->flags)) > + return; > + > + if (test_bit(FR_PENDING, &req->flags)) > + timeout_pending_req(req); > + else > + timeout_inflight_req(req); > +} > + > static int queue_interrupt(struct fuse_req *req) > { > struct fuse_iqueue *fiq = &req->fm->fc->iq; > @@ -393,6 +491,11 @@ static void request_wait_answer(struct fuse_req *req) > if (test_bit(FR_PENDING, &req->flags)) { > list_del(&req->list); > spin_unlock(&fiq->lock); > + if (req->timer.function) { > + bool timed_out = !timer_delete_sync(&req->timer); > + if (timed_out) > + return; > + } > __fuse_put_request(req); > req->out.h.error = -EINTR; > return; > @@ -409,7 +512,8 @@ static void request_wait_answer(struct fuse_req *req) > > static void __fuse_request_send(struct fuse_req *req) > { > - struct fuse_iqueue *fiq = &req->fm->fc->iq; > + struct fuse_conn *fc = req->fm->fc; > + struct fuse_iqueue *fiq = &fc->iq; > > BUG_ON(test_bit(FR_BACKGROUND, &req->flags)); > spin_lock(&fiq->lock); > @@ -421,6 +525,10 @@ static void __fuse_request_send(struct fuse_req *req) > /* acquire extra reference, since request is still needed > after fuse_request_end() */ > __fuse_get_request(req); > + if (req->timer.function) { > + req->timer.expires = jiffies + fc->req_timeout; > + add_timer(&req->timer); > + } > queue_request_and_unlock(fiq, req); > > request_wait_answer(req); > @@ -539,6 +647,10 @@ static bool fuse_request_queue_background(struct fuse_req *req) > if (fc->num_background == fc->max_background) > fc->blocked = 1; > list_add_tail(&req->list, &fc->bg_queue); > + if (req->timer.function) { > + req->timer.expires = jiffies + fc->req_timeout; > + add_timer(&req->timer); > + } > flush_bg_queue(fc); > queued = true; > } > @@ -594,6 +706,10 @@ static int fuse_simple_notify_reply(struct fuse_mount *fm, > > spin_lock(&fiq->lock); > if (fiq->connected) { > + if (req->timer.function) { > + req->timer.expires = jiffies + fm->fc->req_timeout; > + add_timer(&req->timer); > + } > queue_request_and_unlock(fiq, req); > } else { > err = -ENODEV; > @@ -1268,8 +1384,26 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file, > req = list_entry(fiq->pending.next, struct fuse_req, list); > clear_bit(FR_PENDING, &req->flags); > list_del_init(&req->list); > + /* Acquire a reference in case the timeout handler starts executing */ > + __fuse_get_request(req); > + req->fpq = fpq; > spin_unlock(&fiq->lock); > > + if (req->timer.function) { > + /* > + * Temporarily disable the timer on the request to avoid race > + * conditions between this code and the timeout handler. > + * > + * The timer is readded at the end of this function. > + */ > + bool timed_out = !timer_delete_sync(&req->timer); > + if (timed_out) { > + WARN_ON(!test_bit(FR_FINISHED, &req->flags)); Is there any possibility that FR_FINISHED bit has not been set for the request when the timeout handler finishes, e.g. for the following sequence? ``` # read # timer handler #aborting fuse_dev_do_read spin_lock(&fiq->lock) # remove req from # pending list spin_unlock(&fiq->lock) fuse_abort_conn spin_lock(fpq->lock) fpq->connected = 0 spin_unlock(fpq->lock) fuse_request_timeout # disarm the timer # wait for # timer handler timeout_inflight_req spin_lock(&fpq->lock) if !fpq->connected: spin_unlock(&fpq->lock) return WARN(no FR_FINISHED)! end_requests set FR_FINISHED bit ``` > + fuse_put_request(req); > + goto restart; > + } > + } > + > args = req->args; > reqsize = req->in.h.len; > > @@ -1280,6 +1414,7 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file, > if (args->opcode == FUSE_SETXATTR) > req->out.h.error = -E2BIG; > fuse_request_end(req); > + fuse_put_request(req); > goto restart; > } > spin_lock(&fpq->lock); > @@ -1316,13 +1451,18 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file, > } > hash = fuse_req_hash(req->in.h.unique); > list_move_tail(&req->list, &fpq->processing[hash]); > - __fuse_get_request(req); > set_bit(FR_SENT, &req->flags); > + > + /* re-arm the original timer */ > + if (req->timer.function) > + add_timer(&req->timer); > + > spin_unlock(&fpq->lock); > /* matches barrier in request_wait_answer() */ > smp_mb__after_atomic(); > if (test_bit(FR_INTERRUPTED, &req->flags)) > queue_interrupt(req); > + A nonsense newline diff?
On Thu, Aug 08, 2024 at 04:50:06PM -0400, Josef Bacik wrote: > On Thu, Aug 08, 2024 at 12:01:09PM -0700, Joanne Koong wrote: > > There are situations where fuse servers can become unresponsive or take > > too long to reply to a request. Currently there is no upper bound on > > how long a request may take, which may be frustrating to users who get > > stuck waiting for a request to complete. > > > > This commit adds a timeout option (in seconds) for requests. If the > > timeout elapses before the server replies to the request, the request > > will fail with -ETIME. > > > > There are 3 possibilities for a request that times out: > > a) The request times out before the request has been sent to userspace > > b) The request times out after the request has been sent to userspace > > and before it receives a reply from the server > > c) The request times out after the request has been sent to userspace > > and the server replies while the kernel is timing out the request > > > > While a request timeout is being handled, there may be other handlers > > running at the same time if: > > a) the kernel is forwarding the request to the server > > b) the kernel is processing the server's reply to the request > > c) the request is being re-sent > > d) the connection is aborting > > e) the device is getting released > > > > Proper synchronization must be added to ensure that the request is > > handled correctly in all of these cases. To this effect, there is a new > > FR_FINISHING bit added to the request flags, which is set atomically by > > either the timeout handler (see fuse_request_timeout()) which is invoked > > after the request timeout elapses or set by the request reply handler > > (see dev_do_write()), whichever gets there first. If the reply handler > > and the timeout handler are executing simultaneously and the reply handler > > sets FR_FINISHING before the timeout handler, then the request will be > > handled as if the timeout did not elapse. If the timeout handler sets > > FR_FINISHING before the reply handler, then the request will fail with > > -ETIME and the request will be cleaned up. > > > > Currently, this is the refcount lifecycle of a request: > > > > Synchronous request is created: > > fuse_simple_request -> allocates request, sets refcount to 1 > > __fuse_request_send -> acquires refcount > > queues request and waits for reply... > > fuse_simple_request -> drops refcount > > > > Background request is created: > > fuse_simple_background -> allocates request, sets refcount to 1 > > > > Request is replied to: > > fuse_dev_do_write > > fuse_request_end -> drops refcount on request > > > > Proper acquires on the request reference must be added to ensure that the > > timeout handler does not drop the last refcount on the request while > > other handlers may be operating on the request. Please note that the > > timeout handler may get invoked at any phase of the request's > > lifetime (eg before the request has been forwarded to userspace, etc). > > > > It is always guaranteed that there is a refcount on the request when the > > timeout handler is executing. The timeout handler will be either > > deactivated by the reply/abort/release handlers, or if the timeout > > handler is concurrently executing on another CPU, the reply/abort/release > > handlers will wait for the timeout handler to finish executing first before > > it drops the final refcount on the request. > > > > Signed-off-by: Joanne Koong <joannelkoong@gmail.com> > > --- > > fs/fuse/dev.c | 197 +++++++++++++++++++++++++++++++++++++++++++++-- > > fs/fuse/fuse_i.h | 14 ++++ > > fs/fuse/inode.c | 7 ++ > > 3 files changed, 210 insertions(+), 8 deletions(-) > > > > diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c > > index 9eb191b5c4de..bcb9ff2156c0 100644 > > --- a/fs/fuse/dev.c > > +++ b/fs/fuse/dev.c > > @@ -31,6 +31,8 @@ MODULE_ALIAS("devname:fuse"); > > > > static struct kmem_cache *fuse_req_cachep; > > > > +static void fuse_request_timeout(struct timer_list *timer); > > + > > static struct fuse_dev *fuse_get_dev(struct file *file) > > { > > /* > > @@ -48,6 +50,8 @@ 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; > > + if (fm->fc->req_timeout) > > + timer_setup(&req->timer, fuse_request_timeout, 0); > > } > > > > static struct fuse_req *fuse_request_alloc(struct fuse_mount *fm, gfp_t flags) > > @@ -277,7 +281,7 @@ static void flush_bg_queue(struct fuse_conn *fc) > > * the 'end' callback is called if given, else the reference to the > > * request is released > > */ > > -void fuse_request_end(struct fuse_req *req) > > +static void do_fuse_request_end(struct fuse_req *req) > > { > > struct fuse_mount *fm = req->fm; > > struct fuse_conn *fc = fm->fc; > > @@ -296,8 +300,6 @@ void fuse_request_end(struct fuse_req *req) > > list_del_init(&req->intr_entry); > > spin_unlock(&fiq->lock); > > } > > - WARN_ON(test_bit(FR_PENDING, &req->flags)); > > - WARN_ON(test_bit(FR_SENT, &req->flags)); > > if (test_bit(FR_BACKGROUND, &req->flags)) { > > spin_lock(&fc->bg_lock); > > clear_bit(FR_BACKGROUND, &req->flags); > > @@ -329,8 +331,104 @@ void fuse_request_end(struct fuse_req *req) > > put_request: > > fuse_put_request(req); > > } > > + > > +void fuse_request_end(struct fuse_req *req) > > +{ > > + WARN_ON(test_bit(FR_PENDING, &req->flags)); > > + WARN_ON(test_bit(FR_SENT, &req->flags)); > > + > > + if (req->timer.function) > > + timer_delete_sync(&req->timer); > > This becomes just timer_delete_sync(); > Err ignore this, I had another comment about always initializing the timer, but I realized why you're doing what you're doing and so this isn't relevant. Thanks, Josef
On Thu, Aug 8, 2024 at 11:22 PM Jingbo Xu <jefflexu@linux.alibaba.com> wrote: > > > > On 8/9/24 3:01 AM, Joanne Koong wrote: > > There are situations where fuse servers can become unresponsive or take > > too long to reply to a request. Currently there is no upper bound on > > how long a request may take, which may be frustrating to users who get > > stuck waiting for a request to complete. > > > > This commit adds a timeout option (in seconds) for requests. If the > > timeout elapses before the server replies to the request, the request > > will fail with -ETIME. > > > > There are 3 possibilities for a request that times out: > > a) The request times out before the request has been sent to userspace > > b) The request times out after the request has been sent to userspace > > and before it receives a reply from the server > > c) The request times out after the request has been sent to userspace > > and the server replies while the kernel is timing out the request > > > > While a request timeout is being handled, there may be other handlers > > running at the same time if: > > a) the kernel is forwarding the request to the server > > b) the kernel is processing the server's reply to the request > > c) the request is being re-sent > > d) the connection is aborting > > e) the device is getting released > > > > Proper synchronization must be added to ensure that the request is > > handled correctly in all of these cases. To this effect, there is a new > > FR_FINISHING bit added to the request flags, which is set atomically by > > either the timeout handler (see fuse_request_timeout()) which is invoked > > after the request timeout elapses or set by the request reply handler > > (see dev_do_write()), whichever gets there first. If the reply handler > > and the timeout handler are executing simultaneously and the reply handler > > sets FR_FINISHING before the timeout handler, then the request will be > > handled as if the timeout did not elapse. If the timeout handler sets > > FR_FINISHING before the reply handler, then the request will fail with > > -ETIME and the request will be cleaned up. > > > > Currently, this is the refcount lifecycle of a request: > > > > Synchronous request is created: > > fuse_simple_request -> allocates request, sets refcount to 1 > > __fuse_request_send -> acquires refcount > > queues request and waits for reply... > > fuse_simple_request -> drops refcount > > > > Background request is created: > > fuse_simple_background -> allocates request, sets refcount to 1 > > > > Request is replied to: > > fuse_dev_do_write > > fuse_request_end -> drops refcount on request > > > > Proper acquires on the request reference must be added to ensure that the > > timeout handler does not drop the last refcount on the request while > > other handlers may be operating on the request. Please note that the > > timeout handler may get invoked at any phase of the request's > > lifetime (eg before the request has been forwarded to userspace, etc). > > > > It is always guaranteed that there is a refcount on the request when the > > timeout handler is executing. The timeout handler will be either > > deactivated by the reply/abort/release handlers, or if the timeout > > handler is concurrently executing on another CPU, the reply/abort/release > > handlers will wait for the timeout handler to finish executing first before > > it drops the final refcount on the request. > > > > Signed-off-by: Joanne Koong <joannelkoong@gmail.com> > > --- > > fs/fuse/dev.c | 197 +++++++++++++++++++++++++++++++++++++++++++++-- > > fs/fuse/fuse_i.h | 14 ++++ > > fs/fuse/inode.c | 7 ++ > > 3 files changed, 210 insertions(+), 8 deletions(-) > > > > diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c > > index 9eb191b5c4de..bcb9ff2156c0 100644 > > --- a/fs/fuse/dev.c > > +++ b/fs/fuse/dev.c > > @@ -31,6 +31,8 @@ MODULE_ALIAS("devname:fuse"); > > > > static struct kmem_cache *fuse_req_cachep; > > > > +static void fuse_request_timeout(struct timer_list *timer); > > + > > static struct fuse_dev *fuse_get_dev(struct file *file) > > { > > /* > > @@ -48,6 +50,8 @@ 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; > > + if (fm->fc->req_timeout) > > + timer_setup(&req->timer, fuse_request_timeout, 0); > > } > > > > static struct fuse_req *fuse_request_alloc(struct fuse_mount *fm, gfp_t flags) > > @@ -277,7 +281,7 @@ static void flush_bg_queue(struct fuse_conn *fc) > > * the 'end' callback is called if given, else the reference to the > > * request is released > > */ > > -void fuse_request_end(struct fuse_req *req) > > +static void do_fuse_request_end(struct fuse_req *req) > > { > > struct fuse_mount *fm = req->fm; > > struct fuse_conn *fc = fm->fc; > > @@ -296,8 +300,6 @@ void fuse_request_end(struct fuse_req *req) > > list_del_init(&req->intr_entry); > > spin_unlock(&fiq->lock); > > } > > - WARN_ON(test_bit(FR_PENDING, &req->flags)); > > - WARN_ON(test_bit(FR_SENT, &req->flags)); > > if (test_bit(FR_BACKGROUND, &req->flags)) { > > spin_lock(&fc->bg_lock); > > clear_bit(FR_BACKGROUND, &req->flags); > > @@ -329,8 +331,104 @@ void fuse_request_end(struct fuse_req *req) > > put_request: > > fuse_put_request(req); > > } > > + > > +void fuse_request_end(struct fuse_req *req) > > +{ > > + WARN_ON(test_bit(FR_PENDING, &req->flags)); > > + WARN_ON(test_bit(FR_SENT, &req->flags)); > > + > > + if (req->timer.function) > > + timer_delete_sync(&req->timer); > > + > > + do_fuse_request_end(req); > > +} > > EXPORT_SYMBOL_GPL(fuse_request_end); > > > > +static void timeout_inflight_req(struct fuse_req *req) > > +{ > > + struct fuse_conn *fc = req->fm->fc; > > + struct fuse_iqueue *fiq = &fc->iq; > > + struct fuse_pqueue *fpq; > > + > > + spin_lock(&fiq->lock); > > + fpq = req->fpq; > > + spin_unlock(&fiq->lock); > > + > > + /* > > + * If fpq has not been set yet, then the request is aborting (which > > + * clears FR_PENDING flag) before dev_do_read (which sets req->fpq) > > + * has been called. Let the abort handler handle this request. > > + */ > > + if (!fpq) > > + return; > > + > > + spin_lock(&fpq->lock); > > + if (!fpq->connected || req->out.h.error == -ECONNABORTED) { > > + /* > > + * Connection is being aborted or the fuse_dev is being released. > > + * The abort / release will clean up the request > > + */ > > + spin_unlock(&fpq->lock); > > + return; > > + } > > + > > + if (!test_bit(FR_PRIVATE, &req->flags)) > > + list_del_init(&req->list); > > + > > + spin_unlock(&fpq->lock); > > + > > + req->out.h.error = -ETIME; > > + > > + do_fuse_request_end(req); > > +} > > + > > +static void timeout_pending_req(struct fuse_req *req) > > +{ > > + struct fuse_conn *fc = req->fm->fc; > > + struct fuse_iqueue *fiq = &fc->iq; > > + bool background = test_bit(FR_BACKGROUND, &req->flags); > > + > > + if (background) > > + spin_lock(&fc->bg_lock); > > + spin_lock(&fiq->lock); > > + > > + if (!test_bit(FR_PENDING, &req->flags)) { > > + spin_unlock(&fiq->lock); > > + if (background) > > + spin_unlock(&fc->bg_lock); > > + timeout_inflight_req(req); > > + return; > > + } > > + > > + if (!test_bit(FR_PRIVATE, &req->flags)) > > + list_del_init(&req->list); > > + > > + spin_unlock(&fiq->lock); > > + if (background) > > + spin_unlock(&fc->bg_lock); > > + > > + req->out.h.error = -ETIME; > > + > > + do_fuse_request_end(req); > > +} > > + > > +static void fuse_request_timeout(struct timer_list *timer) > > +{ > > + struct fuse_req *req = container_of(timer, struct fuse_req, timer); > > + > > + /* > > + * Request reply is being finished by the kernel right now. > > + * No need to time out the request. > > + */ > > + if (test_and_set_bit(FR_FINISHING, &req->flags)) > > + return; > > + > > + if (test_bit(FR_PENDING, &req->flags)) > > + timeout_pending_req(req); > > + else > > + timeout_inflight_req(req); > > +} > > + > > static int queue_interrupt(struct fuse_req *req) > > { > > struct fuse_iqueue *fiq = &req->fm->fc->iq; > > @@ -393,6 +491,11 @@ static void request_wait_answer(struct fuse_req *req) > > if (test_bit(FR_PENDING, &req->flags)) { > > list_del(&req->list); > > spin_unlock(&fiq->lock); > > + if (req->timer.function) { > > + bool timed_out = !timer_delete_sync(&req->timer); > > + if (timed_out) > > + return; > > + } > > __fuse_put_request(req); > > req->out.h.error = -EINTR; > > return; > > @@ -409,7 +512,8 @@ static void request_wait_answer(struct fuse_req *req) > > > > static void __fuse_request_send(struct fuse_req *req) > > { > > - struct fuse_iqueue *fiq = &req->fm->fc->iq; > > + struct fuse_conn *fc = req->fm->fc; > > + struct fuse_iqueue *fiq = &fc->iq; > > > > BUG_ON(test_bit(FR_BACKGROUND, &req->flags)); > > spin_lock(&fiq->lock); > > @@ -421,6 +525,10 @@ static void __fuse_request_send(struct fuse_req *req) > > /* acquire extra reference, since request is still needed > > after fuse_request_end() */ > > __fuse_get_request(req); > > + if (req->timer.function) { > > + req->timer.expires = jiffies + fc->req_timeout; > > + add_timer(&req->timer); > > + } > > queue_request_and_unlock(fiq, req); > > > > request_wait_answer(req); > > @@ -539,6 +647,10 @@ static bool fuse_request_queue_background(struct fuse_req *req) > > if (fc->num_background == fc->max_background) > > fc->blocked = 1; > > list_add_tail(&req->list, &fc->bg_queue); > > + if (req->timer.function) { > > + req->timer.expires = jiffies + fc->req_timeout; > > + add_timer(&req->timer); > > + } > > flush_bg_queue(fc); > > queued = true; > > } > > @@ -594,6 +706,10 @@ static int fuse_simple_notify_reply(struct fuse_mount *fm, > > > > spin_lock(&fiq->lock); > > if (fiq->connected) { > > + if (req->timer.function) { > > + req->timer.expires = jiffies + fm->fc->req_timeout; > > + add_timer(&req->timer); > > + } > > queue_request_and_unlock(fiq, req); > > } else { > > err = -ENODEV; > > @@ -1268,8 +1384,26 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file, > > req = list_entry(fiq->pending.next, struct fuse_req, list); > > clear_bit(FR_PENDING, &req->flags); > > list_del_init(&req->list); > > + /* Acquire a reference in case the timeout handler starts executing */ > > + __fuse_get_request(req); > > + req->fpq = fpq; > > spin_unlock(&fiq->lock); > > > > + if (req->timer.function) { > > + /* > > + * Temporarily disable the timer on the request to avoid race > > + * conditions between this code and the timeout handler. > > + * > > + * The timer is readded at the end of this function. > > + */ > > + bool timed_out = !timer_delete_sync(&req->timer); > > + if (timed_out) { > > + WARN_ON(!test_bit(FR_FINISHED, &req->flags)); > > Is there any possibility that FR_FINISHED bit has not been set for the > request when the timeout handler finishes, e.g. for the following sequence? Ah, i meant for this to be FR_FINISHING, not FR_FINISHED. Just as a sanity check that the timeout handler was invoked, even if it wasn't the one that ultimately cleaned up the request. I will make this fix in v4. Thanks! > > > ``` > # read # timer handler #aborting > fuse_dev_do_read > spin_lock(&fiq->lock) > # remove req from > # pending list > spin_unlock(&fiq->lock) > > fuse_abort_conn > spin_lock(fpq->lock) > fpq->connected = 0 > spin_unlock(fpq->lock) > > fuse_request_timeout > # disarm the timer > # wait for > # timer handler > timeout_inflight_req > spin_lock(&fpq->lock) > if !fpq->connected: > spin_unlock(&fpq->lock) > return > WARN(no FR_FINISHED)! > end_requests > set FR_FINISHED bit > ``` > > > > > > + fuse_put_request(req); > > + goto restart; > > + } > > + } > > + > > args = req->args; > > reqsize = req->in.h.len; > > > > @@ -1280,6 +1414,7 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file, > > if (args->opcode == FUSE_SETXATTR) > > req->out.h.error = -E2BIG; > > fuse_request_end(req); > > + fuse_put_request(req); > > goto restart; > > } > > spin_lock(&fpq->lock); > > @@ -1316,13 +1451,18 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file, > > } > > hash = fuse_req_hash(req->in.h.unique); > > list_move_tail(&req->list, &fpq->processing[hash]); > > - __fuse_get_request(req); > > set_bit(FR_SENT, &req->flags); > > + > > + /* re-arm the original timer */ > > + if (req->timer.function) > > + add_timer(&req->timer); > > + > > spin_unlock(&fpq->lock); > > /* matches barrier in request_wait_answer() */ > > smp_mb__after_atomic(); > > if (test_bit(FR_INTERRUPTED, &req->flags)) > > queue_interrupt(req); > > + > > A nonsense newline diff? I'll remove this newline in v4. > > > > -- > Thanks, > Jingbo Thanks, Joanne
On Thu, Aug 8, 2024 at 1:50 PM Josef Bacik <josef@toxicpanda.com> wrote: > > On Thu, Aug 08, 2024 at 12:01:09PM -0700, Joanne Koong wrote: > > There are situations where fuse servers can become unresponsive or take > > too long to reply to a request. Currently there is no upper bound on > > how long a request may take, which may be frustrating to users who get > > stuck waiting for a request to complete. > > > > This commit adds a timeout option (in seconds) for requests. If the > > timeout elapses before the server replies to the request, the request > > will fail with -ETIME. > > > > There are 3 possibilities for a request that times out: > > a) The request times out before the request has been sent to userspace > > b) The request times out after the request has been sent to userspace > > and before it receives a reply from the server > > c) The request times out after the request has been sent to userspace > > and the server replies while the kernel is timing out the request > > > > While a request timeout is being handled, there may be other handlers > > running at the same time if: > > a) the kernel is forwarding the request to the server > > b) the kernel is processing the server's reply to the request > > c) the request is being re-sent > > d) the connection is aborting > > e) the device is getting released > > > > Proper synchronization must be added to ensure that the request is > > handled correctly in all of these cases. To this effect, there is a new > > FR_FINISHING bit added to the request flags, which is set atomically by > > either the timeout handler (see fuse_request_timeout()) which is invoked > > after the request timeout elapses or set by the request reply handler > > (see dev_do_write()), whichever gets there first. If the reply handler > > and the timeout handler are executing simultaneously and the reply handler > > sets FR_FINISHING before the timeout handler, then the request will be > > handled as if the timeout did not elapse. If the timeout handler sets > > FR_FINISHING before the reply handler, then the request will fail with > > -ETIME and the request will be cleaned up. > > > > Currently, this is the refcount lifecycle of a request: > > > > Synchronous request is created: > > fuse_simple_request -> allocates request, sets refcount to 1 > > __fuse_request_send -> acquires refcount > > queues request and waits for reply... > > fuse_simple_request -> drops refcount > > > > Background request is created: > > fuse_simple_background -> allocates request, sets refcount to 1 > > > > Request is replied to: > > fuse_dev_do_write > > fuse_request_end -> drops refcount on request > > > > Proper acquires on the request reference must be added to ensure that the > > timeout handler does not drop the last refcount on the request while > > other handlers may be operating on the request. Please note that the > > timeout handler may get invoked at any phase of the request's > > lifetime (eg before the request has been forwarded to userspace, etc). > > > > It is always guaranteed that there is a refcount on the request when the > > timeout handler is executing. The timeout handler will be either > > deactivated by the reply/abort/release handlers, or if the timeout > > handler is concurrently executing on another CPU, the reply/abort/release > > handlers will wait for the timeout handler to finish executing first before > > it drops the final refcount on the request. > > > > Signed-off-by: Joanne Koong <joannelkoong@gmail.com> > > --- > > fs/fuse/dev.c | 197 +++++++++++++++++++++++++++++++++++++++++++++-- > > fs/fuse/fuse_i.h | 14 ++++ > > fs/fuse/inode.c | 7 ++ > > 3 files changed, 210 insertions(+), 8 deletions(-) > > > > diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c > > index 9eb191b5c4de..bcb9ff2156c0 100644 > > --- a/fs/fuse/dev.c > > +++ b/fs/fuse/dev.c > > @@ -31,6 +31,8 @@ MODULE_ALIAS("devname:fuse"); > > > > static struct kmem_cache *fuse_req_cachep; > > > > +static void fuse_request_timeout(struct timer_list *timer); > > + > > static struct fuse_dev *fuse_get_dev(struct file *file) > > { > > /* > > @@ -48,6 +50,8 @@ 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; > > + if (fm->fc->req_timeout) > > + timer_setup(&req->timer, fuse_request_timeout, 0); > > } > > > > static struct fuse_req *fuse_request_alloc(struct fuse_mount *fm, gfp_t flags) > > @@ -277,7 +281,7 @@ static void flush_bg_queue(struct fuse_conn *fc) > > * the 'end' callback is called if given, else the reference to the > > * request is released > > */ > > -void fuse_request_end(struct fuse_req *req) > > +static void do_fuse_request_end(struct fuse_req *req) > > { > > struct fuse_mount *fm = req->fm; > > struct fuse_conn *fc = fm->fc; > > @@ -296,8 +300,6 @@ void fuse_request_end(struct fuse_req *req) > > list_del_init(&req->intr_entry); > > spin_unlock(&fiq->lock); > > } > > - WARN_ON(test_bit(FR_PENDING, &req->flags)); > > - WARN_ON(test_bit(FR_SENT, &req->flags)); > > if (test_bit(FR_BACKGROUND, &req->flags)) { > > spin_lock(&fc->bg_lock); > > clear_bit(FR_BACKGROUND, &req->flags); > > @@ -329,8 +331,104 @@ void fuse_request_end(struct fuse_req *req) > > put_request: > > fuse_put_request(req); > > } > > + > > +void fuse_request_end(struct fuse_req *req) > > +{ > > + WARN_ON(test_bit(FR_PENDING, &req->flags)); > > + WARN_ON(test_bit(FR_SENT, &req->flags)); > > + > > + if (req->timer.function) > > + timer_delete_sync(&req->timer); > > This becomes just timer_delete_sync(); > > > + > > + do_fuse_request_end(req); > > +} > > EXPORT_SYMBOL_GPL(fuse_request_end); > > > > +static void timeout_inflight_req(struct fuse_req *req) > > +{ > > + struct fuse_conn *fc = req->fm->fc; > > + struct fuse_iqueue *fiq = &fc->iq; > > + struct fuse_pqueue *fpq; > > + > > + spin_lock(&fiq->lock); > > + fpq = req->fpq; > > + spin_unlock(&fiq->lock); > > + > > + /* > > + * If fpq has not been set yet, then the request is aborting (which > > + * clears FR_PENDING flag) before dev_do_read (which sets req->fpq) > > + * has been called. Let the abort handler handle this request. > > + */ > > + if (!fpq) > > + return; > > + > > + spin_lock(&fpq->lock); > > + if (!fpq->connected || req->out.h.error == -ECONNABORTED) { > > + /* > > + * Connection is being aborted or the fuse_dev is being released. > > + * The abort / release will clean up the request > > + */ > > + spin_unlock(&fpq->lock); > > + return; > > + } > > + > > + if (!test_bit(FR_PRIVATE, &req->flags)) > > + list_del_init(&req->list); > > + > > + spin_unlock(&fpq->lock); > > + > > + req->out.h.error = -ETIME; > > + > > + do_fuse_request_end(req); > > +} > > + > > +static void timeout_pending_req(struct fuse_req *req) > > +{ > > + struct fuse_conn *fc = req->fm->fc; > > + struct fuse_iqueue *fiq = &fc->iq; > > + bool background = test_bit(FR_BACKGROUND, &req->flags); > > + > > + if (background) > > + spin_lock(&fc->bg_lock); > > + spin_lock(&fiq->lock); > > + > > + if (!test_bit(FR_PENDING, &req->flags)) { > > + spin_unlock(&fiq->lock); > > + if (background) > > + spin_unlock(&fc->bg_lock); > > + timeout_inflight_req(req); > > + return; > > + } > > + > > + if (!test_bit(FR_PRIVATE, &req->flags)) > > + list_del_init(&req->list); > > + > > + spin_unlock(&fiq->lock); > > + if (background) > > + spin_unlock(&fc->bg_lock); > > + > > + req->out.h.error = -ETIME; > > + > > + do_fuse_request_end(req); > > +} > > + > > +static void fuse_request_timeout(struct timer_list *timer) > > +{ > > + struct fuse_req *req = container_of(timer, struct fuse_req, timer); > > + > > + /* > > + * Request reply is being finished by the kernel right now. > > + * No need to time out the request. > > + */ > > + if (test_and_set_bit(FR_FINISHING, &req->flags)) > > + return; > > + > > + if (test_bit(FR_PENDING, &req->flags)) > > + timeout_pending_req(req); > > + else > > + timeout_inflight_req(req); > > +} > > + > > static int queue_interrupt(struct fuse_req *req) > > { > > struct fuse_iqueue *fiq = &req->fm->fc->iq; > > @@ -393,6 +491,11 @@ static void request_wait_answer(struct fuse_req *req) > > if (test_bit(FR_PENDING, &req->flags)) { > > list_del(&req->list); > > spin_unlock(&fiq->lock); > > + if (req->timer.function) { > > + bool timed_out = !timer_delete_sync(&req->timer); > > + if (timed_out) > > + return; > > + } > > This can just be > > if (!timer_delete_sync(&req->timer)) > return; > > > __fuse_put_request(req); > > req->out.h.error = -EINTR; > > return; > > @@ -409,7 +512,8 @@ static void request_wait_answer(struct fuse_req *req) > > > > static void __fuse_request_send(struct fuse_req *req) > > { > > - struct fuse_iqueue *fiq = &req->fm->fc->iq; > > + struct fuse_conn *fc = req->fm->fc; > > + struct fuse_iqueue *fiq = &fc->iq; > > > > BUG_ON(test_bit(FR_BACKGROUND, &req->flags)); > > spin_lock(&fiq->lock); > > @@ -421,6 +525,10 @@ static void __fuse_request_send(struct fuse_req *req) > > /* acquire extra reference, since request is still needed > > after fuse_request_end() */ > > __fuse_get_request(req); > > + if (req->timer.function) { > > + req->timer.expires = jiffies + fc->req_timeout; > > + add_timer(&req->timer); > > + } > > This can just be > > if (req->timer.function) > mod_timer(&req->timer, jiffies + fc->req_timeout); > > > queue_request_and_unlock(fiq, req); > > > > request_wait_answer(req); > > @@ -539,6 +647,10 @@ static bool fuse_request_queue_background(struct fuse_req *req) > > if (fc->num_background == fc->max_background) > > fc->blocked = 1; > > list_add_tail(&req->list, &fc->bg_queue); > > + if (req->timer.function) { > > + req->timer.expires = jiffies + fc->req_timeout; > > + add_timer(&req->timer); > > + } > > Same comment as above. > > > flush_bg_queue(fc); > > queued = true; > > } > > @@ -594,6 +706,10 @@ static int fuse_simple_notify_reply(struct fuse_mount *fm, > > > > spin_lock(&fiq->lock); > > if (fiq->connected) { > > + if (req->timer.function) { > > + req->timer.expires = jiffies + fm->fc->req_timeout; > > + add_timer(&req->timer); > > + } > > Here as well. > > > queue_request_and_unlock(fiq, req); > > } else { > > err = -ENODEV; > > @@ -1268,8 +1384,26 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file, > > req = list_entry(fiq->pending.next, struct fuse_req, list); > > clear_bit(FR_PENDING, &req->flags); > > list_del_init(&req->list); > > + /* Acquire a reference in case the timeout handler starts executing */ > > + __fuse_get_request(req); > > + req->fpq = fpq; > > spin_unlock(&fiq->lock); > > > > + if (req->timer.function) { > > + /* > > + * Temporarily disable the timer on the request to avoid race > > + * conditions between this code and the timeout handler. > > + * > > + * The timer is readded at the end of this function. > > + */ > > + bool timed_out = !timer_delete_sync(&req->timer); > > + if (timed_out) { > > This can also just be > > if (!timer_delete_sync(&req->timer)); > > > + WARN_ON(!test_bit(FR_FINISHED, &req->flags)); > > + fuse_put_request(req); > > + goto restart; > > + } > > + } > > + > > args = req->args; > > reqsize = req->in.h.len; > > > > @@ -1280,6 +1414,7 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file, > > if (args->opcode == FUSE_SETXATTR) > > req->out.h.error = -E2BIG; > > fuse_request_end(req); > > + fuse_put_request(req); > > goto restart; > > } > > spin_lock(&fpq->lock); > > @@ -1316,13 +1451,18 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file, > > } > > hash = fuse_req_hash(req->in.h.unique); > > list_move_tail(&req->list, &fpq->processing[hash]); > > - __fuse_get_request(req); > > set_bit(FR_SENT, &req->flags); > > + > > + /* re-arm the original timer */ > > + if (req->timer.function) > > + add_timer(&req->timer); > > This will not change anything if the timer was already armed, do you want > mod_timer_pending() here? Or maybe just mod_timer()? Thanks, In this path, the timer will always be inactive here (we deactivated it earlier in this function to make race condition handling simpler), so I will keep this as add_timer() here. > > Josef Thanks for your review, Josef! I will add these changes into v4.
On 8/8/24 21:01, Joanne Koong wrote: > @@ -1951,9 +2115,10 @@ static ssize_t fuse_dev_do_write(struct fuse_dev *fud, > goto copy_finish; > } > > + __fuse_get_request(req); > + > /* Is it an interrupt reply ID? */ > if (oh.unique & FUSE_INT_REQ_BIT) { > - __fuse_get_request(req); > spin_unlock(&fpq->lock); > > err = 0; > @@ -1969,6 +2134,13 @@ static ssize_t fuse_dev_do_write(struct fuse_dev *fud, > goto copy_finish; > } > > + if (test_and_set_bit(FR_FINISHING, &req->flags)) { > + /* timeout handler is already finishing the request */ > + spin_unlock(&fpq->lock); > + fuse_put_request(req); > + goto copy_finish; > + } > + It should be safe already with the FR_FINISHING flag and timer_delete_sync, but maybe we could unset req->fpq here to make that easier to read and to be double sure? > clear_bit(FR_SENT, &req->flags); > list_move(&req->list, &fpq->io); > req->out.h = oh; > @@ -1995,6 +2167,7 @@ static ssize_t fuse_dev_do_write(struct fuse_dev *fud, > spin_unlock(&fpq->lock); > > fuse_request_end(req); > + fuse_put_request(req); > out: > return err ? err : nbytes; > > @@ -2260,13 +2433,21 @@ int fuse_dev_release(struct inode *inode, struct file *file) > if (fud) { > struct fuse_conn *fc = fud->fc; > struct fuse_pqueue *fpq = &fud->pq; > + struct fuse_req *req; > LIST_HEAD(to_end); > unsigned int i; > > spin_lock(&fpq->lock); > WARN_ON(!list_empty(&fpq->io)); > - for (i = 0; i < FUSE_PQ_HASH_SIZE; i++) > + for (i = 0; i < FUSE_PQ_HASH_SIZE; i++) { > + /* > + * Set the req error here so that the timeout > + * handler knows it's being released > + */ > + list_for_each_entry(req, &fpq->processing[i], list) > + req->out.h.error = -ECONNABORTED; > list_splice_init(&fpq->processing[i], &to_end); > + } > spin_unlock(&fpq->lock); > > end_requests(&to_end); > diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h > index f23919610313..2b616c5977b4 100644 > --- a/fs/fuse/fuse_i.h > +++ b/fs/fuse/fuse_i.h > @@ -375,6 +375,8 @@ struct fuse_io_priv { > * FR_FINISHED: request is finished > * FR_PRIVATE: request is on private list > * FR_ASYNC: request is asynchronous > + * FR_FINISHING: request is being finished, by either the timeout handler > + * or the reply handler > */ > enum fuse_req_flag { > FR_ISREPLY, > @@ -389,6 +391,7 @@ enum fuse_req_flag { > FR_FINISHED, > FR_PRIVATE, > FR_ASYNC, > + FR_FINISHING, > }; > > /** > @@ -435,6 +438,12 @@ struct fuse_req { > > /** fuse_mount this request belongs to */ > struct fuse_mount *fm; > + > + /** page queue this request has been added to */ > + struct fuse_pqueue *fpq; Processing queue? Thanks, Bernd
On Tue, Aug 13, 2024 at 10:04 AM Bernd Schubert <bernd.schubert@fastmail.fm> wrote: > > > > On 8/8/24 21:01, Joanne Koong wrote: > > > @@ -1951,9 +2115,10 @@ static ssize_t fuse_dev_do_write(struct fuse_dev *fud, > > goto copy_finish; > > } > > > > + __fuse_get_request(req); > > + > > /* Is it an interrupt reply ID? */ > > if (oh.unique & FUSE_INT_REQ_BIT) { > > - __fuse_get_request(req); > > spin_unlock(&fpq->lock); > > > > err = 0; > > @@ -1969,6 +2134,13 @@ static ssize_t fuse_dev_do_write(struct fuse_dev *fud, > > goto copy_finish; > > } > > > > + if (test_and_set_bit(FR_FINISHING, &req->flags)) { > > + /* timeout handler is already finishing the request */ > > + spin_unlock(&fpq->lock); > > + fuse_put_request(req); > > + goto copy_finish; > > + } > > + > > It should be safe already with the FR_FINISHING flag and > timer_delete_sync, but maybe we could unset req->fpq here to make that > easier to read and to be double sure? Sure, I can add this into v4. I'll add a comment as well explaining that it's not necessary but is here as a safeguard to ensure that the timeout handler is a no-op. > > > clear_bit(FR_SENT, &req->flags); > > list_move(&req->list, &fpq->io); > > req->out.h = oh; > > @@ -1995,6 +2167,7 @@ static ssize_t fuse_dev_do_write(struct fuse_dev *fud, > > spin_unlock(&fpq->lock); > > > > fuse_request_end(req); > > + fuse_put_request(req); > > out: > > return err ? err : nbytes; > > > > @@ -2260,13 +2433,21 @@ int fuse_dev_release(struct inode *inode, struct file *file) > > if (fud) { > > struct fuse_conn *fc = fud->fc; > > struct fuse_pqueue *fpq = &fud->pq; > > + struct fuse_req *req; > > LIST_HEAD(to_end); > > unsigned int i; > > > > spin_lock(&fpq->lock); > > WARN_ON(!list_empty(&fpq->io)); > > - for (i = 0; i < FUSE_PQ_HASH_SIZE; i++) > > + for (i = 0; i < FUSE_PQ_HASH_SIZE; i++) { > > + /* > > + * Set the req error here so that the timeout > > + * handler knows it's being released > > + */ > > + list_for_each_entry(req, &fpq->processing[i], list) > > + req->out.h.error = -ECONNABORTED; > > list_splice_init(&fpq->processing[i], &to_end); > > + } > > spin_unlock(&fpq->lock); > > > > end_requests(&to_end); > > diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h > > index f23919610313..2b616c5977b4 100644 > > --- a/fs/fuse/fuse_i.h > > +++ b/fs/fuse/fuse_i.h > > @@ -375,6 +375,8 @@ struct fuse_io_priv { > > * FR_FINISHED: request is finished > > * FR_PRIVATE: request is on private list > > * FR_ASYNC: request is asynchronous > > + * FR_FINISHING: request is being finished, by either the timeout handler > > + * or the reply handler > > */ > > enum fuse_req_flag { > > FR_ISREPLY, > > @@ -389,6 +391,7 @@ enum fuse_req_flag { > > FR_FINISHED, > > FR_PRIVATE, > > FR_ASYNC, > > + FR_FINISHING, > > }; > > > > /** > > @@ -435,6 +438,12 @@ struct fuse_req { > > > > /** fuse_mount this request belongs to */ > > struct fuse_mount *fm; > > + > > + /** page queue this request has been added to */ > > + struct fuse_pqueue *fpq; > > Processing queue? You're right, this should be "processing queue", I'll make this change in v4. Thanks, Joanne > > > Thanks, > Bernd
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 9eb191b5c4de..bcb9ff2156c0 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -31,6 +31,8 @@ MODULE_ALIAS("devname:fuse"); static struct kmem_cache *fuse_req_cachep; +static void fuse_request_timeout(struct timer_list *timer); + static struct fuse_dev *fuse_get_dev(struct file *file) { /* @@ -48,6 +50,8 @@ 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; + if (fm->fc->req_timeout) + timer_setup(&req->timer, fuse_request_timeout, 0); } static struct fuse_req *fuse_request_alloc(struct fuse_mount *fm, gfp_t flags) @@ -277,7 +281,7 @@ static void flush_bg_queue(struct fuse_conn *fc) * the 'end' callback is called if given, else the reference to the * request is released */ -void fuse_request_end(struct fuse_req *req) +static void do_fuse_request_end(struct fuse_req *req) { struct fuse_mount *fm = req->fm; struct fuse_conn *fc = fm->fc; @@ -296,8 +300,6 @@ void fuse_request_end(struct fuse_req *req) list_del_init(&req->intr_entry); spin_unlock(&fiq->lock); } - WARN_ON(test_bit(FR_PENDING, &req->flags)); - WARN_ON(test_bit(FR_SENT, &req->flags)); if (test_bit(FR_BACKGROUND, &req->flags)) { spin_lock(&fc->bg_lock); clear_bit(FR_BACKGROUND, &req->flags); @@ -329,8 +331,104 @@ void fuse_request_end(struct fuse_req *req) put_request: fuse_put_request(req); } + +void fuse_request_end(struct fuse_req *req) +{ + WARN_ON(test_bit(FR_PENDING, &req->flags)); + WARN_ON(test_bit(FR_SENT, &req->flags)); + + if (req->timer.function) + timer_delete_sync(&req->timer); + + do_fuse_request_end(req); +} EXPORT_SYMBOL_GPL(fuse_request_end); +static void timeout_inflight_req(struct fuse_req *req) +{ + struct fuse_conn *fc = req->fm->fc; + struct fuse_iqueue *fiq = &fc->iq; + struct fuse_pqueue *fpq; + + spin_lock(&fiq->lock); + fpq = req->fpq; + spin_unlock(&fiq->lock); + + /* + * If fpq has not been set yet, then the request is aborting (which + * clears FR_PENDING flag) before dev_do_read (which sets req->fpq) + * has been called. Let the abort handler handle this request. + */ + if (!fpq) + return; + + spin_lock(&fpq->lock); + if (!fpq->connected || req->out.h.error == -ECONNABORTED) { + /* + * Connection is being aborted or the fuse_dev is being released. + * The abort / release will clean up the request + */ + spin_unlock(&fpq->lock); + return; + } + + if (!test_bit(FR_PRIVATE, &req->flags)) + list_del_init(&req->list); + + spin_unlock(&fpq->lock); + + req->out.h.error = -ETIME; + + do_fuse_request_end(req); +} + +static void timeout_pending_req(struct fuse_req *req) +{ + struct fuse_conn *fc = req->fm->fc; + struct fuse_iqueue *fiq = &fc->iq; + bool background = test_bit(FR_BACKGROUND, &req->flags); + + if (background) + spin_lock(&fc->bg_lock); + spin_lock(&fiq->lock); + + if (!test_bit(FR_PENDING, &req->flags)) { + spin_unlock(&fiq->lock); + if (background) + spin_unlock(&fc->bg_lock); + timeout_inflight_req(req); + return; + } + + if (!test_bit(FR_PRIVATE, &req->flags)) + list_del_init(&req->list); + + spin_unlock(&fiq->lock); + if (background) + spin_unlock(&fc->bg_lock); + + req->out.h.error = -ETIME; + + do_fuse_request_end(req); +} + +static void fuse_request_timeout(struct timer_list *timer) +{ + struct fuse_req *req = container_of(timer, struct fuse_req, timer); + + /* + * Request reply is being finished by the kernel right now. + * No need to time out the request. + */ + if (test_and_set_bit(FR_FINISHING, &req->flags)) + return; + + if (test_bit(FR_PENDING, &req->flags)) + timeout_pending_req(req); + else + timeout_inflight_req(req); +} + static int queue_interrupt(struct fuse_req *req) { struct fuse_iqueue *fiq = &req->fm->fc->iq; @@ -393,6 +491,11 @@ static void request_wait_answer(struct fuse_req *req) if (test_bit(FR_PENDING, &req->flags)) { list_del(&req->list); spin_unlock(&fiq->lock); + if (req->timer.function) { + bool timed_out = !timer_delete_sync(&req->timer); + if (timed_out) + return; + } __fuse_put_request(req); req->out.h.error = -EINTR; return; @@ -409,7 +512,8 @@ static void request_wait_answer(struct fuse_req *req) static void __fuse_request_send(struct fuse_req *req) { - struct fuse_iqueue *fiq = &req->fm->fc->iq; + struct fuse_conn *fc = req->fm->fc; + struct fuse_iqueue *fiq = &fc->iq; BUG_ON(test_bit(FR_BACKGROUND, &req->flags)); spin_lock(&fiq->lock); @@ -421,6 +525,10 @@ static void __fuse_request_send(struct fuse_req *req) /* acquire extra reference, since request is still needed after fuse_request_end() */ __fuse_get_request(req); + if (req->timer.function) { + req->timer.expires = jiffies + fc->req_timeout; + add_timer(&req->timer); + } queue_request_and_unlock(fiq, req); request_wait_answer(req); @@ -539,6 +647,10 @@ static bool fuse_request_queue_background(struct fuse_req *req) if (fc->num_background == fc->max_background) fc->blocked = 1; list_add_tail(&req->list, &fc->bg_queue); + if (req->timer.function) { + req->timer.expires = jiffies + fc->req_timeout; + add_timer(&req->timer); + } flush_bg_queue(fc); queued = true; } @@ -594,6 +706,10 @@ static int fuse_simple_notify_reply(struct fuse_mount *fm, spin_lock(&fiq->lock); if (fiq->connected) { + if (req->timer.function) { + req->timer.expires = jiffies + fm->fc->req_timeout; + add_timer(&req->timer); + } queue_request_and_unlock(fiq, req); } else { err = -ENODEV; @@ -1268,8 +1384,26 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file, req = list_entry(fiq->pending.next, struct fuse_req, list); clear_bit(FR_PENDING, &req->flags); list_del_init(&req->list); + /* Acquire a reference in case the timeout handler starts executing */ + __fuse_get_request(req); + req->fpq = fpq; spin_unlock(&fiq->lock); + if (req->timer.function) { + /* + * Temporarily disable the timer on the request to avoid race + * conditions between this code and the timeout handler. + * + * The timer is readded at the end of this function. + */ + bool timed_out = !timer_delete_sync(&req->timer); + if (timed_out) { + WARN_ON(!test_bit(FR_FINISHED, &req->flags)); + fuse_put_request(req); + goto restart; + } + } + args = req->args; reqsize = req->in.h.len; @@ -1280,6 +1414,7 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file, if (args->opcode == FUSE_SETXATTR) req->out.h.error = -E2BIG; fuse_request_end(req); + fuse_put_request(req); goto restart; } spin_lock(&fpq->lock); @@ -1316,13 +1451,18 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file, } hash = fuse_req_hash(req->in.h.unique); list_move_tail(&req->list, &fpq->processing[hash]); - __fuse_get_request(req); set_bit(FR_SENT, &req->flags); + + /* re-arm the original timer */ + if (req->timer.function) + add_timer(&req->timer); + spin_unlock(&fpq->lock); /* matches barrier in request_wait_answer() */ smp_mb__after_atomic(); if (test_bit(FR_INTERRUPTED, &req->flags)) queue_interrupt(req); + fuse_put_request(req); return reqsize; @@ -1332,6 +1472,7 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file, list_del_init(&req->list); spin_unlock(&fpq->lock); fuse_request_end(req); + fuse_put_request(req); return err; err_unlock: @@ -1806,8 +1947,25 @@ static void fuse_resend(struct fuse_conn *fc) struct fuse_pqueue *fpq = &fud->pq; spin_lock(&fpq->lock); - for (i = 0; i < FUSE_PQ_HASH_SIZE; i++) + for (i = 0; i < FUSE_PQ_HASH_SIZE; i++) { + list_for_each_entry(req, &fpq->processing[i], list) { + /* + * We must acquire a reference here in case the timeout + * handler is running at the same time. Else the + * request might get freed out from under us + */ + __fuse_get_request(req); + + /* + * While we have an acquired reference on the request, + * the request must remain on the list so that we + * can release the reference on it + */ + set_bit(FR_PRIVATE, &req->flags); + } + list_splice_tail_init(&fpq->processing[i], &to_queue); + } spin_unlock(&fpq->lock); } spin_unlock(&fc->lock); @@ -1820,6 +1978,12 @@ static void fuse_resend(struct fuse_conn *fc) } spin_lock(&fiq->lock); + list_for_each_entry_safe(req, next, &to_queue, list) { + if (test_bit(FR_FINISHING, &req->flags)) + list_del_init(&req->list); + clear_bit(FR_PRIVATE, &req->flags); + fuse_put_request(req); + } /* iq and pq requests are both oldest to newest */ list_splice(&to_queue, &fiq->pending); fiq->ops->wake_pending_and_unlock(fiq); @@ -1951,9 +2115,10 @@ static ssize_t fuse_dev_do_write(struct fuse_dev *fud, goto copy_finish; } + __fuse_get_request(req); + /* Is it an interrupt reply ID? */ if (oh.unique & FUSE_INT_REQ_BIT) { - __fuse_get_request(req); spin_unlock(&fpq->lock); err = 0; @@ -1969,6 +2134,13 @@ static ssize_t fuse_dev_do_write(struct fuse_dev *fud, goto copy_finish; } + if (test_and_set_bit(FR_FINISHING, &req->flags)) { + /* timeout handler is already finishing the request */ + spin_unlock(&fpq->lock); + fuse_put_request(req); + goto copy_finish; + } + clear_bit(FR_SENT, &req->flags); list_move(&req->list, &fpq->io); req->out.h = oh; @@ -1995,6 +2167,7 @@ static ssize_t fuse_dev_do_write(struct fuse_dev *fud, spin_unlock(&fpq->lock); fuse_request_end(req); + fuse_put_request(req); out: return err ? err : nbytes; @@ -2260,13 +2433,21 @@ int fuse_dev_release(struct inode *inode, struct file *file) if (fud) { struct fuse_conn *fc = fud->fc; struct fuse_pqueue *fpq = &fud->pq; + struct fuse_req *req; LIST_HEAD(to_end); unsigned int i; spin_lock(&fpq->lock); WARN_ON(!list_empty(&fpq->io)); - for (i = 0; i < FUSE_PQ_HASH_SIZE; i++) + for (i = 0; i < FUSE_PQ_HASH_SIZE; i++) { + /* + * Set the req error here so that the timeout + * handler knows it's being released + */ + list_for_each_entry(req, &fpq->processing[i], list) + req->out.h.error = -ECONNABORTED; list_splice_init(&fpq->processing[i], &to_end); + } spin_unlock(&fpq->lock); end_requests(&to_end); diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index f23919610313..2b616c5977b4 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -375,6 +375,8 @@ struct fuse_io_priv { * FR_FINISHED: request is finished * FR_PRIVATE: request is on private list * FR_ASYNC: request is asynchronous + * FR_FINISHING: request is being finished, by either the timeout handler + * or the reply handler */ enum fuse_req_flag { FR_ISREPLY, @@ -389,6 +391,7 @@ enum fuse_req_flag { FR_FINISHED, FR_PRIVATE, FR_ASYNC, + FR_FINISHING, }; /** @@ -435,6 +438,12 @@ struct fuse_req { /** fuse_mount this request belongs to */ struct fuse_mount *fm; + + /** page queue this request has been added to */ + struct fuse_pqueue *fpq; + + /** optional timer for request replies, if timeout is enabled */ + struct timer_list timer; }; struct fuse_iqueue; @@ -574,6 +583,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 */ @@ -633,6 +644,9 @@ struct fuse_conn { /** Constrain ->max_pages to this value during feature negotiation */ unsigned int max_pages_limit; + /* Request timeout (in jiffies). 0 = no timeout (infinite wait) */ + unsigned long req_timeout; + /** Input queue */ struct fuse_iqueue iq; diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 99e44ea7d875..9e69006fc026 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -733,6 +733,7 @@ enum { OPT_ALLOW_OTHER, OPT_MAX_READ, OPT_BLKSIZE, + OPT_REQUEST_TIMEOUT, OPT_ERR }; @@ -747,6 +748,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), {} }; @@ -830,6 +832,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; } @@ -1724,6 +1730,7 @@ int fuse_fill_super_common(struct super_block *sb, struct fuse_fs_context *ctx) fc->group_id = ctx->group_id; fc->legacy_opts_show = ctx->legacy_opts_show; fc->max_read = max_t(unsigned int, 4096, ctx->max_read); + fc->req_timeout = ctx->req_timeout * HZ; fc->destroy = ctx->destroy; fc->no_control = ctx->no_control; fc->no_force_umount = ctx->no_force_umount;
There are situations where fuse servers can become unresponsive or take too long to reply to a request. Currently there is no upper bound on how long a request may take, which may be frustrating to users who get stuck waiting for a request to complete. This commit adds a timeout option (in seconds) for requests. If the timeout elapses before the server replies to the request, the request will fail with -ETIME. There are 3 possibilities for a request that times out: a) The request times out before the request has been sent to userspace b) The request times out after the request has been sent to userspace and before it receives a reply from the server c) The request times out after the request has been sent to userspace and the server replies while the kernel is timing out the request While a request timeout is being handled, there may be other handlers running at the same time if: a) the kernel is forwarding the request to the server b) the kernel is processing the server's reply to the request c) the request is being re-sent d) the connection is aborting e) the device is getting released Proper synchronization must be added to ensure that the request is handled correctly in all of these cases. To this effect, there is a new FR_FINISHING bit added to the request flags, which is set atomically by either the timeout handler (see fuse_request_timeout()) which is invoked after the request timeout elapses or set by the request reply handler (see dev_do_write()), whichever gets there first. If the reply handler and the timeout handler are executing simultaneously and the reply handler sets FR_FINISHING before the timeout handler, then the request will be handled as if the timeout did not elapse. If the timeout handler sets FR_FINISHING before the reply handler, then the request will fail with -ETIME and the request will be cleaned up. Currently, this is the refcount lifecycle of a request: Synchronous request is created: fuse_simple_request -> allocates request, sets refcount to 1 __fuse_request_send -> acquires refcount queues request and waits for reply... fuse_simple_request -> drops refcount Background request is created: fuse_simple_background -> allocates request, sets refcount to 1 Request is replied to: fuse_dev_do_write fuse_request_end -> drops refcount on request Proper acquires on the request reference must be added to ensure that the timeout handler does not drop the last refcount on the request while other handlers may be operating on the request. Please note that the timeout handler may get invoked at any phase of the request's lifetime (eg before the request has been forwarded to userspace, etc). It is always guaranteed that there is a refcount on the request when the timeout handler is executing. The timeout handler will be either deactivated by the reply/abort/release handlers, or if the timeout handler is concurrently executing on another CPU, the reply/abort/release handlers will wait for the timeout handler to finish executing first before it drops the final refcount on the request. Signed-off-by: Joanne Koong <joannelkoong@gmail.com> --- fs/fuse/dev.c | 197 +++++++++++++++++++++++++++++++++++++++++++++-- fs/fuse/fuse_i.h | 14 ++++ fs/fuse/inode.c | 7 ++ 3 files changed, 210 insertions(+), 8 deletions(-)