AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

f2fs: fix to avoid double unlock

Browse Source 
On image that has verity and compression feature, if compressed pages
and non-compressed pages are mixed in one bio, we may double unlock
non-compressed page in below flow:

- f2fs_post_read_work
 - f2fs_decompress_work
  - f2fs_decompress_bio
   - __read_end_io
    - unlock_page
 - fsverity_enqueue_verify_work
  - f2fs_verity_work
   - f2fs_verify_bio
    - unlock_page

So it should skip handling non-compressed page in f2fs_decompress_work()
if verity is on.

Besides, add missing dec_page_count() in f2fs_verify_bio().

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Chao Yu 2020-03-24 14:20:57 +08:00 committed by Jaegeuk Kim
parent 7653b9d875
commit 74878565fb
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/f2fs/data.c
View File

@ -139,6 +139,8 @@ static void __read_end_io(struct bio *bio, bool compr, bool verity)
f2fs_decompress_pages(bio, page, verity); f2fs_decompress_pages(bio, page, verity);
continue; continue;
} }
if (verity)
continue;
#endif #endif
/* PG_error was set if any post_read step failed */ /* PG_error was set if any post_read step failed */
@ -216,6 +218,7 @@ static void f2fs_verify_bio(struct bio *bio)
ClearPageUptodate(page); ClearPageUptodate(page);
ClearPageError(page); ClearPageError(page);
unlock: unlock:
dec_page_count(F2FS_P_SB(page), __read_io_type(page));
unlock_page(page); unlock_page(page);
} }
} }