[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <ZrvdD6EVJAik1b5w@google.com>
Date: Tue, 13 Aug 2024 22:24:15 +0000
From: Jaegeuk Kim <jaegeuk@...nel.org>
To: Chao Yu <chao@...nel.org>
Cc: linux-f2fs-devel@...ts.sourceforge.net, linux-kernel@...r.kernel.org,
Matthew Wilcox <willy@...radead.org>
Subject: Re: [PATCH 1/9] f2fs: convert f2fs_compress_ctx_add_page() to use
folio
Could you please test this series? I hit kernel hang along with refcount warning
in f2fs_put_dic, when running fsstress. You can reproduce it quickly.
On 08/13, Chao Yu wrote:
> onvert to use folio, so that we can get rid of 'page->index' to
> prepare for removal of 'index' field in structure page [1].
>
> [1] https://lore.kernel.org/all/Zp8fgUSIBGQ1TN0D@casper.infradead.org/
>
> Cc: Matthew Wilcox <willy@...radead.org>
> Signed-off-by: Chao Yu <chao@...nel.org>
> ---
> fs/f2fs/compress.c | 14 +++++++-------
> fs/f2fs/data.c | 4 ++--
> fs/f2fs/f2fs.h | 2 +-
> 3 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c
> index 990b93689b46..eb5cd1457ffc 100644
> --- a/fs/f2fs/compress.c
> +++ b/fs/f2fs/compress.c
> @@ -160,17 +160,17 @@ void f2fs_destroy_compress_ctx(struct compress_ctx *cc, bool reuse)
> cc->cluster_idx = NULL_CLUSTER;
> }
>
> -void f2fs_compress_ctx_add_page(struct compress_ctx *cc, struct page *page)
> +void f2fs_compress_ctx_add_page(struct compress_ctx *cc, struct folio *folio)
> {
> unsigned int cluster_ofs;
>
> - if (!f2fs_cluster_can_merge_page(cc, page->index))
> + if (!f2fs_cluster_can_merge_page(cc, folio->index))
> f2fs_bug_on(F2FS_I_SB(cc->inode), 1);
>
> - cluster_ofs = offset_in_cluster(cc, page->index);
> - cc->rpages[cluster_ofs] = page;
> + cluster_ofs = offset_in_cluster(cc, folio->index);
> + cc->rpages[cluster_ofs] = folio_page(folio, 0);
> cc->nr_rpages++;
> - cc->cluster_idx = cluster_idx(cc, page->index);
> + cc->cluster_idx = cluster_idx(cc, folio->index);
> }
>
> #ifdef CONFIG_F2FS_FS_LZO
> @@ -1093,7 +1093,7 @@ static int prepare_compress_overwrite(struct compress_ctx *cc,
> if (PageUptodate(page))
> f2fs_put_page(page, 1);
> else
> - f2fs_compress_ctx_add_page(cc, page);
> + f2fs_compress_ctx_add_page(cc, page_folio(page));
> }
>
> if (!f2fs_cluster_is_empty(cc)) {
> @@ -1123,7 +1123,7 @@ static int prepare_compress_overwrite(struct compress_ctx *cc,
> }
>
> f2fs_wait_on_page_writeback(page, DATA, true, true);
> - f2fs_compress_ctx_add_page(cc, page);
> + f2fs_compress_ctx_add_page(cc, page_folio(page));
>
> if (!PageUptodate(page)) {
> release_and_retry:
> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> index e9570f4e0f21..100b6526717f 100644
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@ -2429,7 +2429,7 @@ static int f2fs_mpage_readpages(struct inode *inode,
> if (ret)
> goto set_error_page;
>
> - f2fs_compress_ctx_add_page(&cc, &folio->page);
> + f2fs_compress_ctx_add_page(&cc, folio);
>
> goto next_page;
> read_single_page:
> @@ -3161,7 +3161,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping,
> #ifdef CONFIG_F2FS_FS_COMPRESSION
> if (f2fs_compressed_file(inode)) {
> folio_get(folio);
> - f2fs_compress_ctx_add_page(&cc, &folio->page);
> + f2fs_compress_ctx_add_page(&cc, folio);
> continue;
> }
> #endif
> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> index 51fd5063a69c..df436dd3aac1 100644
> --- a/fs/f2fs/f2fs.h
> +++ b/fs/f2fs/f2fs.h
> @@ -4322,7 +4322,7 @@ bool f2fs_cluster_can_merge_page(struct compress_ctx *cc, pgoff_t index);
> bool f2fs_all_cluster_page_ready(struct compress_ctx *cc, struct page **pages,
> int index, int nr_pages, bool uptodate);
> bool f2fs_sanity_check_cluster(struct dnode_of_data *dn);
> -void f2fs_compress_ctx_add_page(struct compress_ctx *cc, struct page *page);
> +void f2fs_compress_ctx_add_page(struct compress_ctx *cc, struct folio *folio);
> int f2fs_write_multi_pages(struct compress_ctx *cc,
> int *submitted,
> struct writeback_control *wbc,
> --
> 2.40.1
Powered by blists - more mailing lists