From: Philipp Reisner Date: Tue, 18 Mar 2014 13:40:13 +0000 (+0100) Subject: drbd: Limit the time we are waiting for the first packet on an accepted socket X-Git-Tag: v3.17-rc1~31^2~37 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4920e37a9e851172158ecc0fd7e060712dc1b5e8;p=karo-tx-linux.git drbd: Limit the time we are waiting for the first packet on an accepted socket Before the patch 'drbd: Keep the listening socket open while trying to connect to the peer' the newly created socket inherited the receive timeout from the listen socket. The listen socket had a receive timeout of connect-intervall +- 30% random jitter. The real issue is that after the mentioned patch we had no timeout at all. Now use 4 times the ping-timeout. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg --- diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index d326af67c27e..7da83f3a61eb 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -791,8 +791,18 @@ static int receive_first_packet(struct drbd_connection *connection, struct socke { unsigned int header_size = drbd_header_size(connection); struct packet_info pi; + struct net_conf *nc; int err; + rcu_read_lock(); + nc = rcu_dereference(connection->net_conf); + if (!nc) { + rcu_read_unlock(); + return -EIO; + } + sock->sk->sk_rcvtimeo = nc->ping_timeo * 4 * HZ / 10; + rcu_read_unlock(); + err = drbd_recv_short(sock, connection->data.rbuf, header_size, 0); if (err != header_size) { if (err >= 0)