btrfs: fix __folio_put refcount errors
v3 cover btrfs: fix __folio_put refcount errors
Switching from __free_page to __folio_put introduced a bug because __free_page called put_page_testzero while __folio_put does not. Fix the two affected callers by changing to folio_put which does call put_folio_testzero.
--
Changelog:
v3:
- split up patches for backporting
v2:
- add second callsite
Boris Burkov (2):
btrfs: fix __folio_put refcount in btrfs_do_encoded_write
btrfs: fix __folio_put refcount in __alloc_dummy_extent_buffer
fs/btrfs/extent_io.c | 2 +- fs/btrfs/inode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
2.45.2
PATCH v3 1/2 btrfs: fix __folio_put refcount in btrfs_do_encoded_write
The conversion to folios switched __free_page to __folio_put in the error path in btrfs_do_encoded_write.
However, this gets the page refcounting wrong. If we do hit that error path (I reproduced by modifying btrfs_do_encoded_write to pretend to always fail in a way that jumps to out_folios and running the xfstest btrfs/281), then we always hit the following BUG freeing the folio:
BUG: Bad page state in process btrfs pfn:40ab0b page: refcount:1 mapcount:0 mapping:0000000000000000 index:0x61be5 pfn:0x40ab0b flags: 0x5ffff0000000000(node=0|zone=2|lastcpupid=0x1ffff) raw: 05ffff0000000000 0000000000000000 dead000000000122 0000000000000000 raw: 0000000000061be5 0000000000000000 00000001ffffffff 0000000000000000 page dumped because: nonzero _refcount Call Trace: <TASK> dump_stack_lvl+0x3d/0xe0 bad_page+0xea/0xf0 free_unref_page+0x8e1/0x900 ? __mem_cgroup_uncharge+0x69/0x90 __folio_put+0xe6/0x190 btrfs_do_encoded_write+0x445/0x780 ? current_time+0x25/0xd0 btrfs_do_write_iter+0x2cc/0x4b0 btrfs_ioctl_encoded_write+0x2b6/0x340
It turns out __free_page dereferenced the page while __folio_put does not. Switch __folio_put to folio_put which does dereference the folio first.
--- fs/btrfs/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/inode.c +1 -1
@@ -9558,7 +9558,7 @@ ssize_t btrfs_do_encoded_write(struct kiocb *iocb, struct iov_iter *from, out_folios:for (i =0 ; i < nr_folios; i++) {if (folios[i]) -__folio_put (folios[i]); +folio_put (folios[i]); }kvfree (folios); out:
Signature · 1 line
2.45.2
Re: [PATCH v3 1/2] btrfs: fix __folio_put refcount in btrfs_do_encoded_write
Quoted 26 lines · Boris Burkov
The conversion to folios switched
__free_pageto__folio_putin the error path inbtrfs_do_encoded_write.However, this gets the page refcounting wrong. If we do hit that error path (I reproduced by modifying
btrfs_do_encoded_writeto pretend to always fail in a way that jumps toout_foliosand running the xfstest btrfs/281), then we always hit the following BUG freeing the folio:BUG: Bad page state in process btrfs pfn:40ab0b page: refcount:1 mapcount:0 mapping:0000000000000000 index:0x61be5 pfn:0x40ab0b flags: 0x5ffff0000000000(node=0|zone=2|lastcpupid=0x1ffff) raw: 05ffff0000000000 0000000000000000 dead000000000122 0000000000000000 raw: 0000000000061be5 0000000000000000 00000001ffffffff 0000000000000000 page dumped because: nonzero _refcount Call Trace: <TASK> dump_stack_lvl+0x3d/0xe0 bad_page+0xea/0xf0 free_unref_page+0x8e1/0x900 ? __mem_cgroup_uncharge+0x69/0x90 __folio_put+0xe6/0x190 btrfs_do_encoded_write+0x445/0x780 ? current_time+0x25/0xd0 btrfs_do_write_iter+0x2cc/0x4b0 btrfs_ioctl_encoded_write+0x2b6/0x340
Quoted 3 lines
It turns out
__free_pagedereferenced the page while__folio_putdoes not. Switch__folio_puttofolio_putwhich does dereference the folio first.
By 'dereferenced' you mean to decrease the reference count? Because dereference is usually said about pointers, it's confusing in this context.
Re: [PATCH v3 1/2] btrfs: fix __folio_put refcount in btrfs_do_encoded_write
Quoted 27 lines · David Sterba
Quoted 26 lines · Boris Burkov
The conversion to folios switched
__free_pageto__folio_putin the error path inbtrfs_do_encoded_write.However, this gets the page refcounting wrong. If we do hit that error path (I reproduced by modifying
btrfs_do_encoded_writeto pretend to always fail in a way that jumps toout_foliosand running the xfstest btrfs/281), then we always hit the following BUG freeing the folio:BUG: Bad page state in process btrfs pfn:40ab0b page: refcount:1 mapcount:0 mapping:0000000000000000 index:0x61be5 pfn:0x40ab0b flags: 0x5ffff0000000000(node=0|zone=2|lastcpupid=0x1ffff) raw: 05ffff0000000000 0000000000000000 dead000000000122 0000000000000000 raw: 0000000000061be5 0000000000000000 00000001ffffffff 0000000000000000 page dumped because: nonzero _refcount Call Trace: <TASK> dump_stack_lvl+0x3d/0xe0 bad_page+0xea/0xf0 free_unref_page+0x8e1/0x900 ? __mem_cgroup_uncharge+0x69/0x90 __folio_put+0xe6/0x190 btrfs_do_encoded_write+0x445/0x780 ? current_time+0x25/0xd0 btrfs_do_write_iter+0x2cc/0x4b0 btrfs_ioctl_encoded_write+0x2b6/0x340
Quoted 7 lines
Quoted 3 lines
It turns out
__free_pagedereferenced the page while__folio_putdoes not. Switch__folio_puttofolio_putwhich does dereference the folio first.By 'dereferenced' you mean to decrease the reference count? Because dereference is usually said about pointers, it's confusing in this context.
Yes, you're right. It is "removing a reference" but not the best use of "de-reference" in that case :) "decrement the refcount" is certainly much clearer.
PATCH v3 2/2 btrfs: fix __folio_put refcount in __alloc_dummy_extent_buffer
In reply to Boris BurkovAnother improper use of __folio_put in an error path after freshly allocating pages/folios which returns them with the refcount initialized to 1. The refactor from __free_pages -> __folio_put (instead of folio_put) removed a refcount decrement found in __free_pages and folio_put but absent from __folio_put.
--- fs/btrfs/extent_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/extent_io.c +1 -1
@@ -2775,7 +2775,7 @@ struct extent_buffer *__alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,for (int i =0 ; i < num_folios; i++) {if (eb->folios[i]) {detach_extent_buffer_folio (eb, eb->folios[i]); -__folio_put (eb->folios[i]); +folio_put (eb->folios[i]); } }__free_extent_buffer (eb);
Signature · 1 line
2.45.2
Quoted 12 lines · Boris Burkov
Switching from
__free_pageto__folio_putintroduced a bug because__free_pagecalledput_page_testzerowhile__folio_putdoes not. Fix the two affected callers by changing tofolio_putwhich does callput_folio_testzero.
--
Changelog:
v3:
- split up patches for backporting
v2:
- add second callsite
Quoted 7 lines
Boris Burkov (2):
btrfs: fix__folio_putrefcount inbtrfs_do_encoded_write
btrfs: fix__folio_putrefcount in__alloc_dummy_extent_bufferfs/btrfs/extent_io.c | 2 +- fs/btrfs/inode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
For both patches:
Thanks.
Quoted 5 lines
--
2.45.2
Quoted 11 lines · Boris Burkov
Switching from
__free_pageto__folio_putintroduced a bug because__free_pagecalledput_page_testzerowhile__folio_putdoes not. Fix the two affected callers by changing tofolio_putwhich does callput_folio_testzero.
--
Changelog:
v3:
- split up patches for backporting
v2:
- add second callsite
Quoted 3 lines
Boris Burkov (2):
btrfs: fix__folio_putrefcount inbtrfs_do_encoded_write
btrfs: fix__folio_putrefcount in__alloc_dummy_extent_buffer