Skip to content

Commit c0fe299

Browse files
committed
libceph: make calc_target() set t->paused, not just clear it
Currently calc_target() clears t->paused if the request shouldn't be paused anymore, but doesn't ever set t->paused even though it's able to determine when the request should be paused. Setting t->paused is left to __submit_request() which is fine for regular requests but doesn't work for linger requests -- since __submit_request() doesn't operate on linger requests, there is nowhere for lreq->t.paused to be set. One consequence of this is that watches don't get reestablished on paused -> unpaused transitions in cases where requests have been paused long enough for the (paused) unwatch request to time out and for the subsequent (re)watch request to enter the paused state. On top of the watch not getting reestablished, rbd_reregister_watch() gets stuck with rbd_dev->watch_mutex held: rbd_register_watch __rbd_register_watch ceph_osdc_watch linger_reg_commit_wait It's waiting for lreq->reg_commit_wait to be completed, but for that to happen the respective request needs to end up on need_resend_linger list and be kicked when requests are unpaused. There is no chance for that if the request in question is never marked paused in the first place. The fact that rbd_dev->watch_mutex remains taken out forever then prevents the image from getting unmapped -- "rbd unmap" would inevitably hang in D state on an attempt to grab the mutex. Cc: stable@vger.kernel.org Reported-by: Raphael Zimmer <raphael.zimmer@tu-ilmenau.de> Signed-off-by: Ilya Dryomov <idryomov@gmail.com> Reviewed-by: Viacheslav Dubeyko <Slava.Dubeyko@ibm.com>
1 parent 11194b4 commit c0fe299

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

net/ceph/osd_client.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1586,6 +1586,7 @@ static enum calc_target_result calc_target(struct ceph_osd_client *osdc,
15861586
struct ceph_pg_pool_info *pi;
15871587
struct ceph_pg pgid, last_pgid;
15881588
struct ceph_osds up, acting;
1589+
bool should_be_paused;
15891590
bool is_read = t->flags & CEPH_OSD_FLAG_READ;
15901591
bool is_write = t->flags & CEPH_OSD_FLAG_WRITE;
15911592
bool force_resend = false;
@@ -1654,10 +1655,16 @@ static enum calc_target_result calc_target(struct ceph_osd_client *osdc,
16541655
&last_pgid))
16551656
force_resend = true;
16561657

1657-
if (t->paused && !target_should_be_paused(osdc, t, pi)) {
1658-
t->paused = false;
1658+
should_be_paused = target_should_be_paused(osdc, t, pi);
1659+
if (t->paused && !should_be_paused) {
16591660
unpaused = true;
16601661
}
1662+
if (t->paused != should_be_paused) {
1663+
dout("%s t %p paused %d -> %d\n", __func__, t, t->paused,
1664+
should_be_paused);
1665+
t->paused = should_be_paused;
1666+
}
1667+
16611668
legacy_change = ceph_pg_compare(&t->pgid, &pgid) ||
16621669
ceph_osds_changed(&t->acting, &acting,
16631670
t->used_replica || any_change);

0 commit comments

Comments
 (0)