Skip to content

Commit b820de7

Browse files
bvanasschebrauner
authored andcommitted
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>
1 parent 6ea38e2 commit b820de7

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

fs/aio.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,13 @@ void kiocb_set_cancel_fn(struct kiocb *iocb, kiocb_cancel_fn *cancel)
593593
struct kioctx *ctx = req->ki_ctx;
594594
unsigned long flags;
595595

596+
/*
597+
* kiocb didn't come from aio or is neither a read nor a write, hence
598+
* ignore it.
599+
*/
600+
if (!(iocb->ki_flags & IOCB_AIO_RW))
601+
return;
602+
596603
if (WARN_ON_ONCE(!list_empty(&req->ki_list)))
597604
return;
598605

@@ -1509,7 +1516,7 @@ static int aio_prep_rw(struct kiocb *req, const struct iocb *iocb)
15091516
req->ki_complete = aio_complete_rw;
15101517
req->private = NULL;
15111518
req->ki_pos = iocb->aio_offset;
1512-
req->ki_flags = req->ki_filp->f_iocb_flags;
1519+
req->ki_flags = req->ki_filp->f_iocb_flags | IOCB_AIO_RW;
15131520
if (iocb->aio_flags & IOCB_FLAG_RESFD)
15141521
req->ki_flags |= IOCB_EVENTFD;
15151522
if (iocb->aio_flags & IOCB_FLAG_IOPRIO) {

include/linux/fs.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,8 @@ enum rw_hint {
352352
* unrelated IO (like cache flushing, new IO generation, etc).
353353
*/
354354
#define IOCB_DIO_CALLER_COMP (1 << 22)
355+
/* kiocb is a read or write operation submitted by fs/aio.c. */
356+
#define IOCB_AIO_RW (1 << 23)
355357

356358
/* for use in trace events */
357359
#define TRACE_IOCB_STRINGS \

0 commit comments

Comments
 (0)