aio: Fix freeze protection of aio writes
Jan Kara
reviewerPATCH 1/1 aio: Fix freeze protection of aio writes
Currently we dropped freeze protection of aio writes just after IO was submitted. Thus aio write could be in flight while the filesystem was frozen and that could result in unexpected situation like aio completion wanting to convert extent type on frozen filesystem. Testcase from Dmitry triggering this is like:
for ((i=0;i<60;i++));do fsfreeze -f /mnt ;sleep 1;fsfreeze -u /mnt;done &
fio --bs=4k --ioengine=libaio --iodepth=128 --size=1g --direct=1 \
--runtime=60 --filename=/mnt/file --name=rand-write --rw=randwriteFix the problem by dropping freeze protection only once IO is completed in aio_complete().
--- fs/aio.c | 31 ++++++++++++++++++++++++++++--- include/linux/fs.h | 1 + 2 files changed, 29 insertions(+), 3 deletions(-)
This patch seems to have fallen through the cracks. Al / Ben, can you please merge it? Thanks!
fs/aio.c +28 -3
@@ -1065,6 +1065,19 @@ static void aio_complete(struct kiocb *kiocb, long res, long res2)unsigned tail, pos, head;unsigned long flags; +if (kiocb->ki_flags &IOCB_WRITE ) { +struct file *f = kiocb->ki_filp; + +/* +* Tell lockdep we inherited freeze protection from submission +* thread. +*/ +percpu_rwsem_acquire ( + &f->f_inode->i_sb->s_writers.rw_sem[SB_FREEZE_WRITE -1 ], +1 , _THIS_IP_); +file_end_write (f); + } +/* * Special case handling for sync iocbs: * - events go directly into the iocb for fast handling
@@ -1449,13 +1462,25 @@ rw_common: len = ret; -if (rw ==WRITE ) +if (rw ==WRITE ) {file_start_write (file); + req->ki_flags |=IOCB_WRITE ; + } ret =iter_op (req, &iter); -if (rw ==WRITE ) -file_end_write (file); +if (rw ==WRITE ) { +/* +* We release freeze protection in aio_complete(). Fool +* lockdep by telling it the lock got released so that +* it doesn't complain about held lock when we return +* to userspace. +*/ +percpu_rwsem_release ( + &file->f_inode->i_sb->s_writers.rw_sem[SB_FREEZE_WRITE -1 ], +1 , _THIS_IP_); + } +kfree (iovec);break ;
include/linux/fs.h +1 -0
@@ -319,6 +319,7 @@ struct writeback_control;#define IOCB_EVENTFD (1 << 0)#define IOCB_APPEND (1 << 1)#define IOCB_DIRECT (1 << 2) +#define IOCB_WRITE (1 << 3)struct kiocb {struct file *ki_filp;
Signature · 1 line
2.6.2
Benjamin LaHaise
maintainerQuoted 6 lines · Jan Kara
Currently we dropped freeze protection of aio writes just after IO was submitted. Thus aio write could be in flight while the filesystem was frozen and that could result in unexpected situation like aio completion wanting to convert extent type on frozen filesystem. Testcase from Dmitry triggering this is like:
Quoted 6 lines
for ((i=0;i<60;i++));do fsfreeze -f /mnt ;sleep 1;fsfreeze -u /mnt;done &
fio --bs=4k --ioengine=libaio --iodepth=128 --size=1g --direct=1 \ --runtime=60 --filename=/mnt/file --name=rand-write --rw=randwriteFix the problem by dropping freeze protection only once IO is completed in
aio_complete().
Why isn't this code placed in file_start_write() and file_end_write()? That makes more sense to me than sprinkling it in the aio code.
-ben
Quoted 77 lines
Reported-by Dmitry Monakhov <[email protected]>Signed-off-by Jan Kara <[email protected]>--- fs/aio.c | 31 ++++++++++++++++++++++++++++--- include/linux/fs.h | 1 + 2 files changed, 29 insertions(+), 3 deletions(-)This patch seems to have fallen through the cracks. Al / Ben, can you please merge it? Thanks!
fs/aio.c +28
-3@@ -1065,6 +1065,19 @@ static void aio_complete(struct kiocb *kiocb, long res, long res2)unsigned tail, pos, head;unsigned long flags; +if (kiocb->ki_flags &IOCB_WRITE ) { +struct file *f = kiocb->ki_filp; + +/* +* Tell lockdep we inherited freeze protection from submission +* thread. +*/ +percpu_rwsem_acquire ( + &f->f_inode->i_sb->s_writers.rw_sem[SB_FREEZE_WRITE -1 ], +1 , _THIS_IP_); +file_end_write (f); + } +/* * Special case handling for sync iocbs: * - events go directly into the iocb for fast handling @@ -1449,13 +1462,25 @@ rw_common: len = ret; -if (rw ==WRITE ) +if (rw ==WRITE ) {file_start_write (file); + req->ki_flags |=IOCB_WRITE ; + } ret =iter_op (req, &iter); -if (rw ==WRITE ) -file_end_write (file); +if (rw ==WRITE ) { +/* +* We release freeze protection in aio_complete(). Fool +* lockdep by telling it the lock got released so that +* it doesn't complain about held lock when we return +* to userspace. +*/ +percpu_rwsem_release ( + &file->f_inode->i_sb->s_writers.rw_sem[SB_FREEZE_WRITE -1 ], +1 , _THIS_IP_); + } +kfree (iovec);break ;include/linux/fs.h +1
-0@@ -319,6 +319,7 @@ struct writeback_control;#define IOCB_EVENTFD (1 << 0)#define IOCB_APPEND (1 << 1)#define IOCB_DIRECT (1 << 2) +#define IOCB_WRITE (1 << 3)struct kiocb {struct file *ki_filp;Signature · 1 line
2.6.2
Signature · 1 line
"Thought is the essence of where you are now."
Benjamin LaHaise
maintainerQuoted 6 lines · Benjamin LaHaise
Quoted 2 lines · Jan Kara
Fix the problem by dropping freeze protection only once IO is completed in
aio_complete().Why isn't this code placed in
file_start_write()andfile_end_write()? That makes more sense to me than sprinkling it in the aio code.
And yes, the file_end_write() call should be moved to aio completion as well.
-ben
Signature · 1 line
"Thought is the essence of where you are now."
Jan Kara
reviewerQuoted 11 lines · Benjamin LaHaise
Quoted 10 lines · Jan Kara
Currently we dropped freeze protection of aio writes just after IO was submitted. Thus aio write could be in flight while the filesystem was frozen and that could result in unexpected situation like aio completion wanting to convert extent type on frozen filesystem. Testcase from Dmitry triggering this is like:
for ((i=0;i<60;i++));do fsfreeze -f /mnt ;sleep 1;fsfreeze -u /mnt;done &
fio --bs=4k --ioengine=libaio --iodepth=128 --size=1g --direct=1 \ --runtime=60 --filename=/mnt/file --name=rand-write --rw=randwrite
Quoted 5 lines
Quoted 2 lines
Fix the problem by dropping freeze protection only once IO is completed in
aio_complete().Why isn't this code placed in
file_start_write()andfile_end_write()? That makes more sense to me than sprinkling it in the aio code.
Well, that would completely defeat the purpose of lockdep annotations for fs freeze protection - we want lockdep to treat file_start_write() - file_end_write() pair as a lock-unlock pair. But in case of AIO the unlock will happen from a different process than lock and lockdep cannot handle such cases. That's why for AIO we have to add some lockdep magic to avoid false warnings.
Honza
Quoted 84 lines
Quoted 77 lines
Reported-by Dmitry Monakhov <[email protected]>Signed-off-by Jan Kara <[email protected]>--- fs/aio.c | 31 ++++++++++++++++++++++++++++--- include/linux/fs.h | 1 + 2 files changed, 29 insertions(+), 3 deletions(-)This patch seems to have fallen through the cracks. Al / Ben, can you please merge it? Thanks!
fs/aio.c +28
-3@@ -1065,6 +1065,19 @@ static void aio_complete(struct kiocb *kiocb, long res, long res2)unsigned tail, pos, head;unsigned long flags; +if (kiocb->ki_flags &IOCB_WRITE ) { +struct file *f = kiocb->ki_filp; + +/* +* Tell lockdep we inherited freeze protection from submission +* thread. +*/ +percpu_rwsem_acquire ( + &f->f_inode->i_sb->s_writers.rw_sem[SB_FREEZE_WRITE -1 ], +1 , _THIS_IP_); +file_end_write (f); + } +/* * Special case handling for sync iocbs: * - events go directly into the iocb for fast handling @@ -1449,13 +1462,25 @@ rw_common: len = ret; -if (rw ==WRITE ) +if (rw ==WRITE ) {file_start_write (file); + req->ki_flags |=IOCB_WRITE ; + } ret =iter_op (req, &iter); -if (rw ==WRITE ) -file_end_write (file); +if (rw ==WRITE ) { +/* +* We release freeze protection in aio_complete(). Fool +* lockdep by telling it the lock got released so that +* it doesn't complain about held lock when we return +* to userspace. +*/ +percpu_rwsem_release ( + &file->f_inode->i_sb->s_writers.rw_sem[SB_FREEZE_WRITE -1 ], +1 , _THIS_IP_); + } +kfree (iovec);break ;include/linux/fs.h +1
-0@@ -319,6 +319,7 @@ struct writeback_control;#define IOCB_EVENTFD (1 << 0)#define IOCB_APPEND (1 << 1)#define IOCB_DIRECT (1 << 2) +#define IOCB_WRITE (1 << 3)struct kiocb {struct file *ki_filp;Signature · 1 line
2.6.2Signature · 5 lines
"Thought is the essence of where you are now." -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Benjamin LaHaise
maintainerQuoted 1 line · Jan Kara
On Thu 07-01-16 10:07:05, Benjamin LaHaise wrote:
...
Quoted 9 lines
Quoted 2 lines
Why isn't this code placed in
file_start_write()andfile_end_write()? That makes more sense to me than sprinkling it in the aio code.Well, that would completely defeat the purpose of lockdep annotations for fs freeze protection - we want lockdep to treat
file_start_write()-file_end_write()pair as a lock-unlock pair. But in case of AIO the unlock will happen from a different process than lock and lockdep cannot handle such cases. That's why for AIO we have to add some lockdep magic to avoid false warnings.
Okay, makes sense. Applied. I'll forward that with the other fix that is pending.
-ben
Signature · 1 line
"Thought is the essence of where you are now."