Skip to content

Commit a0d9555

Browse files
CFSworksidryomov
authored andcommitted
ceph: fix num_ops off-by-one when crypto allocation fails
move_dirty_folio_in_page_array() may fail if the file is encrypted, the dirty folio is not the first in the batch, and it fails to allocate a bounce buffer to hold the ciphertext. When that happens, ceph_process_folio_batch() simply redirties the folio and flushes the current batch -- it can retry that folio in a future batch. However, if this failed folio is not contiguous with the last folio that did make it into the batch, then ceph_process_folio_batch() has already incremented `ceph_wbc->num_ops`; because it doesn't follow through and add the discontiguous folio to the array, ceph_submit_write() -- which expects that `ceph_wbc->num_ops` accurately reflects the number of contiguous ranges (and therefore the required number of "write extent" ops) in the writeback -- will panic the kernel: BUG_ON(ceph_wbc->op_idx + 1 != req->r_num_ops); This issue can be reproduced on affected kernels by writing to fscrypt-enabled CephFS file(s) with a 4KiB-written/4KiB-skipped/repeat pattern (total filesize should not matter) and gradually increasing the system's memory pressure until a bounce buffer allocation fails. Fix this crash by decrementing `ceph_wbc->num_ops` back to the correct value when move_dirty_folio_in_page_array() fails, but the folio already started counting a new (i.e. still-empty) extent. The defect corrected by this patch has existed since 2022 (see first `Fixes:`), but another bug blocked multi-folio encrypted writeback until recently (see second `Fixes:`). The second commit made it into 6.18.16, 6.19.6, and 7.0-rc1, unmasking the panic in those versions. This patch therefore fixes a regression (panic) introduced by cac190c. Cc: stable@vger.kernel.org Fixes: d552077 ("ceph: add encryption support to writepage and writepages") Fixes: cac190c ("ceph: fix write storm on fscrypted files") Signed-off-by: Sam Edwards <CFSworks@gmail.com> Reviewed-by: Viacheslav Dubeyko <Slava.Dubeyko@ibm.com> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
1 parent 5199c12 commit a0d9555

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

fs/ceph/addr.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1365,6 +1365,10 @@ void ceph_process_folio_batch(struct address_space *mapping,
13651365
rc = move_dirty_folio_in_page_array(mapping, wbc, ceph_wbc,
13661366
folio);
13671367
if (rc) {
1368+
/* Did we just begin a new contiguous op? Nevermind! */
1369+
if (ceph_wbc->len == 0)
1370+
ceph_wbc->num_ops--;
1371+
13681372
folio_redirty_for_writepage(wbc, folio);
13691373
folio_unlock(folio);
13701374
break;

0 commit comments

Comments
 (0)