[CRIU] [PATCH] socket: increase socket buffers for restoring queues (v2)

[Andrey Vagin]

Sizes of send and recv buffers are set to maximum to restore queues,
after that sizes of buffers are restored.

O_NONBLOCK is set to a socket to prevent blocking during restore.

https://bugzilla.openvz.org/show_bug.cgi?id=2411

v2: do the same for unix sockets.

Signed-off-by: Andrey Vagin <avagin at openvz.org>
---
 include/sockets.h |  1 +
 sk-queue.c        | 17 +++--------------
 sk-tcp.c          |  3 +++
 sockets.c         | 27 +++++++++++++++++++++++++++
 4 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/include/sockets.h b/include/sockets.h
index cc45577..9c7315e 100644
--- a/include/sockets.h
+++ b/include/sockets.h
@@ -29,6 +29,7 @@ struct socket_desc {
 extern int dump_socket(struct fd_parms *p, int lfd, const struct cr_fdset *cr_fdset);
 extern int dump_socket_opts(int sk, SkOptsEntry *soe);
 extern int restore_socket_opts(int sk, SkOptsEntry *soe);
+extern int restore_prepare_socket(int sk);
 
 extern int sk_collect_one(int ino, int family, struct socket_desc *d);
 extern int collect_sockets(int pid);
diff --git a/sk-queue.c b/sk-queue.c
index 992e74e..af10799 100644
--- a/sk-queue.c
+++ b/sk-queue.c
@@ -16,6 +16,7 @@
 #include "crtools.h"
 #include "util.h"
 #include "util-net.h"
+#include "sockets.h"
 
 #include "sk-queue.h"
 
@@ -189,19 +190,12 @@ void show_sk_queues(int fd, struct cr_options *o)
 int restore_sk_queue(int fd, unsigned int peer_id)
 {
 	struct sk_packet *pkt, *tmp;
-	int ret, img_fd, flags;
+	int ret, img_fd;
 
 	pr_info("Trying to restore recv queue for %u\n", peer_id);
 
-	flags = fcntl(fd, F_GETFL, 0);
-	if (flags == -1) {
-		pr_perror("Unable to get flags for %d", fd);
+	if (restore_prepare_socket(fd))
 		return -1;
-	}
-	if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) ) {
-		pr_perror("Unable to set O_NONBLOCK for %d", fd);
-		return -1;
-	}
 
 	img_fd = open_image_ro(CR_FD_SK_QUEUES);
 	if (img_fd < 0)
@@ -255,11 +249,6 @@ int restore_sk_queue(int fd, unsigned int peer_id)
 		xfree(pkt);
 	}
 
-	if (fcntl(fd, F_SETFL, flags) ) {
-		pr_perror("Unable to restore flags for %d", fd);
-		goto err;
-	}
-
 	close(img_fd);
 	return 0;
 err:
diff --git a/sk-tcp.c b/sk-tcp.c
index 9bc2880..9e01a08 100644
--- a/sk-tcp.c
+++ b/sk-tcp.c
@@ -379,6 +379,9 @@ static int send_tcp_queue(int sk, int queue, u32 len, int imgfd)
 
 static int restore_tcp_queues(int sk, TcpStreamEntry *tse, int fd)
 {
+	if (restore_prepare_socket(sk))
+		return -1;
+
 	if (tse->inq_len &&
 			send_tcp_queue(sk, TCP_RECV_QUEUE, tse->inq_len, fd))
 		return -1;
diff --git a/sockets.c b/sockets.c
index 2bf327a..5a85cdb 100644
--- a/sockets.c
+++ b/sockets.c
@@ -110,6 +110,33 @@ int do_restore_opt(int sk, int level, int name, void *val, int len)
 	return 0;
 }
 
+/* Set sizes of buffers to maximum and prevent blocking */
+int restore_prepare_socket(int sk)
+{
+	int flags;
+
+	/* In kernel a bufsize has type int and a value is doubled. */
+	u32 maxbuf = INT_MAX / 2;
+
+	if (restore_opt(sk, SOL_SOCKET, SO_SNDBUFFORCE, &maxbuf))
+		return -1;
+	if (restore_opt(sk, SOL_SOCKET, SO_RCVBUFFORCE, &maxbuf))
+		return -1;
+
+	/* Prevent blocking on restore */
+	flags = fcntl(sk, F_GETFL, 0);
+	if (flags == -1) {
+		pr_perror("Unable to get flags for %d", sk);
+		return -1;
+	}
+	if (fcntl(sk, F_SETFL, flags | O_NONBLOCK) ) {
+		pr_perror("Unable to set O_NONBLOCK for %d", sk);
+		return -1;
+	}
+
+	return 0;
+}
+
 int restore_socket_opts(int sk, SkOptsEntry *soe)
 {
 	int ret = 0, val;
-- 
1.7.11.7