From: "zhengbing.huang" <zhengbing.huang@easystack.cn>
To: drbd-dev@lists.linbit.com
Subject: [PATCH 08/11] drbd_transport_rdma: fix a race between dtr_connect and drbd_thread_stop
Date: Mon, 24 Jun 2024 13:46:16 +0800 [thread overview]
Message-ID: <20240624054619.23212-8-zhengbing.huang@easystack.cn> (raw)
In-Reply-To: <20240624054619.23212-1-zhengbing.huang@easystack.cn>
From: Dongsheng Yang <dongsheng.yang@easystack.cn>
If the send_sig() in drbd_thread_stop before wait_for_completion_interruptible() in dtr_connect(),
it can't return from dtr_connect in network failure.
So replace wait_for_completion_interruptible with wait_for_completion_interruptible_timeout, and
check status by dtr_connect() itself.
This behavior is similar with tcp transport
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
---
drbd/drbd_transport_rdma.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/drbd/drbd_transport_rdma.c b/drbd/drbd_transport_rdma.c
index 77ff0055e..c47b344f8 100644
--- a/drbd/drbd_transport_rdma.c
+++ b/drbd/drbd_transport_rdma.c
@@ -2996,12 +2996,21 @@ static int dtr_connect(struct drbd_transport *transport)
{
struct dtr_transport *rdma_transport =
container_of(transport, struct dtr_transport, transport);
- int i, err = -ENOMEM;
+ int i, err;
- err = wait_for_completion_interruptible(&rdma_transport->connected);
- if (err) {
+again:
+ if (drbd_should_abort_listening(transport)) {
+ err = -EAGAIN;
+ goto abort;
+ }
+
+ err = wait_for_completion_interruptible_timeout(&rdma_transport->connected, HZ);
+ if (err < 0) {
flush_signals(current);
goto abort;
+ } else if (err == 0) {
+ /* timed out */
+ goto again;
}
err = atomic_read(&rdma_transport->first_path_connect_err);
--
2.27.0
next prev parent reply other threads:[~2024-06-24 7:27 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-24 5:46 [PATCH 01/11] drbd_nl: dont allow detating to be inttrupted in waiting D_DETACHING to DISKLESS zhengbing.huang
2024-06-24 5:46 ` [PATCH 02/11] drbd_receiver: get_ldev before use device->ldev for drbd_reconsider_queue_parameters() zhengbing.huang
2024-06-28 9:35 ` Philipp Reisner
2024-06-24 5:46 ` [PATCH 03/11] drbd_transport_rdma: put kref for cm in dtr_path_established in error path zhengbing.huang
2024-06-28 9:40 ` Philipp Reisner
2024-07-01 2:07 ` Dongsheng Yang
2024-07-01 2:48 ` Dongsheng Yang
2024-10-16 16:44 ` Philipp Reisner
2024-10-17 6:42 ` Zhengbing
2024-06-24 5:46 ` [PATCH 04/11] drbd_transport_rdma: dont schedule retry_connect_work in active is false zhengbing.huang
2024-06-28 11:51 ` Philipp Reisner
2024-07-01 2:11 ` Dongsheng Yang
2024-06-24 5:46 ` [PATCH 05/11] drbd_transport_rdma: dont break in dtr_tx_cq_event_handler if (cm->state != DSM_CONNECTED) zhengbing.huang
2024-06-28 12:07 ` Philipp Reisner
2024-07-01 2:23 ` Dongsheng Yang
2024-06-24 5:46 ` [PATCH 06/11] drbd_transport_rdma: put kref in error path zhengbing.huang
2024-06-28 12:12 ` Philipp Reisner
2024-06-24 5:46 ` [PATCH 07/11] drbd_transport_rdma: put kref in dtr_remap_tx_desc error zhengbing.huang
2024-06-28 12:19 ` Philipp Reisner
2024-07-01 2:28 ` Dongsheng Yang
2024-06-24 5:46 ` zhengbing.huang [this message]
2024-06-28 12:36 ` [PATCH 08/11] drbd_transport_rdma: fix a race between dtr_connect and drbd_thread_stop Philipp Reisner
2024-07-01 2:30 ` Dongsheng Yang
2024-06-24 5:46 ` [PATCH 09/11] drbd_transport_rdma: introduce timeout for rdma_disocnnect zhengbing.huang
2024-06-24 5:46 ` [PATCH 10/11] drbd_transport_rdma: introduce timeout for rdma_connect zhengbing.huang
2024-06-24 5:46 ` [PATCH 11/11] drbd_transport_rdma: wake up state_wq after clear DSB_CONNECTED in dtr_tx_timeout_work_fn zhengbing.huang
2024-06-28 9:10 ` [PATCH 01/11] drbd_nl: dont allow detating to be inttrupted in waiting D_DETACHING to DISKLESS Philipp Reisner
2024-07-01 2:02 ` Dongsheng Yang
2024-07-01 10:00 ` Philipp Reisner
2024-07-02 1:45 ` Dongsheng Yang
2024-07-03 14:31 ` [PATCH] drbd: make drbd_adm_detach() interruptible Philipp Reisner
2024-07-04 2:59 ` Zhengbing
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240624054619.23212-8-zhengbing.huang@easystack.cn \
--to=zhengbing.huang@easystack.cn \
--cc=drbd-dev@lists.linbit.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox