xfs: abort unaligned nowait directio early
PATCH 1/1 xfs: abort unaligned nowait directio early
From: Darrick J. Wong <[email protected]>
Dave Chinner noticed that xfs_file_dio_aio_write returns EAGAIN without dropping the IOLOCK when its deciding not to wait, which means that we leak the IOLOCK there. Since we now make unaligned directio always wait, we have the opportunity to bail out before trying to take the lock, which should reduce the overhead of this never-gonna-work case considerably while also solving the dropped lock problem.
--- fs/xfs/xfs_file.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/xfs/xfs_file.c +3 -3
@@ -517,6 +517,9 @@ xfs_file_dio_aio_write( }if (iocb->ki_flags &IOCB_NOWAIT ) { +/* unaligned dio always waits, bail */ +if (unaligned_io) +return -EAGAIN ;if (!xfs_ilock_nowait (ip, iolock))return -EAGAIN ; }else {
@@ -536,9 +539,6 @@ xfs_file_dio_aio_write(* xfs_file_aio_write_checks() for other reasons. */ if (unaligned_io) { -/* unaligned dio always waits, bail */ -if (iocb->ki_flags &IOCB_NOWAIT ) -return -EAGAIN ;inode_dio_wait (inode); }else if (iolock ==XFS_IOLOCK_EXCL ) {xfs_ilock_demote (ip,XFS_IOLOCK_EXCL );
Quoted 9 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
Dave Chinner noticed that
xfs_file_dio_aio_writereturns EAGAIN without dropping the IOLOCK when its deciding not to wait, which means that we leak the IOLOCK there. Since we now make unaligned directio always wait, we have the opportunity to bail out before trying to take the lock, which should reduce the overhead of this never-gonna-work case considerably while also solving the dropped lock problem.
Quoted 3 lines
Reported-by Dave Chinner <[email protected]>Signed-off-by Darrick J. Wong <[email protected]>---
Quoted 27 lines
fs/xfs/xfs_file.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)fs/xfs/xfs_file.c +3
-3@@ -517,6 +517,9 @@ xfs_file_dio_aio_write( }if (iocb->ki_flags &IOCB_NOWAIT ) { +/* unaligned dio always waits, bail */ +if (unaligned_io) +return -EAGAIN ;if (!xfs_ilock_nowait (ip, iolock))return -EAGAIN ; }else {@@ -536,9 +539,6 @@ xfs_file_dio_aio_write(* xfs_file_aio_write_checks() for other reasons. */ if (unaligned_io) { -/* unaligned dio always waits, bail */ -if (iocb->ki_flags &IOCB_NOWAIT ) -return -EAGAIN ;inode_dio_wait (inode); }else if (iolock ==XFS_IOLOCK_EXCL ) {xfs_ilock_demote (ip,XFS_IOLOCK_EXCL );
Quoted 11 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
Dave Chinner noticed that
xfs_file_dio_aio_writereturns EAGAIN without dropping the IOLOCK when its deciding not to wait, which means that we leak the IOLOCK there. Since we now make unaligned directio always wait, we have the opportunity to bail out before trying to take the lock, which should reduce the overhead of this never-gonna-work case considerably while also solving the dropped lock problem.Reported-by Dave Chinner <[email protected]>Signed-off-by Darrick J. Wong <[email protected]>
Looks good.
Signature · 2 lines
Dave Chinner [email protected]
Quoted 11 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
Dave Chinner noticed that
xfs_file_dio_aio_writereturns EAGAIN without dropping the IOLOCK when its deciding not to wait, which means that we leak the IOLOCK there. Since we now make unaligned directio always wait, we have the opportunity to bail out before trying to take the lock, which should reduce the overhead of this never-gonna-work case considerably while also solving the dropped lock problem.Reported-by Dave Chinner <[email protected]>Signed-off-by Darrick J. Wong <[email protected]>
Looks good,