direct-io: Fix sleep in atomic due to sync AIO
Subsystems (2)
Jan Kara
reviewerPATCH 1/1 direct-io: Fix sleep in atomic due to sync AIO
Commit e864f39569f4 "fs: add RWF_DSYNC aand RWF_SYNC" added additional way for direct IO to become synchronous and thus trigger fsync from the IO completion handler. Then commit 9830f4be159b "fs: Use RWF_* flags for AIO operations" allowed these flags to be set for AIO as well. However that commit forgot to update the condition checking whether the IO completion handling should be defered to a workqueue and thus AIO DIO with RWF_[D]SYNC set will call fsync() from IRQ context resulting in sleep in atomic.
Fix the problem by checking directly iocb flags (the same way as it is done in dio_complete()) instead of checking all conditions that could lead to IO being synchronous.
--- fs/direct-io.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/direct-io.c +1 -2
@@ -1274,8 +1274,7 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,*/ if (dio->is_async &&iov_iter_rw (iter) ==WRITE ) { retval =0 ; -if ((iocb->ki_filp->f_flags &O_DSYNC ) || -IS_SYNC (iocb->ki_filp->f_mapping->host)) +if (iocb->ki_flags &IOCB_DSYNC ) retval =dio_set_defer_completion (dio);else if (!dio->inode->i_sb->s_dio_done_wq) {/*
Signature · 1 line
2.13.6
Jens Axboe
AppliedQuoted 9 lines · Jan Kara
Commit
e864f39569f4"fs: addRWF_DSYNCaandRWF_SYNC" added additional way for direct IO to become synchronous and thus trigger fsync from the IO completion handler. Then commit9830f4be159b"fs: Use RWF_* flags for AIO operations" allowed these flags to be set for AIO as well. However that commit forgot to update the condition checking whether the IO completion handling should be defered to a workqueue and thus AIO DIO with RWF_[D]SYNC set will callfsync()from IRQ context resulting in sleep in atomic.
Quoted 3 lines
Fix the problem by checking directly iocb flags (the same way as it is done in
dio_complete()) instead of checking all conditions that could lead to IO being synchronous.
Thanks, applied.
Signature · 1 line
Jens Axboe