Skip to content

Commit 8b8fbb2

Browse files
bvanasscheroxanan1996
authored andcommitted
fs/aio: Restrict kiocb_set_cancel_fn() to I/O submitted via libaio
BugLink: https://bugs.launchpad.net/bugs/2060142 commit b820de7 upstream. 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> Signed-off-by: Bart Van Assche <bvanassche@acm.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Manuel Diewald <manuel.diewald@canonical.com> Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
1 parent 95a5785 commit 8b8fbb2

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
@@ -568,6 +568,13 @@ void kiocb_set_cancel_fn(struct kiocb *iocb, kiocb_cancel_fn *cancel)
568568
struct kioctx *ctx = req->ki_ctx;
569569
unsigned long flags;
570570

571+
/*
572+
* kiocb didn't come from aio or is neither a read nor a write, hence
573+
* ignore it.
574+
*/
575+
if (!(iocb->ki_flags & IOCB_AIO_RW))
576+
return;
577+
571578
if (WARN_ON_ONCE(!list_empty(&req->ki_list)))
572579
return;
573580

@@ -1453,7 +1460,7 @@ static int aio_prep_rw(struct kiocb *req, const struct iocb *iocb)
14531460
req->ki_complete = aio_complete_rw;
14541461
req->private = NULL;
14551462
req->ki_pos = iocb->aio_offset;
1456-
req->ki_flags = iocb_flags(req->ki_filp);
1463+
req->ki_flags = iocb_flags(req->ki_filp) | IOCB_AIO_RW;
14571464
if (iocb->aio_flags & IOCB_FLAG_RESFD)
14581465
req->ki_flags |= IOCB_EVENTFD;
14591466
req->ki_hint = ki_hint_validate(file_write_hint(req->ki_filp));

include/linux/fs.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,8 @@ enum rw_hint {
322322
#define IOCB_NOIO (1 << 20)
323323
/* can use bio alloc cache */
324324
#define IOCB_ALLOC_CACHE (1 << 21)
325+
/* kiocb is a read or write operation submitted by fs/aio.c. */
326+
#define IOCB_AIO_RW (1 << 23)
325327

326328
struct kiocb {
327329
struct file *ki_filp;

0 commit comments

Comments
 (0)