diff options
| author | Bart Van Assche <bvanassche@acm.org> | 2024-02-15 12:47:38 -0800 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2024-02-21 16:31:49 +0100 |
| commit | b820de741ae48ccf50dd95e297889c286ff4f760 (patch) | |
| tree | 78b62c4082fd58567636efdd41cc0b88e6db90da | |
| parent | 6ea38e2aeb72349cad50e38899b0ba6fbcb2af3d (diff) | |
| download | linux-b820de741ae48ccf50dd95e297889c286ff4f760.tar.gz | |
fs/aio: Restrict kiocb_set_cancel_fn() to I/O submitted via libaio
If kiocb_set_cancel_fn() is called for I/O submitted via io_uring, the
following kernel warning appears:
WARNING: CPU: 3 PID: 368 at fs/aio.c:598 kiocb_set_cancel_fn+0x9c/0xa8
Call trace:
kiocb_set_cancel_fn+0x9c/0xa8
ffs_epfile_read_iter+0x144/0x1d0
io_read+0x19c/0x498
io_issue_sqe+0x118/0x27c
io_submit_sqes+0x25c/0x5fc
__arm64_sys_io_uring_enter+0x104/0xab0
invoke_syscall+0x58/0x11c
el0_svc_common+0xb4/0xf4
do_el0_svc+0x2c/0xb0
el0_svc+0x2c/0xa4
el0t_64_sync_handler+0x68/0xb4
el0t_64_sync+0x1a4/0x1a8
Fix this by setting the IOCB_AIO_RW flag for read and write I/O that is
submitted by libaio.
Suggested-by: Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Avi Kivity <avi@scylladb.com>
Cc: Sandeep Dhavale <dhavale@google.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Kent Overstreet <kent.overstreet@linux.dev>
Cc: stable@vger.kernel.org
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20240215204739.2677806-2-bvanassche@acm.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
Notes
Fixed-by: 961ebd120565 ("fs/aio: Check IOCB_AIO_RW before the struct aio_kiocb conversion") # master
Stable: e7e23fc5d5fe # v6.6.19
Stable: 18f614369def # v6.1.80
Stable: d7b6fa97ec89 # v5.15.150
Stable: ea1cd64d59f2 # v5.10.211
Stable: b4eea7a05ee0 # v5.4.270
Stable: 337b543e274f # v4.19.308
Lore: https://lore.kernel.org/r/20240215204739.2677806-2-bvanassche@acm.org # linux-fsdevel, stable
Lore: https://lore.kernel.org/r/20240226192950.4136472-1-bvanassche@acm.org # stable
Lore: https://lore.kernel.org/r/20240226193234.4177638-1-bvanassche@acm.org # stable
Lore: https://lore.kernel.org/r/20240226193421.16169-1-bvanassche@acm.org # stable
Lore: https://lore.kernel.org/r/20240226193604.59623-1-bvanassche@acm.org # stable
Lore: https://lore.kernel.org/r/20240226193726.93631-1-bvanassche@acm.org # stable
Lore: https://lore.kernel.org/r/20240227131550.210449345@linuxfoundation.org # linux-patches, stable
Lore: https://lore.kernel.org/r/20240227131555.580101633@linuxfoundation.org # linux-patches, stable
Lore: https://lore.kernel.org/r/20240227131602.630277329@linuxfoundation.org # linux-patches, stable
Lore: https://lore.kernel.org/r/20240227131616.612391729@linuxfoundation.org # linux-patches, stable
Lore: https://lore.kernel.org/r/20240227131622.962672342@linuxfoundation.org # linux-patches, stable
Lore: https://lore.kernel.org/r/20240227131630.535091139@linuxfoundation.org # linux-patches, stable
Lore: https://lore.kernel.org/r/20240227131635.535878649@linuxfoundation.org # linux-patches, stable
| -rw-r--r-- | fs/aio.c | 9 | ||||
| -rw-r--r-- | include/linux/fs.h | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/fs/aio.c b/fs/aio.c index bb2ff48991f35e..da18dbcfcb2208 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -593,6 +593,13 @@ void kiocb_set_cancel_fn(struct kiocb *iocb, kiocb_cancel_fn *cancel) struct kioctx *ctx = req->ki_ctx; unsigned long flags; + /* + * kiocb didn't come from aio or is neither a read nor a write, hence + * ignore it. + */ + if (!(iocb->ki_flags & IOCB_AIO_RW)) + return; + if (WARN_ON_ONCE(!list_empty(&req->ki_list))) return; @@ -1509,7 +1516,7 @@ static int aio_prep_rw(struct kiocb *req, const struct iocb *iocb) req->ki_complete = aio_complete_rw; req->private = NULL; req->ki_pos = iocb->aio_offset; - req->ki_flags = req->ki_filp->f_iocb_flags; + req->ki_flags = req->ki_filp->f_iocb_flags | IOCB_AIO_RW; if (iocb->aio_flags & IOCB_FLAG_RESFD) req->ki_flags |= IOCB_EVENTFD; if (iocb->aio_flags & IOCB_FLAG_IOPRIO) { diff --git a/include/linux/fs.h b/include/linux/fs.h index ed5966a7049512..c2dcc98cb4c8df 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -352,6 +352,8 @@ enum rw_hint { * unrelated IO (like cache flushing, new IO generation, etc). */ #define IOCB_DIO_CALLER_COMP (1 << 22) +/* kiocb is a read or write operation submitted by fs/aio.c. */ +#define IOCB_AIO_RW (1 << 23) /* for use in trace events */ #define TRACE_IOCB_STRINGS \ |