f2fs: avoid wrong decrypted data from disk
Jaegeuk Kim
maintainerPATCH 1/1 f2fs: avoid wrong decrypted data from disk
1. Create a file in an encrypted directory
2. Do GC & drop caches
3. Read stale data before its bio for metapage was not issued yet
--- fs/f2fs/data.c | 7 +++++++ 1 file changed, 7 insertions(+)
fs/f2fs/data.c +7 -0
@@ -1550,6 +1550,13 @@ static int f2fs_mpage_readpages(struct address_space *mapping, bio =NULL ; }if (bio ==NULL ) { +/* +* If the page is under writeback, we need to wait for +* its completion to see the correct decrypted data. +*/ +if (unlikely (f2fs_encrypted_file (inode))) +f2fs_wait_on_block_writeback (F2FS_I_SB (inode), block_nr); + bio =f2fs_grab_read_bio (inode, block_nr, nr_pages, is_readahead ?REQ_RAHEAD :0 );if (IS_ERR (bio)) {
Signature · 1 line
2.17.0.441.gb46fe60e1d-goog
Quoted 14 lines · Jaegeuk Kim
1. Create a file in an encrypted directory
2. Do GC & drop caches
3. Read stale data before its bio for metapage was not issued yetSigned-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/data.c | 7 +++++++ 1 file changed, 7 insertions(+)fs/f2fs/data.c +0
-0
fs/f2fs/data.c static int f2fs_mpage_readpages(struct address_space *mapping, · line 1558
Quoted 9 lines
fs/f2fs/data.c +6
-0@@ -1550,6 +1550,13 @@ static int f2fs_mpage_readpages(struct address_space *mapping, bio =NULL ; }if (bio ==NULL ) { +/* +* If the page is under writeback, we need to wait for +* its completion to see the correct decrypted data. +*/ +if (unlikely (f2fs_encrypted_file (inode))) +f2fs_wait_on_block_writeback (F2FS_I_SB (inode), block_nr);
I think we have did this in f2fs_grab_read_bio(), so we just need to cover 'bio != NULL' case, right?
Thanks,
Quoted 5 lines
fs/f2fs/data.c +1
-0+ bio =f2fs_grab_read_bio (inode, block_nr, nr_pages, is_readahead ?REQ_RAHEAD :0 );if (IS_ERR (bio)) {
Jaegeuk Kim
maintainer1. Create a file in an encrypted directory
2. Do GC & drop caches
3. Read stale data before its bio for metapage was not issued yet
---
Change log from v1:
- move to bio != NULL
fs/f2fs/data.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/f2fs/data.c +6 -0
@@ -1556,6 +1556,12 @@ static int f2fs_mpage_readpages(struct address_space *mapping, bio =NULL ; goto set_error_page; } + }else if (unlikely (f2fs_encrypted_file (inode))) { +/* +* If the page is under writeback, we need to wait for +* its completion to see the correct decrypted data. +*/ +f2fs_wait_on_block_writeback (F2FS_I_SB (inode), block_nr); }if (bio_add_page (bio, page, blocksize,0 ) < blocksize)
Signature · 1 line
2.17.0.441.gb46fe60e1d-goog
Quoted 17 lines · Jaegeuk Kim
1. Create a file in an encrypted directory
2. Do GC & drop caches
3. Read stale data before its bio for metapage was not issued yetSigned-off-by Jaegeuk Kim <[email protected]>---
Change log from v1:
- move to bio != NULLfs/f2fs/data.c | 6 ++++++ 1 file changed, 6 insertions(+)fs/f2fs/data.c +0
-0
fs/f2fs/data.c static int f2fs_mpage_readpages(struct address_space *mapping, · line 1559
Quoted 4 lines
fs/f2fs/data.c +1
-0@@ -1556,6 +1556,12 @@ static int f2fs_mpage_readpages(struct address_space *mapping, bio =NULL ; goto set_error_page; } + }else if (unlikely (f2fs_encrypted_file (inode))) {
For android scenario, encryption becomes a common case now, so I think we can remove unlikely here.
fs/f2fs/data.c static int f2fs_mpage_readpages(struct address_space *mapping, · line 1565
Quoted 6 lines
fs/f2fs/data.c +5
-0+/* +* If the page is under writeback, we need to wait for +* its completion to see the correct decrypted data. +*/ +f2fs_wait_on_block_writeback (F2FS_I_SB (inode), block_nr); }
Look at this again, it seems f2fs_wait_on_block_writeback() is not related to f2fs_grab_read_bio(), so we can move it here to make code logic more clear:
if (f2fs_encrypted_file(inode)) {
/* */
f2fs_wait_on_block_writeback(F2FS_I_SB(inode), block_nr);
}Also, in f2fs_submit_page_read(), we need to adjust to:
- f2fs_grab_read_bio()
- f2fs_wait_on_block_writeback()
- bio_add_page()
How do you think?
Thanks,
Quoted 3 lines
fs/f2fs/data.c +0
-0if (bio_add_page (bio, page, blocksize,0 ) < blocksize)
Jaegeuk Kim
maintainerQuoted 41 lines · Chao Yu
Quoted 17 lines · Jaegeuk Kim
1. Create a file in an encrypted directory
2. Do GC & drop caches
3. Read stale data before its bio for metapage was not issued yetSigned-off-by Jaegeuk Kim <[email protected]>---
Change log from v1:
- move to bio != NULLfs/f2fs/data.c | 6 ++++++ 1 file changed, 6 insertions(+)fs/f2fs/data.c +0
-0fs/f2fs/data.c static int f2fs_mpage_readpages(struct address_space *mapping, · line 1559
Quoted 4 lines
fs/f2fs/data.c +1
-0@@ -1556,6 +1556,12 @@ static int f2fs_mpage_readpages(struct address_space *mapping, bio =NULL ; goto set_error_page; } + }else if (unlikely (f2fs_encrypted_file (inode))) {For android scenario, encryption becomes a common case now, so I think we can remove unlikely here.
fs/f2fs/data.c static int f2fs_mpage_readpages(struct address_space *mapping, · line 1565
Quoted 6 lines
fs/f2fs/data.c +5
-0+/* +* If the page is under writeback, we need to wait for +* its completion to see the correct decrypted data. +*/ +f2fs_wait_on_block_writeback (F2FS_I_SB (inode), block_nr); }Look at this again, it seems
f2fs_wait_on_block_writeback()is not related tof2fs_grab_read_bio(), so we can move it here to make code logic more clear:if (f2fs_encrypted_file(inode)) { /* */ f2fs_wait_on_block_writeback(F2FS_I_SB(inode), block_nr); }
Quoted 7 lines
Also, in
f2fs_submit_page_read(), we need to adjust to:-
f2fs_grab_read_bio()
-f2fs_wait_on_block_writeback()
-bio_add_page()How do you think?
Oh, yeah!
Quoted 6 lines
Thanks,
Quoted 3 lines
fs/f2fs/data.c +0
-0if (bio_add_page (bio, page, blocksize,0 ) < blocksize)
Jaegeuk Kim
maintainer1. Create a file in an encrypted directory
2. Do GC & drop caches
3. Read stale data before its bio for metapage was not issued yet
---
Change log from v2:
- make it globally consistent
- should use f2fs_post_read_required()
fs/f2fs/data.c | 18 ++++++++++-------- fs/f2fs/f2fs.h | 2 +- fs/f2fs/file.c | 3 +-- fs/f2fs/segment.c | 6 +++++- 4 files changed, 17 insertions(+), 12 deletions(-)
fs/f2fs/data.c +10 -8
@@ -565,9 +565,6 @@ static struct bio *f2fs_grab_read_bio(struct inode *inode, block_t blkaddr, ctx->bio = bio; ctx->enabled_steps = post_read_steps; bio->bi_private = ctx; - -/* wait the page to be moved by cleaning */ -f2fs_wait_on_block_writeback (sbi, blkaddr); }return bio;
@@ -582,6 +579,9 @@ static int f2fs_submit_page_read(struct inode *inode, struct page *page,if (IS_ERR (bio))return PTR_ERR (bio); +/* wait for GCed page writeback via META_MAPPING */ +f2fs_wait_on_block_writeback (inode, blkaddr); +if (bio_add_page (bio, page,PAGE_SIZE ,0 ) <PAGE_SIZE ) {bio_put (bio);return -EFAULT ;
@@ -1558,6 +1558,12 @@ static int f2fs_mpage_readpages(struct address_space *mapping, } } +/* +* If the page is under writeback, we need to wait for +* its completion to see the correct decrypted data. +*/ +f2fs_wait_on_block_writeback (inode, block_nr); +if (bio_add_page (bio, page, blocksize,0 ) < blocksize) goto submit_and_realloc;
@@ -1625,7 +1631,7 @@ static int encrypt_one_page(struct f2fs_io_info *fio)return 0 ;/* wait for GCed page writeback via META_MAPPING */ -f2fs_wait_on_block_writeback (fio->sbi, fio->old_blkaddr); +f2fs_wait_on_block_writeback (inode, fio->old_blkaddr); retry_encrypt: fio->encrypted_page = fscrypt_encrypt_page(inode, fio->page,
@@ -2382,10 +2388,6 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping,f2fs_wait_on_page_writeback (page,DATA , false); -/* wait for GCed page writeback via META_MAPPING */ -if (f2fs_post_read_required (inode)) -f2fs_wait_on_block_writeback (sbi, blkaddr); -if (len ==PAGE_SIZE ||PageUptodate (page))return 0 ;
fs/f2fs/f2fs.h +1 -1
@@ -2942,7 +2942,7 @@ void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page, struct f2fs_io_info *fio, bool add_list);void f2fs_wait_on_page_writeback (struct page *page,enum page_type type,bool ordered); -void f2fs_wait_on_block_writeback (struct f2fs_sb_info *sbi,block_t blkaddr); +void f2fs_wait_on_block_writeback (struct inode *inode,block_t blkaddr);void f2fs_write_data_summaries (struct f2fs_sb_info *sbi,block_t start_blk);void f2fs_write_node_summaries (struct f2fs_sb_info *sbi,block_t start_blk); int f2fs_lookup_journal_in_cursum(struct f2fs_journal *journal, int type,
fs/f2fs/file.c +1 -2
@@ -112,8 +112,7 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)f2fs_wait_on_page_writeback (page,DATA , false);/* wait for GCed page writeback via META_MAPPING */ -if (f2fs_post_read_required (inode)) -f2fs_wait_on_block_writeback (sbi, dn.data_blkaddr); +f2fs_wait_on_block_writeback (inode, dn.data_blkaddr); out_sem:up_read (&F2FS_I (inode)->i_mmap_sem);
fs/f2fs/segment.c +5 -1
@@ -3191,10 +3191,14 @@ void f2fs_wait_on_page_writeback(struct page *page, } } -void f2fs_wait_on_block_writeback (struct f2fs_sb_info *sbi,block_t blkaddr) +void f2fs_wait_on_block_writeback (struct inode *inode,block_t blkaddr) { +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);struct page *cpage; +if (!f2fs_post_read_required (inode)) +return ; +if (!is_valid_data_blkaddr (sbi, blkaddr))return ;
Signature · 1 line
2.17.0.441.gb46fe60e1d-goog
Quoted 5 lines · Jaegeuk Kim
1. Create a file in an encrypted directory
2. Do GC & drop caches
3. Read stale data before its bio for metapage was not issued yetSigned-off-by Jaegeuk Kim <[email protected]>
Thanks,
Quoted 14 lines · Jaegeuk Kim
1. Create a file in an encrypted directory
2. Do GC & drop caches
3. Read stale data before its bio for metapage was not issued yetSigned-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/data.c | 7 +++++++ 1 file changed, 7 insertions(+)fs/f2fs/data.c +0
-0
fs/f2fs/data.c static int f2fs_mpage_readpages(struct address_space *mapping, · line 1559
Quoted 10 lines
fs/f2fs/data.c +7
-0@@ -1550,6 +1550,13 @@ static int f2fs_mpage_readpages(struct address_space *mapping, bio =NULL ; }if (bio ==NULL ) { +/* +* If the page is under writeback, we need to wait for +* its completion to see the correct decrypted data. +*/ +if (unlikely (f2fs_encrypted_file (inode))) +f2fs_wait_on_block_writeback (F2FS_I_SB (inode), block_nr); +
I am not sure if this really helps the case.
When the data is being moved by GC, the writeback is set on the encrypted page which belongs to meta mapping. But before that writeback could complete, the read will happen on the original file where it's corresponding page will not have any writeback set, right?
Quoted 14 lines
fs/f2fs/data.c +0
-0bio =f2fs_grab_read_bio (inode, block_nr, nr_pages, is_readahead ?REQ_RAHEAD :0 );if (IS_ERR (bio)) {Signature · 10 lines
2.17.0.441.gb46fe60e1d-goog ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Signature · 3 lines
-- Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
Quoted 28 lines · Sahitya Tummala
Quoted 14 lines · Jaegeuk Kim
1. Create a file in an encrypted directory
2. Do GC & drop caches
3. Read stale data before its bio for metapage was not issued yetSigned-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/data.c | 7 +++++++ 1 file changed, 7 insertions(+)fs/f2fs/data.c +0
-0fs/f2fs/data.c static int f2fs_mpage_readpages(struct address_space *mapping, · line 1559
Quoted 10 lines
fs/f2fs/data.c +7
-0@@ -1550,6 +1550,13 @@ static int f2fs_mpage_readpages(struct address_space *mapping, bio =NULL ; }if (bio ==NULL ) { +/* +* If the page is under writeback, we need to wait for +* its completion to see the correct decrypted data. +*/ +if (unlikely (f2fs_encrypted_file (inode))) +f2fs_wait_on_block_writeback (F2FS_I_SB (inode), block_nr); +I am not sure if this really helps the case.
Quoted 4 lines
When the data is being moved by GC, the writeback is set on the encrypted page which belongs to meta mapping. But before that writeback could complete, the read will happen on the original file where it's corresponding page will not have any writeback set, right?
Never mind, got it. Tested with your latest v3 patch and it is fixing the problem. Thanks.
Quoted 28 lines
Quoted 15 lines
fs/f2fs/data.c +0
-0bio =f2fs_grab_read_bio (inode, block_nr, nr_pages, is_readahead ?REQ_RAHEAD :0 );if (IS_ERR (bio)) {Signature · 10 lines
2.17.0.441.gb46fe60e1d-goog ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-develSignature · 11 lines
-- Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Signature · 3 lines
-- Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.