f2fs: fix to avoid overflow while left shift operation
Chao Yu
maintainerPATCH v2 1/3 f2fs: fix to avoid overflow while left shift operation
Should cast type of folio->index from pgoff_t to loff_t to avoid overflow while left shift operation.
--- fs/f2fs/compress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/compress.c +1 -1
@@ -1245,7 +1245,7 @@ int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock)for (i = cluster_size -1 ; i >=0 ; i--) {struct folio *folio =page_folio (rpages[i]); -loff_t start = folio->index <<PAGE_SHIFT ; +loff_t start = (loff_t )folio->index <<PAGE_SHIFT ;if (from <= start) {folio_zero_segment (folio,0 ,folio_size (folio));
Signature · 1 line
2.49.0
Chao Yu
maintainerPATCH v2 2/3 f2fs: clean up f2fs_truncate_partial_cluster()
Clean up codes as below:
- avoid unnecessary "err > 0" check condition
- simply if-else condition in the loop
- use "1 << log_cluster_size" instead of F2FS_I(inode)->i_cluster_size
No logic changes.
--- fs/f2fs/compress.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-)
fs/f2fs/compress.c +15 -18
@@ -1215,9 +1215,11 @@ int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock) {void *fsdata =NULL ;struct page *pagep; +struct page **rpages;int log_cluster_size =F2FS_I (inode)->i_log_cluster_size;pgoff_t start_idx = from >> (PAGE_SHIFT + log_cluster_size) << log_cluster_size; +int i;int err; err =f2fs_is_compressed_cluster (inode, start_idx);
@@ -1238,26 +1240,21 @@ int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock)if (err <=0 )return err; -if (err >0 ) { -struct page **rpages = fsdata; -int cluster_size =F2FS_I (inode)->i_cluster_size; -int i; - -for (i = cluster_size -1 ; i >=0 ; i--) { -struct folio *folio =page_folio (rpages[i]); -loff_t start = (loff_t )folio->index <<PAGE_SHIFT ; - -if (from <= start) { -folio_zero_segment (folio,0 ,folio_size (folio)); - }else { -folio_zero_segment (folio, from - start, -folio_size (folio)); -break ; - } - } + rpages = fsdata; + +for (i = (1 << log_cluster_size) -1 ; i >=0 ; i--) { +struct folio *folio =page_folio (rpages[i]); +loff_t start = (loff_t )folio->index <<PAGE_SHIFT ; -f2fs_compress_write_end (inode, fsdata, start_idx, true); +if (from > start) { +folio_zero_segment (folio, from - start, +folio_size (folio)); +break ; + } +folio_zero_segment (folio,0 ,folio_size (folio)); } + +f2fs_compress_write_end (inode, fsdata, start_idx, true);return 0 ; }
Signature · 1 line
2.49.0
Chao Yu
maintainerPATCH v2 3/3 f2fs: fix to zero data after EOF for compressed file correctly
In reply to Chao Yugeneric/091 may fail, then it bisects to the bad commit ba8dac350faf ("f2fs: fix to zero post-eof page").
What will cause generic/091 to fail is something like below Testcase #1:
1. write 16k as compressed blocks
2. truncate to 12k
3. truncate to 20k
4. verify data in range of [12k, 16k], however data is not zero as expected
Script of Testcase #1
mkfs.f2fs -f -O extra_attr,compression /dev/vdb
mount -t f2fs -o compress_extension=* /dev/vdb /mnt/f2fs dd if=/dev/zero of=/mnt/f2fs/file bs=12k count=1
dd if=/dev/random of=/mnt/f2fs/file bs=4k count=1 seek=3 conv=notrunc sync
truncate -s $((12*1024)) /mnt/f2fs/file
truncate -s $((20*1024)) /mnt/f2fs/file
dd if=/mnt/f2fs/file of=/mnt/f2fs/data bs=4k count=1 skip=3 od /mnt/f2fs/data
umount /mnt/f2fs
Analisys:
in step 2), we will redirty all data pages from #0 to #3 in compressed cluster, and zero page #3,
in step 3), f2fs_setattr() will call f2fs_zero_post_eof_page() to drop all page cache post eof, includeing dirtied page #3,
in step 4) when we read data from page #3, it will decompressed cluster and extra random data to page #3, finally, we hit the non-zeroed data post eof.
However, the commit ba8dac350faf ("f2fs: fix to zero post-eof page") just let the issue be reproduced easily, w/o the commit, it can reproduce this bug w/ below Testcase #2:
1. write 16k as compressed blocks
2. truncate to 8k
3. truncate to 12k
4. truncate to 20k
5. verify data in range of [12k, 16k], however data is not zero as expected
Script of Testcase #2
mkfs.f2fs -f -O extra_attr,compression /dev/vdb
mount -t f2fs -o compress_extension=* /dev/vdb /mnt/f2fs dd if=/dev/zero of=/mnt/f2fs/file bs=12k count=1
dd if=/dev/random of=/mnt/f2fs/file bs=4k count=1 seek=3 conv=notrunc sync
truncate -s $((8*1024)) /mnt/f2fs/file
truncate -s $((12*1024)) /mnt/f2fs/file
truncate -s $((20*1024)) /mnt/f2fs/file
echo 3 > /proc/sys/vm/drop_caches
dd if=/mnt/f2fs/file of=/mnt/f2fs/data bs=4k count=1 skip=3 od /mnt/f2fs/data
umount /mnt/f2fs
Anlysis:
in step 2), we will redirty all data pages from #0 to #3 in compressed cluster, and zero page #2 and #3,
in step 3), we will truncate page #3 in page cache,
in step 4), expand file size,
in step 5), hit random data post eof w/ the same reason in Testcase #1.
Root Cause:
In f2fs_truncate_partial_cluster(), after we truncate partial data block on compressed cluster, all pages in cluster including the one post eof will be dirtied, after another tuncation, dirty page post eof will be dropped, however on-disk compressed cluster is still valid, it includes invalid data post eof, result in exposing previous data post eof while reading.
Fix:
In f2fs_truncate_partial_cluster(), let change as below to fix:
- call filemap_write_and_wait_range() to flush dirty page
- call truncate_pagecache() to drop pages or zero partial page post eof
- call f2fs_do_truncate_blocks() to truncate non-compress cluster to last vali block
---
v2:
- should dirty & flush all pages in cluster and truncate blocks post eof later
fs/f2fs/compress.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
fs/f2fs/compress.c +14 -6
@@ -1245,17 +1245,25 @@ int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock)for (i = (1 << log_cluster_size) -1 ; i >=0 ; i--) {struct folio *folio =page_folio (rpages[i]);loff_t start = (loff_t )folio->index <<PAGE_SHIFT ; +loff_t offset = from > start ? from - start :0 ; -if (from > start) { -folio_zero_segment (folio, from - start, -folio_size (folio)); +folio_zero_segment (folio, offset,folio_size (folio)); + +if (from >= start)break ; - } -folio_zero_segment (folio,0 ,folio_size (folio)); }f2fs_compress_write_end (inode, fsdata, start_idx, true); -return 0 ; + + err =filemap_write_and_wait_range (inode->i_mapping, +round_down (from,1 << log_cluster_size <<PAGE_SHIFT ), +LLONG_MAX ); +if (err) +return err; + +truncate_pagecache (inode, from); + +return f2fs_do_truncate_blocks (inode,round_up (from,PAGE_SIZE ), lock); } static int f2fs_write_compressed_pages(struct compress_ctx *cc,
Signature · 1 line
2.49.0
Jaegeuk Kim
maintainerRe: [PATCH v2 3/3] f2fs: fix to zero data after EOF for compressed file correctly
Chao, it seems you made a clean up before this? Can you post it first?
Quoted 125 lines · Chao Yu
generic/091 may fail, then it bisects to the bad commit
ba8dac350faf("f2fs: fix to zero post-eof page").What will cause generic/091 to fail is something like below Testcase #1:
1. write 16k as compressed blocks
2. truncate to 12k
3. truncate to 20k
4. verify data in range of [12k, 16k], however data is not zero as expectedScript of Testcase #1
mkfs.f2fs -f -O extra_attr,compression/dev/vdb
mount -t f2fs -o compress_extension=*/dev/vdb/mnt/f2fsdd if=/dev/zero of=/mnt/f2fs/file bs=12k count=1
dd if=/dev/random of=/mnt/f2fs/file bs=4k count=1 seek=3 conv=notrunc sync
truncate -s $((12*1024))/mnt/f2fs/file
truncate -s $((20*1024))/mnt/f2fs/file
dd if=/mnt/f2fs/file of=/mnt/f2fs/data bs=4k count=1 skip=3 od/mnt/f2fs/data
umount/mnt/f2fsAnalisys:
in step 2), we will redirty all data pages from #0 to #3 in compressed cluster, and zero page #3,
in step 3),f2fs_setattr()will callf2fs_zero_post_eof_page()to drop all page cache post eof, includeing dirtied page #3,
in step 4) when we read data from page #3, it will decompressed cluster and extra random data to page #3, finally, we hit the non-zeroed data post eof.However, the commit
ba8dac350faf("f2fs: fix to zero post-eof page") just let the issue be reproduced easily, w/o the commit, it can reproduce this bug w/ below Testcase #2:
1. write 16k as compressed blocks
2. truncate to 8k
3. truncate to 12k
4. truncate to 20k
5. verify data in range of [12k, 16k], however data is not zero as expectedScript of Testcase #2
mkfs.f2fs -f -O extra_attr,compression/dev/vdb
mount -t f2fs -o compress_extension=*/dev/vdb/mnt/f2fsdd if=/dev/zero of=/mnt/f2fs/file bs=12k count=1
dd if=/dev/random of=/mnt/f2fs/file bs=4k count=1 seek=3 conv=notrunc sync
truncate -s $((8*1024))/mnt/f2fs/file
truncate -s $((12*1024))/mnt/f2fs/file
truncate -s $((20*1024))/mnt/f2fs/file
echo 3 >/proc/sys/vm/drop_caches
dd if=/mnt/f2fs/file of=/mnt/f2fs/data bs=4k count=1 skip=3 od/mnt/f2fs/data
umount/mnt/f2fsAnlysis:
in step 2), we will redirty all data pages from #0 to #3 in compressed cluster, and zero page #2 and #3,
in step 3), we will truncate page #3 in page cache,
in step 4), expand file size,
in step 5), hit random data post eof w/ the same reason in Testcase #1.Root Cause:
Inf2fs_truncate_partial_cluster(), after we truncate partial data block on compressed cluster, all pages in cluster including the one post eof will be dirtied, after another tuncation, dirty page post eof will be dropped, however on-disk compressed cluster is still valid, it includes invalid data post eof, result in exposing previous data post eof while reading.Fix:
Inf2fs_truncate_partial_cluster(), let change as below to fix:
- callfilemap_write_and_wait_range()to flush dirty page
- calltruncate_pagecache()to drop pages or zero partial page post eof
- callf2fs_do_truncate_blocks()to truncate non-compress cluster to last vali blockFixes 3265d3db1f16 ("f2fs: support partial truncation on compressed inode")Reported-by Jan Prusakowski <[email protected]>Signed-off-by Chao Yu <[email protected]>---
v2:
- should dirty & flush all pages in cluster and truncate blocks post eof laterfs/f2fs/compress.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)fs/f2fs/compress.c +14
-6@@ -1245,17 +1245,25 @@ int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock)for (i = (1 << log_cluster_size) -1 ; i >=0 ; i--) {struct folio *folio =page_folio (rpages[i]);loff_t start = (loff_t )folio->index <<PAGE_SHIFT ; +loff_t offset = from > start ? from - start :0 ; -if (from > start) { -folio_zero_segment (folio, from - start, -folio_size (folio)); +folio_zero_segment (folio, offset,folio_size (folio)); + +if (from >= start)break ; - } -folio_zero_segment (folio,0 ,folio_size (folio)); }f2fs_compress_write_end (inode, fsdata, start_idx, true); -return 0 ; + + err =filemap_write_and_wait_range (inode->i_mapping, +round_down (from,1 << log_cluster_size <<PAGE_SHIFT ), +LLONG_MAX ); +if (err) +return err; + +truncate_pagecache (inode, from); + +return f2fs_do_truncate_blocks (inode,round_up (from,PAGE_SIZE ), lock); } static int f2fs_write_compressed_pages(struct compress_ctx *cc,Signature · 1 line
2.49.0
Chao Yu
maintainerRe: [PATCH v2 3/3] f2fs: fix to zero data after EOF for compressed file correctly
Jaegeuk, sure, let me change the order.
Quoted 128 lines · Jaegeuk Kim
Chao, it seems you made a clean up before this? Can you post it first?
Quoted 125 lines · Chao Yu
generic/091 may fail, then it bisects to the bad commit
ba8dac350faf("f2fs: fix to zero post-eof page").What will cause generic/091 to fail is something like below Testcase #1:
1. write 16k as compressed blocks
2. truncate to 12k
3. truncate to 20k
4. verify data in range of [12k, 16k], however data is not zero as expectedScript of Testcase #1
mkfs.f2fs -f -O extra_attr,compression/dev/vdb
mount -t f2fs -o compress_extension=*/dev/vdb/mnt/f2fsdd if=/dev/zero of=/mnt/f2fs/file bs=12k count=1
dd if=/dev/random of=/mnt/f2fs/file bs=4k count=1 seek=3 conv=notrunc sync
truncate -s $((12*1024))/mnt/f2fs/file
truncate -s $((20*1024))/mnt/f2fs/file
dd if=/mnt/f2fs/file of=/mnt/f2fs/data bs=4k count=1 skip=3 od/mnt/f2fs/data
umount/mnt/f2fsAnalisys:
in step 2), we will redirty all data pages from #0 to #3 in compressed cluster, and zero page #3,
in step 3),f2fs_setattr()will callf2fs_zero_post_eof_page()to drop all page cache post eof, includeing dirtied page #3,
in step 4) when we read data from page #3, it will decompressed cluster and extra random data to page #3, finally, we hit the non-zeroed data post eof.However, the commit
ba8dac350faf("f2fs: fix to zero post-eof page") just let the issue be reproduced easily, w/o the commit, it can reproduce this bug w/ below Testcase #2:
1. write 16k as compressed blocks
2. truncate to 8k
3. truncate to 12k
4. truncate to 20k
5. verify data in range of [12k, 16k], however data is not zero as expectedScript of Testcase #2
mkfs.f2fs -f -O extra_attr,compression/dev/vdb
mount -t f2fs -o compress_extension=*/dev/vdb/mnt/f2fsdd if=/dev/zero of=/mnt/f2fs/file bs=12k count=1
dd if=/dev/random of=/mnt/f2fs/file bs=4k count=1 seek=3 conv=notrunc sync
truncate -s $((8*1024))/mnt/f2fs/file
truncate -s $((12*1024))/mnt/f2fs/file
truncate -s $((20*1024))/mnt/f2fs/file
echo 3 >/proc/sys/vm/drop_caches
dd if=/mnt/f2fs/file of=/mnt/f2fs/data bs=4k count=1 skip=3 od/mnt/f2fs/data
umount/mnt/f2fsAnlysis:
in step 2), we will redirty all data pages from #0 to #3 in compressed cluster, and zero page #2 and #3,
in step 3), we will truncate page #3 in page cache,
in step 4), expand file size,
in step 5), hit random data post eof w/ the same reason in Testcase #1.Root Cause:
Inf2fs_truncate_partial_cluster(), after we truncate partial data block on compressed cluster, all pages in cluster including the one post eof will be dirtied, after another tuncation, dirty page post eof will be dropped, however on-disk compressed cluster is still valid, it includes invalid data post eof, result in exposing previous data post eof while reading.Fix:
Inf2fs_truncate_partial_cluster(), let change as below to fix:
- callfilemap_write_and_wait_range()to flush dirty page
- calltruncate_pagecache()to drop pages or zero partial page post eof
- callf2fs_do_truncate_blocks()to truncate non-compress cluster to last vali blockFixes 3265d3db1f16 ("f2fs: support partial truncation on compressed inode")Reported-by Jan Prusakowski <[email protected]>Signed-off-by Chao Yu <[email protected]>---
v2:
- should dirty & flush all pages in cluster and truncate blocks post eof laterfs/f2fs/compress.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)fs/f2fs/compress.c +14
-6@@ -1245,17 +1245,25 @@ int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock)for (i = (1 << log_cluster_size) -1 ; i >=0 ; i--) {struct folio *folio =page_folio (rpages[i]);loff_t start = (loff_t )folio->index <<PAGE_SHIFT ; +loff_t offset = from > start ? from - start :0 ; -if (from > start) { -folio_zero_segment (folio, from - start, -folio_size (folio)); +folio_zero_segment (folio, offset,folio_size (folio)); + +if (from >= start)break ; - } -folio_zero_segment (folio,0 ,folio_size (folio)); }f2fs_compress_write_end (inode, fsdata, start_idx, true); -return 0 ; + + err =filemap_write_and_wait_range (inode->i_mapping, +round_down (from,1 << log_cluster_size <<PAGE_SHIFT ), +LLONG_MAX ); +if (err) +return err; + +truncate_pagecache (inode, from); + +return f2fs_do_truncate_blocks (inode,round_up (from,PAGE_SIZE ), lock); } static int f2fs_write_compressed_pages(struct compress_ctx *cc,Signature · 1 line
2.49.0