f2fs: clear PageError on the read path
Jaegeuk Kim
maintainerPATCH 1/2 f2fs: clear PageError on the read path
When running fault injection test, I hit somewhat wrong behavior in f2fs_gc -> gc_data_segment():
0. fault injection generated some PageError'ed pages
1. gc_data_segment
-> f2fs_get_read_data_page(REQ_RAHEAD)
2. move_data_page
-> f2fs_get_lock_data_page()
-> f2f_get_read_data_page()
-> f2fs_submit_page_read()
-> submit_bio(READ)
-> return EIO due to PageError
-> fail to move data
--- fs/f2fs/data.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/f2fs/data.c +4 -1
@@ -77,7 +77,8 @@ static void __read_end_io(struct bio *bio)/* PG_error was set if any post_read step failed */ if (bio->bi_status ||PageError (page)) {ClearPageUptodate (page); -SetPageError (page); +/* will re-read again later */ +ClearPageError (page); }else {SetPageUptodate (page); }
@@ -591,6 +592,7 @@ static int f2fs_submit_page_read(struct inode *inode, struct page *page,bio_put (bio);return -EFAULT ; } +ClearPageError (page);__submit_bio (F2FS_I_SB (inode), bio,DATA );return 0 ; }
@@ -1571,6 +1573,7 @@ static int f2fs_mpage_readpages(struct address_space *mapping,if (bio_add_page (bio, page, blocksize,0 ) < blocksize) goto submit_and_realloc; +ClearPageError (page); last_block_in_bio = block_nr; goto next_page; set_error_page:
Signature · 1 line
2.17.0.441.gb46fe60e1d-goog
Jaegeuk Kim
maintainerPATCH 2/2 f2fs: return correct errno in f2fs_gc
This fixes overriding error number in f2fs_gc.
--- fs/f2fs/gc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/gc.c +1 -1
@@ -1241,7 +1241,7 @@ int f2fs_gc(struct f2fs_sb_info *sbi, bool sync,put_gc_inode (&gc_list); -if (sync) +if (sync && !ret) ret = sec_freed ?0 : -EAGAIN ;return ret; }
Signature · 1 line
2.17.0.441.gb46fe60e1d-goog
Re: [f2fs-dev] [PATCH 2/2] f2fs: return correct errno in f2fs_gc
Quoted 3 lines · Jaegeuk Kim
This fixes overriding error number in
f2fs_gc.Signed-off-by Jaegeuk Kim <[email protected]>
Thanks,
Chao Yu
maintainerQuoted 26 lines · Jaegeuk Kim
When running fault injection test, I hit somewhat wrong behavior in
f2fs_gc->gc_data_segment():0. fault injection generated some PageError'ed pages
1.
gc_data_segment
->f2fs_get_read_data_page(REQ_RAHEAD)2.
move_data_page
->f2fs_get_lock_data_page()
->f2f_get_read_data_page()
->f2fs_submit_page_read()-> submit_bio(READ)-> return EIO due to PageError
-> fail to move dataSigned-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/data.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)fs/f2fs/data.c +0
-0
fs/f2fs/data.c static void __read_end_io(struct bio *bio) · line 83
Quoted 8 lines
fs/f2fs/data.c +2
-1@@ -77,7 +77,8 @@ static void __read_end_io(struct bio *bio)/* PG_error was set if any post_read step failed */ if (bio->bi_status ||PageError (page)) {ClearPageUptodate (page); -SetPageError (page); +/* will re-read again later */ +ClearPageError (page); }else {SetPageUptodate (page);
How about:
if (PaegeError(page))
ClearPageError(page);
if (bio->bi_status) {
ClearPageUptodate(page);
SetPageError(page);
} else {
SetPageUptodate(page);
ClearPageError(page);
}So that below codes are not needed.
Thanks,
Quoted 18 lines
fs/f2fs/data.c +2
-0}@@ -591,6 +592,7 @@ static int f2fs_submit_page_read(struct inode *inode, struct page *page,bio_put (bio);return -EFAULT ; } +ClearPageError (page);__submit_bio (F2FS_I_SB (inode), bio,DATA );return 0 ; }@@ -1571,6 +1573,7 @@ static int f2fs_mpage_readpages(struct address_space *mapping,if (bio_add_page (bio, page, blocksize,0 ) < blocksize) goto submit_and_realloc; +ClearPageError (page); last_block_in_bio = block_nr; goto next_page; set_error_page: