* [PATCH] btrfs: fix a race between reflink and compressed writes
@ 2026-11-05 1:08 Qu Wenruo
2026-11-05 11:07 ` Breno Leitao
2026-11-06 18:21 ` Filipe Manana
0 siblings, 2 replies; 3+ messages in thread
From: Qu Wenruo @ 2026-11-05 1:08 UTC (permalink / raw)
To: linux-btrfs; +Cc: Breno Leitao
[BUG]
There is a bug report with a reproduce that can lead to transaction
abort. The reproducer requires either large folios or page size larger
than block size and compression:
BTRFS info (device dm-2): use zstd compression, level 3
------------[ cut here ]------------
WARNING: fs/btrfs/extent_map.c:443 at btrfs_unpin_extent_cache+0x12a/0x1a0 [btrfs], CPU#0: kworker/u41:1/1073
CPU: 0 UID: 0 PID: 1073 Comm: kworker/u41:1 Tainted: G W E 7.3.0-rc7-custom+ #111 PREEMPT(full) 181cfbec4e757bdd6c595e90a917484279074a92
Workqueue: btrfs-endio-write btrfs_work_helper [btrfs]
RIP: 0010:btrfs_unpin_extent_cache+0x12a/0x1a0 [btrfs]
Call Trace:
<TASK>
btrfs_finish_one_ordered+0x8f9/0xce0 [btrfs 78b39de6ff5f8aabf4d2477512804f86456deeca]
btrfs_work_helper+0xc5/0x3a0 [btrfs 78b39de6ff5f8aabf4d2477512804f86456deeca]
process_scheduled_works+0x20b/0x480
worker_thread+0x1f7/0x2f0
kthread+0x101/0x130
ret_from_fork+0xd9/0x250
ret_from_fork_asm+0x11/0x20
</TASK>
---[ end trace 0000000000000000 ]---
BTRFS warning (device dm-2): found extent map for inode 257 (root 5) with unexpected start offset 8192 when unpinning extent range [4096, 12288), generation 12
------------[ cut here ]------------
WARNING: fs/btrfs/inode.c:3321 at btrfs_finish_one_ordered+0xc4b/0xce0 [btrfs], CPU#0: kworker/u41:1/1073
CPU: 0 UID: 0 PID: 1073 Comm: kworker/u41:1 Tainted: G W E 7.3.0-rc7-custom+ #111 PREEMPT(full) 181cfbec4e757bdd6c595e90a917484279074a92
Workqueue: btrfs-endio-write btrfs_work_helper [btrfs]
RIP: 0010:btrfs_finish_one_ordered+0xc4b/0xce0 [btrfs]
Call Trace:
<TASK>
btrfs_work_helper+0xc5/0x3a0 [btrfs 78b39de6ff5f8aabf4d2477512804f86456deeca]
process_scheduled_works+0x20b/0x480
worker_thread+0x1f7/0x2f0
kthread+0x101/0x130
ret_from_fork+0xd9/0x250
ret_from_fork_asm+0x11/0x20
</TASK>
---[ end trace 0000000000000000 ]---
BTRFS error (device dm-2 state A): Transaction 12 aborted (-EUCLEAN)
BTRFS: error (device dm-2 state A) in btrfs_finish_one_ordered:3321: errno=-117 Filesystem corrupted
[CAUSE]
There is a race between compressed write and regular write inside the
same folio, that can lead to incorrect PAGECACHE_TAG_DIRTY tag to be
cleared too early.
In this example, we have a large folio containing 8 pages (4K page size,
4K block size), with the following layout:
0 8K 16K 24K 32K
|//////////| |///|
Where [4K, 12K) is dirty, and [20K, 24K) is also dirty.
Writeback | Compression worker
----------------------------------+------------------------------------
writepage_delalloc() |
|- run_delalloc_compressed() |
| | Queueing [4K, 12K) for |
| | compression. |
| \- btrfs_queue_work() |
| | compress_file_range()
| | |- extent_range_clear_dirty_for_io()
| | \- btrfs_folio_clamp_clear_dirty()
| | Now range [4K, 12K) is no longer
| | dirty, but also without an OE.
\- run_delalloc_cow() |
| For the [20K, 24K) |
\- submit_one_sector() |
|- btrfs_folio_clear_dirty()|
| Since [20K, 24K) is the |
| last dirty block, the |
| folio is no longer dirty |
| |
|- btrfs_folio_set_writeback()
Since the folio is no |
longer dirty, the |
PAGECACHE_TAG_DIRTY tag |
is also cleared. |
The above race will lead to a 32K folio that contains [4K, 12K) range
that is still under compression (and should still be counted dirty), but
without an OE.
Then later in the reflink:
Reflink | Compression worker
----------------------------------+------------------------------------
btrfs_clone_files() |
| Which is to replace [4K, 8K) |
| |
|- btrfs_wait_ordered_range() |
| |- btrfs_fdatawrite_range() |
| | Nothing to do, since no |
| | DIRTY tag for the folio |
| | |
| |- filemap_fdatawait_range() |
| | The [20K, 24K) finished, |
| | So no WRITEBACK tag |
| | |
| \- lookup OE |
| No OE is created for range |
| [4K, 12K) |
| |
| | submit_compressed_extents
| | \- submit_one_async_extent
| | \- btrfs_alloc_ordered_extent()
| | OE for [4K, 12K) created, but
| | it's too late.
\- btrfs_clone() |
Replace file extents for range |
[4K, 8K), which will conflict |
with the new compressed range |
[4K, 12K) |
| end_bbio_data_write([4k, 12K))
| \- btrfs_finish_ordered()
|
|
| finish_ordered_fn()
| \- btrfs_finish_one_ordered()
| \- btrfs_unpin_extent_cache()
| em start 8K != 4K
return -EUCLEAN, transaction aborted
[FIX]
Do not clear the folio dirty early during compress_file_range().
The early clearing is done through extent_range_clear_dirty_for_io(), so
remove the folio dirty clearing completely from it.
And since what's left is only checking the folio write protection,
rename the function to extent_range_check_write_protected() instead, and
slightly clean it up, so it doesn't need to return an int.
Finally since the range is still dirty now, all run_delalloc_cow()
callers pass @pages_dirty = true, we can remove that parameter along other
involved functions.
Fixes: 1d2fbb7f1f9e ("btrfs: allow compression even if the range is not page aligned")
Reported-by: Breno Leitao <leitao@debian.org>
Link: https://lore.kernel.org/linux-btrfs/ause7k_HjzUWT3D-@gmail.com/
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
fs/btrfs/extent_io.c | 5 ++---
fs/btrfs/extent_io.h | 3 +--
fs/btrfs/inode.c | 42 ++++++++++++------------------------------
3 files changed, 15 insertions(+), 35 deletions(-)
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index a221b63bdb20..a143592c20d4 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2904,8 +2904,7 @@ static int extent_write_cache_pages(struct address_space *mapping,
* locked.
*/
void extent_write_locked_range(struct inode *inode, const struct folio *locked_folio,
- u64 start, u64 end, struct writeback_control *wbc,
- bool pages_dirty)
+ u64 start, u64 end, struct writeback_control *wbc)
{
bool found_error = false;
int ret = 0;
@@ -2948,7 +2947,7 @@ void extent_write_locked_range(struct inode *inode, const struct folio *locked_f
cur_len = cur_end + 1 - cur;
ASSERT(folio_test_locked(folio));
- if (pages_dirty && folio != locked_folio)
+ if (folio != locked_folio)
ASSERT(folio_test_dirty(folio));
/*
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index d8dd2ae9ff9a..c55b37cb24b7 100644
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -280,8 +280,7 @@ void btrfs_check_folio_write_protected(struct folio *folio);
static inline void btrfs_check_folio_write_protected(struct folio *folio) { }
#endif
void extent_write_locked_range(struct inode *inode, const struct folio *locked_folio,
- u64 start, u64 end, struct writeback_control *wbc,
- bool pages_dirty);
+ u64 start, u64 end, struct writeback_control *wbc);
int btrfs_writepages(struct address_space *mapping, struct writeback_control *wbc);
int btree_writepages(struct address_space *mapping, struct writeback_control *wbc);
void btrfs_btree_wait_writeback_range(struct btrfs_fs_info *fs_info, u64 start, u64 end);
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index b6ea1f713b7e..91186c0cd6af 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -120,8 +120,7 @@ static int btrfs_truncate(struct btrfs_inode *inode, bool skip_writeback);
static noinline int run_delalloc_cow(struct btrfs_inode *inode,
struct folio *locked_folio, u64 start,
- u64 end, struct writeback_control *wbc,
- bool pages_dirty);
+ u64 end, struct writeback_control *wbc);
static int data_reloc_print_warning_inode(u64 inum, u64 offset, u64 num_bytes,
u64 root, void *warn_ctx)
@@ -773,33 +772,27 @@ static inline void inode_should_defrag(struct btrfs_inode *inode,
btrfs_add_inode_defrag(inode, small_write);
}
-static int extent_range_clear_dirty_for_io(struct btrfs_inode *inode, u64 start, u64 end)
+static void extent_range_check_write_protected(struct btrfs_inode *inode, u64 start, u64 end)
{
pgoff_t index = start >> PAGE_SHIFT;
const pgoff_t end_index = end >> PAGE_SHIFT;
struct folio *folio;
- int ret = 0;
+
+ if (!IS_ENABLED(CONFIG_BTRFS_DEBUG))
+ return;
while (index <= end_index) {
folio = filemap_get_folio(inode->vfs_inode.i_mapping, index);
+ /* Compression should have all involved folios still locked. */
if (IS_ERR(folio)) {
- if (!ret)
- ret = PTR_ERR(folio);
+ ASSERT(0, "missing a folio inside the compression range");
index++;
continue;
}
- /*
- * We are about to compress the folio, so it must not be mmap
- * writeable or we could corrupt the data as we attempt to
- * compress it.
- */
btrfs_check_folio_write_protected(folio);
- btrfs_folio_clamp_clear_dirty(inode->root->fs_info, folio, start,
- end + 1 - start);
index = folio_next_index(folio);
folio_put(folio);
}
- return ret;
}
static struct folio *compressed_bio_last_folio(struct compressed_bio *cb)
@@ -886,16 +879,7 @@ static void compress_file_range(struct btrfs_work *work)
inode_should_defrag(inode, start, end, end - start + 1, SZ_16K);
- ret = extent_range_clear_dirty_for_io(inode, start, end);
-
- /*
- * All the folios should have been locked thus no failure.
- *
- * And even if some folios are missing, btrfs_compress_bio()
- * would handle them correctly, so here just do an ASSERT() check for
- * early logic errors.
- */
- ASSERT(ret == 0);
+ extent_range_check_write_protected(inode, start, end);
/*
* We need to save i_size before now because it could change in between
@@ -1011,8 +995,7 @@ static void submit_uncompressed_range(struct btrfs_inode *inode,
};
wbc_attach_fdatawrite_inode(&wbc, &inode->vfs_inode);
- ret = run_delalloc_cow(inode, locked_folio, start, end,
- &wbc, false);
+ ret = run_delalloc_cow(inode, locked_folio, start, end, &wbc);
wbc_detach_inode(&wbc);
if (ret < 0) {
if (locked_folio)
@@ -1657,8 +1640,7 @@ static bool run_delalloc_compressed(struct btrfs_inode *inode,
*/
static noinline int run_delalloc_cow(struct btrfs_inode *inode,
struct folio *locked_folio, u64 start,
- u64 end, struct writeback_control *wbc,
- bool pages_dirty)
+ u64 end, struct writeback_control *wbc)
{
u64 done_offset = end;
int ret;
@@ -1669,7 +1651,7 @@ static noinline int run_delalloc_cow(struct btrfs_inode *inode,
if (ret)
return ret;
extent_write_locked_range(&inode->vfs_inode, locked_folio,
- start, done_offset, wbc, pages_dirty);
+ start, done_offset, wbc);
start = done_offset + 1;
}
@@ -2436,7 +2418,7 @@ int btrfs_run_delalloc_range(struct btrfs_inode *inode, struct folio *locked_fol
return 1;
if (zoned)
- return run_delalloc_cow(inode, locked_folio, start, end, wbc, true);
+ return run_delalloc_cow(inode, locked_folio, start, end, wbc);
else
return cow_file_range(inode, locked_folio, start, end, NULL, 0);
}
--
2.56.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] btrfs: fix a race between reflink and compressed writes
2026-11-05 1:08 [PATCH] btrfs: fix a race between reflink and compressed writes Qu Wenruo
@ 2026-11-05 11:07 ` Breno Leitao
2026-11-06 18:21 ` Filipe Manana
1 sibling, 0 replies; 3+ messages in thread
From: Breno Leitao @ 2026-11-05 11:07 UTC (permalink / raw)
To: Qu Wenruo; +Cc: linux-btrfs
Hello Qu,
On Thu, Nov 05, 2026 at 11:38:00AM +1030, Qu Wenruo wrote:
> Do not clear the folio dirty early during compress_file_range().
>
> The early clearing is done through extent_range_clear_dirty_for_io(), so
> remove the folio dirty clearing completely from it.
>
> And since what's left is only checking the folio write protection,
> rename the function to extent_range_check_write_protected() instead, and
> slightly clean it up, so it doesn't need to return an int.
>
> Finally since the range is still dirty now, all run_delalloc_cow()
> callers pass @pages_dirty = true, we can remove that parameter along other
> involved functions.
>
> Fixes: 1d2fbb7f1f9e ("btrfs: allow compression even if the range is not page aligned")
> Reported-by: Breno Leitao <leitao@debian.org>
> Link: https://lore.kernel.org/linux-btrfs/ause7k_HjzUWT3D-@gmail.com/
> Signed-off-by: Qu Wenruo <wqu@suse.com>
Thanks for the quick fix. I ran the reproducer against next-20261104 with
and without this patch, on arm64, compress-force=zstd:3 (compress=zstd:3
for the compress mode), and CONFIG_BTRFS_DEBUG and CONFIG_BTRFS_ASSERT
enabled:
pages run.sh mode without the patch with the patch
64K clone stale read after 2s clean for 600s
64K clone -d read-only after 2s clean for 300s
64K compress stale read after 2s clean for 300s
64K inline deadlock after 32s clean for 300s
4K, large folio clone stale read after 26s clean for 600s
4K, large folio clone -d read-only after 2s clean for 300s
4K, large folio compress stale read after 16s clean for 300s
I've also run fstests (-g clone,compress,punch,fiemap with
compress-force) give the same results with and without the patch, with
no new warnings.
Tested-by: Breno Leitao <leitao@debian.org>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] btrfs: fix a race between reflink and compressed writes
2026-11-05 1:08 [PATCH] btrfs: fix a race between reflink and compressed writes Qu Wenruo
2026-11-05 11:07 ` Breno Leitao
@ 2026-11-06 18:21 ` Filipe Manana
1 sibling, 0 replies; 3+ messages in thread
From: Filipe Manana @ 2026-11-06 18:21 UTC (permalink / raw)
To: Qu Wenruo; +Cc: linux-btrfs, Breno Leitao
On Thu, Nov 5, 2026 at 1:08 AM Qu Wenruo <wqu@suse.com> wrote:
>
> [BUG]
> There is a bug report with a reproduce that can lead to transaction
reproduce -> reproducer
> abort. The reproducer requires either large folios or page size larger
> than block size and compression:
>
> BTRFS info (device dm-2): use zstd compression, level 3
> ------------[ cut here ]------------
> WARNING: fs/btrfs/extent_map.c:443 at btrfs_unpin_extent_cache+0x12a/0x1a0 [btrfs], CPU#0: kworker/u41:1/1073
> CPU: 0 UID: 0 PID: 1073 Comm: kworker/u41:1 Tainted: G W E 7.3.0-rc7-custom+ #111 PREEMPT(full) 181cfbec4e757bdd6c595e90a917484279074a92
> Workqueue: btrfs-endio-write btrfs_work_helper [btrfs]
> RIP: 0010:btrfs_unpin_extent_cache+0x12a/0x1a0 [btrfs]
> Call Trace:
> <TASK>
> btrfs_finish_one_ordered+0x8f9/0xce0 [btrfs 78b39de6ff5f8aabf4d2477512804f86456deeca]
> btrfs_work_helper+0xc5/0x3a0 [btrfs 78b39de6ff5f8aabf4d2477512804f86456deeca]
> process_scheduled_works+0x20b/0x480
> worker_thread+0x1f7/0x2f0
> kthread+0x101/0x130
> ret_from_fork+0xd9/0x250
> ret_from_fork_asm+0x11/0x20
> </TASK>
> ---[ end trace 0000000000000000 ]---
> BTRFS warning (device dm-2): found extent map for inode 257 (root 5) with unexpected start offset 8192 when unpinning extent range [4096, 12288), generation 12
> ------------[ cut here ]------------
> WARNING: fs/btrfs/inode.c:3321 at btrfs_finish_one_ordered+0xc4b/0xce0 [btrfs], CPU#0: kworker/u41:1/1073
> CPU: 0 UID: 0 PID: 1073 Comm: kworker/u41:1 Tainted: G W E 7.3.0-rc7-custom+ #111 PREEMPT(full) 181cfbec4e757bdd6c595e90a917484279074a92
> Workqueue: btrfs-endio-write btrfs_work_helper [btrfs]
> RIP: 0010:btrfs_finish_one_ordered+0xc4b/0xce0 [btrfs]
> Call Trace:
> <TASK>
> btrfs_work_helper+0xc5/0x3a0 [btrfs 78b39de6ff5f8aabf4d2477512804f86456deeca]
> process_scheduled_works+0x20b/0x480
> worker_thread+0x1f7/0x2f0
> kthread+0x101/0x130
> ret_from_fork+0xd9/0x250
> ret_from_fork_asm+0x11/0x20
> </TASK>
> ---[ end trace 0000000000000000 ]---
> BTRFS error (device dm-2 state A): Transaction 12 aborted (-EUCLEAN)
> BTRFS: error (device dm-2 state A) in btrfs_finish_one_ordered:3321: errno=-117 Filesystem corrupted
>
> [CAUSE]
>
> There is a race between compressed write and regular write inside the
> same folio, that can lead to incorrect PAGECACHE_TAG_DIRTY tag to be
> cleared too early.
>
> In this example, we have a large folio containing 8 pages (4K page size,
> 4K block size), with the following layout:
>
> 0 8K 16K 24K 32K
> |//////////| |///|
>
> Where [4K, 12K) is dirty, and [20K, 24K) is also dirty.
>
> Writeback | Compression worker
> ----------------------------------+------------------------------------
> writepage_delalloc() |
> |- run_delalloc_compressed() |
> | | Queueing [4K, 12K) for |
> | | compression. |
> | \- btrfs_queue_work() |
> | | compress_file_range()
> | | |- extent_range_clear_dirty_for_io()
> | | \- btrfs_folio_clamp_clear_dirty()
> | | Now range [4K, 12K) is no longer
> | | dirty, but also without an OE.
> \- run_delalloc_cow() |
> | For the [20K, 24K) |
> \- submit_one_sector() |
> |- btrfs_folio_clear_dirty()|
> | Since [20K, 24K) is the |
> | last dirty block, the |
> | folio is no longer dirty |
> | |
> |- btrfs_folio_set_writeback()
> Since the folio is no |
> longer dirty, the |
> PAGECACHE_TAG_DIRTY tag |
> is also cleared. |
>
> The above race will lead to a 32K folio that contains [4K, 12K) range
> that is still under compression (and should still be counted dirty), but
> without an OE.
>
> Then later in the reflink:
>
> Reflink | Compression worker
> ----------------------------------+------------------------------------
> btrfs_clone_files() |
> | Which is to replace [4K, 8K) |
> | |
> |- btrfs_wait_ordered_range() |
> | |- btrfs_fdatawrite_range() |
> | | Nothing to do, since no |
> | | DIRTY tag for the folio |
> | | |
> | |- filemap_fdatawait_range() |
> | | The [20K, 24K) finished, |
> | | So no WRITEBACK tag |
> | | |
> | \- lookup OE |
> | No OE is created for range |
> | [4K, 12K) |
> | |
> | | submit_compressed_extents
> | | \- submit_one_async_extent
> | | \- btrfs_alloc_ordered_extent()
> | | OE for [4K, 12K) created, but
> | | it's too late.
> \- btrfs_clone() |
> Replace file extents for range |
> [4K, 8K), which will conflict |
> with the new compressed range |
> [4K, 12K) |
> | end_bbio_data_write([4k, 12K))
> | \- btrfs_finish_ordered()
> |
> |
> | finish_ordered_fn()
> | \- btrfs_finish_one_ordered()
> | \- btrfs_unpin_extent_cache()
> | em start 8K != 4K
> return -EUCLEAN, transaction aborted
>
> [FIX]
> Do not clear the folio dirty early during compress_file_range().
>
> The early clearing is done through extent_range_clear_dirty_for_io(), so
early -> premature
It's more clear that way IMO.
> remove the folio dirty clearing completely from it.
>
> And since what's left is only checking the folio write protection,
> rename the function to extent_range_check_write_protected() instead, and
> slightly clean it up, so it doesn't need to return an int.
>
> Finally since the range is still dirty now, all run_delalloc_cow()
> callers pass @pages_dirty = true, we can remove that parameter along other
> involved functions.
>
> Fixes: 1d2fbb7f1f9e ("btrfs: allow compression even if the range is not page aligned")
> Reported-by: Breno Leitao <leitao@debian.org>
> Link: https://lore.kernel.org/linux-btrfs/ause7k_HjzUWT3D-@gmail.com/
> Signed-off-by: Qu Wenruo <wqu@suse.com>
> ---
> fs/btrfs/extent_io.c | 5 ++---
> fs/btrfs/extent_io.h | 3 +--
> fs/btrfs/inode.c | 42 ++++++++++++------------------------------
> 3 files changed, 15 insertions(+), 35 deletions(-)
>
> diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
> index a221b63bdb20..a143592c20d4 100644
> --- a/fs/btrfs/extent_io.c
> +++ b/fs/btrfs/extent_io.c
> @@ -2904,8 +2904,7 @@ static int extent_write_cache_pages(struct address_space *mapping,
> * locked.
> */
> void extent_write_locked_range(struct inode *inode, const struct folio *locked_folio,
> - u64 start, u64 end, struct writeback_control *wbc,
> - bool pages_dirty)
> + u64 start, u64 end, struct writeback_control *wbc)
> {
> bool found_error = false;
> int ret = 0;
> @@ -2948,7 +2947,7 @@ void extent_write_locked_range(struct inode *inode, const struct folio *locked_f
> cur_len = cur_end + 1 - cur;
>
> ASSERT(folio_test_locked(folio));
> - if (pages_dirty && folio != locked_folio)
> + if (folio != locked_folio)
> ASSERT(folio_test_dirty(folio));
>
> /*
> diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
> index d8dd2ae9ff9a..c55b37cb24b7 100644
> --- a/fs/btrfs/extent_io.h
> +++ b/fs/btrfs/extent_io.h
> @@ -280,8 +280,7 @@ void btrfs_check_folio_write_protected(struct folio *folio);
> static inline void btrfs_check_folio_write_protected(struct folio *folio) { }
> #endif
> void extent_write_locked_range(struct inode *inode, const struct folio *locked_folio,
> - u64 start, u64 end, struct writeback_control *wbc,
> - bool pages_dirty);
> + u64 start, u64 end, struct writeback_control *wbc);
> int btrfs_writepages(struct address_space *mapping, struct writeback_control *wbc);
> int btree_writepages(struct address_space *mapping, struct writeback_control *wbc);
> void btrfs_btree_wait_writeback_range(struct btrfs_fs_info *fs_info, u64 start, u64 end);
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index b6ea1f713b7e..91186c0cd6af 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -120,8 +120,7 @@ static int btrfs_truncate(struct btrfs_inode *inode, bool skip_writeback);
>
> static noinline int run_delalloc_cow(struct btrfs_inode *inode,
> struct folio *locked_folio, u64 start,
> - u64 end, struct writeback_control *wbc,
> - bool pages_dirty);
> + u64 end, struct writeback_control *wbc);
>
> static int data_reloc_print_warning_inode(u64 inum, u64 offset, u64 num_bytes,
> u64 root, void *warn_ctx)
> @@ -773,33 +772,27 @@ static inline void inode_should_defrag(struct btrfs_inode *inode,
> btrfs_add_inode_defrag(inode, small_write);
> }
>
> -static int extent_range_clear_dirty_for_io(struct btrfs_inode *inode, u64 start, u64 end)
> +static void extent_range_check_write_protected(struct btrfs_inode *inode, u64 start, u64 end)
> {
> pgoff_t index = start >> PAGE_SHIFT;
> const pgoff_t end_index = end >> PAGE_SHIFT;
> struct folio *folio;
> - int ret = 0;
> +
> + if (!IS_ENABLED(CONFIG_BTRFS_DEBUG))
> + return;
>
> while (index <= end_index) {
> folio = filemap_get_folio(inode->vfs_inode.i_mapping, index);
> + /* Compression should have all involved folios still locked. */
> if (IS_ERR(folio)) {
> - if (!ret)
> - ret = PTR_ERR(folio);
> + ASSERT(0, "missing a folio inside the compression range");
I really don't like having an ASSERT(0), specially when we can deal
with the issue, as it avoids having to reboot since ASSERT() triggers
a BUG().
How about DEBUG_WARN()? It logs a message and triggers a stack trace
(WARN()), so we can detect it through fstests for example.
Otherwise it looks good, so:
Reviewed-by: Filipe Manana <fdmanana@suse.com>
Thanks.
> index++;
> continue;
> }
> - /*
> - * We are about to compress the folio, so it must not be mmap
> - * writeable or we could corrupt the data as we attempt to
> - * compress it.
> - */
> btrfs_check_folio_write_protected(folio);
> - btrfs_folio_clamp_clear_dirty(inode->root->fs_info, folio, start,
> - end + 1 - start);
> index = folio_next_index(folio);
> folio_put(folio);
> }
> - return ret;
> }
>
> static struct folio *compressed_bio_last_folio(struct compressed_bio *cb)
> @@ -886,16 +879,7 @@ static void compress_file_range(struct btrfs_work *work)
>
> inode_should_defrag(inode, start, end, end - start + 1, SZ_16K);
>
> - ret = extent_range_clear_dirty_for_io(inode, start, end);
> -
> - /*
> - * All the folios should have been locked thus no failure.
> - *
> - * And even if some folios are missing, btrfs_compress_bio()
> - * would handle them correctly, so here just do an ASSERT() check for
> - * early logic errors.
> - */
> - ASSERT(ret == 0);
> + extent_range_check_write_protected(inode, start, end);
>
> /*
> * We need to save i_size before now because it could change in between
> @@ -1011,8 +995,7 @@ static void submit_uncompressed_range(struct btrfs_inode *inode,
> };
>
> wbc_attach_fdatawrite_inode(&wbc, &inode->vfs_inode);
> - ret = run_delalloc_cow(inode, locked_folio, start, end,
> - &wbc, false);
> + ret = run_delalloc_cow(inode, locked_folio, start, end, &wbc);
> wbc_detach_inode(&wbc);
> if (ret < 0) {
> if (locked_folio)
> @@ -1657,8 +1640,7 @@ static bool run_delalloc_compressed(struct btrfs_inode *inode,
> */
> static noinline int run_delalloc_cow(struct btrfs_inode *inode,
> struct folio *locked_folio, u64 start,
> - u64 end, struct writeback_control *wbc,
> - bool pages_dirty)
> + u64 end, struct writeback_control *wbc)
> {
> u64 done_offset = end;
> int ret;
> @@ -1669,7 +1651,7 @@ static noinline int run_delalloc_cow(struct btrfs_inode *inode,
> if (ret)
> return ret;
> extent_write_locked_range(&inode->vfs_inode, locked_folio,
> - start, done_offset, wbc, pages_dirty);
> + start, done_offset, wbc);
> start = done_offset + 1;
> }
>
> @@ -2436,7 +2418,7 @@ int btrfs_run_delalloc_range(struct btrfs_inode *inode, struct folio *locked_fol
> return 1;
>
> if (zoned)
> - return run_delalloc_cow(inode, locked_folio, start, end, wbc, true);
> + return run_delalloc_cow(inode, locked_folio, start, end, wbc);
> else
> return cow_file_range(inode, locked_folio, start, end, NULL, 0);
> }
> --
> 2.56.0
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-11-06 18:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-05 1:08 [PATCH] btrfs: fix a race between reflink and compressed writes Qu Wenruo
2026-11-05 11:07 ` Breno Leitao
2026-11-06 18:21 ` Filipe Manana
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.