diff options
| author | Jens Axboe <axboe@kernel.dk> | 2020-01-08 18:26:07 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-01-21 03:04:04 +0300 |
| commit | c150368b496837cb207712e78f903ccfd7633b93 (patch) | |
| tree | ae5000abfeaf34ce0f55d60003122bec52d30f00 | |
| parent | 96fd84d83a778450ffae737d9efa546ac3983b1f (diff) | |
| download | linux-c150368b496837cb207712e78f903ccfd7633b93.tar.xz | |
io_uring: file set registration should use interruptible waits
If an application attempts to register a set with unbounded requests
pending, we can be stuck here forever if they don't complete. We can
make this wait interruptible, and just abort if we get signaled.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | fs/io_uring.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 00426b686092..2c036972930f 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -6524,8 +6524,13 @@ static int __io_uring_register(struct io_ring_ctx *ctx, unsigned opcode, * after we've killed the percpu ref. */ mutex_unlock(&ctx->uring_lock); - wait_for_completion(&ctx->completions[0]); + ret = wait_for_completion_interruptible(&ctx->completions[0]); mutex_lock(&ctx->uring_lock); + if (ret) { + percpu_ref_resurrect(&ctx->refs); + ret = -EINTR; + goto out; + } } switch (opcode) { @@ -6571,8 +6576,9 @@ static int __io_uring_register(struct io_ring_ctx *ctx, unsigned opcode, if (opcode != IORING_UNREGISTER_FILES && opcode != IORING_REGISTER_FILES_UPDATE) { /* bring the ctx back to life */ - reinit_completion(&ctx->completions[0]); percpu_ref_reinit(&ctx->refs); +out: + reinit_completion(&ctx->completions[0]); } return ret; } |