Skip to content

Commit ccda991

Browse files
batrickidryomov
authored andcommitted
ceph: fix cap ref leak via netfs init_request
Log recovered from a user's cluster: <7>[ 5413.970692] ceph: get_cap_refs 00000000958c114b ret 1 got Fr <7>[ 5413.970695] ceph: start_read 00000000958c114b, no cache cap ... <7>[ 5473.934609] ceph: my wanted = Fr, used = Fr, dirty - <7>[ 5473.934616] ceph: revocation: pAsLsXsFr -> pAsLsXs (revoking Fr) <7>[ 5473.934632] ceph: __ceph_caps_issued 00000000958c114b cap 00000000f7784259 issued pAsLsXs <7>[ 5473.934638] ceph: check_caps 10000000e68.fffffffffffffffe file_want - used Fr dirty - flushing - issued pAsLsXs revoking Fr retain pAsLsXsFsr AUTHONLY NOINVAL FLUSH_FORCE The MDS subsequently complains that the kernel client is late releasing caps. Approximately, a series of changes to this code by commits 4987005 ("ceph: convert ceph_readpages to ceph_readahead"), 2de1604 ("netfs: Change ->init_request() to return an error code") and a5c9dc4 ("ceph: Make ceph_init_request() check caps on readahead") resulted in subtle resource cleanup to be missed. The main culprit is the change in error handling in 2de1604 which meant that a failure in init_request() would no longer cause cleanup to be called. That would prevent the ceph_put_cap_refs() call which would cleanup the leaked cap ref. Cc: [email protected] Fixes: a5c9dc4 ("ceph: Make ceph_init_request() check caps on readahead") Link: https://tracker.ceph.com/issues/67008 Signed-off-by: Patrick Donnelly <[email protected]> Reviewed-by: Ilya Dryomov <[email protected]> Signed-off-by: Ilya Dryomov <[email protected]>
1 parent 7264745 commit ccda991

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

fs/ceph/addr.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,8 +489,11 @@ static int ceph_init_request(struct netfs_io_request *rreq, struct file *file)
489489
rreq->io_streams[0].sreq_max_len = fsc->mount_options->rsize;
490490

491491
out:
492-
if (ret < 0)
492+
if (ret < 0) {
493+
if (got)
494+
ceph_put_cap_refs(ceph_inode(inode), got);
493495
kfree(priv);
496+
}
494497

495498
return ret;
496499
}

0 commit comments

Comments
 (0)