Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5dbf1673 authored by Lars Ellenberg's avatar Lars Ellenberg Committed by Jens Axboe
Browse files

drbd: need to set socket bufsize early to take effect 



quoting tcp(7):
    On individual connections, the socket buffer size must be set prior to the
    listen(2) or connect(2) calls in order to have it take effect.

This adds a wrapper to do so, and uses it appropriately.
Improves performance in certain situations.

Note that because we cannot easily determine which socket will be
"meta" and wich "data" (bulk) socket, we adjust both sockets.
Previously, DRBD only adjusted the bufsizes of the "data" socket.

Thanks again to Eduard.Guzovsky@stratus.com.

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 344fa462

drivers/block/drbd/drbd_receiver.c

+23 −10
Original line number Original line Diff line number Diff line
@@ -571,6 +571,25 @@ static int drbd_recv(struct drbd_conf *mdev, void *buf, size_t size) 
	return rv;

	return rv;

}

}





/* quoting tcp(7):

 *   On individual connections, the socket buffer size must be set prior to the

 *   listen(2) or connect(2) calls in order to have it take effect.

 * This is our wrapper to do so.

 */

static void drbd_setbufsize(struct socket *sock, unsigned int snd,

		unsigned int rcv)

{

	/* open coded SO_SNDBUF, SO_RCVBUF */

	if (snd) {

		sock->sk->sk_sndbuf = snd;

		sock->sk->sk_userlocks |= SOCK_SNDBUF_LOCK;

	}

	if (rcv) {

		sock->sk->sk_rcvbuf = rcv;

		sock->sk->sk_userlocks |= SOCK_RCVBUF_LOCK;

	}

}



static struct socket *drbd_try_connect(struct drbd_conf *mdev)

static struct socket *drbd_try_connect(struct drbd_conf *mdev)

{

{

	const char *what;

	const char *what;
@@ -592,6 +611,8 @@ static struct socket *drbd_try_connect(struct drbd_conf *mdev) 




	sock->sk->sk_rcvtimeo =

	sock->sk->sk_rcvtimeo =

	sock->sk->sk_sndtimeo =  mdev->net_conf->try_connect_int*HZ;

	sock->sk->sk_sndtimeo =  mdev->net_conf->try_connect_int*HZ;

	drbd_setbufsize(sock, mdev->net_conf->sndbuf_size,

			mdev->net_conf->rcvbuf_size);





       /* explicitly bind to the configured IP as source IP

       /* explicitly bind to the configured IP as source IP

	*  for the outgoing connections.

	*  for the outgoing connections.
@@ -670,6 +691,8 @@ static struct socket *drbd_wait_for_connect(struct drbd_conf *mdev) 
	s_listen->sk->sk_reuse    = 1; /* SO_REUSEADDR */

	s_listen->sk->sk_reuse    = 1; /* SO_REUSEADDR */

	s_listen->sk->sk_rcvtimeo = timeo;

	s_listen->sk->sk_rcvtimeo = timeo;

	s_listen->sk->sk_sndtimeo = timeo;

	s_listen->sk->sk_sndtimeo = timeo;

	drbd_setbufsize(s_listen, mdev->net_conf->sndbuf_size,

			mdev->net_conf->rcvbuf_size);





	what = "bind before listen";

	what = "bind before listen";

	err = s_listen->ops->bind(s_listen,

	err = s_listen->ops->bind(s_listen,
@@ -856,16 +879,6 @@ retry: 
	sock->sk->sk_priority = TC_PRIO_INTERACTIVE_BULK;

	sock->sk->sk_priority = TC_PRIO_INTERACTIVE_BULK;

	msock->sk->sk_priority = TC_PRIO_INTERACTIVE;

	msock->sk->sk_priority = TC_PRIO_INTERACTIVE;





	if (mdev->net_conf->sndbuf_size) {

		sock->sk->sk_sndbuf = mdev->net_conf->sndbuf_size;

		sock->sk->sk_userlocks |= SOCK_SNDBUF_LOCK;

	}



	if (mdev->net_conf->rcvbuf_size) {

		sock->sk->sk_rcvbuf = mdev->net_conf->rcvbuf_size;

		sock->sk->sk_userlocks |= SOCK_RCVBUF_LOCK;

	}



	/* NOT YET ...

	/* NOT YET ...

	 * sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;

	 * sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;

	 * sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;

	 * sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;