f2fs: deallocate compressed pages when error happens
Jaegeuk Kim
maintainerPATCH 1/2 f2fs: deallocate compressed pages when error happens
In f2fs_write_multi_pages(), f2fs_compress_pages() allocates pages for compression work in cc->cpages[]. Then, f2fs_write_compressed_pages() initiates bio submission. But, if there's any error before submitting the IOs like early f2fs_cp_error(), previously it didn't free cpages by f2fs_compress_free_page(). Let's fix memory leak by putting that just before deallocating cc->cpages.
--- fs/f2fs/compress.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
fs/f2fs/compress.c +6 -6
@@ -1394,12 +1394,6 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc,for (--i; i >=0 ; i--)fscrypt_finalize_bounce_page (&cc->cpages[i]); -for (i =0 ; i < cc->nr_cpages; i++) { -if (!cc->cpages[i]) -continue ; -f2fs_compress_free_page (cc->cpages[i]); - cc->cpages[i] =NULL ; - } out_put_cic:kmem_cache_free (cic_entry_slab, cic); out_put_dnode:
@@ -1410,6 +1404,12 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc,else f2fs_unlock_op (sbi); out_free: +for (i =0 ; i < cc->nr_cpages; i++) { +if (!cc->cpages[i]) +continue ; +f2fs_compress_free_page (cc->cpages[i]); + cc->cpages[i] =NULL ; + }page_array_free (cc->inode, cc->cpages, cc->nr_cpages); cc->cpages =NULL ;return -EAGAIN ;
Signature · 1 line
2.33.0.259.gc128427fd7-goog
Jaegeuk Kim
maintainerPATCH 2/2 f2fs: should put a page beyond EOF when preparing a write
The prepare_compress_overwrite() gets/locks a page to prepare a read, and calls f2fs_read_multi_pages() which checks EOF first. If there's any page beyond EOF, we unlock the page and set cc->rpages[i] = NULL, which we can't put the page anymore. This makes page leak, so let's fix by putting that page.
--- fs/f2fs/data.c | 2 ++ 1 file changed, 2 insertions(+)
fs/f2fs/data.c +2 -0
@@ -2183,6 +2183,8 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret,continue ; }unlock_page (page); +if (for_write) +put_page (page); cc->rpages[i] =NULL ; cc->nr_rpages--; }
Signature · 1 line
2.33.0.259.gc128427fd7-goog
Re: [f2fs-dev] [PATCH 2/2] f2fs: should put a page beyond EOF when preparing a write
Quoted 5 lines · Jaegeuk Kim
The
prepare_compress_overwrite()gets/locks a page to prepare a read, and callsf2fs_read_multi_pages()which checks EOF first. If there's any page beyond EOF, we unlock the page and set cc->rpages[i] = NULL, which we can't put the page anymore. This makes page leak, so let's fix by putting that page.
Quoted 1 line
Signed-off-by Jaegeuk Kim <[email protected]>
Thanks,
Quoted 6 lines · Jaegeuk Kim
In
f2fs_write_multi_pages(),f2fs_compress_pages()allocates pages for compression work in cc->cpages[]. Then,f2fs_write_compressed_pages()initiates bio submission. But, if there's any error before submitting the IOs like earlyf2fs_cp_error(), previously it didn't free cpages byf2fs_compress_free_page(). Let's fix memory leak by putting that just before deallocatingcc->cpages.
Quoted 1 line
Signed-off-by Jaegeuk Kim <[email protected]>
Thanks,