2022-10-17 20:31:40

by Vishal Moola

Subject: [PATCH v3 13/23] f2fs: Convert f2fs_sync_node_pages() to use filemap_get_folios_tag()

Convert function to use a folio_batch instead of pagevec. This is in
preparation for the removal of find_get_pages_range_tag().

Signed-off-by: Vishal Moola (Oracle) <[email protected]>
---
fs/f2fs/node.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index a2f477cc48c7..38f32b4d61dc 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1935,23 +1935,24 @@ int f2fs_sync_node_pages(struct f2fs_sb_info *sbi,
bool do_balance, enum iostat_type io_type)
{
pgoff_t index;
- struct pagevec pvec;
+ struct folio_batch fbatch;
int step = 0;
int nwritten = 0;
int ret = 0;
- int nr_pages, done = 0;
+ int nr_folios, done = 0;

- pagevec_init(&pvec);
+ folio_batch_init(&fbatch);

next_step:
index = 0;

- while (!done && (nr_pages = pagevec_lookup_tag(&pvec,
- NODE_MAPPING(sbi), &index, PAGECACHE_TAG_DIRTY))) {
+ while (!done && (nr_folios = filemap_get_folios_tag(NODE_MAPPING(sbi),
+ &index, (pgoff_t)-1, PAGECACHE_TAG_DIRTY,
+ &fbatch))) {
int i;

- for (i = 0; i < nr_pages; i++) {
- struct page *page = pvec.pages[i];
+ for (i = 0; i < nr_folios; i++) {
+ struct page *page = &fbatch.folios[i]->page;
bool submitted = false;

/* give a priority to WB_SYNC threads */
@@ -2026,7 +2027,7 @@ int f2fs_sync_node_pages(struct f2fs_sb_info *sbi,
if (--wbc->nr_to_write == 0)
break;
}
- pagevec_release(&pvec);
+ folio_batch_release(&fbatch);
cond_resched();

if (wbc->nr_to_write == 0) {
--
2.36.1

2022-10-29 04:50:59

by Chao Yu

Subject: Re: [f2fs-dev] [PATCH v3 13/23] f2fs: Convert f2fs_sync_node_pages() to use filemap_get_folios_tag()

On 2022/10/18 4:24, Vishal Moola (Oracle) wrote:
> Convert function to use a folio_batch instead of pagevec. This is in
> preparation for the removal of find_get_pages_range_tag().
>
> Signed-off-by: Vishal Moola (Oracle) <[email protected]>

Acked-by: Chao Yu <[email protected]>

Thanks,

> ---
> fs/f2fs/node.c | 17 +++++++++--------
> 1 file changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
> index a2f477cc48c7..38f32b4d61dc 100644
> --- a/fs/f2fs/node.c
> +++ b/fs/f2fs/node.c
> @@ -1935,23 +1935,24 @@ int f2fs_sync_node_pages(struct f2fs_sb_info *sbi,
> bool do_balance, enum iostat_type io_type)
> {
> pgoff_t index;
> - struct pagevec pvec;
> + struct folio_batch fbatch;
> int step = 0;
> int nwritten = 0;
> int ret = 0;
> - int nr_pages, done = 0;
> + int nr_folios, done = 0;
>
> - pagevec_init(&pvec);
> + folio_batch_init(&fbatch);
>
> next_step:
> index = 0;
>
> - while (!done && (nr_pages = pagevec_lookup_tag(&pvec,
> - NODE_MAPPING(sbi), &index, PAGECACHE_TAG_DIRTY))) {
> + while (!done && (nr_folios = filemap_get_folios_tag(NODE_MAPPING(sbi),
> + &index, (pgoff_t)-1, PAGECACHE_TAG_DIRTY,
> + &fbatch))) {
> int i;
>
> - for (i = 0; i < nr_pages; i++) {
> - struct page *page = pvec.pages[i];
> + for (i = 0; i < nr_folios; i++) {
> + struct page *page = &fbatch.folios[i]->page;
> bool submitted = false;
>
> /* give a priority to WB_SYNC threads */
> @@ -2026,7 +2027,7 @@ int f2fs_sync_node_pages(struct f2fs_sb_info *sbi,
> if (--wbc->nr_to_write == 0)
> break;
> }
> - pagevec_release(&pvec);
> + folio_batch_release(&fbatch);
> cond_resched();
>
> if (wbc->nr_to_write == 0) {