bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-26 14:17:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

libceph: fix potential hang in ceph_osdc_notify()

Browse source 
If the cluster becomes unavailable, ceph_osdc_notify() may hang even
with osd_request_timeout option set because linger_notify_finish_wait()
waits for MWatchNotify NOTIFY_COMPLETE message with no associated OSD
request in flight -- it's completely asynchronous.

Introduce an additional timeout, derived from the specified notify
timeout.  While at it, switch both waits to killable which is more
correct.

Cc: stable@vger.kernel.org
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
This commit is contained in:
Ilya Dryomov 2023-08-01 19:14:24 +02:00
parent 9d01e07fd1
commit e6e2843230
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
net/ceph/osd_client.c
View file

@ -3334,17 +3334,24 @@ static int linger_reg_commit_wait(struct ceph_osd_linger_request *lreq)
int ret; int ret;
dout("%s lreq %p linger_id %llu\n", __func__, lreq, lreq->linger_id); dout("%s lreq %p linger_id %llu\n", __func__, lreq, lreq->linger_id);
ret = wait_for_completion_interruptible(&lreq->reg_commit_wait); ret = wait_for_completion_killable(&lreq->reg_commit_wait);
return ret ?: lreq->reg_commit_error; return ret ?: lreq->reg_commit_error;
} }
static int linger_notify_finish_wait(struct ceph_osd_linger_request *lreq) static int linger_notify_finish_wait(struct ceph_osd_linger_request *lreq,
unsigned long timeout)
{ {
int ret; long left;
dout("%s lreq %p linger_id %llu\n", __func__, lreq, lreq->linger_id); dout("%s lreq %p linger_id %llu\n", __func__, lreq, lreq->linger_id);
ret = wait_for_completion_interruptible(&lreq->notify_finish_wait); left = wait_for_completion_killable_timeout(&lreq->notify_finish_wait,
return ret ?: lreq->notify_finish_error; ceph_timeout_jiffies(timeout));
if (left <= 0)
left = left ?: -ETIMEDOUT;
else
left = lreq->notify_finish_error; /* completed */
return left;
} }
/* /*
@ -4896,7 +4903,8 @@ int ceph_osdc_notify(struct ceph_osd_client *osdc,
linger_submit(lreq); linger_submit(lreq);
ret = linger_reg_commit_wait(lreq); ret = linger_reg_commit_wait(lreq);
if (!ret) if (!ret)
ret = linger_notify_finish_wait(lreq); ret = linger_notify_finish_wait(lreq,
msecs_to_jiffies(2 * timeout * MSEC_PER_SEC));
else else
dout("lreq %p failed to initiate notify %d\n", lreq, ret); dout("lreq %p failed to initiate notify %d\n", lreq, ret);