fs: Fix page cache inconsistency when mixing buffered and AIO DIO
Subsystems (3)
PATCH 1/1 fs: Fix page cache inconsistency when mixing buffered and AIO DIO
Currently when mixing buffered reads and asynchronous direct writes it is possible to end up with the situation where we have stale data in the page cache while the new data is already written to disk. This is permanent until the affected pages are flushed away. Despite the fact that mixing buffered and direct IO is ill-advised it does pose a thread for a data integrity, is unexpected and should be fixed.
Fix this by deferring completion of asynchronous direct writes to a process context in the case that there are mapped pages to be found in the inode. Later before the completion in dio_complete() invalidate the pages in question. This ensures that after the completion the pages in the written area are either unmapped, or populated with up-to-date data. Also do the same for the iomap case which uses iomap_dio_complete() instead.
This has a side effect of deferring the completion to a process context for every AIO DIO that happens on inode that has pages mapped. However since the consensus is that this is ill-advised practice the performance implication should not be a problem.
This was based on proposal from Jeff Moyer, thanks!
--- fs/direct-io.c | 31 ++++++++++++++++++++++++++----- fs/iomap.c | 7 +++++++ 2 files changed, 33 insertions(+), 5 deletions(-)
fs/direct-io.c +26 -5
@@ -258,6 +258,11 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async)if (ret ==0 ) ret = transferred; +if ((dio->op ==REQ_OP_WRITE && dio->inode->i_mapping->nrpages)) +invalidate_inode_pages2_range (dio->inode->i_mapping, + offset >>PAGE_SHIFT , + (offset + ret -1 ) >>PAGE_SHIFT ); +if (dio->end_io) {int err;
@@ -304,6 +309,7 @@ static void dio_bio_end_aio(struct bio *bio)struct dio *dio = bio->bi_private;unsigned long remaining;unsigned long flags; +bool defer_completion = false;/* cleanup the bio */ dio_bio_complete (dio, bio);
@@ -315,7 +321,19 @@ static void dio_bio_end_aio(struct bio *bio)spin_unlock_irqrestore (&dio->bio_lock, flags);if (remaining ==0 ) { -if (dio->result && dio->defer_completion) { +/* +* Defer completion when defer_completion is set or +* when the inode has pages mapped and this is AIO write. +* We need to invalidate those pages because there is a +* chance they contain stale data in the case buffered IO +* went in between AIO submission and completion into the +* same region. +*/ +if (dio->result) + defer_completion = dio->defer_completion || + (dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages); +if (defer_completion) {INIT_WORK (&dio->complete_work, dio_aio_complete_work);queue_work (dio->inode->i_sb->s_dio_done_wq, &dio->complete_work);
@@ -1210,10 +1228,13 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,* For AIO O_(D)SYNC writes we need to defer completions to a workqueue * so that we can call ->fsync. */ -if (dio->is_async &&iov_iter_rw (iter) ==WRITE && - ((iocb->ki_filp->f_flags &O_DSYNC ) || -IS_SYNC (iocb->ki_filp->f_mapping->host))) { - retval =dio_set_defer_completion (dio); +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)) + retval =dio_set_defer_completion (dio); +else if (!dio->inode->i_sb->s_dio_done_wq) + retval =sb_init_dio_done_wq (dio->inode->i_sb);if (retval) {/* * We grab i_mutex only for reads so we don't have
fs/iomap.c +7 -0
@@ -713,8 +713,15 @@ struct iomap_dio {static ssize_t iomap_dio_complete (struct iomap_dio *dio) {struct kiocb *iocb = dio->iocb; +loff_t offset = iocb->ki_pos; +struct inode *inode =file_inode (iocb->ki_filp);ssize_t ret; +if ((dio->flags &IOMAP_DIO_WRITE ) && inode->i_mapping->nrpages) +invalidate_inode_pages2_range (inode->i_mapping, + offset >>PAGE_SHIFT , + (offset + dio->size + ret -1 ) >>PAGE_SHIFT ); +if (dio->end_io) { ret = dio->end_io(iocb, dio->error ? dio->error : dio->size,
Signature · 1 line
2.7.5
kbuild test robot
build boturl: https://github.com/0day-ci/linux/commits/Lukas-Czerner/fs-Fix-page-cache-inconsistency-when-mixing-buffered-and-AIO-DIO/20170714-181130 config: x86_64-randconfig-x010-201728 (attached as…
Hi Lukas,
[auto build test WARNING on linus/master]
[also build test WARNING on v4.12 next-20170713]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Lukas-Czerner/fs-Fix-page-cache-inconsistency-when-mixing-buffered-and-AIO-DIO/20170714-181130
config: x86_64-randconfig-x010-201728 (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64 Note: it may well be a FALSE warning. FWIW you are at least aware of it now.
http://gcc.gnu.org/wiki/Better_Uninitialized_Warnings
All warnings (new ones prefixed by >>):
fs/iomap.c: In function 'iomap_dio_complete':
>> fs/iomap.c:629:25: warning: 'ret' may be used uninitialized in this function [-Wmaybe-uninitialized]
(offset + dio->size + ret - 1) >> PAGE_SHIFT);
~~~~~~~~~~~~~~~~~~~^~~~~vim +/ret +629 fs/iomap.c
618
619 static ssize_t iomap_dio_complete(struct iomap_dio *dio)
620 {
621 struct kiocb *iocb = dio->iocb;
622 loff_t offset = iocb->ki_pos;
623 struct inode *inode = file_inode(iocb->ki_filp);
624 ssize_t ret;
625
626 if ((dio->flags & IOMAP_DIO_WRITE) && inode->i_mapping->nrpages)
627 invalidate_inode_pages2_range(inode->i_mapping,
628 offset >> PAGE_SHIFT,
> 629 (offset + dio->size + ret - 1) >> PAGE_SHIFT);
630
631 if (dio->end_io) {
632 ret = dio->end_io(iocb,
633 dio->error ? dio->error : dio->size,
634 dio->flags);
635 } else {
636 ret = dio->error;
637 }
638
639 if (likely(!ret)) {
640 ret = dio->size;
641 /* check for short read */
642 if (iocb->ki_pos + ret > dio->i_size &&
643 !(dio->flags & IOMAP_DIO_WRITE))
644 ret = dio->i_size - iocb->ki_pos;
645 iocb->ki_pos += ret;
646 }
647
648 inode_dio_end(file_inode(iocb->ki_filp));
649 kfree(dio);
650
651 return ret;
652 }
653
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Quoted 16 lines · kbuild test robot
Hi Lukas,
[auto build test WARNING on linus/master]
[also build test WARNING on v4.12 next-20170713]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]url: https://github.com/0day-ci/linux/commits/Lukas-Czerner/fs-Fix-page-cache-inconsistency-when-mixing-buffered-and-AIO-DIO/20170714-181130
config: x86_64-randconfig-x010-201728 (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce:# save the attached .config to linux build tree make ARCH=x86_64Note: it may well be a FALSE warning. FWIW you are at least aware of it now.
http://gcc.gnu.org/wiki/Better_Uninitialized_Warnings
Quoted 6 lines
All warnings (new ones prefixed by >>):
fs/iomap.c: In function 'iomap_dio_complete':Quoted 1 line
Quoted 1 line
fs/iomap.c:629:25: warning: 'ret' may be used uninitialized in this function [-Wmaybe-uninitialized](offset + dio->size + ret - 1) >> PAGE_SHIFT); ~~~~~~~~~~~~~~~~~~~^~~~~
Oops, right, this is obviously wrong.
Thanks!
-Lukas
Quoted 43 lines
vim +/ret +629
fs/iomap.c618 619 static ssize_t iomap_dio_complete(struct iomap_dio *dio) 620 { 621 struct kiocb *iocb = dio->iocb; 622 loff_t offset = iocb->ki_pos; 623 struct inode *inode = file_inode(iocb->ki_filp); 624 ssize_t ret; 625 626 if ((dio->flags & IOMAP_DIO_WRITE) && inode->i_mapping->nrpages) 627 invalidate_inode_pages2_range(inode->i_mapping, 628 offset >> PAGE_SHIFT,Quoted 1 line
629 (offset +
dio->size+ ret - 1) >>PAGE_SHIFT);630
631 if (dio->end_io) { 632 ret = dio->end_io(iocb, 633 dio->error ? dio->error : dio->size, 634 dio->flags); 635 } else { 636 ret = dio->error; 637 } 638 639 if (likely(!ret)) { 640 ret = dio->size; 641 /* check for short read */ 642 if (iocb->ki_pos + ret > dio->i_size && 643 !(dio->flags & IOMAP_DIO_WRITE)) 644 ret = dio->i_size - iocb->ki_pos; 645 iocb->ki_pos += ret; 646 } 647 648 inode_dio_end(file_inode(iocb->ki_filp)); 649 kfree(dio); 650 651 return ret; 652 } 653---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
PATCH v2 1/1 fs: Fix page cache inconsistency when mixing buffered and AIO DIO
In reply to Lukas CzernerCurrently when mixing buffered reads and asynchronous direct writes it is possible to end up with the situation where we have stale data in the page cache while the new data is already written to disk. This is permanent until the affected pages are flushed away. Despite the fact that mixing buffered and direct IO is ill-advised it does pose a thread for a data integrity, is unexpected and should be fixed.
Fix this by deferring completion of asynchronous direct writes to a process context in the case that there are mapped pages to be found in the inode. Later before the completion in dio_complete() invalidate the pages in question. This ensures that after the completion the pages in the written area are either unmapped, or populated with up-to-date data. Also do the same for the iomap case which uses iomap_dio_complete() instead.
This has a side effect of deferring the completion to a process context for every AIO DIO that happens on inode that has pages mapped. However since the consensus is that this is ill-advised practice the performance implication should not be a problem.
This was based on proposal from Jeff Moyer, thanks!
---
v2: Remove leftover ret variable from invalidate call in iomap_dio_complete
fs/direct-io.c | 31 ++++++++++++++++++++++++++----- fs/iomap.c | 7 +++++++ 2 files changed, 33 insertions(+), 5 deletions(-)
fs/direct-io.c +26 -5
@@ -258,6 +258,11 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async)if (ret ==0 ) ret = transferred; +if ((dio->op ==REQ_OP_WRITE && dio->inode->i_mapping->nrpages)) +invalidate_inode_pages2_range (dio->inode->i_mapping, + offset >>PAGE_SHIFT , + (offset + ret -1 ) >>PAGE_SHIFT ); +if (dio->end_io) {int err;
@@ -304,6 +309,7 @@ static void dio_bio_end_aio(struct bio *bio)struct dio *dio = bio->bi_private;unsigned long remaining;unsigned long flags; +bool defer_completion = false;/* cleanup the bio */ dio_bio_complete (dio, bio);
@@ -315,7 +321,19 @@ static void dio_bio_end_aio(struct bio *bio)spin_unlock_irqrestore (&dio->bio_lock, flags);if (remaining ==0 ) { -if (dio->result && dio->defer_completion) { +/* +* Defer completion when defer_completion is set or +* when the inode has pages mapped and this is AIO write. +* We need to invalidate those pages because there is a +* chance they contain stale data in the case buffered IO +* went in between AIO submission and completion into the +* same region. +*/ +if (dio->result) + defer_completion = dio->defer_completion || + (dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages); +if (defer_completion) {INIT_WORK (&dio->complete_work, dio_aio_complete_work);queue_work (dio->inode->i_sb->s_dio_done_wq, &dio->complete_work);
@@ -1210,10 +1228,13 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,* For AIO O_(D)SYNC writes we need to defer completions to a workqueue * so that we can call ->fsync. */ -if (dio->is_async &&iov_iter_rw (iter) ==WRITE && - ((iocb->ki_filp->f_flags &O_DSYNC ) || -IS_SYNC (iocb->ki_filp->f_mapping->host))) { - retval =dio_set_defer_completion (dio); +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)) + retval =dio_set_defer_completion (dio); +else if (!dio->inode->i_sb->s_dio_done_wq) + retval =sb_init_dio_done_wq (dio->inode->i_sb);if (retval) {/* * We grab i_mutex only for reads so we don't have
fs/iomap.c +7 -0
@@ -713,8 +713,15 @@ struct iomap_dio {static ssize_t iomap_dio_complete (struct iomap_dio *dio) {struct kiocb *iocb = dio->iocb; +loff_t offset = iocb->ki_pos; +struct inode *inode =file_inode (iocb->ki_filp);ssize_t ret; +if ((dio->flags &IOMAP_DIO_WRITE ) && inode->i_mapping->nrpages) +invalidate_inode_pages2_range (inode->i_mapping, + offset >>PAGE_SHIFT , + (offset + dio->size -1 ) >>PAGE_SHIFT ); +if (dio->end_io) { ret = dio->end_io(iocb, dio->error ? dio->error : dio->size,
Signature · 1 line
2.7.5
Jan Kara
maintainerQuoted 20 lines · Lukas Czerner
Currently when mixing buffered reads and asynchronous direct writes it is possible to end up with the situation where we have stale data in the page cache while the new data is already written to disk. This is permanent until the affected pages are flushed away. Despite the fact that mixing buffered and direct IO is ill-advised it does pose a thread for a data integrity, is unexpected and should be fixed.
Fix this by deferring completion of asynchronous direct writes to a process context in the case that there are mapped pages to be found in the inode. Later before the completion in
dio_complete()invalidate the pages in question. This ensures that after the completion the pages in the written area are either unmapped, or populated with up-to-date data. Also do the same for the iomap case which usesiomap_dio_complete()instead.This has a side effect of deferring the completion to a process context for every AIO DIO that happens on inode that has pages mapped. However since the consensus is that this is ill-advised practice the performance implication should not be a problem.
Quoted 4 lines
This was based on proposal from Jeff Moyer, thanks!
Signed-off-by Lukas Czerner <[email protected]>Cc Jeff Moyer <[email protected]>
OK, this looks like it could work. Some comments below.
fs/direct-io.c static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async) · line 261
Quoted 13 lines
fs/direct-io.c | 31 ++++++++++++++++++++++++++----- fs/iomap.c | 7 +++++++ 2 files changed, 33 insertions(+), 5 deletions(-)fs/direct-io.c +1
-0@@ -258,6 +258,11 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async)if (ret ==0 ) ret = transferred; +if ((dio->op ==REQ_OP_WRITE && dio->inode->i_mapping->nrpages))
Superfluous braces here... Also you should not call invalidate_inode_pages2_range() in case of error I suppose.
Quoted 41 lines
fs/direct-io.c +18
-2+invalidate_inode_pages2_range (dio->inode->i_mapping, + offset >>PAGE_SHIFT , + (offset + ret -1 ) >>PAGE_SHIFT ); +if (dio->end_io) {int err;@@ -304,6 +309,7 @@ static void dio_bio_end_aio(struct bio *bio)struct dio *dio = bio->bi_private;unsigned long remaining;unsigned long flags; +bool defer_completion = false;/* cleanup the bio */ dio_bio_complete (dio, bio);@@ -315,7 +321,19 @@ static void dio_bio_end_aio(struct bio *bio)spin_unlock_irqrestore (&dio->bio_lock, flags);if (remaining ==0 ) { -if (dio->result && dio->defer_completion) { +/* +* Defer completion when defer_completion is set or +* when the inode has pages mapped and this is AIO write. +* We need to invalidate those pages because there is a +* chance they contain stale data in the case buffered IO +* went in between AIO submission and completion into the +* same region. +*/ +if (dio->result) + defer_completion = dio->defer_completion || + (dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages); +if (defer_completion) {INIT_WORK (&dio->complete_work, dio_aio_complete_work);queue_work (dio->inode->i_sb->s_dio_done_wq, &dio->complete_work);@@ -1210,10 +1228,13 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,* For AIO O_(D)SYNC writes we need to defer completions to a workqueue * so that we can call ->fsync. */ - if (dio->is_async && iov_iter_rw(iter) == WRITE &&
fs/direct-io.c do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode, · line 1237
Quoted 10 lines
fs/direct-io.c +7
-3- ((iocb->ki_filp->f_flags & O_DSYNC) || - IS_SYNC(iocb->ki_filp->f_mapping->host))) { - retval =dio_set_defer_completion (dio); +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)) + retval =dio_set_defer_completion (dio); +else if (!dio->inode->i_sb->s_dio_done_wq) + retval =sb_init_dio_done_wq (dio->inode->i_sb);
Please add a comment explaining why sb_init_dio_done_wq() is needed here.
Quoted 8 lines
fs/direct-io.c +0
-0if (retval) {/* * We grab i_mutex only for reads so we don't have fs/iomap.c +0
-0
fs/iomap.c struct iomap_dio { · line 720
Quoted 8 lines
fs/iomap.c +3
-0@@ -713,8 +713,15 @@ struct iomap_dio {static ssize_t iomap_dio_complete (struct iomap_dio *dio) {struct kiocb *iocb = dio->iocb; +loff_t offset = iocb->ki_pos; +struct inode *inode =file_inode (iocb->ki_filp);ssize_t ret; +if ((dio->flags &IOMAP_DIO_WRITE ) && inode->i_mapping->nrpages)
Again I don't think you want to invalidate pages in case DIO failed with an error...
fs/iomap.c struct iomap_dio { · line 727
Quoted 7 lines
fs/iomap.c +4
-0+invalidate_inode_pages2_range (inode->i_mapping, + offset >>PAGE_SHIFT , + (offset + dio->size -1 ) >>PAGE_SHIFT ); +if (dio->end_io) { ret = dio->end_io(iocb, dio->error ? dio->error : dio->size,
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 40 lines · Jan Kara
Quoted 20 lines · Lukas Czerner
Currently when mixing buffered reads and asynchronous direct writes it is possible to end up with the situation where we have stale data in the page cache while the new data is already written to disk. This is permanent until the affected pages are flushed away. Despite the fact that mixing buffered and direct IO is ill-advised it does pose a thread for a data integrity, is unexpected and should be fixed.
Fix this by deferring completion of asynchronous direct writes to a process context in the case that there are mapped pages to be found in the inode. Later before the completion in
dio_complete()invalidate the pages in question. This ensures that after the completion the pages in the written area are either unmapped, or populated with up-to-date data. Also do the same for the iomap case which usesiomap_dio_complete()instead.This has a side effect of deferring the completion to a process context for every AIO DIO that happens on inode that has pages mapped. However since the consensus is that this is ill-advised practice the performance implication should not be a problem.
Quoted 4 lines
This was based on proposal from Jeff Moyer, thanks!
Signed-off-by Lukas Czerner <[email protected]>Cc Jeff Moyer <[email protected]>OK, this looks like it could work. Some comments below.
Quoted 12 lines
fs/direct-io.c | 31 ++++++++++++++++++++++++++----- fs/iomap.c | 7 +++++++ 2 files changed, 33 insertions(+), 5 deletions(-)fs/direct-io.c +0
-0@@ -258,6 +258,11 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async)if (ret ==0 ) ret = transferred;
Quoted 4 lines
fs/direct-io.c static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async) · line 261
Quoted 1 line
fs/direct-io.c +1
-0+if ((dio->op ==REQ_OP_WRITE && dio->inode->i_mapping->nrpages))Superfluous braces here... Also you should not call
invalidate_inode_pages2_range()in case of error I suppose.
Sure, I'll fix the braces.
About the error case, is it not possible that some data has already been writtent to the disk despite the error ?
Thanks!
-Lukas
Quoted 46 lines
Quoted 46 lines
fs/direct-io.c +19
-5+invalidate_inode_pages2_range (dio->inode->i_mapping, + offset >>PAGE_SHIFT , + (offset + ret -1 ) >>PAGE_SHIFT ); +if (dio->end_io) {int err;@@ -304,6 +309,7 @@ static void dio_bio_end_aio(struct bio *bio)struct dio *dio = bio->bi_private;unsigned long remaining;unsigned long flags; +bool defer_completion = false;/* cleanup the bio */ dio_bio_complete (dio, bio);@@ -315,7 +321,19 @@ static void dio_bio_end_aio(struct bio *bio)spin_unlock_irqrestore (&dio->bio_lock, flags);if (remaining ==0 ) { -if (dio->result && dio->defer_completion) { +/* +* Defer completion when defer_completion is set or +* when the inode has pages mapped and this is AIO write. +* We need to invalidate those pages because there is a +* chance they contain stale data in the case buffered IO +* went in between AIO submission and completion into the +* same region. +*/ +if (dio->result) + defer_completion = dio->defer_completion || + (dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages); +if (defer_completion) {INIT_WORK (&dio->complete_work, dio_aio_complete_work);queue_work (dio->inode->i_sb->s_dio_done_wq, &dio->complete_work);@@ -1210,10 +1228,13 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,* For AIO O_(D)SYNC writes we need to defer completions to a workqueue * so that we can call ->fsync. */ -if (dio->is_async &&iov_iter_rw (iter) ==WRITE && - ((iocb->ki_filp->f_flags &O_DSYNC ) || -IS_SYNC (iocb->ki_filp->f_mapping->host))) { - retval =dio_set_defer_completion (dio); +if (dio->is_async &&iov_iter_rw (iter) ==WRITE ) {
Quoted 8 lines
fs/direct-io.c do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode, · line 1237
Quoted 6 lines
fs/direct-io.c +6
-0+ retval =0 ; +if ((iocb->ki_filp->f_flags &O_DSYNC ) || +IS_SYNC (iocb->ki_filp->f_mapping->host)) + retval =dio_set_defer_completion (dio); +else if (!dio->inode->i_sb->s_dio_done_wq) + retval =sb_init_dio_done_wq (dio->inode->i_sb);Please add a comment explaining why
sb_init_dio_done_wq()is needed here.
ok, thanks.
Quoted 34 lines
Quoted 9 lines
fs/direct-io.c +0
-0if (retval) {/* * We grab i_mutex only for reads so we don't have fs/iomap.c +0
-0fs/iomap.c struct iomap_dio { · line 720
Quoted 8 lines
fs/iomap.c +3
-0@@ -713,8 +713,15 @@ struct iomap_dio {static ssize_t iomap_dio_complete (struct iomap_dio *dio) {struct kiocb *iocb = dio->iocb; +loff_t offset = iocb->ki_pos; +struct inode *inode =file_inode (iocb->ki_filp);ssize_t ret; +if ((dio->flags &IOMAP_DIO_WRITE ) && inode->i_mapping->nrpages)Again I don't think you want to invalidate pages in case DIO failed with an error...
fs/iomap.c struct iomap_dio { · line 727
Quoted 7 lines
fs/iomap.c +4
-0+invalidate_inode_pages2_range (inode->i_mapping, + offset >>PAGE_SHIFT , + (offset + dio->size -1 ) >>PAGE_SHIFT ); +if (dio->end_io) { ret = dio->end_io(iocb, dio->error ? dio->error : dio->size,Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 2 lines · Lukas Czerner
About the error case, is it not possible that some data has already been writtent to the disk despite the error ?
Yes, it's possible. However, that data is in an inconsistent state, so it shouldn't be read, anyway.
Now, in the non-async path, we do the invalidation unconditionally, so I could go either way on this. I don't think it's going to matter for performance or data integrity.
Cheers,
Jeff
Jan Kara
maintainerQuoted 11 lines · Jeff Moyer
Quoted 2 lines · Lukas Czerner
About the error case, is it not possible that some data has already been writtent to the disk despite the error ?
Yes, it's possible. However, that data is in an inconsistent state, so it shouldn't be read, anyway.
Now, in the non-async path, we do the invalidation unconditionally, so I could go either way on this. I don't think it's going to matter for performance or data integrity.
Well, at least 'ret' would be negative in the error case so arguments passed to invalidate_inode_pages2_range() would be bogus if I'm reading the code right...
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 9 lines · Jan Kara
Quoted 8 lines · Jeff Moyer
Quoted 2 lines · Lukas Czerner
About the error case, is it not possible that some data has already been writtent to the disk despite the error ?
Yes, it's possible. However, that data is in an inconsistent state, so it shouldn't be read, anyway.
Quoted 7 lines
Quoted 3 lines
Now, in the non-async path, we do the invalidation unconditionally, so I could go either way on this. I don't think it's going to matter for performance or data integrity.
Well, at least 'ret' would be negative in the error case so arguments passed to
invalidate_inode_pages2_range()would be bogus if I'm reading the code right...
Ah, yes. Sorry, I was commenting on the more general point. You are correct, in dio_complete, ret could be set to dio->page_errors or dio->io_error. So yes, that needs to be checked.
-Jeff
Quoted 7 lines · Jeff Moyer
Quoted 2 lines · Lukas Czerner
About the error case, is it not possible that some data has already been writtent to the disk despite the error ?
Yes, it's possible. However, that data is in an inconsistent state, so it shouldn't be read, anyway.
I think it can be read if we wrote into already allocated space.
Quoted 4 lines
Now, in the non-async path, we do the invalidation unconditionally, so I could go either way on this. I don't think it's going to matter for performance or data integrity.
That's part of the reason why I did it unconditionaly as well, however Jan is right that ret would be negative. The way to fix it would differ depending on whether I am right about reading partially written data from AIO that failed. We still want to invalidate in that case.
-Lukas
Quoted 3 lines
Cheers,
Jeff
Jan Kara
maintainerQuoted 12 lines · Lukas Czerner
Quoted 7 lines · Jeff Moyer
Quoted 2 lines · Lukas Czerner
About the error case, is it not possible that some data has already been writtent to the disk despite the error ?
Yes, it's possible. However, that data is in an inconsistent state, so it shouldn't be read, anyway.
I think it can be read if we wrote into already allocated space.
Quoted 1 line
Quoted 8 lines
Quoted 3 lines
Now, in the non-async path, we do the invalidation unconditionally, so I could go either way on this. I don't think it's going to matter for performance or data integrity.
That's part of the reason why I did it unconditionaly as well, however Jan is right that ret would be negative. The way to fix it would differ depending on whether I am right about reading partially written data from AIO that failed. We still want to invalidate in that case.
Frankly, I don't think it really matters so I'd go for not invalidating anything on error just out of philosophy: "There's something weird going on, bail out as quickly as you can."
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 22 lines · Jan Kara
Quoted 12 lines · Lukas Czerner
Quoted 7 lines · Jeff Moyer
Quoted 2 lines · Lukas Czerner
About the error case, is it not possible that some data has already been writtent to the disk despite the error ?
Yes, it's possible. However, that data is in an inconsistent state, so it shouldn't be read, anyway.
I think it can be read if we wrote into already allocated space.
Quoted 1 line
Quoted 8 lines
Quoted 3 lines
Now, in the non-async path, we do the invalidation unconditionally, so I could go either way on this. I don't think it's going to matter for performance or data integrity.
That's part of the reason why I did it unconditionaly as well, however Jan is right that ret would be negative. The way to fix it would differ depending on whether I am right about reading partially written data from AIO that failed. We still want to invalidate in that case.
Quoted 5 lines
Frankly, I don't think it really matters so I'd go for not invalidating anything on error just out of philosophy: "There's something weird going on, bail out as quickly as you can."
Honza
Fair enough, thanks!
-Lukas
Quoted 3 lines
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
PATCH v3 1/1 fs: Fix page cache inconsistency when mixing buffered and AIO DIO
In reply to Lukas CzernerCurrently when mixing buffered reads and asynchronous direct writes it is possible to end up with the situation where we have stale data in the page cache while the new data is already written to disk. This is permanent until the affected pages are flushed away. Despite the fact that mixing buffered and direct IO is ill-advised it does pose a thread for a data integrity, is unexpected and should be fixed.
Fix this by deferring completion of asynchronous direct writes to a process context in the case that there are mapped pages to be found in the inode. Later before the completion in dio_complete() invalidate the pages in question. This ensures that after the completion the pages in the written area are either unmapped, or populated with up-to-date data. Also do the same for the iomap case which uses iomap_dio_complete() instead.
This has a side effect of deferring the completion to a process context for every AIO DIO that happens on inode that has pages mapped. However since the consensus is that this is ill-advised practice the performance implication should not be a problem.
This was based on proposal from Jeff Moyer, thanks!
---
v2: Remove leftover ret variable from invalidate call in iomap_dio_complete
v3: Do not invalidate in case of error. Add some coments
fs/direct-io.c | 37 ++++++++++++++++++++++++++++++++----- fs/iomap.c | 8 ++++++++ 2 files changed, 40 insertions(+), 5 deletions(-)
fs/direct-io.c +32 -5
@@ -258,6 +258,12 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async)if (ret ==0 ) ret = transferred; +if ((ret >0 ) && + (dio->op ==REQ_OP_WRITE && dio->inode->i_mapping->nrpages)) +invalidate_inode_pages2_range (dio->inode->i_mapping, + offset >>PAGE_SHIFT , + (offset + ret -1 ) >>PAGE_SHIFT ); +if (dio->end_io) {int err;
@@ -304,6 +310,7 @@ static void dio_bio_end_aio(struct bio *bio)struct dio *dio = bio->bi_private;unsigned long remaining;unsigned long flags; +bool defer_completion = false;/* cleanup the bio */ dio_bio_complete (dio, bio);
@@ -315,7 +322,19 @@ static void dio_bio_end_aio(struct bio *bio)spin_unlock_irqrestore (&dio->bio_lock, flags);if (remaining ==0 ) { -if (dio->result && dio->defer_completion) { +/* +* Defer completion when defer_completion is set or +* when the inode has pages mapped and this is AIO write. +* We need to invalidate those pages because there is a +* chance they contain stale data in the case buffered IO +* went in between AIO submission and completion into the +* same region. +*/ +if (dio->result) + defer_completion = dio->defer_completion || + (dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages); +if (defer_completion) {INIT_WORK (&dio->complete_work, dio_aio_complete_work);queue_work (dio->inode->i_sb->s_dio_done_wq, &dio->complete_work);
@@ -1210,10 +1229,18 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,* For AIO O_(D)SYNC writes we need to defer completions to a workqueue * so that we can call ->fsync. */ -if (dio->is_async &&iov_iter_rw (iter) ==WRITE && - ((iocb->ki_filp->f_flags &O_DSYNC ) || -IS_SYNC (iocb->ki_filp->f_mapping->host))) { - retval =dio_set_defer_completion (dio); +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)) + retval =dio_set_defer_completion (dio); +else if (!dio->inode->i_sb->s_dio_done_wq) +/* +* In case of AIO write racing with buffered read we +* need to defer completion. We can't decide this now, +* however the workqueue needs to be initialized here. +*/ + retval =sb_init_dio_done_wq (dio->inode->i_sb);if (retval) {/* * We grab i_mutex only for reads so we don't have
fs/iomap.c +8 -0
@@ -713,8 +713,16 @@ struct iomap_dio {static ssize_t iomap_dio_complete (struct iomap_dio *dio) {struct kiocb *iocb = dio->iocb; +loff_t offset = iocb->ki_pos; +struct inode *inode =file_inode (iocb->ki_filp);ssize_t ret; +if ((!dio->error) && + (dio->flags &IOMAP_DIO_WRITE ) && inode->i_mapping->nrpages) +invalidate_inode_pages2_range (inode->i_mapping, + offset >>PAGE_SHIFT , + (offset + dio->size -1 ) >>PAGE_SHIFT ); +if (dio->end_io) { ret = dio->end_io(iocb, dio->error ? dio->error : dio->size,
Signature · 1 line
2.7.5
fs/direct-io.c static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async) · line 261
Quoted 1 line
fs/direct-io.c +1
-0+ if ((ret > 0) &&
No need for the braces here.
fs/direct-io.c do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode, · line 1243
Quoted 12 lines
fs/direct-io.c +12
-0+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)) + retval =dio_set_defer_completion (dio); +else if (!dio->inode->i_sb->s_dio_done_wq) +/* +* In case of AIO write racing with buffered read we +* need to defer completion. We can't decide this now, +* however the workqueue needs to be initialized here. +*/ + retval =sb_init_dio_done_wq (dio->inode->i_sb);
So now we initialize the workqueue on the first aio write. Maybe we should just always initialize it? Especially given that the cost of a workqueue is rather cheap. I also don't really understand why we even need the workqueue per-superblock instead of global.
fs/iomap.c struct iomap_dio { · line 716
Quoted 8 lines
index 1732228..2f8dbf9 100644
fs/iomap.c +1
-0@@ -713,8 +713,16 @@ struct iomap_dio {static ssize_t iomap_dio_complete (struct iomap_dio *dio) {struct kiocb *iocb = dio->iocb; +loff_t offset = iocb->ki_pos;
If you introduce this variable please also use it later in the function instead of iocb->ki_pos. OR remove the variable, which would be fine with me as well.
fs/iomap.c struct iomap_dio { · line 720
Quoted 4 lines
fs/iomap.c +2
-0+struct inode *inode =file_inode (iocb->ki_filp);ssize_t ret; + if ((!dio->error) &&
no need for the inner braces.
Jan Kara
maintainerQuoted 9 lines · Christoph Hellwig
Quoted 9 lines
fs/direct-io.c +9
-0+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)) + retval =dio_set_defer_completion (dio); +else if (!dio->inode->i_sb->s_dio_done_wq) +/* +* In case of AIO write racing with buffered read we +* need to defer completion. We can't decide this now,
Quoted 8 lines
fs/direct-io.c do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode, · line 1243
Quoted 3 lines
fs/direct-io.c +3
-0+* however the workqueue needs to be initialized here. +*/ + retval =sb_init_dio_done_wq (dio->inode->i_sb);So now we initialize the workqueue on the first aio write. Maybe we should just always initialize it? Especially given that the cost of a workqueue is rather cheap. I also don't really understand why we even need the workqueue per-superblock instead of global.
So the workqueue is WQ_MEM_RECLAIM which means there will be always "rescue" worker running. Not that it would make workqueue too expensive but it is not zero cost either. So saving the cost for filesystems that don't support AIO DIO makes sense to me.
Regarding creating global workqueue - it would create IO completion dependencies between filesystems which could have unwanted side effects and possibly create deadlocks. The default paralelism of workqueues would mostly hide this but I'm not sure there won't be some corner case e.g. when memory is tight...
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 6 lines · Christoph Hellwig
->inode->i_sb);
So now we initialize the workqueue on the first aio write. Maybe we should just always initialize it? Especially given that the cost of a workqueue is rather cheap. I also don't really understand why we even need the workqueue per-superblock instead of global.
As Jan mentioned and I agree it's worth initializing it only when actually needed.
Quoted 13 lines
fs/iomap.c struct iomap_dio { · line 716
Quoted 9 lines
index 1732228..2f8dbf9 100644
fs/iomap.c +1
-0@@ -713,8 +713,16 @@ struct iomap_dio {static ssize_t iomap_dio_complete (struct iomap_dio *dio) {struct kiocb *iocb = dio->iocb; +loff_t offset = iocb->ki_pos;If you introduce this variable please also use it later in the function instead of
iocb->ki_pos. OR remove the variable, which would be fine with me as well.
Right, I did not use it later in the fucntion because it would be confusing (we're changing iocb->ki_pos). So I'll just remove the variable.
Quoted 7 lines
fs/iomap.c struct iomap_dio { · line 720
Quoted 5 lines
fs/iomap.c +2
-0+struct inode *inode =file_inode (iocb->ki_filp);ssize_t ret; + if ((!dio->error) &&no need for the inner braces.
ok
Thanks!
-Lukas
PATCH v4 1/1 fs: Fix page cache inconsistency when mixing buffered and AIO DIO
In reply to Lukas CzernerCurrently when mixing buffered reads and asynchronous direct writes it is possible to end up with the situation where we have stale data in the page cache while the new data is already written to disk. This is permanent until the affected pages are flushed away. Despite the fact that mixing buffered and direct IO is ill-advised it does pose a thread for a data integrity, is unexpected and should be fixed.
Fix this by deferring completion of asynchronous direct writes to a process context in the case that there are mapped pages to be found in the inode. Later before the completion in dio_complete() invalidate the pages in question. This ensures that after the completion the pages in the written area are either unmapped, or populated with up-to-date data. Also do the same for the iomap case which uses iomap_dio_complete() instead.
This has a side effect of deferring the completion to a process context for every AIO DIO that happens on inode that has pages mapped. However since the consensus is that this is ill-advised practice the performance implication should not be a problem.
This was based on proposal from Jeff Moyer, thanks!
---
v2: Remove leftover ret variable from invalidate call in iomap_dio_complete
v3: Do not invalidate in case of error. Add some coments
v4: Remove unnecessary variable, remove unnecessary inner braces
fs/direct-io.c | 37 ++++++++++++++++++++++++++++++++----- fs/iomap.c | 7 +++++++ 2 files changed, 39 insertions(+), 5 deletions(-)
fs/direct-io.c +32 -5
@@ -258,6 +258,12 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async)if (ret ==0 ) ret = transferred; +if ((ret >0 ) && + (dio->op ==REQ_OP_WRITE && dio->inode->i_mapping->nrpages)) +invalidate_inode_pages2_range (dio->inode->i_mapping, + offset >>PAGE_SHIFT , + (offset + ret -1 ) >>PAGE_SHIFT ); +if (dio->end_io) {int err;
@@ -304,6 +310,7 @@ static void dio_bio_end_aio(struct bio *bio)struct dio *dio = bio->bi_private;unsigned long remaining;unsigned long flags; +bool defer_completion = false;/* cleanup the bio */ dio_bio_complete (dio, bio);
@@ -315,7 +322,19 @@ static void dio_bio_end_aio(struct bio *bio)spin_unlock_irqrestore (&dio->bio_lock, flags);if (remaining ==0 ) { -if (dio->result && dio->defer_completion) { +/* +* Defer completion when defer_completion is set or +* when the inode has pages mapped and this is AIO write. +* We need to invalidate those pages because there is a +* chance they contain stale data in the case buffered IO +* went in between AIO submission and completion into the +* same region. +*/ +if (dio->result) + defer_completion = dio->defer_completion || + (dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages); +if (defer_completion) {INIT_WORK (&dio->complete_work, dio_aio_complete_work);queue_work (dio->inode->i_sb->s_dio_done_wq, &dio->complete_work);
@@ -1210,10 +1229,18 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,* For AIO O_(D)SYNC writes we need to defer completions to a workqueue * so that we can call ->fsync. */ -if (dio->is_async &&iov_iter_rw (iter) ==WRITE && - ((iocb->ki_filp->f_flags &O_DSYNC ) || -IS_SYNC (iocb->ki_filp->f_mapping->host))) { - retval =dio_set_defer_completion (dio); +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)) + retval =dio_set_defer_completion (dio); +else if (!dio->inode->i_sb->s_dio_done_wq) +/* +* In case of AIO write racing with buffered read we +* need to defer completion. We can't decide this now, +* however the workqueue needs to be initialized here. +*/ + retval =sb_init_dio_done_wq (dio->inode->i_sb);if (retval) {/* * We grab i_mutex only for reads so we don't have
fs/iomap.c +7 -0
@@ -713,8 +713,15 @@ struct iomap_dio {static ssize_t iomap_dio_complete (struct iomap_dio *dio) {struct kiocb *iocb = dio->iocb; +struct inode *inode =file_inode (iocb->ki_filp);ssize_t ret; +if (!dio->error && + (dio->flags &IOMAP_DIO_WRITE ) && inode->i_mapping->nrpages) +invalidate_inode_pages2_range (inode->i_mapping, + iocb->ki_pos >>PAGE_SHIFT , + (iocb->ki_pos + dio->size -1 ) >>PAGE_SHIFT ); +if (dio->end_io) { ret = dio->end_io(iocb, dio->error ? dio->error : dio->size,
Signature · 1 line
2.7.5
Quoted 20 lines · Lukas Czerner
Currently when mixing buffered reads and asynchronous direct writes it is possible to end up with the situation where we have stale data in the page cache while the new data is already written to disk. This is permanent until the affected pages are flushed away. Despite the fact that mixing buffered and direct IO is ill-advised it does pose a thread for a data integrity, is unexpected and should be fixed.
Fix this by deferring completion of asynchronous direct writes to a process context in the case that there are mapped pages to be found in the inode. Later before the completion in
dio_complete()invalidate the pages in question. This ensures that after the completion the pages in the written area are either unmapped, or populated with up-to-date data. Also do the same for the iomap case which usesiomap_dio_complete()instead.This has a side effect of deferring the completion to a process context for every AIO DIO that happens on inode that has pages mapped. However since the consensus is that this is ill-advised practice the performance implication should not be a problem.
Quoted 8 lines
This was based on proposal from Jeff Moyer, thanks!
Signed-off-by Lukas Czerner <[email protected]>Cc Jeff Moyer <[email protected]>---
v2: Remove leftover ret variable from invalidate call iniomap_dio_complete
v3: Do not invalidate in case of error. Add some coments
v4: Remove unnecessary variable, remove unnecessary inner braces
Looks good to me now, just two style nits below. You can add:
fs/direct-io.c static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async) · line 262
Quoted 10 lines
fs/direct-io.c +2
-0@@ -258,6 +258,12 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async)if (ret ==0 ) ret = transferred; +if ((ret >0 ) && + (dio->op ==REQ_OP_WRITE && dio->inode->i_mapping->nrpages))
Heh, you seem to love braces. The general rule is that braces should be around bit-ops (as there people find the priority unclear and also it is too easy to forget to add those braces when negating the condition) but not around comparison or such. I.e. the above would be:
if (ret > 0 && dio->op == REQ_OP_WRITE && dio->inode->i_mapping->nrpages)
...
fs/direct-io.c do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode, · line 1243
Quoted 12 lines
fs/direct-io.c +12
-0+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)) + retval =dio_set_defer_completion (dio); +else if (!dio->inode->i_sb->s_dio_done_wq) +/* +* In case of AIO write racing with buffered read we +* need to defer completion. We can't decide this now, +* however the workqueue needs to be initialized here. +*/ + retval =sb_init_dio_done_wq (dio->inode->i_sb);
Curly braces here please. When command block is multi-line we enforce those despite it is only a single statement and thus they are not necessary strictly speaking. Thanks!
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 39 lines · Jan Kara
in question. This ensures that after the completion the pages
Quoted 9 lines
in the written area are either unmapped, or populated with up-to-date data. Also do the same for the iomap case which uses
iomap_dio_complete()instead.This has a side effect of deferring the completion to a process context for every AIO DIO that happens on inode that has pages mapped. However since the consensus is that this is ill-advised practice the performance implication should not be a problem.
Quoted 8 lines
This was based on proposal from Jeff Moyer, thanks!
Signed-off-by Lukas Czerner <[email protected]>Cc Jeff Moyer <[email protected]>---
v2: Remove leftover ret variable from invalidate call iniomap_dio_complete
v3: Do not invalidate in case of error. Add some coments
v4: Remove unnecessary variable, remove unnecessary inner bracesLooks good to me now, just two style nits below. You can add:
Reviewed-by Jan Kara <[email protected]>fs/direct-io.c static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async) · line 262
Quoted 10 lines
fs/direct-io.c +2
-0@@ -258,6 +258,12 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async)if (ret ==0 ) ret = transferred; +if ((ret >0 ) && + (dio->op ==REQ_OP_WRITE && dio->inode->i_mapping->nrpages))Heh, you seem to love braces. The general rule is that braces should be around bit-ops (as there people find the priority unclear and also it is too easy to forget to add those braces when negating the condition) but not around comparison or such. I.e. the above would be:
Quoted 2 lines
if (ret > 0 && dio->op == REQ_OP_WRITE && dio->inode->i_mapping->nrpages)
:D
sure, I'll resend.
Quoted 19 lines
...
fs/direct-io.c do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode, · line 1243
Quoted 12 lines
fs/direct-io.c +12
-0+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)) + retval =dio_set_defer_completion (dio); +else if (!dio->inode->i_sb->s_dio_done_wq) +/* +* In case of AIO write racing with buffered read we +* need to defer completion. We can't decide this now, +* however the workqueue needs to be initialized here. +*/ + retval =sb_init_dio_done_wq (dio->inode->i_sb);Curly braces here please. When command block is multi-line we enforce those despite it is only a single statement and thus they are not necessary strictly speaking. Thanks!
ok.
Thanks!
-Lukas
Quoted 5 lines
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
PATCH v5 1/1 fs: Fix page cache inconsistency when mixing buffered and AIO DIO
In reply to Lukas CzernerCurrently when mixing buffered reads and asynchronous direct writes it is possible to end up with the situation where we have stale data in the page cache while the new data is already written to disk. This is permanent until the affected pages are flushed away. Despite the fact that mixing buffered and direct IO is ill-advised it does pose a thread for a data integrity, is unexpected and should be fixed.
Fix this by deferring completion of asynchronous direct writes to a process context in the case that there are mapped pages to be found in the inode. Later before the completion in dio_complete() invalidate the pages in question. This ensures that after the completion the pages in the written area are either unmapped, or populated with up-to-date data. Also do the same for the iomap case which uses iomap_dio_complete() instead.
This has a side effect of deferring the completion to a process context for every AIO DIO that happens on inode that has pages mapped. However since the consensus is that this is ill-advised practice the performance implication should not be a problem.
This was based on proposal from Jeff Moyer, thanks!
---
v2: Remove leftover ret variable from invalidate call in iomap_dio_complete
v3: Do not invalidate in case of error. Add some coments
v4: Remove unnecessary variable, remove unnecessary inner braces
v5: Style changes
fs/direct-io.c | 39 ++++++++++++++++++++++++++++++++++----- fs/iomap.c | 7 +++++++ 2 files changed, 41 insertions(+), 5 deletions(-)
fs/direct-io.c +34 -5
@@ -258,6 +258,13 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async)if (ret ==0 ) ret = transferred; +if (ret >0 && dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages) { +invalidate_inode_pages2_range (dio->inode->i_mapping, + offset >>PAGE_SHIFT , + (offset + ret -1 ) >>PAGE_SHIFT ); + } +if (dio->end_io) {int err;
@@ -304,6 +311,7 @@ static void dio_bio_end_aio(struct bio *bio)struct dio *dio = bio->bi_private;unsigned long remaining;unsigned long flags; +bool defer_completion = false;/* cleanup the bio */ dio_bio_complete (dio, bio);
@@ -315,7 +323,19 @@ static void dio_bio_end_aio(struct bio *bio)spin_unlock_irqrestore (&dio->bio_lock, flags);if (remaining ==0 ) { -if (dio->result && dio->defer_completion) { +/* +* Defer completion when defer_completion is set or +* when the inode has pages mapped and this is AIO write. +* We need to invalidate those pages because there is a +* chance they contain stale data in the case buffered IO +* went in between AIO submission and completion into the +* same region. +*/ +if (dio->result) + defer_completion = dio->defer_completion || + (dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages); +if (defer_completion) {INIT_WORK (&dio->complete_work, dio_aio_complete_work);queue_work (dio->inode->i_sb->s_dio_done_wq, &dio->complete_work);
@@ -1210,10 +1230,19 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,* For AIO O_(D)SYNC writes we need to defer completions to a workqueue * so that we can call ->fsync. */ -if (dio->is_async &&iov_iter_rw (iter) ==WRITE && - ((iocb->ki_filp->f_flags &O_DSYNC ) || -IS_SYNC (iocb->ki_filp->f_mapping->host))) { - retval =dio_set_defer_completion (dio); +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)) + retval =dio_set_defer_completion (dio); +else if (!dio->inode->i_sb->s_dio_done_wq) { +/* +* In case of AIO write racing with buffered read we +* need to defer completion. We can't decide this now, +* however the workqueue needs to be initialized here. +*/ + retval =sb_init_dio_done_wq (dio->inode->i_sb); + }if (retval) {/* * We grab i_mutex only for reads so we don't have
fs/iomap.c +7 -0
@@ -713,8 +713,15 @@ struct iomap_dio {static ssize_t iomap_dio_complete (struct iomap_dio *dio) {struct kiocb *iocb = dio->iocb; +struct inode *inode =file_inode (iocb->ki_filp);ssize_t ret; +if (!dio->error && + (dio->flags &IOMAP_DIO_WRITE ) && inode->i_mapping->nrpages) +invalidate_inode_pages2_range (inode->i_mapping, + iocb->ki_pos >>PAGE_SHIFT , + (iocb->ki_pos + dio->size -1 ) >>PAGE_SHIFT ); +if (dio->end_io) { ret = dio->end_io(iocb, dio->error ? dio->error : dio->size,
Signature · 1 line
2.7.5
Quoted 20 lines · Lukas Czerner
Currently when mixing buffered reads and asynchronous direct writes it is possible to end up with the situation where we have stale data in the page cache while the new data is already written to disk. This is permanent until the affected pages are flushed away. Despite the fact that mixing buffered and direct IO is ill-advised it does pose a thread for a data integrity, is unexpected and should be fixed.
Fix this by deferring completion of asynchronous direct writes to a process context in the case that there are mapped pages to be found in the inode. Later before the completion in
dio_complete()invalidate the pages in question. This ensures that after the completion the pages in the written area are either unmapped, or populated with up-to-date data. Also do the same for the iomap case which usesiomap_dio_complete()instead.This has a side effect of deferring the completion to a process context for every AIO DIO that happens on inode that has pages mapped. However since the consensus is that this is ill-advised practice the performance implication should not be a problem.
Quoted 4 lines
This was based on proposal from Jeff Moyer, thanks!
Signed-off-by Lukas Czerner <[email protected]>Cc Jeff Moyer <[email protected]>
You forgot to add my Reviewed-by tag. So feel free to add it now:
Honza
Quoted 104 lines
---
v2: Remove leftover ret variable from invalidate call iniomap_dio_complete
v3: Do not invalidate in case of error. Add some coments
v4: Remove unnecessary variable, remove unnecessary inner braces
v5: Style changesfs/direct-io.c | 39 ++++++++++++++++++++++++++++++++++----- fs/iomap.c | 7 +++++++ 2 files changed, 41 insertions(+), 5 deletions(-)fs/direct-io.c +34
-5@@ -258,6 +258,13 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async)if (ret ==0 ) ret = transferred; +if (ret >0 && dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages) { +invalidate_inode_pages2_range (dio->inode->i_mapping, + offset >>PAGE_SHIFT , + (offset + ret -1 ) >>PAGE_SHIFT ); + } +if (dio->end_io) {int err;@@ -304,6 +311,7 @@ static void dio_bio_end_aio(struct bio *bio)struct dio *dio = bio->bi_private;unsigned long remaining;unsigned long flags; +bool defer_completion = false;/* cleanup the bio */ dio_bio_complete (dio, bio);@@ -315,7 +323,19 @@ static void dio_bio_end_aio(struct bio *bio)spin_unlock_irqrestore (&dio->bio_lock, flags);if (remaining ==0 ) { -if (dio->result && dio->defer_completion) { +/* +* Defer completion when defer_completion is set or +* when the inode has pages mapped and this is AIO write. +* We need to invalidate those pages because there is a +* chance they contain stale data in the case buffered IO +* went in between AIO submission and completion into the +* same region. +*/ +if (dio->result) + defer_completion = dio->defer_completion || + (dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages); +if (defer_completion) {INIT_WORK (&dio->complete_work, dio_aio_complete_work);queue_work (dio->inode->i_sb->s_dio_done_wq, &dio->complete_work);@@ -1210,10 +1230,19 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,* For AIO O_(D)SYNC writes we need to defer completions to a workqueue * so that we can call ->fsync. */ -if (dio->is_async &&iov_iter_rw (iter) ==WRITE && - ((iocb->ki_filp->f_flags &O_DSYNC ) || -IS_SYNC (iocb->ki_filp->f_mapping->host))) { - retval =dio_set_defer_completion (dio); +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)) + retval =dio_set_defer_completion (dio); +else if (!dio->inode->i_sb->s_dio_done_wq) { +/* +* In case of AIO write racing with buffered read we +* need to defer completion. We can't decide this now, +* however the workqueue needs to be initialized here. +*/ + retval =sb_init_dio_done_wq (dio->inode->i_sb); + }if (retval) {/* * We grab i_mutex only for reads so we don't have fs/iomap.c +7
-0@@ -713,8 +713,15 @@ struct iomap_dio {static ssize_t iomap_dio_complete (struct iomap_dio *dio) {struct kiocb *iocb = dio->iocb; +struct inode *inode =file_inode (iocb->ki_filp);ssize_t ret; +if (!dio->error && + (dio->flags &IOMAP_DIO_WRITE ) && inode->i_mapping->nrpages) +invalidate_inode_pages2_range (inode->i_mapping, + iocb->ki_pos >>PAGE_SHIFT , + (iocb->ki_pos + dio->size -1 ) >>PAGE_SHIFT ); +if (dio->end_io) { ret = dio->end_io(iocb, dio->error ? dio->error : dio->size,Signature · 1 line
2.7.5
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 20 lines · Lukas Czerner
Currently when mixing buffered reads and asynchronous direct writes it is possible to end up with the situation where we have stale data in the page cache while the new data is already written to disk. This is permanent until the affected pages are flushed away. Despite the fact that mixing buffered and direct IO is ill-advised it does pose a thread for a data integrity, is unexpected and should be fixed.
Fix this by deferring completion of asynchronous direct writes to a process context in the case that there are mapped pages to be found in the inode. Later before the completion in
dio_complete()invalidate the pages in question. This ensures that after the completion the pages in the written area are either unmapped, or populated with up-to-date data. Also do the same for the iomap case which usesiomap_dio_complete()instead.This has a side effect of deferring the completion to a process context for every AIO DIO that happens on inode that has pages mapped. However since the consensus is that this is ill-advised practice the performance implication should not be a problem.
Quoted 4 lines
This was based on proposal from Jeff Moyer, thanks!
Signed-off-by Lukas Czerner <[email protected]>Cc Jeff Moyer <[email protected]>
Looks good, Lukas! Thanks!
Quoted 101 lines
---
v2: Remove leftover ret variable from invalidate call iniomap_dio_complete
v3: Do not invalidate in case of error. Add some coments
v4: Remove unnecessary variable, remove unnecessary inner braces
v5: Style changesfs/direct-io.c | 39 ++++++++++++++++++++++++++++++++++----- fs/iomap.c | 7 +++++++ 2 files changed, 41 insertions(+), 5 deletions(-)fs/direct-io.c +34
-5@@ -258,6 +258,13 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async)if (ret ==0 ) ret = transferred; +if (ret >0 && dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages) { +invalidate_inode_pages2_range (dio->inode->i_mapping, + offset >>PAGE_SHIFT , + (offset + ret -1 ) >>PAGE_SHIFT ); + } +if (dio->end_io) {int err;@@ -304,6 +311,7 @@ static void dio_bio_end_aio(struct bio *bio)struct dio *dio = bio->bi_private;unsigned long remaining;unsigned long flags; +bool defer_completion = false;/* cleanup the bio */ dio_bio_complete (dio, bio);@@ -315,7 +323,19 @@ static void dio_bio_end_aio(struct bio *bio)spin_unlock_irqrestore (&dio->bio_lock, flags);if (remaining ==0 ) { -if (dio->result && dio->defer_completion) { +/* +* Defer completion when defer_completion is set or +* when the inode has pages mapped and this is AIO write. +* We need to invalidate those pages because there is a +* chance they contain stale data in the case buffered IO +* went in between AIO submission and completion into the +* same region. +*/ +if (dio->result) + defer_completion = dio->defer_completion || + (dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages); +if (defer_completion) {INIT_WORK (&dio->complete_work, dio_aio_complete_work);queue_work (dio->inode->i_sb->s_dio_done_wq, &dio->complete_work);@@ -1210,10 +1230,19 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,* For AIO O_(D)SYNC writes we need to defer completions to a workqueue * so that we can call ->fsync. */ -if (dio->is_async &&iov_iter_rw (iter) ==WRITE && - ((iocb->ki_filp->f_flags &O_DSYNC ) || -IS_SYNC (iocb->ki_filp->f_mapping->host))) { - retval =dio_set_defer_completion (dio); +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)) + retval =dio_set_defer_completion (dio); +else if (!dio->inode->i_sb->s_dio_done_wq) { +/* +* In case of AIO write racing with buffered read we +* need to defer completion. We can't decide this now, +* however the workqueue needs to be initialized here. +*/ + retval =sb_init_dio_done_wq (dio->inode->i_sb); + }if (retval) {/* * We grab i_mutex only for reads so we don't have fs/iomap.c +7
-0@@ -713,8 +713,15 @@ struct iomap_dio {static ssize_t iomap_dio_complete (struct iomap_dio *dio) {struct kiocb *iocb = dio->iocb; +struct inode *inode =file_inode (iocb->ki_filp);ssize_t ret; +if (!dio->error && + (dio->flags &IOMAP_DIO_WRITE ) && inode->i_mapping->nrpages) +invalidate_inode_pages2_range (inode->i_mapping, + iocb->ki_pos >>PAGE_SHIFT , + (iocb->ki_pos + dio->size -1 ) >>PAGE_SHIFT ); +if (dio->end_io) { ret = dio->end_io(iocb, dio->error ? dio->error : dio->size,
Al, would you mind taking this in through your tree? It's been reviewed by myself and Jan in this mail thread.
Thanks!
Jeff
Quoted 125 lines · Lukas Czerner
Currently when mixing buffered reads and asynchronous direct writes it is possible to end up with the situation where we have stale data in the page cache while the new data is already written to disk. This is permanent until the affected pages are flushed away. Despite the fact that mixing buffered and direct IO is ill-advised it does pose a thread for a data integrity, is unexpected and should be fixed.
Fix this by deferring completion of asynchronous direct writes to a process context in the case that there are mapped pages to be found in the inode. Later before the completion in
dio_complete()invalidate the pages in question. This ensures that after the completion the pages in the written area are either unmapped, or populated with up-to-date data. Also do the same for the iomap case which usesiomap_dio_complete()instead.This has a side effect of deferring the completion to a process context for every AIO DIO that happens on inode that has pages mapped. However since the consensus is that this is ill-advised practice the performance implication should not be a problem.
This was based on proposal from Jeff Moyer, thanks!
Signed-off-by Lukas Czerner <[email protected]>Cc Jeff Moyer <[email protected]>---
v2: Remove leftover ret variable from invalidate call iniomap_dio_complete
v3: Do not invalidate in case of error. Add some coments
v4: Remove unnecessary variable, remove unnecessary inner braces
v5: Style changesfs/direct-io.c | 39 ++++++++++++++++++++++++++++++++++----- fs/iomap.c | 7 +++++++ 2 files changed, 41 insertions(+), 5 deletions(-)fs/direct-io.c +34
-5@@ -258,6 +258,13 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async)if (ret ==0 ) ret = transferred; +if (ret >0 && dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages) { +invalidate_inode_pages2_range (dio->inode->i_mapping, + offset >>PAGE_SHIFT , + (offset + ret -1 ) >>PAGE_SHIFT ); + } +if (dio->end_io) {int err;@@ -304,6 +311,7 @@ static void dio_bio_end_aio(struct bio *bio)struct dio *dio = bio->bi_private;unsigned long remaining;unsigned long flags; +bool defer_completion = false;/* cleanup the bio */ dio_bio_complete (dio, bio);@@ -315,7 +323,19 @@ static void dio_bio_end_aio(struct bio *bio)spin_unlock_irqrestore (&dio->bio_lock, flags);if (remaining ==0 ) { -if (dio->result && dio->defer_completion) { +/* +* Defer completion when defer_completion is set or +* when the inode has pages mapped and this is AIO write. +* We need to invalidate those pages because there is a +* chance they contain stale data in the case buffered IO +* went in between AIO submission and completion into the +* same region. +*/ +if (dio->result) + defer_completion = dio->defer_completion || + (dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages); +if (defer_completion) {INIT_WORK (&dio->complete_work, dio_aio_complete_work);queue_work (dio->inode->i_sb->s_dio_done_wq, &dio->complete_work);@@ -1210,10 +1230,19 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,* For AIO O_(D)SYNC writes we need to defer completions to a workqueue * so that we can call ->fsync. */ -if (dio->is_async &&iov_iter_rw (iter) ==WRITE && - ((iocb->ki_filp->f_flags &O_DSYNC ) || -IS_SYNC (iocb->ki_filp->f_mapping->host))) { - retval =dio_set_defer_completion (dio); +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)) + retval =dio_set_defer_completion (dio); +else if (!dio->inode->i_sb->s_dio_done_wq) { +/* +* In case of AIO write racing with buffered read we +* need to defer completion. We can't decide this now, +* however the workqueue needs to be initialized here. +*/ + retval =sb_init_dio_done_wq (dio->inode->i_sb); + }if (retval) {/* * We grab i_mutex only for reads so we don't have fs/iomap.c +7
-0@@ -713,8 +713,15 @@ struct iomap_dio {static ssize_t iomap_dio_complete (struct iomap_dio *dio) {struct kiocb *iocb = dio->iocb; +struct inode *inode =file_inode (iocb->ki_filp);ssize_t ret; +if (!dio->error && + (dio->flags &IOMAP_DIO_WRITE ) && inode->i_mapping->nrpages) +invalidate_inode_pages2_range (inode->i_mapping, + iocb->ki_pos >>PAGE_SHIFT , + (iocb->ki_pos + dio->size -1 ) >>PAGE_SHIFT ); +if (dio->end_io) { ret = dio->end_io(iocb, dio->error ? dio->error : dio->size,
Quoted 2 lines · Jeff Moyer
Al, would you mind taking this in through your tree? It's been reviewed by myself and Jan in this mail thread.
Still needs more fixing, I think?
Sorry, this is the first time I've seen this patch....
Quoted 11 lines
Quoted 11 lines
fs/iomap.c +1
-0@@ -713,8 +713,15 @@ struct iomap_dio {static ssize_t iomap_dio_complete (struct iomap_dio *dio) {struct kiocb *iocb = dio->iocb; +struct inode *inode =file_inode (iocb->ki_filp);ssize_t ret;
Quoted 10 lines
fs/iomap.c struct iomap_dio { · line 727
Quoted 9 lines
fs/iomap.c +6
-0+if (!dio->error && + (dio->flags &IOMAP_DIO_WRITE ) && inode->i_mapping->nrpages) +invalidate_inode_pages2_range (inode->i_mapping, + iocb->ki_pos >>PAGE_SHIFT , + (iocb->ki_pos + dio->size -1 ) >>PAGE_SHIFT ); +if (dio->end_io) { ret = dio->end_io(iocb, dio->error ? dio->error : dio->size,
This invalidation is already run in iomap_dio_rw() for the sync IO case directly after the call to iomap_dio_complete(). It also has a comment to explain exactly why the the invalidation is needed, and it issues a warning to dmesg if the invalidation fails to indicate the reason why the user is reporting data corruption to us. i.e.:
.....
ret = iomap_dio_complete(dio);
/*
* Try again to invalidate clean pages which might have been cached by
* non-direct readahead, or faulted in by get_user_pages() if the source
* of the write was an mmap'ed region of the file we're writing. Either
* one is a pretty crazy thing to do, so we don't support it 100%. If
* this invalidation fails, tough, the write still worked...
*/
if (iov_iter_rw(iter) == WRITE) {
int err = invalidate_inode_pages2_range(mapping,
start >> PAGE_SHIFT, end >> PAGE_SHIFT);
WARN_ON_ONCE(err);
}
return ret;If we're going to replace this with an invalidation in iomap_dio_complete() so it also handles the AIO path, then the comment and warning on invalidation failure also need to be moved to iomap_dio_complete() and the duplicate code removed from iomap_dio_rw()...
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]
Quoted 54 lines · Dave Chinner
Quoted 2 lines · Jeff Moyer
Al, would you mind taking this in through your tree? It's been reviewed by myself and Jan in this mail thread.
Still needs more fixing, I think?
Sorry, this is the first time I've seen this patch....
Quoted 11 lines
Quoted 11 lines
fs/iomap.c +1
-0@@ -713,8 +713,15 @@ struct iomap_dio {static ssize_t iomap_dio_complete (struct iomap_dio *dio) {struct kiocb *iocb = dio->iocb; +struct inode *inode =file_inode (iocb->ki_filp);ssize_t ret;Quoted 10 lines
fs/iomap.c struct iomap_dio { · line 727
Quoted 9 lines
fs/iomap.c +6
-0+if (!dio->error && + (dio->flags &IOMAP_DIO_WRITE ) && inode->i_mapping->nrpages) +invalidate_inode_pages2_range (inode->i_mapping, + iocb->ki_pos >>PAGE_SHIFT , + (iocb->ki_pos + dio->size -1 ) >>PAGE_SHIFT ); +if (dio->end_io) { ret = dio->end_io(iocb, dio->error ? dio->error : dio->size,This invalidation is already run in
iomap_dio_rw()for the sync IO case directly after the call toiomap_dio_complete(). It also has a comment to explain exactly why the the invalidation is needed, and it issues a warning to dmesg if the invalidation fails to indicate the reason why the user is reporting data corruption to us. i.e.:.....
ret = iomap_dio_complete(dio); /* * Try again to invalidate clean pages which might have been cached by * non-direct readahead, or faulted in by get_user_pages() if the source * of the write was an mmap'ed region of the file we're writing. Either * one is a pretty crazy thing to do, so we don't support it 100%. If * this invalidation fails, tough, the write still worked... */ if (iov_iter_rw(iter) == WRITE) { int err = invalidate_inode_pages2_range(mapping, start >> PAGE_SHIFT, end >> PAGE_SHIFT); WARN_ON_ONCE(err); } return ret;
Quoted 5 lines
If we're going to replace this with an invalidation in
iomap_dio_complete()so it also handles the AIO path, then the comment and warning on invalidation failure also need to be moved toiomap_dio_complete()and the duplicate code removed fromiomap_dio_rw()...
Yep, good catch. Lukas, care to respin?
-Jeff
Quoted 56 lines · Jeff Moyer
Quoted 54 lines · Dave Chinner
Quoted 2 lines · Jeff Moyer
Al, would you mind taking this in through your tree? It's been reviewed by myself and Jan in this mail thread.
Still needs more fixing, I think?
Sorry, this is the first time I've seen this patch....
Quoted 11 lines
Quoted 11 lines
fs/iomap.c +1
-0@@ -713,8 +713,15 @@ struct iomap_dio {static ssize_t iomap_dio_complete (struct iomap_dio *dio) {struct kiocb *iocb = dio->iocb; +struct inode *inode =file_inode (iocb->ki_filp);ssize_t ret;Quoted 10 lines
fs/iomap.c struct iomap_dio { · line 727
Quoted 9 lines
fs/iomap.c +6
-0+if (!dio->error && + (dio->flags &IOMAP_DIO_WRITE ) && inode->i_mapping->nrpages) +invalidate_inode_pages2_range (inode->i_mapping, + iocb->ki_pos >>PAGE_SHIFT , + (iocb->ki_pos + dio->size -1 ) >>PAGE_SHIFT ); +if (dio->end_io) { ret = dio->end_io(iocb, dio->error ? dio->error : dio->size,This invalidation is already run in
iomap_dio_rw()for the sync IO case directly after the call toiomap_dio_complete(). It also has a comment to explain exactly why the the invalidation is needed, and it issues a warning to dmesg if the invalidation fails to indicate the reason why the user is reporting data corruption to us. i.e.:.....
ret = iomap_dio_complete(dio); /* * Try again to invalidate clean pages which might have been cached by * non-direct readahead, or faulted in by get_user_pages() if the source * of the write was an mmap'ed region of the file we're writing. Either * one is a pretty crazy thing to do, so we don't support it 100%. If * this invalidation fails, tough, the write still worked... */ if (iov_iter_rw(iter) == WRITE) { int err = invalidate_inode_pages2_range(mapping, start >> PAGE_SHIFT, end >> PAGE_SHIFT); WARN_ON_ONCE(err); } return ret;
Quoted 7 lines
Quoted 5 lines
If we're going to replace this with an invalidation in
iomap_dio_complete()so it also handles the AIO path, then the comment and warning on invalidation failure also need to be moved toiomap_dio_complete()and the duplicate code removed fromiomap_dio_rw()...Yep, good catch. Lukas, care to respin?
Of course, I'll respin.
-Lukas
Quoted 2 lines
-Jeff
PATCH v6 1/1 fs: Fix page cache inconsistency when mixing buffered and AIO DIO
In reply to Lukas CzernerCurrently when mixing buffered reads and asynchronous direct writes it is possible to end up with the situation where we have stale data in the page cache while the new data is already written to disk. This is permanent until the affected pages are flushed away. Despite the fact that mixing buffered and direct IO is ill-advised it does pose a thread for a data integrity, is unexpected and should be fixed.
Fix this by deferring completion of asynchronous direct writes to a process context in the case that there are mapped pages to be found in the inode. Later before the completion in dio_complete() invalidate the pages in question. This ensures that after the completion the pages in the written area are either unmapped, or populated with up-to-date data. Also do the same for the iomap case which uses iomap_dio_complete() instead.
This has a side effect of deferring the completion to a process context for every AIO DIO that happens on inode that has pages mapped. However since the consensus is that this is ill-advised practice the performance implication should not be a problem.
This was based on proposal from Jeff Moyer, thanks!
---
v2: Remove leftover ret variable from invalidate call in iomap_dio_complete
v3: Do not invalidate in case of error. Add some coments
v4: Remove unnecessary variable, remove unnecessary inner braces
v5: Style changes
v6: Remove redundant invalidatepage, add warning and comment
fs/direct-io.c | 49 +++++++++++++++++++++++++++++++++++++++++++------ fs/iomap.c | 29 ++++++++++++++++------------- 2 files changed, 59 insertions(+), 19 deletions(-)
fs/direct-io.c +43 -6
@@ -229,6 +229,7 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async) {loff_t offset = dio->iocb->ki_pos;ssize_t transferred =0 ; +int err;/* * AIO submission can race with bio completion to get here while
@@ -258,8 +259,22 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async)if (ret ==0 ) ret = transferred; +/* +* Try again to invalidate clean pages which might have been cached by +* non-direct readahead, or faulted in by get_user_pages() if the source +* of the write was an mmap'ed region of the file we're writing. Either +* one is a pretty crazy thing to do, so we don't support it 100%. If +* this invalidation fails, tough, the write still worked... +*/ +if (ret >0 && dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages) { + err =invalidate_inode_pages2_range (dio->inode->i_mapping, + offset >>PAGE_SHIFT , + (offset + ret -1 ) >>PAGE_SHIFT ); +WARN_ON_ONCE (err); + } +if (dio->end_io) { -int err;// XXX: ki_pos?? err = dio->end_io (dio->iocb, offset, ret, dio->private);
@@ -304,6 +319,7 @@ static void dio_bio_end_aio(struct bio *bio)struct dio *dio = bio->bi_private;unsigned long remaining;unsigned long flags; +bool defer_completion = false;/* cleanup the bio */ dio_bio_complete (dio, bio);
@@ -315,7 +331,19 @@ static void dio_bio_end_aio(struct bio *bio)spin_unlock_irqrestore (&dio->bio_lock, flags);if (remaining ==0 ) { -if (dio->result && dio->defer_completion) { +/* +* Defer completion when defer_completion is set or +* when the inode has pages mapped and this is AIO write. +* We need to invalidate those pages because there is a +* chance they contain stale data in the case buffered IO +* went in between AIO submission and completion into the +* same region. +*/ +if (dio->result) + defer_completion = dio->defer_completion || + (dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages); +if (defer_completion) {INIT_WORK (&dio->complete_work, dio_aio_complete_work);queue_work (dio->inode->i_sb->s_dio_done_wq, &dio->complete_work);
@@ -1210,10 +1238,19 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,* For AIO O_(D)SYNC writes we need to defer completions to a workqueue * so that we can call ->fsync. */ -if (dio->is_async &&iov_iter_rw (iter) ==WRITE && - ((iocb->ki_filp->f_flags &O_DSYNC ) || -IS_SYNC (iocb->ki_filp->f_mapping->host))) { - retval =dio_set_defer_completion (dio); +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)) + retval =dio_set_defer_completion (dio); +else if (!dio->inode->i_sb->s_dio_done_wq) { +/* +* In case of AIO write racing with buffered read we +* need to defer completion. We can't decide this now, +* however the workqueue needs to be initialized here. +*/ + retval =sb_init_dio_done_wq (dio->inode->i_sb); + }if (retval) {/* * We grab i_mutex only for reads so we don't have
fs/iomap.c +16 -13
@@ -713,8 +713,24 @@ struct iomap_dio {static ssize_t iomap_dio_complete (struct iomap_dio *dio) {struct kiocb *iocb = dio->iocb; +struct inode *inode =file_inode (iocb->ki_filp);ssize_t ret; +/* +* Try again to invalidate clean pages which might have been cached by +* non-direct readahead, or faulted in by get_user_pages() if the source +* of the write was an mmap'ed region of the file we're writing. Either +* one is a pretty crazy thing to do, so we don't support it 100%. If +* this invalidation fails, tough, the write still worked... +*/ +if (!dio->error && + (dio->flags &IOMAP_DIO_WRITE ) && inode->i_mapping->nrpages) { + ret =invalidate_inode_pages2_range (inode->i_mapping, + iocb->ki_pos >>PAGE_SHIFT , + (iocb->ki_pos + dio->size -1 ) >>PAGE_SHIFT ); +WARN_ON_ONCE (ret); + } +if (dio->end_io) { ret = dio->end_io(iocb, dio->error ? dio->error : dio->size,
@@ -1042,19 +1058,6 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, ret =iomap_dio_complete (dio); -/* -* Try again to invalidate clean pages which might have been cached by -* non-direct readahead, or faulted in by get_user_pages() if the source -* of the write was an mmap'ed region of the file we're writing. Either -* one is a pretty crazy thing to do, so we don't support it 100%. If -* this invalidation fails, tough, the write still worked... -*/ -if (iov_iter_rw (iter) ==WRITE ) { -int err =invalidate_inode_pages2_range (mapping, - start >>PAGE_SHIFT , end >>PAGE_SHIFT ); -WARN_ON_ONCE (err); - } -return ret; out_free_dio:
Signature · 1 line
2.7.5
Jan Kara
maintainerQuoted 15 lines · Lukas Czerner
Currently when mixing buffered reads and asynchronous direct writes it is possible to end up with the situation where we have stale data in the page cache while the new data is already written to disk. This is permanent until the affected pages are flushed away. Despite the fact that mixing buffered and direct IO is ill-advised it does pose a thread for a data integrity, is unexpected and should be fixed.
Fix this by deferring completion of asynchronous direct writes to a process context in the case that there are mapped pages to be found in the inode. Later before the completion in
dio_complete()invalidate the pages in question. This ensures that after the completion the pages in the written area are either unmapped, or populated with up-to-date data. Also do the same for the iomap case which usesiomap_dio_complete()instead.
Quoted 6 lines
This has a side effect of deferring the completion to a process context for every AIO DIO that happens on inode that has pages mapped. However since the consensus is that this is ill-advised practice the performance implication should not be a problem.
This was based on proposal from Jeff Moyer, thanks!
It seems the invalidation can be also removed from generic_file_direct_write(), can't it? It is duplicit there the same way as it was in the iomap code...
Honza
Quoted 155 lines
Signed-off-by Lukas Czerner <[email protected]>Cc Jeff Moyer <[email protected]>---
v2: Remove leftover ret variable from invalidate call iniomap_dio_complete
v3: Do not invalidate in case of error. Add some coments
v4: Remove unnecessary variable, remove unnecessary inner braces
v5: Style changes
v6: Remove redundant invalidatepage, add warning and commentfs/direct-io.c | 49 +++++++++++++++++++++++++++++++++++++++++++------ fs/iomap.c | 29 ++++++++++++++++------------- 2 files changed, 59 insertions(+), 19 deletions(-)fs/direct-io.c +43
-6@@ -229,6 +229,7 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async) {loff_t offset = dio->iocb->ki_pos;ssize_t transferred =0 ; +int err;/* * AIO submission can race with bio completion to get here while @@ -258,8 +259,22 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async)if (ret ==0 ) ret = transferred; +/* +* Try again to invalidate clean pages which might have been cached by +* non-direct readahead, or faulted in by get_user_pages() if the source +* of the write was an mmap'ed region of the file we're writing. Either +* one is a pretty crazy thing to do, so we don't support it 100%. If +* this invalidation fails, tough, the write still worked... +*/ +if (ret >0 && dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages) { + err =invalidate_inode_pages2_range (dio->inode->i_mapping, + offset >>PAGE_SHIFT , + (offset + ret -1 ) >>PAGE_SHIFT ); +WARN_ON_ONCE (err); + } +if (dio->end_io) { -int err;// XXX: ki_pos?? err = dio->end_io (dio->iocb, offset, ret, dio->private);@@ -304,6 +319,7 @@ static void dio_bio_end_aio(struct bio *bio)struct dio *dio = bio->bi_private;unsigned long remaining;unsigned long flags; +bool defer_completion = false;/* cleanup the bio */ dio_bio_complete (dio, bio);@@ -315,7 +331,19 @@ static void dio_bio_end_aio(struct bio *bio)spin_unlock_irqrestore (&dio->bio_lock, flags);if (remaining ==0 ) { -if (dio->result && dio->defer_completion) { +/* +* Defer completion when defer_completion is set or +* when the inode has pages mapped and this is AIO write. +* We need to invalidate those pages because there is a +* chance they contain stale data in the case buffered IO +* went in between AIO submission and completion into the +* same region. +*/ +if (dio->result) + defer_completion = dio->defer_completion || + (dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages); +if (defer_completion) {INIT_WORK (&dio->complete_work, dio_aio_complete_work);queue_work (dio->inode->i_sb->s_dio_done_wq, &dio->complete_work);@@ -1210,10 +1238,19 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,* For AIO O_(D)SYNC writes we need to defer completions to a workqueue * so that we can call ->fsync. */ -if (dio->is_async &&iov_iter_rw (iter) ==WRITE && - ((iocb->ki_filp->f_flags &O_DSYNC ) || -IS_SYNC (iocb->ki_filp->f_mapping->host))) { - retval =dio_set_defer_completion (dio); +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)) + retval =dio_set_defer_completion (dio); +else if (!dio->inode->i_sb->s_dio_done_wq) { +/* +* In case of AIO write racing with buffered read we +* need to defer completion. We can't decide this now, +* however the workqueue needs to be initialized here. +*/ + retval =sb_init_dio_done_wq (dio->inode->i_sb); + }if (retval) {/* * We grab i_mutex only for reads so we don't have fs/iomap.c +16
-13@@ -713,8 +713,24 @@ struct iomap_dio {static ssize_t iomap_dio_complete (struct iomap_dio *dio) {struct kiocb *iocb = dio->iocb; +struct inode *inode =file_inode (iocb->ki_filp);ssize_t ret; +/* +* Try again to invalidate clean pages which might have been cached by +* non-direct readahead, or faulted in by get_user_pages() if the source +* of the write was an mmap'ed region of the file we're writing. Either +* one is a pretty crazy thing to do, so we don't support it 100%. If +* this invalidation fails, tough, the write still worked... +*/ +if (!dio->error && + (dio->flags &IOMAP_DIO_WRITE ) && inode->i_mapping->nrpages) { + ret =invalidate_inode_pages2_range (inode->i_mapping, + iocb->ki_pos >>PAGE_SHIFT , + (iocb->ki_pos + dio->size -1 ) >>PAGE_SHIFT ); +WARN_ON_ONCE (ret); + } +if (dio->end_io) { ret = dio->end_io(iocb, dio->error ? dio->error : dio->size,@@ -1042,19 +1058,6 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, ret =iomap_dio_complete (dio); -/* -* Try again to invalidate clean pages which might have been cached by -* non-direct readahead, or faulted in by get_user_pages() if the source -* of the write was an mmap'ed region of the file we're writing. Either -* one is a pretty crazy thing to do, so we don't support it 100%. If -* this invalidation fails, tough, the write still worked... -*/ -if (iov_iter_rw (iter) ==WRITE ) { -int err =invalidate_inode_pages2_range (mapping, - start >>PAGE_SHIFT , end >>PAGE_SHIFT ); -WARN_ON_ONCE (err); - } -return ret; out_free_dio:Signature · 1 line
2.7.5
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 21 lines · Jan Kara
Quoted 20 lines · Lukas Czerner
Currently when mixing buffered reads and asynchronous direct writes it is possible to end up with the situation where we have stale data in the page cache while the new data is already written to disk. This is permanent until the affected pages are flushed away. Despite the fact that mixing buffered and direct IO is ill-advised it does pose a thread for a data integrity, is unexpected and should be fixed.
Fix this by deferring completion of asynchronous direct writes to a process context in the case that there are mapped pages to be found in the inode. Later before the completion in
dio_complete()invalidate the pages in question. This ensures that after the completion the pages in the written area are either unmapped, or populated with up-to-date data. Also do the same for the iomap case which usesiomap_dio_complete()instead.This has a side effect of deferring the completion to a process context for every AIO DIO that happens on inode that has pages mapped. However since the consensus is that this is ill-advised practice the performance implication should not be a problem.
Quoted 5 lines
Quoted 1 line
This was based on proposal from Jeff Moyer, thanks!
It seems the invalidation can be also removed from
generic_file_direct_write(), can't it? It is duplicit there the same way as it was in the iomap code...
Yep, sure looks that way.
-Jeff
Quoted 23 lines · Jeff Moyer
Quoted 21 lines · Jan Kara
Quoted 20 lines · Lukas Czerner
Currently when mixing buffered reads and asynchronous direct writes it is possible to end up with the situation where we have stale data in the page cache while the new data is already written to disk. This is permanent until the affected pages are flushed away. Despite the fact that mixing buffered and direct IO is ill-advised it does pose a thread for a data integrity, is unexpected and should be fixed.
Fix this by deferring completion of asynchronous direct writes to a process context in the case that there are mapped pages to be found in the inode. Later before the completion in
dio_complete()invalidate the pages in question. This ensures that after the completion the pages in the written area are either unmapped, or populated with up-to-date data. Also do the same for the iomap case which usesiomap_dio_complete()instead.This has a side effect of deferring the completion to a process context for every AIO DIO that happens on inode that has pages mapped. However since the consensus is that this is ill-advised practice the performance implication should not be a problem.
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
This was based on proposal from Jeff Moyer, thanks!
It seems the invalidation can be also removed from
generic_file_direct_write(), can't it? It is duplicit there the same way as it was in the iomap code...Yep, sure looks that way.
Hrm, ok. Technically speaking generic_file_direct_write does not have to eventually end up with dio_complete() being called. This will change the behaviour for those that implement dio differently. Looking at the users now, vast majority will end up with complete_dio() so maybe this is not a problem.
This is in contrast with iomap_dio_rw() which will end up calling iomap_dio_complete() so the situation is different there.
Maybe adding mapping->nrpages check would be better than outright removing it ?
-Lukas
Quoted 2 lines
-Jeff
Jan Kara
maintainerHello,
Quoted 30 lines · Lukas Czerner
Quoted 29 lines · Jeff Moyer
Quoted 26 lines · Jan Kara
Quoted 15 lines · Lukas Czerner
Currently when mixing buffered reads and asynchronous direct writes it is possible to end up with the situation where we have stale data in the page cache while the new data is already written to disk. This is permanent until the affected pages are flushed away. Despite the fact that mixing buffered and direct IO is ill-advised it does pose a thread for a data integrity, is unexpected and should be fixed.
Fix this by deferring completion of asynchronous direct writes to a process context in the case that there are mapped pages to be found in the inode. Later before the completion in
dio_complete()invalidate the pages in question. This ensures that after the completion the pages in the written area are either unmapped, or populated with up-to-date data. Also do the same for the iomap case which usesiomap_dio_complete()instead.Quoted 6 lines
This has a side effect of deferring the completion to a process context for every AIO DIO that happens on inode that has pages mapped. However since the consensus is that this is ill-advised practice the performance implication should not be a problem.
This was based on proposal from Jeff Moyer, thanks!
It seems the invalidation can be also removed from
generic_file_direct_write(), can't it? It is duplicit there the same way as it was in the iomap code...
Quoted 7 lines
Quoted 1 line
Yep, sure looks that way.
Hrm, ok. Technically speaking
generic_file_direct_writedoes not have to eventually end up withdio_complete()being called. This will change the behaviour for those that implement dio differently. Looking at the users now, vast majority will end up withcomplete_dio()so maybe this is not a problem.
OK, so this seems to be the problem with 9p, fuse, nfs, lustre.
Quoted 5 lines
This is in contrast with
iomap_dio_rw()which will end up callingiomap_dio_complete()so the situation is different there.Maybe adding
mapping->nrpagescheck would be better than outright removing it ?
OK, I agree we cannot just remove the invalidation. But shouldn't we rather fix the above mentioned filesystems? Otherwise they will keep having issues you are trying to fix? But for now I could live with keeping the invalidation behind nrpages check and adding a comment why we kept it there...
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 46 lines · Jan Kara
Hello,
Quoted 30 lines · Lukas Czerner
Quoted 29 lines · Jeff Moyer
Quoted 26 lines · Jan Kara
Quoted 15 lines · Lukas Czerner
Currently when mixing buffered reads and asynchronous direct writes it is possible to end up with the situation where we have stale data in the page cache while the new data is already written to disk. This is permanent until the affected pages are flushed away. Despite the fact that mixing buffered and direct IO is ill-advised it does pose a thread for a data integrity, is unexpected and should be fixed.
Fix this by deferring completion of asynchronous direct writes to a process context in the case that there are mapped pages to be found in the inode. Later before the completion in
dio_complete()invalidate the pages in question. This ensures that after the completion the pages in the written area are either unmapped, or populated with up-to-date data. Also do the same for the iomap case which usesiomap_dio_complete()instead.Quoted 6 lines
This has a side effect of deferring the completion to a process context for every AIO DIO that happens on inode that has pages mapped. However since the consensus is that this is ill-advised practice the performance implication should not be a problem.
This was based on proposal from Jeff Moyer, thanks!
It seems the invalidation can be also removed from
generic_file_direct_write(), can't it? It is duplicit there the same way as it was in the iomap code...Quoted 7 lines
Quoted 1 line
Yep, sure looks that way.
Hrm, ok. Technically speaking
generic_file_direct_writedoes not have to eventually end up withdio_complete()being called. This will change the behaviour for those that implement dio differently. Looking at the users now, vast majority will end up withcomplete_dio()so maybe this is not a problem.OK, so this seems to be the problem with 9p, fuse, nfs, lustre.
Quoted 3 lines
This is in contrast with
iomap_dio_rw()which will end up callingiomap_dio_complete()so the situation is different there.
Quoted 8 lines
Quoted 2 lines
Maybe adding
mapping->nrpagescheck would be better than outright removing it ?OK, I agree we cannot just remove the invalidation. But shouldn't we rather fix the above mentioned filesystems? Otherwise they will keep having issues you are trying to fix? But for now I could live with keeping the invalidation behind nrpages check and adding a comment why we kept it there...
Right, I'd rather have closere on this neverending patch. The rest of the fs can be fixed later.
-Lukas
Quoted 5 lines
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
PATCH v7 1/1 fs: Fix page cache inconsistency when mixing buffered and AIO DIO
In reply to Lukas CzernerCurrently when mixing buffered reads and asynchronous direct writes it is possible to end up with the situation where we have stale data in the page cache while the new data is already written to disk. This is permanent until the affected pages are flushed away. Despite the fact that mixing buffered and direct IO is ill-advised it does pose a thread for a data integrity, is unexpected and should be fixed.
Fix this by deferring completion of asynchronous direct writes to a process context in the case that there are mapped pages to be found in the inode. Later before the completion in dio_complete() invalidate the pages in question. This ensures that after the completion the pages in the written area are either unmapped, or populated with up-to-date data. Also do the same for the iomap case which uses iomap_dio_complete() instead.
This has a side effect of deferring the completion to a process context for every AIO DIO that happens on inode that has pages mapped. However since the consensus is that this is ill-advised practice the performance implication should not be a problem.
This was based on proposal from Jeff Moyer, thanks!
---
v2: Remove leftover ret variable from invalidate call in iomap_dio_complete
v3: Do not invalidate in case of error. Add some coments
v4: Remove unnecessary variable, remove unnecessary inner braces
v5: Style changes
v6: Remove redundant invalidatepage, add warning and comment
v7: Run invalidateion conditionally from generic_file_direct_write()
fs/direct-io.c | 49 +++++++++++++++++++++++++++++++++++++++++++------ fs/iomap.c | 29 ++++++++++++++++------------- mm/filemap.c | 10 ++++++++-- 3 files changed, 67 insertions(+), 21 deletions(-)
fs/direct-io.c +43 -6
@@ -229,6 +229,7 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async) {loff_t offset = dio->iocb->ki_pos;ssize_t transferred =0 ; +int err;/* * AIO submission can race with bio completion to get here while
@@ -258,8 +259,22 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async)if (ret ==0 ) ret = transferred; +/* +* Try again to invalidate clean pages which might have been cached by +* non-direct readahead, or faulted in by get_user_pages() if the source +* of the write was an mmap'ed region of the file we're writing. Either +* one is a pretty crazy thing to do, so we don't support it 100%. If +* this invalidation fails, tough, the write still worked... +*/ +if (ret >0 && dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages) { + err =invalidate_inode_pages2_range (dio->inode->i_mapping, + offset >>PAGE_SHIFT , + (offset + ret -1 ) >>PAGE_SHIFT ); +WARN_ON_ONCE (err); + } +if (dio->end_io) { -int err;// XXX: ki_pos?? err = dio->end_io (dio->iocb, offset, ret, dio->private);
@@ -304,6 +319,7 @@ static void dio_bio_end_aio(struct bio *bio)struct dio *dio = bio->bi_private;unsigned long remaining;unsigned long flags; +bool defer_completion = false;/* cleanup the bio */ dio_bio_complete (dio, bio);
@@ -315,7 +331,19 @@ static void dio_bio_end_aio(struct bio *bio)spin_unlock_irqrestore (&dio->bio_lock, flags);if (remaining ==0 ) { -if (dio->result && dio->defer_completion) { +/* +* Defer completion when defer_completion is set or +* when the inode has pages mapped and this is AIO write. +* We need to invalidate those pages because there is a +* chance they contain stale data in the case buffered IO +* went in between AIO submission and completion into the +* same region. +*/ +if (dio->result) + defer_completion = dio->defer_completion || + (dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages); +if (defer_completion) {INIT_WORK (&dio->complete_work, dio_aio_complete_work);queue_work (dio->inode->i_sb->s_dio_done_wq, &dio->complete_work);
@@ -1210,10 +1238,19 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,* For AIO O_(D)SYNC writes we need to defer completions to a workqueue * so that we can call ->fsync. */ -if (dio->is_async &&iov_iter_rw (iter) ==WRITE && - ((iocb->ki_filp->f_flags &O_DSYNC ) || -IS_SYNC (iocb->ki_filp->f_mapping->host))) { - retval =dio_set_defer_completion (dio); +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)) + retval =dio_set_defer_completion (dio); +else if (!dio->inode->i_sb->s_dio_done_wq) { +/* +* In case of AIO write racing with buffered read we +* need to defer completion. We can't decide this now, +* however the workqueue needs to be initialized here. +*/ + retval =sb_init_dio_done_wq (dio->inode->i_sb); + }if (retval) {/* * We grab i_mutex only for reads so we don't have
fs/iomap.c +16 -13
@@ -713,8 +713,24 @@ struct iomap_dio {static ssize_t iomap_dio_complete (struct iomap_dio *dio) {struct kiocb *iocb = dio->iocb; +struct inode *inode =file_inode (iocb->ki_filp);ssize_t ret; +/* +* Try again to invalidate clean pages which might have been cached by +* non-direct readahead, or faulted in by get_user_pages() if the source +* of the write was an mmap'ed region of the file we're writing. Either +* one is a pretty crazy thing to do, so we don't support it 100%. If +* this invalidation fails, tough, the write still worked... +*/ +if (!dio->error && + (dio->flags &IOMAP_DIO_WRITE ) && inode->i_mapping->nrpages) { + ret =invalidate_inode_pages2_range (inode->i_mapping, + iocb->ki_pos >>PAGE_SHIFT , + (iocb->ki_pos + dio->size -1 ) >>PAGE_SHIFT ); +WARN_ON_ONCE (ret); + } +if (dio->end_io) { ret = dio->end_io(iocb, dio->error ? dio->error : dio->size,
@@ -1042,19 +1058,6 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, ret =iomap_dio_complete (dio); -/* -* Try again to invalidate clean pages which might have been cached by -* non-direct readahead, or faulted in by get_user_pages() if the source -* of the write was an mmap'ed region of the file we're writing. Either -* one is a pretty crazy thing to do, so we don't support it 100%. If -* this invalidation fails, tough, the write still worked... -*/ -if (iov_iter_rw (iter) ==WRITE ) { -int err =invalidate_inode_pages2_range (mapping, - start >>PAGE_SHIFT , end >>PAGE_SHIFT ); -WARN_ON_ONCE (err); - } -return ret; out_free_dio:
mm/filemap.c +8 -2
@@ -2885,9 +2885,15 @@ generic_file_direct_write(struct kiocb *iocb, struct iov_iter *from)* we're writing. Either one is a pretty crazy thing to do, * so we don't support it 100%. If this invalidation * fails, tough, the write still worked... +* +* Most of the time we do not need this since dio_complete() will do +* the invalidation for us. However there are some file systems that +* do not end up with dio_complete() being called, so let's not break +* them by removing it completely */ -invalidate_inode_pages2_range (mapping, - pos >>PAGE_SHIFT , end); +if (mapping->nrpages) +invalidate_inode_pages2_range (mapping, + pos >>PAGE_SHIFT , end);if (written >0 ) { pos += written;
Signature · 1 line
2.7.5
Quoted 20 lines · Lukas Czerner
Currently when mixing buffered reads and asynchronous direct writes it is possible to end up with the situation where we have stale data in the page cache while the new data is already written to disk. This is permanent until the affected pages are flushed away. Despite the fact that mixing buffered and direct IO is ill-advised it does pose a thread for a data integrity, is unexpected and should be fixed.
Fix this by deferring completion of asynchronous direct writes to a process context in the case that there are mapped pages to be found in the inode. Later before the completion in
dio_complete()invalidate the pages in question. This ensures that after the completion the pages in the written area are either unmapped, or populated with up-to-date data. Also do the same for the iomap case which usesiomap_dio_complete()instead.This has a side effect of deferring the completion to a process context for every AIO DIO that happens on inode that has pages mapped. However since the consensus is that this is ill-advised practice the performance implication should not be a problem.
Quoted 4 lines
This was based on proposal from Jeff Moyer, thanks!
Signed-off-by Lukas Czerner <[email protected]>Cc Jeff Moyer <[email protected]>
Looks good to me. You can add:
Honza
Quoted 176 lines
---
v2: Remove leftover ret variable from invalidate call iniomap_dio_complete
v3: Do not invalidate in case of error. Add some coments
v4: Remove unnecessary variable, remove unnecessary inner braces
v5: Style changes
v6: Remove redundant invalidatepage, add warning and comment
v7: Run invalidateion conditionally fromgeneric_file_direct_write()fs/direct-io.c | 49 +++++++++++++++++++++++++++++++++++++++++++------ fs/iomap.c | 29 ++++++++++++++++------------- mm/filemap.c | 10 ++++++++-- 3 files changed, 67 insertions(+), 21 deletions(-)fs/direct-io.c +43
-6@@ -229,6 +229,7 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async) {loff_t offset = dio->iocb->ki_pos;ssize_t transferred =0 ; +int err;/* * AIO submission can race with bio completion to get here while @@ -258,8 +259,22 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async)if (ret ==0 ) ret = transferred; +/* +* Try again to invalidate clean pages which might have been cached by +* non-direct readahead, or faulted in by get_user_pages() if the source +* of the write was an mmap'ed region of the file we're writing. Either +* one is a pretty crazy thing to do, so we don't support it 100%. If +* this invalidation fails, tough, the write still worked... +*/ +if (ret >0 && dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages) { + err =invalidate_inode_pages2_range (dio->inode->i_mapping, + offset >>PAGE_SHIFT , + (offset + ret -1 ) >>PAGE_SHIFT ); +WARN_ON_ONCE (err); + } +if (dio->end_io) { -int err;// XXX: ki_pos?? err = dio->end_io (dio->iocb, offset, ret, dio->private);@@ -304,6 +319,7 @@ static void dio_bio_end_aio(struct bio *bio)struct dio *dio = bio->bi_private;unsigned long remaining;unsigned long flags; +bool defer_completion = false;/* cleanup the bio */ dio_bio_complete (dio, bio);@@ -315,7 +331,19 @@ static void dio_bio_end_aio(struct bio *bio)spin_unlock_irqrestore (&dio->bio_lock, flags);if (remaining ==0 ) { -if (dio->result && dio->defer_completion) { +/* +* Defer completion when defer_completion is set or +* when the inode has pages mapped and this is AIO write. +* We need to invalidate those pages because there is a +* chance they contain stale data in the case buffered IO +* went in between AIO submission and completion into the +* same region. +*/ +if (dio->result) + defer_completion = dio->defer_completion || + (dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages); +if (defer_completion) {INIT_WORK (&dio->complete_work, dio_aio_complete_work);queue_work (dio->inode->i_sb->s_dio_done_wq, &dio->complete_work);@@ -1210,10 +1238,19 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,* For AIO O_(D)SYNC writes we need to defer completions to a workqueue * so that we can call ->fsync. */ -if (dio->is_async &&iov_iter_rw (iter) ==WRITE && - ((iocb->ki_filp->f_flags &O_DSYNC ) || -IS_SYNC (iocb->ki_filp->f_mapping->host))) { - retval =dio_set_defer_completion (dio); +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)) + retval =dio_set_defer_completion (dio); +else if (!dio->inode->i_sb->s_dio_done_wq) { +/* +* In case of AIO write racing with buffered read we +* need to defer completion. We can't decide this now, +* however the workqueue needs to be initialized here. +*/ + retval =sb_init_dio_done_wq (dio->inode->i_sb); + }if (retval) {/* * We grab i_mutex only for reads so we don't have fs/iomap.c +16
-13@@ -713,8 +713,24 @@ struct iomap_dio {static ssize_t iomap_dio_complete (struct iomap_dio *dio) {struct kiocb *iocb = dio->iocb; +struct inode *inode =file_inode (iocb->ki_filp);ssize_t ret; +/* +* Try again to invalidate clean pages which might have been cached by +* non-direct readahead, or faulted in by get_user_pages() if the source +* of the write was an mmap'ed region of the file we're writing. Either +* one is a pretty crazy thing to do, so we don't support it 100%. If +* this invalidation fails, tough, the write still worked... +*/ +if (!dio->error && + (dio->flags &IOMAP_DIO_WRITE ) && inode->i_mapping->nrpages) { + ret =invalidate_inode_pages2_range (inode->i_mapping, + iocb->ki_pos >>PAGE_SHIFT , + (iocb->ki_pos + dio->size -1 ) >>PAGE_SHIFT ); +WARN_ON_ONCE (ret); + } +if (dio->end_io) { ret = dio->end_io(iocb, dio->error ? dio->error : dio->size,@@ -1042,19 +1058,6 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, ret =iomap_dio_complete (dio); -/* -* Try again to invalidate clean pages which might have been cached by -* non-direct readahead, or faulted in by get_user_pages() if the source -* of the write was an mmap'ed region of the file we're writing. Either -* one is a pretty crazy thing to do, so we don't support it 100%. If -* this invalidation fails, tough, the write still worked... -*/ -if (iov_iter_rw (iter) ==WRITE ) { -int err =invalidate_inode_pages2_range (mapping, - start >>PAGE_SHIFT , end >>PAGE_SHIFT ); -WARN_ON_ONCE (err); - } -return ret; out_free_dio:mm/filemap.c +8
-2@@ -2885,9 +2885,15 @@ generic_file_direct_write(struct kiocb *iocb, struct iov_iter *from)* we're writing. Either one is a pretty crazy thing to do, * so we don't support it 100%. If this invalidation * fails, tough, the write still worked... +* +* Most of the time we do not need this since dio_complete() will do +* the invalidation for us. However there are some file systems that +* do not end up with dio_complete() being called, so let's not break +* them by removing it completely */ -invalidate_inode_pages2_range (mapping, - pos >>PAGE_SHIFT , end); +if (mapping->nrpages) +invalidate_inode_pages2_range (mapping, + pos >>PAGE_SHIFT , end);if (written >0 ) { pos += written;Signature · 1 line
2.7.5
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 20 lines · Lukas Czerner
Currently when mixing buffered reads and asynchronous direct writes it is possible to end up with the situation where we have stale data in the page cache while the new data is already written to disk. This is permanent until the affected pages are flushed away. Despite the fact that mixing buffered and direct IO is ill-advised it does pose a thread for a data integrity, is unexpected and should be fixed.
Fix this by deferring completion of asynchronous direct writes to a process context in the case that there are mapped pages to be found in the inode. Later before the completion in
dio_complete()invalidate the pages in question. This ensures that after the completion the pages in the written area are either unmapped, or populated with up-to-date data. Also do the same for the iomap case which usesiomap_dio_complete()instead.This has a side effect of deferring the completion to a process context for every AIO DIO that happens on inode that has pages mapped. However since the consensus is that this is ill-advised practice the performance implication should not be a problem.
Quoted 4 lines
This was based on proposal from Jeff Moyer, thanks!
Signed-off-by Lukas Czerner <[email protected]>Cc Jeff Moyer <[email protected]>
Looks ok to me,
--D
Quoted 176 lines
---
v2: Remove leftover ret variable from invalidate call iniomap_dio_complete
v3: Do not invalidate in case of error. Add some coments
v4: Remove unnecessary variable, remove unnecessary inner braces
v5: Style changes
v6: Remove redundant invalidatepage, add warning and comment
v7: Run invalidateion conditionally fromgeneric_file_direct_write()fs/direct-io.c | 49 +++++++++++++++++++++++++++++++++++++++++++------ fs/iomap.c | 29 ++++++++++++++++------------- mm/filemap.c | 10 ++++++++-- 3 files changed, 67 insertions(+), 21 deletions(-)fs/direct-io.c +43
-6@@ -229,6 +229,7 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async) {loff_t offset = dio->iocb->ki_pos;ssize_t transferred =0 ; +int err;/* * AIO submission can race with bio completion to get here while @@ -258,8 +259,22 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async)if (ret ==0 ) ret = transferred; +/* +* Try again to invalidate clean pages which might have been cached by +* non-direct readahead, or faulted in by get_user_pages() if the source +* of the write was an mmap'ed region of the file we're writing. Either +* one is a pretty crazy thing to do, so we don't support it 100%. If +* this invalidation fails, tough, the write still worked... +*/ +if (ret >0 && dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages) { + err =invalidate_inode_pages2_range (dio->inode->i_mapping, + offset >>PAGE_SHIFT , + (offset + ret -1 ) >>PAGE_SHIFT ); +WARN_ON_ONCE (err); + } +if (dio->end_io) { -int err;// XXX: ki_pos?? err = dio->end_io (dio->iocb, offset, ret, dio->private);@@ -304,6 +319,7 @@ static void dio_bio_end_aio(struct bio *bio)struct dio *dio = bio->bi_private;unsigned long remaining;unsigned long flags; +bool defer_completion = false;/* cleanup the bio */ dio_bio_complete (dio, bio);@@ -315,7 +331,19 @@ static void dio_bio_end_aio(struct bio *bio)spin_unlock_irqrestore (&dio->bio_lock, flags);if (remaining ==0 ) { -if (dio->result && dio->defer_completion) { +/* +* Defer completion when defer_completion is set or +* when the inode has pages mapped and this is AIO write. +* We need to invalidate those pages because there is a +* chance they contain stale data in the case buffered IO +* went in between AIO submission and completion into the +* same region. +*/ +if (dio->result) + defer_completion = dio->defer_completion || + (dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages); +if (defer_completion) {INIT_WORK (&dio->complete_work, dio_aio_complete_work);queue_work (dio->inode->i_sb->s_dio_done_wq, &dio->complete_work);@@ -1210,10 +1238,19 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,* For AIO O_(D)SYNC writes we need to defer completions to a workqueue * so that we can call ->fsync. */ -if (dio->is_async &&iov_iter_rw (iter) ==WRITE && - ((iocb->ki_filp->f_flags &O_DSYNC ) || -IS_SYNC (iocb->ki_filp->f_mapping->host))) { - retval =dio_set_defer_completion (dio); +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)) + retval =dio_set_defer_completion (dio); +else if (!dio->inode->i_sb->s_dio_done_wq) { +/* +* In case of AIO write racing with buffered read we +* need to defer completion. We can't decide this now, +* however the workqueue needs to be initialized here. +*/ + retval =sb_init_dio_done_wq (dio->inode->i_sb); + }if (retval) {/* * We grab i_mutex only for reads so we don't have fs/iomap.c +16
-13@@ -713,8 +713,24 @@ struct iomap_dio {static ssize_t iomap_dio_complete (struct iomap_dio *dio) {struct kiocb *iocb = dio->iocb; +struct inode *inode =file_inode (iocb->ki_filp);ssize_t ret; +/* +* Try again to invalidate clean pages which might have been cached by +* non-direct readahead, or faulted in by get_user_pages() if the source +* of the write was an mmap'ed region of the file we're writing. Either +* one is a pretty crazy thing to do, so we don't support it 100%. If +* this invalidation fails, tough, the write still worked... +*/ +if (!dio->error && + (dio->flags &IOMAP_DIO_WRITE ) && inode->i_mapping->nrpages) { + ret =invalidate_inode_pages2_range (inode->i_mapping, + iocb->ki_pos >>PAGE_SHIFT , + (iocb->ki_pos + dio->size -1 ) >>PAGE_SHIFT ); +WARN_ON_ONCE (ret); + } +if (dio->end_io) { ret = dio->end_io(iocb, dio->error ? dio->error : dio->size,@@ -1042,19 +1058,6 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, ret =iomap_dio_complete (dio); -/* -* Try again to invalidate clean pages which might have been cached by -* non-direct readahead, or faulted in by get_user_pages() if the source -* of the write was an mmap'ed region of the file we're writing. Either -* one is a pretty crazy thing to do, so we don't support it 100%. If -* this invalidation fails, tough, the write still worked... -*/ -if (iov_iter_rw (iter) ==WRITE ) { -int err =invalidate_inode_pages2_range (mapping, - start >>PAGE_SHIFT , end >>PAGE_SHIFT ); -WARN_ON_ONCE (err); - } -return ret; out_free_dio:mm/filemap.c +8
-2@@ -2885,9 +2885,15 @@ generic_file_direct_write(struct kiocb *iocb, struct iov_iter *from)* we're writing. Either one is a pretty crazy thing to do, * so we don't support it 100%. If this invalidation * fails, tough, the write still worked... +* +* Most of the time we do not need this since dio_complete() will do +* the invalidation for us. However there are some file systems that +* do not end up with dio_complete() being called, so let's not break +* them by removing it completely */ -invalidate_inode_pages2_range (mapping, - pos >>PAGE_SHIFT , end); +if (mapping->nrpages) +invalidate_inode_pages2_range (mapping, + pos >>PAGE_SHIFT , end);if (written >0 ) { pos += written;Signature · 1 line
2.7.5
Quoted 20 lines · Lukas Czerner
Currently when mixing buffered reads and asynchronous direct writes it is possible to end up with the situation where we have stale data in the page cache while the new data is already written to disk. This is permanent until the affected pages are flushed away. Despite the fact that mixing buffered and direct IO is ill-advised it does pose a thread for a data integrity, is unexpected and should be fixed.
Fix this by deferring completion of asynchronous direct writes to a process context in the case that there are mapped pages to be found in the inode. Later before the completion in
dio_complete()invalidate the pages in question. This ensures that after the completion the pages in the written area are either unmapped, or populated with up-to-date data. Also do the same for the iomap case which usesiomap_dio_complete()instead.This has a side effect of deferring the completion to a process context for every AIO DIO that happens on inode that has pages mapped. However since the consensus is that this is ill-advised practice the performance implication should not be a problem.
Quoted 4 lines
This was based on proposal from Jeff Moyer, thanks!
Signed-off-by Lukas Czerner <[email protected]>Cc Jeff Moyer <[email protected]>
Is this still in limbo?
Quoted 173 lines
---
v2: Remove leftover ret variable from invalidate call iniomap_dio_complete
v3: Do not invalidate in case of error. Add some coments
v4: Remove unnecessary variable, remove unnecessary inner braces
v5: Style changes
v6: Remove redundant invalidatepage, add warning and comment
v7: Run invalidateion conditionally fromgeneric_file_direct_write()fs/direct-io.c | 49 +++++++++++++++++++++++++++++++++++++++++++------ fs/iomap.c | 29 ++++++++++++++++------------- mm/filemap.c | 10 ++++++++-- 3 files changed, 67 insertions(+), 21 deletions(-)fs/direct-io.c +43
-6@@ -229,6 +229,7 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async) {loff_t offset = dio->iocb->ki_pos;ssize_t transferred =0 ; +int err;/* * AIO submission can race with bio completion to get here while @@ -258,8 +259,22 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async)if (ret ==0 ) ret = transferred; +/* +* Try again to invalidate clean pages which might have been cached by +* non-direct readahead, or faulted in by get_user_pages() if the source +* of the write was an mmap'ed region of the file we're writing. Either +* one is a pretty crazy thing to do, so we don't support it 100%. If +* this invalidation fails, tough, the write still worked... +*/ +if (ret >0 && dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages) { + err =invalidate_inode_pages2_range (dio->inode->i_mapping, + offset >>PAGE_SHIFT , + (offset + ret -1 ) >>PAGE_SHIFT ); +WARN_ON_ONCE (err); + } +if (dio->end_io) { -int err;// XXX: ki_pos?? err = dio->end_io (dio->iocb, offset, ret, dio->private);@@ -304,6 +319,7 @@ static void dio_bio_end_aio(struct bio *bio)struct dio *dio = bio->bi_private;unsigned long remaining;unsigned long flags; +bool defer_completion = false;/* cleanup the bio */ dio_bio_complete (dio, bio);@@ -315,7 +331,19 @@ static void dio_bio_end_aio(struct bio *bio)spin_unlock_irqrestore (&dio->bio_lock, flags);if (remaining ==0 ) { -if (dio->result && dio->defer_completion) { +/* +* Defer completion when defer_completion is set or +* when the inode has pages mapped and this is AIO write. +* We need to invalidate those pages because there is a +* chance they contain stale data in the case buffered IO +* went in between AIO submission and completion into the +* same region. +*/ +if (dio->result) + defer_completion = dio->defer_completion || + (dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages); +if (defer_completion) {INIT_WORK (&dio->complete_work, dio_aio_complete_work);queue_work (dio->inode->i_sb->s_dio_done_wq, &dio->complete_work);@@ -1210,10 +1238,19 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,* For AIO O_(D)SYNC writes we need to defer completions to a workqueue * so that we can call ->fsync. */ -if (dio->is_async &&iov_iter_rw (iter) ==WRITE && - ((iocb->ki_filp->f_flags &O_DSYNC ) || -IS_SYNC (iocb->ki_filp->f_mapping->host))) { - retval =dio_set_defer_completion (dio); +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)) + retval =dio_set_defer_completion (dio); +else if (!dio->inode->i_sb->s_dio_done_wq) { +/* +* In case of AIO write racing with buffered read we +* need to defer completion. We can't decide this now, +* however the workqueue needs to be initialized here. +*/ + retval =sb_init_dio_done_wq (dio->inode->i_sb); + }if (retval) {/* * We grab i_mutex only for reads so we don't have fs/iomap.c +16
-13@@ -713,8 +713,24 @@ struct iomap_dio {static ssize_t iomap_dio_complete (struct iomap_dio *dio) {struct kiocb *iocb = dio->iocb; +struct inode *inode =file_inode (iocb->ki_filp);ssize_t ret; +/* +* Try again to invalidate clean pages which might have been cached by +* non-direct readahead, or faulted in by get_user_pages() if the source +* of the write was an mmap'ed region of the file we're writing. Either +* one is a pretty crazy thing to do, so we don't support it 100%. If +* this invalidation fails, tough, the write still worked... +*/ +if (!dio->error && + (dio->flags &IOMAP_DIO_WRITE ) && inode->i_mapping->nrpages) { + ret =invalidate_inode_pages2_range (inode->i_mapping, + iocb->ki_pos >>PAGE_SHIFT , + (iocb->ki_pos + dio->size -1 ) >>PAGE_SHIFT ); +WARN_ON_ONCE (ret); + } +if (dio->end_io) { ret = dio->end_io(iocb, dio->error ? dio->error : dio->size,@@ -1042,19 +1058,6 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, ret =iomap_dio_complete (dio); -/* -* Try again to invalidate clean pages which might have been cached by -* non-direct readahead, or faulted in by get_user_pages() if the source -* of the write was an mmap'ed region of the file we're writing. Either -* one is a pretty crazy thing to do, so we don't support it 100%. If -* this invalidation fails, tough, the write still worked... -*/ -if (iov_iter_rw (iter) ==WRITE ) { -int err =invalidate_inode_pages2_range (mapping, - start >>PAGE_SHIFT , end >>PAGE_SHIFT ); -WARN_ON_ONCE (err); - } -return ret; out_free_dio:mm/filemap.c +8
-2@@ -2885,9 +2885,15 @@ generic_file_direct_write(struct kiocb *iocb, struct iov_iter *from)* we're writing. Either one is a pretty crazy thing to do, * so we don't support it 100%. If this invalidation * fails, tough, the write still worked... +* +* Most of the time we do not need this since dio_complete() will do +* the invalidation for us. However there are some file systems that +* do not end up with dio_complete() being called, so let's not break +* them by removing it completely */ -invalidate_inode_pages2_range (mapping, - pos >>PAGE_SHIFT , end); +if (mapping->nrpages) +invalidate_inode_pages2_range (mapping, + pos >>PAGE_SHIFT , end);if (written >0 ) { pos += written;
Al, Jens,
can any of you please take this throught your tree ?
Thanks!
-Lukas
Quoted 200 lines · Lukas Czerner
Currently when mixing buffered reads and asynchronous direct writes it is possible to end up with the situation where we have stale data in the page cache while the new data is already written to disk. This is permanent until the affected pages are flushed away. Despite the fact that mixing buffered and direct IO is ill-advised it does pose a thread for a data integrity, is unexpected and should be fixed.
Fix this by deferring completion of asynchronous direct writes to a process context in the case that there are mapped pages to be found in the inode. Later before the completion in
dio_complete()invalidate the pages in question. This ensures that after the completion the pages in the written area are either unmapped, or populated with up-to-date data. Also do the same for the iomap case which usesiomap_dio_complete()instead.This has a side effect of deferring the completion to a process context for every AIO DIO that happens on inode that has pages mapped. However since the consensus is that this is ill-advised practice the performance implication should not be a problem.
This was based on proposal from Jeff Moyer, thanks!
Signed-off-by Lukas Czerner <[email protected]>Cc Jeff Moyer <[email protected]>---
v2: Remove leftover ret variable from invalidate call iniomap_dio_complete
v3: Do not invalidate in case of error. Add some coments
v4: Remove unnecessary variable, remove unnecessary inner braces
v5: Style changes
v6: Remove redundant invalidatepage, add warning and comment
v7: Run invalidateion conditionally fromgeneric_file_direct_write()fs/direct-io.c | 49 +++++++++++++++++++++++++++++++++++++++++++------ fs/iomap.c | 29 ++++++++++++++++------------- mm/filemap.c | 10 ++++++++-- 3 files changed, 67 insertions(+), 21 deletions(-)fs/direct-io.c +43
-6@@ -229,6 +229,7 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async) {loff_t offset = dio->iocb->ki_pos;ssize_t transferred =0 ; +int err;/* * AIO submission can race with bio completion to get here while @@ -258,8 +259,22 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async)if (ret ==0 ) ret = transferred; +/* +* Try again to invalidate clean pages which might have been cached by +* non-direct readahead, or faulted in by get_user_pages() if the source +* of the write was an mmap'ed region of the file we're writing. Either +* one is a pretty crazy thing to do, so we don't support it 100%. If +* this invalidation fails, tough, the write still worked... +*/ +if (ret >0 && dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages) { + err =invalidate_inode_pages2_range (dio->inode->i_mapping, + offset >>PAGE_SHIFT , + (offset + ret -1 ) >>PAGE_SHIFT ); +WARN_ON_ONCE (err); + } +if (dio->end_io) { -int err;// XXX: ki_pos?? err = dio->end_io (dio->iocb, offset, ret, dio->private);@@ -304,6 +319,7 @@ static void dio_bio_end_aio(struct bio *bio)struct dio *dio = bio->bi_private;unsigned long remaining;unsigned long flags; +bool defer_completion = false;/* cleanup the bio */ dio_bio_complete (dio, bio);@@ -315,7 +331,19 @@ static void dio_bio_end_aio(struct bio *bio)spin_unlock_irqrestore (&dio->bio_lock, flags);if (remaining ==0 ) { -if (dio->result && dio->defer_completion) { +/* +* Defer completion when defer_completion is set or +* when the inode has pages mapped and this is AIO write. +* We need to invalidate those pages because there is a +* chance they contain stale data in the case buffered IO +* went in between AIO submission and completion into the +* same region. +*/ +if (dio->result) + defer_completion = dio->defer_completion || + (dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages); +if (defer_completion) {INIT_WORK (&dio->complete_work, dio_aio_complete_work);queue_work (dio->inode->i_sb->s_dio_done_wq, &dio->complete_work);@@ -1210,10 +1238,19 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,* For AIO O_(D)SYNC writes we need to defer completions to a workqueue * so that we can call ->fsync. */ -if (dio->is_async &&iov_iter_rw (iter) ==WRITE && - ((iocb->ki_filp->f_flags &O_DSYNC ) || -IS_SYNC (iocb->ki_filp->f_mapping->host))) { - retval =dio_set_defer_completion (dio); +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)) + retval =dio_set_defer_completion (dio); +else if (!dio->inode->i_sb->s_dio_done_wq) { +/* +* In case of AIO write racing with buffered read we +* need to defer completion. We can't decide this now, +* however the workqueue needs to be initialized here. +*/ + retval =sb_init_dio_done_wq (dio->inode->i_sb); + }if (retval) {/* * We grab i_mutex only for reads so we don't have fs/iomap.c +16
-13@@ -713,8 +713,24 @@ struct iomap_dio {static ssize_t iomap_dio_complete (struct iomap_dio *dio) {struct kiocb *iocb = dio->iocb; +struct inode *inode =file_inode (iocb->ki_filp);ssize_t ret; +/* +* Try again to invalidate clean pages which might have been cached by +* non-direct readahead, or faulted in by get_user_pages() if the source +* of the write was an mmap'ed region of the file we're writing. Either +* one is a pretty crazy thing to do, so we don't support it 100%. If +* this invalidation fails, tough, the write still worked... +*/ +if (!dio->error && + (dio->flags &IOMAP_DIO_WRITE ) && inode->i_mapping->nrpages) { + ret =invalidate_inode_pages2_range (inode->i_mapping, + iocb->ki_pos >>PAGE_SHIFT , + (iocb->ki_pos + dio->size -1 ) >>PAGE_SHIFT ); +WARN_ON_ONCE (ret); + } +if (dio->end_io) { ret = dio->end_io(iocb, dio->error ? dio->error : dio->size,@@ -1042,19 +1058,6 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, ret =iomap_dio_complete (dio); -/* -* Try again to invalidate clean pages which might have been cached by -* non-direct readahead, or faulted in by get_user_pages() if the source -* of the write was an mmap'ed region of the file we're writing. Either -* one is a pretty crazy thing to do, so we don't support it 100%. If -* this invalidation fails, tough, the write still worked... -*/ -if (iov_iter_rw (iter) ==WRITE ) { -int err =invalidate_inode_pages2_range (mapping, - start >>PAGE_SHIFT , end >>PAGE_SHIFT ); -WARN_ON_ONCE (err); - } -return ret; out_free_dio:mm/filemap.c +8
-2@@ -2885,9 +2885,15 @@ generic_file_direct_write(struct kiocb *iocb, struct iov_iter *from)* we're writing. Either one is a pretty crazy thing to do, * so we don't support it 100%. If this invalidation * fails, tough, the write still worked... +* +* Most of the time we do not need this since dio_complete() will do +* the invalidation for us. However there are some file systems that +* do not end up with dio_complete() being called, so let's not break +* them by removing it completely */ -invalidate_inode_pages2_range (mapping, - pos >>PAGE_SHIFT , end); +if (mapping->nrpages) +invalidate_inode_pages2_range (mapping, + pos >>PAGE_SHIFT , end);if (written >0 ) { pos += written;Signature · 1 line
2.7.5
Quoted 3 lines · Lukas Czerner
Al, Jens,
can any of you please take this throught your tree ?
I can take it, it's well reviewed at this point (to say the least).
Signature · 1 line
Jens Axboe
fs/direct-io.c static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async) · line 274
Quoted 13 lines · Lukas Czerner
fs/direct-io.c +13
-0+/* +* Try again to invalidate clean pages which might have been cached by +* non-direct readahead, or faulted in by get_user_pages() if the source +* of the write was an mmap'ed region of the file we're writing. Either +* one is a pretty crazy thing to do, so we don't support it 100%. If +* this invalidation fails, tough, the write still worked... +*/ +if (ret >0 && dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages) { + err =invalidate_inode_pages2_range (dio->inode->i_mapping, + offset >>PAGE_SHIFT , + (offset + ret -1 ) >>PAGE_SHIFT ); +WARN_ON_ONCE (err);
fstests/btrfs/062 reports this:
[ 6235.547298] ------------[ cut here ]------------ [ 6235.552098] WARNING: CPU: 7 PID: 24321 at fs/direct-io.c:274 dio_complete+0x16f/0x1f0 [ 6235.560858] Modules linked in: dm_flakey loop rpcsec_gss_krb5 auth_rpcgss nfsv4 dns_resolver nfs lockd grace sunrpc fscache af_packet br_netfilter bridge stp llc iscsi_ibft iscsi_boot_sysfs btrfs xor zstd_decompress zstd_compress i2c_algo_bit drm_kms_helper xxhash zlib_deflate raid6_pq syscopyarea sysfillrect sysimgblt fb_sys_fops ttm tg3 drm dm_mod dax ptp kvm_amd pps_core kvm libphy tpm_infineon mptctl shpchp k10temp tpm_tis tpm_tis_core button i2c_piix4 tpm pcspkr irqbypass acpi_cpufreq ext4 mbcache jbd2 sr_mod cdrom ohci_pci ehci_pci ohci_hcd mptsas ehci_hcd scsi_transport_sas ata_generic mptscsih serio_raw mptbase usbcore sata_svw pata_serverworks sg scsi_dh_rdac scsi_dh_emc scsi_dh_alua [ 6235.560942] CPU: 7 PID: 24321 Comm: kworker/7:1 Not tainted 4.14.0-rc4-1.ge195904-vanilla+ #71 [ 6235.560944] Hardware name: empty empty/S3993, BIOS PAQEX0-3 02/24/2008 [ 6235.560950] Workqueue: dio/sdb6 dio_aio_complete_work [ 6235.560953] task: ffff894fe0bd8300 task.stack: ffffb45742f7c000 [ 6235.560957] RIP: 0010:dio_complete+0x16f/0x1f0 [ 6235.560959] RSP: 0018:ffffb45742f7fde8 EFLAGS: 00010286 [ 6235.560968] RAX: 00000000fffffff0 RBX: ffff894fd1e3a680 RCX: ffff894fe0bd8300 [ 6235.560970] RDX: 0000000000000000 RSI: 00000000000002b4 RDI: ffffffffaba438e9 [ 6235.560971] RBP: ffffb45742f7fe10 R08: 0000000000000000 R09: 0000000000000025 [ 6235.560973] R10: 0000000000000000 R11: 0000000000000000 R12: 000000000001e000 [ 6235.560974] R13: 000000000001e000 R14: 0000000000007000 R15: 0000000000000001 [ 6235.560977] FS: 0000000000000000(0000) GS:ffff894fefdc0000(0000) knlGS:0000000000000000 [ 6235.560978] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 6235.560980] CR2: 00007fe1e1dfb610 CR3: 0000000213ee7000 CR4: 00000000000006e0 [ 6235.560982] Call Trace: [ 6235.561075] dio_aio_complete_work+0x1c/0x20 [ 6235.561082] process_one_work+0x1d8/0x620 [ 6235.561085] ? process_one_work+0x14b/0x620 [ 6235.561092] worker_thread+0x4d/0x3c0 [ 6235.561097] ? trace_hardirqs_on+0xd/0x10 [ 6235.561105] kthread+0x152/0x190 [ 6235.561107] ? process_one_work+0x620/0x620 [ 6235.561111] ? kthread_create_on_node+0x40/0x40 [ 6235.561116] ? do_syscall_64+0x69/0x180 [ 6235.561122] ret_from_fork+0x2a/0x40 [ 6235.561131] Code: 48 83 bf 00 01 00 00 00 0f 84 37 ff ff ff 4b 8d 54 34 ff 4c 89 f6 48 c1 fe 0c 48 c1 fa 0c e8 49 82 f2 ff 85 c0 0f 84 1a ff ff ff <0f> ff e9 13 ff ff ff 48 81 c7 e0 00 00 00 be 09 00 00 00 e8 79 [ 6235.561179] ---[ end trace ba80cd81f19cb389 ]---
I've added Chris and Bo to CC if they have more to say about the specifics of dio and buffered writes as implemented in btrfs.
Quoted 48 lines · David Sterba
fs/direct-io.c static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async) · line 274
Quoted 13 lines · Lukas Czerner
fs/direct-io.c +13
-0+/* +* Try again to invalidate clean pages which might have been cached by +* non-direct readahead, or faulted in by get_user_pages() if the source +* of the write was an mmap'ed region of the file we're writing. Either +* one is a pretty crazy thing to do, so we don't support it 100%. If +* this invalidation fails, tough, the write still worked... +*/ +if (ret >0 && dio->op ==REQ_OP_WRITE && + dio->inode->i_mapping->nrpages) { + err =invalidate_inode_pages2_range (dio->inode->i_mapping, + offset >>PAGE_SHIFT , + (offset + ret -1 ) >>PAGE_SHIFT ); +WARN_ON_ONCE (err);fstests/btrfs/062 reports this:
[ 6235.547298] ------------[ cut here ]------------ [ 6235.552098] WARNING: CPU: 7 PID: 24321 at fs/direct-io.c:274 dio_complete+0x16f/0x1f0 [ 6235.560858] Modules linked in: dm_flakey loop rpcsec_gss_krb5 auth_rpcgss nfsv4 dns_resolver nfs lockd grace sunrpc fscache af_packet br_netfilter bridge stp llc iscsi_ibft iscsi_boot_sysfs btrfs xor zstd_decompress zstd_compress i2c_algo_bit drm_kms_helper xxhash zlib_deflate raid6_pq syscopyarea sysfillrect sysimgblt fb_sys_fops ttm tg3 drm dm_mod dax ptp kvm_amd pps_core kvm libphy tpm_infineon mptctl shpchp k10temp tpm_tis tpm_tis_core button i2c_piix4 tpm pcspkr irqbypass acpi_cpufreq ext4 mbcache jbd2 sr_mod cdrom ohci_pci ehci_pci ohci_hcd mptsas ehci_hcd scsi_transport_sas ata_generic mptscsih serio_raw mptbase usbcore sata_svw pata_serverworks sg scsi_dh_rdac scsi_dh_emc scsi_dh_alua [ 6235.560942] CPU: 7 PID: 24321 Comm: kworker/7:1 Not tainted 4.14.0-rc4-1.ge195904-vanilla+ #71 [ 6235.560944] Hardware name: empty empty/S3993, BIOS PAQEX0-3 02/24/2008 [ 6235.560950] Workqueue: dio/sdb6 dio_aio_complete_work [ 6235.560953] task: ffff894fe0bd8300 task.stack: ffffb45742f7c000 [ 6235.560957] RIP: 0010:dio_complete+0x16f/0x1f0 [ 6235.560959] RSP: 0018:ffffb45742f7fde8 EFLAGS: 00010286 [ 6235.560968] RAX: 00000000fffffff0 RBX: ffff894fd1e3a680 RCX: ffff894fe0bd8300 [ 6235.560970] RDX: 0000000000000000 RSI: 00000000000002b4 RDI: ffffffffaba438e9 [ 6235.560971] RBP: ffffb45742f7fe10 R08: 0000000000000000 R09: 0000000000000025 [ 6235.560973] R10: 0000000000000000 R11: 0000000000000000 R12: 000000000001e000 [ 6235.560974] R13: 000000000001e000 R14: 0000000000007000 R15: 0000000000000001 [ 6235.560977] FS: 0000000000000000(0000) GS:ffff894fefdc0000(0000) knlGS:0000000000000000 [ 6235.560978] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 6235.560980] CR2: 00007fe1e1dfb610 CR3: 0000000213ee7000 CR4: 00000000000006e0 [ 6235.560982] Call Trace: [ 6235.561075] dio_aio_complete_work+0x1c/0x20 [ 6235.561082] process_one_work+0x1d8/0x620 [ 6235.561085] ? process_one_work+0x14b/0x620 [ 6235.561092] worker_thread+0x4d/0x3c0 [ 6235.561097] ? trace_hardirqs_on+0xd/0x10 [ 6235.561105] kthread+0x152/0x190 [ 6235.561107] ? process_one_work+0x620/0x620 [ 6235.561111] ? kthread_create_on_node+0x40/0x40 [ 6235.561116] ? do_syscall_64+0x69/0x180 [ 6235.561122] ret_from_fork+0x2a/0x40 [ 6235.561131] Code: 48 83 bf 00 01 00 00 00 0f 84 37 ff ff ff 4b 8d 54 34 ff 4c 89 f6 48 c1 fe 0c 48 c1 fa 0c e8 49 82 f2 ff 85 c0 0f 84 1a ff ff ff <0f> ff e9 13 ff ff ff 48 81 c7 e0 00 00 00 be 09 00 00 00 e8 79 [ 6235.561179] ---[ end trace ba80cd81f19cb389 ]---
Quoted 2 lines
I've added Chris and Bo to CC if they have more to say about the specifics of dio and buffered writes as implemented in btrfs.
There are several places where we warn on invalidation failing. The question is why invalidation failed on btrfs in this test.
-Lukas