From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f0.google.com (mail-pj2-f0.google.com [74.125.227.128]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E298E4F403D for ; Tue, 13 Oct 2026 11:57:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.128 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791892625; cv=none; b=ceSrvOEWsPUqSCDGxgy3w4XukN38MA1n9GzPL+YZuslxMlZGiNi/eK4s370gE/K1u+9qv8FyygQGEK8heURlQAZ9aB9HkKl0LN80y5O+Ot8FNn6pVhPhHgVcxpGwn4X81KQReFqs8qcSpG45JHFXas4OiflsIhHI4oYoLgMoYFQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791892625; c=relaxed/simple; bh=xPI8s9CyBbzpisetgy/iS/uDS3By8g1LLnMuxcCgXOM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jMQxCQIdCGC5nNU9YcFlTBrxPtot+I8JJEC7HBkBTeCbj6MebTy0fEotuFneE78e++zuEPMoFwyCff9McNkN+I9h87opu4GLl4yR+00C3ighVDlwlNLB3HdHVC1GdQF4MToD/EKgyIBhEeC3AnqvnwXCBSCZxPd6H0AHgFZ2U64= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=desWNv+6; arc=none smtp.client-ip=74.125.227.128 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="desWNv+6" Received: by mail-pj2-f0.google.com with SMTP id 98e67ed59e1d1-3a476ee8669so601961a91.0 for ; Tue, 13 Oct 2026 04:57:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791892623; x=1792497423; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=HY9e4jgfVZu8eZjq+rOkc60bmsQYeKGnwop7+ZmWuVQ=; b=desWNv+6geFoVoZNJuD5sYEQcOjcSDKQbNfRjzKh+XTUJZmPk2QwE0qTu+kq1Y5i7h nabny9hNthaq3cmDuReAqmsVRiTUefJolpzsgT7hO20Du1Qaw/TKZKyG3l3YfulpHsub Kuw838xdr1PK8ri8uGO1fzzSjF6i/PrsoQvF0Gz8iab8bmTNTSwi2jKF0Iu06XoIYF4j MAXbaQhuwPq3notnYOnDYLSjrpqiq+YUqYWEHqVZure0m5PnivnLpPiwFvg06taLD5Pr 7iejvakLICM7J7dFrBZExIueSo37tzkSCuomIUtbjoCueiB7EVbzLuHDr5xwxQaHxAXx 6cBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791892623; x=1792497423; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=HY9e4jgfVZu8eZjq+rOkc60bmsQYeKGnwop7+ZmWuVQ=; b=Fqd/kfyU0jRtVmxtmtfceuAkNvKf4zJT38ZV4/E+zkFEqyVz/4BmwPrVEH9DW3MexG j2S6jTL3enuCuRrTQJpZ//lgs000DH53RMRagPFyg4aNYeH39SNejh2/WH48+4Qtmbox YojP6CpLb74xl7GMmp7FFMgPsWTqT838P1qEfXg+XWwDyeUbdBv6ywH2aMidt6ZpwYNI T4lB6t8ACCjpvmyR+Gfq2OIqhEP44dYAWdI6fU+rKpf0Q4F9nAViLxu6EOaOh1M7r6b8 8YWklvmC3yHpjuFGUhCB4T0wnfDiNiWwk+I1Eitw2E3/QQzm4YU0+cXU+hFG5Lq2G11q ahUg== X-Forwarded-Encrypted: i=1; AKwUvBx7BgPKpSAFWzzTqHzs7nP5zRhyRerv/YiPBBNpUBOA/T0h3srwfAVHfK9jGcf6jVqh72/gEiJnJMdBOXc=@vger.kernel.org X-Gm-Message-State: AFq9FYK+GlwC5lcxRQwo494hShGt9ysoYxSR6WbJ3pldRFHqVVWn25+M fS+9A4b6CfS0CFNiXQerN1anE3vGTZYLIqRr7ITjkZi2/iy5Fqaqek11BcbDowLD49k= X-Gm-Gg: AYBFou1NrRtd04AAHJZY68cKv2zZv5j4yjjR0/z+zI7a6jmCnjoN/Do4KPnuArvqnpr mV2CUsolb+puHbg4aWd7iKX3RcHxL9OEIllqPlswC6lyWLar0J1K4TNfW/O7vu8iFwKwH6I61ZN HjJO+xKZC3KWzUTLwHq32K6aRc+nddxdcA9BHm5yjgeFy/u9ye2UFTRupNRL08aCmN/UyCm0z8m BxyjwEuICrpVxJRXTu/audaOb60Xd1/ce49aAbBc8AYh56iZc+t1Fm72txZE3ViBXsFzDv32wcQ AcSzyh48yai1cjdq2aIzUHb26yk7mo7NmlCjR/DcE6FRYzA9OJmYe7QNuCUTxsMc4ybdCXZiCW0 QYnC3gAq3dimZzQd1CsXPAJyV10diAIVydpFctRL1B8G1seATGhE/DUklECjS1w+7p/O0NRFXVo seQssmS5Uo8CvnfLHrmA9TsBQXRtJfhR29C7GVADmPAiuUpQAHz7D2Kk5P+3NgxSe7+dXU9ABXD mt9sG6sWkI3tkkWV3lsJi2vFLHg+MmKbif2 X-Received: by 2002:a17:90b:3c08:b0:3a4:c11d:b78b with SMTP id 98e67ed59e1d1-3ab3a9128bdmr10466599a91.22.1791892623140; Tue, 13 Oct 2026 04:57:03 -0700 (PDT) Received: from nzzhao-ThinkCentre-M760t.mioffice.cn ([43.224.245.179]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3ab37139b59sm21248516a91.13.2026.10.13.04.56.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 04:57:02 -0700 (PDT) From: Nanzhe Zhao To: linux-f2fs-devel@lists.sourceforge.net, Jaegeuk Kim , Chao Yu Cc: Barry Song , Nanzhe Zhao , Juan Yescas , Daeho Jeong , Dev Jain , David Hildenbrand , linux-kernel@vger.kernel.org, Bo Zhang , Kalesh Singh , Nanzhe Zhao , Pengfei Li , Ryan Roberts Subject: [PATCH v4 07/18] f2fs: support large folio writeback Date: Tue, 13 Oct 2026 19:56:10 +0800 Message-ID: <20261013115621.968742-8-nzzhao.sigma@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261013115621.968742-1-nzzhao.sigma@gmail.com> References: <20261013115621.968742-1-nzzhao.sigma@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Nanzhe Zhao Large folio can contain multiple dirty ranges. Add a folio-based writeback path for large-folio mapping files and keep the legacy f2fs_write_cache_pages() path unchanged for non large-folio mapping files. Signed-off-by: Nanzhe Zhao --- fs/f2fs/data.c | 450 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 445 insertions(+), 5 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 2ae3013b6..be182b9e8 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -334,7 +334,9 @@ static void f2fs_write_end_bio(struct bio *bio) bio_for_each_folio_all(fi, bio) { struct folio *folio = fi.folio; + unsigned int nr_pages = fi.length >> PAGE_SHIFT; enum count_type type; + bool finished = true; #ifdef CONFIG_F2FS_FS_COMPRESSION if (f2fs_is_compressed_page(folio)) { @@ -353,7 +355,16 @@ static void f2fs_write_end_bio(struct bio *bio) } } - dec_cache_count(sbi, type); + if (f2fs_folio_has_ffs(folio)) { + struct f2fs_folio_state *ffs = + (struct f2fs_folio_state *)folio->private; + + finished = atomic_sub_and_test(nr_pages, + &ffs->write_pages_pending); + } + + while (nr_pages--) + dec_cache_count(sbi, type); /* * we should access sbi before folio_end_writeback() to @@ -363,8 +374,10 @@ static void f2fs_write_end_bio(struct bio *bio) wq_has_sleeper(&sbi->cp_wait)) wake_up(&sbi->cp_wait); - folio_clear_f2fs_gcing(folio); - folio_end_writeback(folio); + if (finished) { + folio_clear_f2fs_gcing(folio); + folio_end_writeback(folio); + } } bio_put(bio); @@ -2884,7 +2897,7 @@ static unsigned int __ffs_mark_subrange_dirty(struct folio *folio, return bitmap_weight(ffs->state, 2 * nr_subpages) - before; } -static void f2fs_ffs_mark_subrange_dirty(struct folio *folio, +void f2fs_ffs_mark_subrange_dirty(struct folio *folio, size_t offset, size_t len) { struct f2fs_folio_state *ffs; @@ -2902,6 +2915,99 @@ static void f2fs_ffs_mark_subrange_dirty(struct folio *folio, spin_unlock_irqrestore(&ffs->state_lock, flags); } +static bool __ffs_clear_subrange_dirty(struct folio *folio, + struct f2fs_folio_state *ffs, size_t offset, size_t len) +{ + unsigned int nr_subpages = folio_nr_pages(folio); + unsigned int start, end; + + start = offset >> PAGE_SHIFT; + end = (offset + len + PAGE_SIZE - 1) >> PAGE_SHIFT; + end = min(end, nr_subpages); + + bitmap_clear(ffs->state, nr_subpages + start, end - start); + return find_next_bit(ffs->state, 2 * nr_subpages, nr_subpages) < + 2 * nr_subpages; +} + +/** + * f2fs_ffs_clear_subrange_dirty_and_test - clear dirty bits and test remaining + * @folio: the large folio + * @offset: start byte offset within the folio + * @len: byte length of the subrange + * + * Clear the dirty bits of the 4K subpages covered by [offset, offset + len), + * and return whether the folio still has any dirty subpage left. + */ +bool f2fs_ffs_clear_subrange_dirty_and_test(struct folio *folio, size_t offset, + size_t len) +{ + struct f2fs_folio_state *ffs; + unsigned long flags; + bool dirty; + + if (!f2fs_folio_has_ffs(folio)) + return false; + + ffs = (struct f2fs_folio_state *)folio->private; + spin_lock_irqsave(&ffs->state_lock, flags); + dirty = __ffs_clear_subrange_dirty(folio, ffs, offset, len); + spin_unlock_irqrestore(&ffs->state_lock, flags); + + return dirty; +} + +static unsigned int ffs_next_dirty_subpage(struct f2fs_folio_state *ffs, + const struct folio *folio, unsigned int start, + unsigned int end) +{ + unsigned int nr_subpages = folio_nr_pages(folio); + + return find_next_bit(ffs->state, nr_subpages + end + 1, + nr_subpages + start) - nr_subpages; +} + +static unsigned int ffs_next_clean_subpage(struct f2fs_folio_state *ffs, + const struct folio *folio, unsigned int start, + unsigned int end) +{ + unsigned int nr_subpages = folio_nr_pages(folio); + + return find_next_zero_bit(ffs->state, nr_subpages + end + 1, + nr_subpages + start) - nr_subpages; +} + +static unsigned int ffs_find_dirty_range(struct folio *folio, + u64 *range_start, u64 range_end) +{ + struct f2fs_folio_state *ffs; + unsigned int start, end, nr_pages; + + if (*range_start >= range_end) + return 0; + + if (!f2fs_folio_has_ffs(folio)) + return range_end - *range_start; + + ffs = (struct f2fs_folio_state *)folio->private; + start = offset_in_folio(folio, *range_start) >> PAGE_SHIFT; + end = DIV_ROUND_UP(min_not_zero(offset_in_folio(folio, range_end), + folio_size(folio)), PAGE_SIZE) - 1; + + start = ffs_next_dirty_subpage(ffs, folio, start, end); + if (start > end) + return 0; + + if (start == end) + nr_pages = 1; + else + nr_pages = ffs_next_clean_subpage(ffs, folio, + start + 1, end) - start; + + *range_start = folio_pos(folio) + ((u64)start << PAGE_SHIFT); + return (u64)nr_pages << PAGE_SHIFT; +} + static bool find_next_valid_block(const struct folio *folio, size_t orig_off, size_t *need_off, size_t len) @@ -3485,6 +3591,142 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) return err; } +static int f2fs_write_folio_dirty_range(struct folio *folio, int *submitted, + struct writeback_control *wbc, + enum iostat_type io_type, + u64 *pos, u64 len) +{ + struct inode *inode = folio->mapping->host; + struct f2fs_sb_info *sbi = F2FS_I_SB(inode); + bool atomic_commit = f2fs_is_atomic_file(inode) && + folio_test_f2fs_atomic(folio); + struct inode *dn_inode = atomic_commit ? + F2FS_I(inode)->cow_inode : inode; + struct f2fs_folio_state *ffs = NULL; + u64 folio_start = folio_pos(folio); + pgoff_t start_idx = (*pos - folio_start) >> PAGE_SHIFT; + pgoff_t end_idx = (*pos - folio_start + len - 1) >> PAGE_SHIFT; + int err = 0; + + for (pgoff_t i = start_idx; i <= end_idx && !err; i++) { + struct dnode_of_data dn; + struct node_info ni; + pgoff_t data_idx = folio->index + i; + bool ipu_force = false; + bool dn_held = false; + bool submitted_blk = false; + struct f2fs_io_info fio = { + .sbi = sbi, + .ino = inode->i_ino, + .type = DATA, + .op = REQ_OP_WRITE, + .op_flags = wbc_to_write_flags(wbc), + .old_blkaddr = NULL_ADDR, + .folio = folio, + .folio_offset = i, + .folio_blkcnt = 1, + .encrypted_page = NULL, + .submitted = 0, + .need_lock = LOCK_DONE, + .meta_gc = f2fs_meta_inode_gc_required(inode) ? 1 : 0, + .io_type = io_type, + .io_wbc = wbc, + }; + + if (f2fs_folio_has_ffs(folio)) { + ffs = (struct f2fs_folio_state *)folio->private; + atomic_inc(&ffs->write_pages_pending); + } + + set_new_dnode(&dn, dn_inode, NULL, NULL, 0); + + if (need_inplace_update(&fio) && + f2fs_lookup_read_extent_cache_block(inode, data_idx, + &fio.old_blkaddr)) { + if (!f2fs_is_valid_blkaddr(sbi, fio.old_blkaddr, + DATA_GENERIC_ENHANCE)) { + err = -EFSCORRUPTED; + goto block_done; + } + ipu_force = true; + goto got_it; + } + + err = f2fs_get_dnode_of_data(&dn, data_idx, LOOKUP_NODE); + if (err) + goto block_done; + dn_held = true; + + fio.old_blkaddr = dn.data_blkaddr; + +got_it: + if (__is_valid_data_blkaddr(fio.old_blkaddr) && + !f2fs_is_valid_blkaddr(sbi, fio.old_blkaddr, + DATA_GENERIC_ENHANCE)) { + err = -EFSCORRUPTED; + goto block_done; + } + + if (fio.meta_gc) + f2fs_wait_on_block_writeback(inode, fio.old_blkaddr); + + if (ipu_force || + (__is_valid_data_blkaddr(fio.old_blkaddr) && + need_inplace_update(&fio))) { + f2fs_put_dnode(&dn); + dn_held = false; + err = f2fs_inplace_write_data(&fio); + trace_f2fs_do_write_data_page(folio, IPU); + if (err) + goto block_done; + + if (submitted) + (*submitted)++; + submitted_blk = true; + set_inode_flag(inode, FI_UPDATE_WRITE); + goto block_done; + } + + err = f2fs_get_node_info(sbi, dn.nid, &ni, false); + if (err) + goto block_done; + + fio.version = ni.version; + + f2fs_outplace_write_data(&dn, &fio); + /* + * The outplace write path failed to submit this block. + */ + if (!fio.submitted) + goto block_done; + if (submitted) + (*submitted)++; + submitted_blk = true; + set_inode_flag(inode, FI_APPEND_WRITE); + trace_f2fs_do_write_data_page(folio, OPU); +block_done: + if (dn_held) + f2fs_put_dnode(&dn); + /* + * If this block was not submitted, roll back its + * write pages pending. + */ + if (!submitted_blk && ffs) + atomic_dec(&ffs->write_pages_pending); + if (!err) { + *pos = ((loff_t)data_idx + 1) << PAGE_SHIFT; + spin_lock(&F2FS_I(inode)->i_size_lock); + if (F2FS_I(inode)->last_disk_size < *pos) + F2FS_I(inode)->last_disk_size = *pos; + spin_unlock(&F2FS_I(inode)->i_size_lock); + } else { + file_set_keep_isize(inode); + } + } + + return err; +} + int f2fs_write_single_data_page(struct folio *folio, int *submitted, struct bio **bio, sector_t *last_block, @@ -3934,6 +4176,200 @@ static int f2fs_write_cache_pages(struct address_space *mapping, return ret; } +static int f2fs_write_cache_folios(struct address_space *mapping, + struct writeback_control *wbc, + enum iostat_type io_type) +{ + struct folio *folio = NULL; + struct inode *inode = mapping->host; + struct f2fs_sb_info *sbi = F2FS_I_SB(inode); + struct f2fs_lock_context lc; + u64 pos = 0; + u64 end_pos = 0; + u32 r_len = 0; + int err = 0; + int submitted = 0; + int nwritten = 0; + bool op_locked = false; + bool retry = false; + + if (get_dirty_pages(inode) <= SM_I(sbi)->min_hot_blocks) + set_inode_flag(inode, FI_HOT_DATA); + else + clear_inode_flag(inode, FI_HOT_DATA); + + while ((folio = writeback_iter(mapping, wbc, folio, &err))) { + struct f2fs_folio_state *ffs = NULL; + u64 isize; + size_t poff; + pgoff_t end_index; + bool verity_in_progress; + int folio_submitted = 0; + bool bias_added = false; + + submitted = 0; + retry = false; + + if (err) { + folio_redirty_for_writepage(wbc, folio); + goto retry_out; + } + + if (atomic_read(&sbi->wb_sync_req[DATA]) && + wbc->sync_mode == WB_SYNC_NONE) { + folio_redirty_for_writepage(wbc, folio); + /* + * A WB_SYNC_ALL writeback is in progress, so defer + * this writeback. Mark the error as -EBUSY to let + * writeback_iter() stop iterating. + */ + err = -EBUSY; + goto retry_out; + } +retry: + pos = folio_pos(folio); + end_pos = pos + folio_size(folio); + isize = i_size_read(inode); + verity_in_progress = f2fs_verity_in_progress(inode); + poff = 0; + end_index = 0; + + if (retry) { + + if (unlikely(folio->mapping != mapping)) + goto retry_out; + + if (!folio_test_dirty(folio)) + goto retry_out; + + if (folio_test_writeback(folio)) { + if (wbc->sync_mode == WB_SYNC_NONE) + goto retry_out; + f2fs_folio_wait_writeback(folio, true, true); + } + + if (!folio_clear_dirty_for_io(folio)) + goto retry_out; + } + + /* To avoid dealing with the complexity for one subrange is in bio + * while we trylock_op failed before writing another subrange. + * Try to lock_op before any subrange write for the folio. + */ + if (!op_locked) { + if (!f2fs_trylock_op(sbi, &lc)) { + folio_redirty_for_writepage(wbc, folio); + err = 0; + if (wbc->sync_mode != WB_SYNC_ALL) + goto retry_out; + + retry = true; + folio_unlock(folio); + f2fs_io_schedule_timeout(DEFAULT_SCHEDULE_TIMEOUT); + folio_lock(folio); + goto retry; + } + op_locked = true; + } + + if (!verity_in_progress) { + poff = offset_in_folio(folio, isize); + end_index = isize >> PAGE_SHIFT; + + if (folio->index > end_index || + (folio->index == end_index && poff == 0)) + goto out; + + if (end_pos > isize) { + folio_zero_segment(folio, poff, folio_size(folio)); + end_pos = isize; + } + } + + folio_start_writeback(folio); + + /* + * Large folios can be submitted as multiple bios, which may + * complete while we are still submitting the remaining dirty + * ranges. Hold a bias on write_pages_pending to prevent + * folio_end_writeback() from being called early. + */ + if (!bias_added && f2fs_folio_has_ffs(folio)) { + ffs = (struct f2fs_folio_state *)folio->private; + WARN_ON_ONCE(atomic_read(&ffs->write_pages_pending) != 0); + atomic_inc(&ffs->write_pages_pending); + bias_added = true; + } + + while ((r_len = ffs_find_dirty_range(folio, &pos, end_pos))) { + err = f2fs_write_folio_dirty_range(folio, &submitted, + wbc, io_type, &pos, r_len); + folio_submitted += submitted; + nwritten += submitted; + if (err) + goto out; + } + + /* + * Some dirty data of this atomic folio has been written back + * through the COW inode, so it no longer needs to be routed + * there; if nothing was submitted, keep the flag. + */ + if (folio_submitted && + f2fs_is_atomic_file(inode) && + folio_test_f2fs_atomic(folio)) + folio_clear_f2fs_atomic(folio); + +out: + /* + * Clear the dirty state of the subranges that were written back. + * If some subranges are still dirty (e.g. the folio was only + * partially written back), the folio must stay dirty so that + * the remaining subranges are written back later. + */ + if (f2fs_ffs_clear_subrange_dirty_and_test(folio, 0, + (err ? pos : end_pos) - folio_pos(folio))) + folio_redirty_for_writepage(wbc, folio); + else + inode_dec_dirty_pages(inode); + + /* + * Release the bias taken above and we end writeback here if + * no write bio is in flight. + */ + if (bias_added && + atomic_dec_and_test(&ffs->write_pages_pending)) { + folio_end_writeback(folio); + } else if (!folio_submitted && folio_test_writeback(folio)) { + /* + * Order-0 folios take no bias, so end the writeback + * if nothing was submitted. + */ + folio_end_writeback(folio); + } + +retry_out: + if (op_locked) { + f2fs_unlock_op(sbi, &lc); + op_locked = false; + } + + folio_unlock(folio); + } + + if (nwritten) + f2fs_submit_merged_write_cond(F2FS_M_SB(mapping), mapping->host, + NULL); + + /* + * Prevent the -EBUSY error that stopped writeback_iter() from + * propagating to the user. + */ + if (err == -EBUSY) + err = 0; + return err; +} + static inline bool __should_serialize_io(struct inode *inode, struct writeback_control *wbc) { @@ -4028,7 +4464,11 @@ static int __f2fs_write_data_pages(struct address_space *mapping, account_writeback(inode, true); blk_start_plug(&plug); - ret = f2fs_write_cache_pages(mapping, wbc, io_type); + if (mapping_large_folio_support(inode->i_mapping) && + !f2fs_has_inline_data(inode)) + ret = f2fs_write_cache_folios(mapping, wbc, io_type); + else + ret = f2fs_write_cache_pages(mapping, wbc, io_type); blk_finish_plug(&plug); account_writeback(inode, false); -- 2.43.0