* [PATCH] ceph: fix writeback_count leak in write_folio_nounlock()
@ 2026-05-28 3:54 Wentao Liang
2026-05-28 18:44 ` Viacheslav Dubeyko
0 siblings, 1 reply; 2+ messages in thread
From: Wentao Liang @ 2026-05-28 3:54 UTC (permalink / raw)
To: Ilya Dryomov, Alex Markuze, Viacheslav Dubeyko
Cc: ceph-devel, linux-kernel, Wentao Liang
write_folio_nounlock() increments fsc->writeback_count to track
in-flight writeback operations. On several error paths where the
function returns early (folio lookup failure, snapshot context
allocation failure, and writepages submission failure), the function
returns without calling atomic_long_dec() to decrement the counter.
Each leaked increment keeps the counter above zero, which can prevent
the filesystem from cleanly unmounting or suspending writes.
Add atomic_long_dec() calls on all error paths that currently return
without decrementing the counter.
Signed-off-by: Wentao Liang <vulab@iscas.ac.cn>
---
fs/ceph/addr.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index 0a86f672cc09..a606378649c3 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -790,6 +790,7 @@ static int write_folio_nounlock(struct folio *folio,
ceph_wbc.truncate_size, true);
if (IS_ERR(req)) {
folio_redirty_for_writepage(wbc, folio);
+ atomic_long_dec(&fsc->writeback_count);
return PTR_ERR(req);
}
@@ -809,6 +810,7 @@ static int write_folio_nounlock(struct folio *folio,
folio_redirty_for_writepage(wbc, folio);
folio_end_writeback(folio);
ceph_osdc_put_request(req);
+ atomic_long_dec(&fsc->writeback_count);
return PTR_ERR(bounce_page);
}
}
@@ -847,6 +849,7 @@ static int write_folio_nounlock(struct folio *folio,
ceph_vinop(inode), folio);
folio_redirty_for_writepage(wbc, folio);
folio_end_writeback(folio);
+ atomic_long_dec_return(&fsc->writeback_count);
return err;
}
if (err == -EBLOCKLISTED)
--
2.34.1
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] ceph: fix writeback_count leak in write_folio_nounlock()
2026-05-28 3:54 [PATCH] ceph: fix writeback_count leak in write_folio_nounlock() Wentao Liang
@ 2026-05-28 18:44 ` Viacheslav Dubeyko
0 siblings, 0 replies; 2+ messages in thread
From: Viacheslav Dubeyko @ 2026-05-28 18:44 UTC (permalink / raw)
To: vulab, idryomov, slava, Alex Markuze; +Cc: ceph-devel, linux-kernel
On Thu, 2026-05-28 at 03:54 +0000, Wentao Liang wrote:
> write_folio_nounlock() increments fsc->writeback_count to track
> in-flight writeback operations. On several error paths where the
> function returns early (folio lookup failure, snapshot context
> allocation failure, and writepages submission failure), the function
> returns without calling atomic_long_dec() to decrement the counter.
>
> Each leaked increment keeps the counter above zero, which can prevent
> the filesystem from cleanly unmounting or suspending writes.
>
> Add atomic_long_dec() calls on all error paths that currently return
> without decrementing the counter.
>
> Signed-off-by: Wentao Liang <vulab@iscas.ac.cn>
> ---
> fs/ceph/addr.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
> index 0a86f672cc09..a606378649c3 100644
> --- a/fs/ceph/addr.c
> +++ b/fs/ceph/addr.c
> @@ -790,6 +790,7 @@ static int write_folio_nounlock(struct folio *folio,
> ceph_wbc.truncate_size, true);
> if (IS_ERR(req)) {
> folio_redirty_for_writepage(wbc, folio);
> + atomic_long_dec(&fsc->writeback_count);
Good catch. But I believe that we need to use this pattern in all three cases:
if (atomic_long_dec_return(&fsc->writeback_count) <
CONGESTION_OFF_THRESH(fsc->mount_options->congestion_kb))
fsc->write_congested = false;
> return PTR_ERR(req);
> }
>
> @@ -809,6 +810,7 @@ static int write_folio_nounlock(struct folio *folio,
> folio_redirty_for_writepage(wbc, folio);
> folio_end_writeback(folio);
> ceph_osdc_put_request(req);
> + atomic_long_dec(&fsc->writeback_count);
Ditto.
> return PTR_ERR(bounce_page);
> }
> }
> @@ -847,6 +849,7 @@ static int write_folio_nounlock(struct folio *folio,
> ceph_vinop(inode), folio);
> folio_redirty_for_writepage(wbc, folio);
> folio_end_writeback(folio);
> + atomic_long_dec_return(&fsc->writeback_count);
Ditto. Especially, it is not clear why atomic_long_dec_return() was used instead
of atomic_long_dec() if we don't follow the above-mentioned pattern.
Thanks,
Slava.
> return err;
> }
> if (err == -EBLOCKLISTED)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-05-28 18:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-05-28 3:54 [PATCH] ceph: fix writeback_count leak in write_folio_nounlock() Wentao Liang
2026-05-28 18:44 ` Viacheslav Dubeyko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®