[v3,15/15] zdtm: Add socket_snd_addr01 test

Submitted by Kirill Tkhai on June 1, 2016, 3:13 p.m.

Details

Message ID 146479401730.19418.13224806568722328611.stgit@pro
State Rejected
Series "Support for packet's msg_name in receive queue of promiscous DGRAM sockets"
Headers show

Commit Message

Kirill Tkhai June 1, 2016, 3:13 p.m.
Send messages from client to server, and check their msg_names.
Client sockets stay alive during suspend/restore, so we check
that criu properly sends them to server, and it restores its
promiscous queue right.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
 test/zdtm/static/Makefile            |    1 
 test/zdtm/static/socket_snd_addr01.c |  166 ++++++++++++++++++++++++++++++++++
 2 files changed, 167 insertions(+)
 create mode 100644 test/zdtm/static/socket_snd_addr01.c

Patch hide | download patch | download mbox

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index b6ed8f3..d6041e8 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -37,6 +37,7 @@  TST_NOFILE	=				\
 		socket_aio			\
 		socket_close_data		\
 		socket_snd_addr			\
+		socket_snd_addr01		\
 		socket_dgram_data		\
 		packet_sock			\
 		packet_sock_mmap		\
diff --git a/test/zdtm/static/socket_snd_addr01.c b/test/zdtm/static/socket_snd_addr01.c
new file mode 100644
index 0000000..f9065d5
--- /dev/null
+++ b/test/zdtm/static/socket_snd_addr01.c
@@ -0,0 +1,166 @@ 
+#define _GNU_SOURCE
+#include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/wait.h>
+#include <limits.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+
+#include "zdtmtst.h"
+
+/* Based on socket_snd_addr test */
+const char *test_doc	= "Check that sender addresses are restored correctly";
+const char *test_author	= "Kirill Tkhai <ktkhai@virtuozzo.com";
+
+#define SK_SRV "\0socket_snd_srv"
+#define SK_NAMEA "\0A-socket_snd_clnt"
+#define SK_NAMEB "\0B-socket_snd_clnt"
+
+char *sk_names[3] = {
+		SK_NAMEA,
+		SK_NAMEB,
+		NULL,
+	};
+
+#define MSG "hello"
+
+static inline int sk_name_len(const char *name)
+{
+	if (!name)
+		return 0;
+	/* '\0' prefix and '\0' postfix */
+	return 1 + strlen(name + 1) + 1;
+}
+
+int do_client(int clnt[])
+{
+	int i;
+
+	for (i = 0; i < 6; i++) {
+		if (send(clnt[i%3], MSG, sizeof(MSG), 0) != sizeof(MSG)) {
+			pr_perror("write");
+			return 1;
+		}
+	}
+
+	test_waitsig();
+	return 0;
+}
+
+int main(int argc, char **argv)
+{
+	struct sockaddr_un addr;
+	unsigned int addrlen;
+	int srv, clnt[3] = {-1, -1, -1}, ret, i, status;
+	char buf[1024];
+	struct iovec iov = {
+			.iov_base = &buf,
+			.iov_len = sizeof(buf),
+		};
+	struct msghdr hdr = {
+			.msg_name = &addr,
+			.msg_namelen = sizeof(addr),
+			.msg_iov = &iov,
+			.msg_iovlen = 1,
+		};
+	pid_t pid;
+
+	test_init(argc, argv);
+
+	srv = socket(PF_UNIX, SOCK_DGRAM | SOCK_NONBLOCK, 0);
+	if (srv < 0) {
+		fail("socket");
+		exit(1);
+	}
+
+	addr.sun_family = AF_UNIX;
+	memcpy(addr.sun_path, SK_SRV, sizeof(SK_SRV));
+	addrlen = sizeof(addr.sun_family) + sizeof(SK_SRV);
+
+	if (bind(srv, &addr, addrlen)) {
+		fail("bind\n");
+		exit(1);
+	}
+
+	for (i = 0; i < 3; i++) {
+		clnt[i] = socket(PF_UNIX, SOCK_DGRAM, 0);
+
+		if (sk_names[i]) {
+			addr.sun_family = AF_UNIX;
+			memcpy(addr.sun_path, sk_names[i], sk_name_len(sk_names[i]));
+			addrlen = sizeof(addr.sun_family) + sk_name_len(sk_names[i]);;
+
+			if (bind(clnt[i], &addr, addrlen)) {
+				fail("bind\n");
+				exit(1);
+			}
+		}
+
+		memcpy(addr.sun_path, SK_SRV, sizeof(SK_SRV));
+		addrlen = sizeof(addr.sun_family) + sizeof(SK_SRV);
+		if (connect(clnt[i], &addr, addrlen)) {
+			fail("connect\n");
+			exit(1);
+		}
+	}
+
+	pid = fork();
+	if (pid == 0) {
+		close(srv);
+		exit(do_client(clnt));
+	} else if (pid != -1) {
+		for (i = 0; i < 2; i++)
+			close(clnt[i]);
+	} else {
+		fail("fork");
+		exit(1);
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	kill(pid, SIGTERM);
+
+	if (wait(&status) != pid) {
+		fail("wait");
+		exit(1);
+	}
+
+	if (status != 0) {
+		fail("%d:%d:%d:%d", WIFEXITED(status), WEXITSTATUS(status),
+				    WIFSIGNALED(status), WTERMSIG(status));
+		return 1;
+	}
+
+	for (i = 0; i < 6; i++) {
+		const char *sk_name = sk_names[i % 3];
+		hdr.msg_namelen = sizeof(addr);
+		memset(addr.sun_path, 0, sizeof(addr.sun_path));
+		ret = recvmsg(srv, &hdr, MSG_DONTWAIT);
+		buf[ret > 0 ? ret : 0] = 0;
+		if (ret != sizeof(MSG)) {
+			fail("%d: %s", ret, buf);
+			return 1;
+		}
+
+		if (!sk_name && !hdr.msg_namelen)
+			continue;
+		if (hdr.msg_namelen != sk_name_len(sk_name) + sizeof(addr.sun_family)) {
+			fail("Name len is mismatch: iter=%d, %d %d", i, hdr.msg_namelen, sk_name_len(sk_name));
+			return 1;
+		}
+		if (sk_name_len(sk_name) && memcmp(addr.sun_path, sk_name, sk_name_len(sk_name))) {
+			fail("A sender address is mismatch");
+			return 1;
+		}
+	}
+
+	pass();
+	return 0;
+}

Comments

Andrey Vagin June 1, 2016, 3:44 p.m.
On Wed, Jun 01, 2016 at 06:13:37PM +0300, Kirill Tkhai wrote:
> Send messages from client to server, and check their msg_names.
> Client sockets stay alive during suspend/restore, so we check
> that criu properly sends them to server, and it restores its
> promiscous queue right.
> 
> Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
> ---
>  test/zdtm/static/Makefile            |    1 
>  test/zdtm/static/socket_snd_addr01.c |  166 ++++++++++++++++++++++++++++++++++
>  2 files changed, 167 insertions(+)
>  create mode 100644 test/zdtm/static/socket_snd_addr01.c
> 
> diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
> index b6ed8f3..d6041e8 100644
> --- a/test/zdtm/static/Makefile
> +++ b/test/zdtm/static/Makefile
> @@ -37,6 +37,7 @@ TST_NOFILE	=				\
>  		socket_aio			\
>  		socket_close_data		\
>  		socket_snd_addr			\
> +		socket_snd_addr01		\
>  		socket_dgram_data		\
>  		packet_sock			\
>  		packet_sock_mmap		\
> diff --git a/test/zdtm/static/socket_snd_addr01.c b/test/zdtm/static/socket_snd_addr01.c
> new file mode 100644
> index 0000000..f9065d5
> --- /dev/null
> +++ b/test/zdtm/static/socket_snd_addr01.c
> @@ -0,0 +1,166 @@
> +#define _GNU_SOURCE
> +#include <errno.h>
> +#include <unistd.h>
> +#include <fcntl.h>
> +#include <stdlib.h>
> +#include <string.h>
> +#include <sys/types.h>
> +#include <sys/socket.h>
> +#include <sys/un.h>
> +#include <sys/wait.h>
> +#include <limits.h>
> +#include <sys/time.h>
> +#include <sys/resource.h>
> +
> +#include "zdtmtst.h"
> +
> +/* Based on socket_snd_addr test */
> +const char *test_doc	= "Check that sender addresses are restored correctly";
> +const char *test_author	= "Kirill Tkhai <ktkhai@virtuozzo.com";
> +
> +#define SK_SRV "\0socket_snd_srv"
> +#define SK_NAMEA "\0A-socket_snd_clnt"
> +#define SK_NAMEB "\0B-socket_snd_clnt"
> +
> +char *sk_names[3] = {
> +		SK_NAMEA,
> +		SK_NAMEB,
> +		NULL,
> +	};
> +
> +#define MSG "hello"
> +
> +static inline int sk_name_len(const char *name)
> +{
> +	if (!name)
> +		return 0;
> +	/* '\0' prefix and '\0' postfix */
> +	return 1 + strlen(name + 1) + 1;
> +}
> +
> +int do_client(int clnt[])
> +{
> +	int i;
> +
> +	for (i = 0; i < 6; i++) {
> +		if (send(clnt[i%3], MSG, sizeof(MSG), 0) != sizeof(MSG)) {
> +			pr_perror("write");
> +			return 1;
> +		}
> +	}
> +

You need to signal a parent from here that it can be daemonized. You can
look at zdtm/static/fd for example.

> +	test_waitsig();
> +	return 0;
> +}
> +
> +int main(int argc, char **argv)
> +{
> +	struct sockaddr_un addr;
> +	unsigned int addrlen;
> +	int srv, clnt[3] = {-1, -1, -1}, ret, i, status;
> +	char buf[1024];
> +	struct iovec iov = {
> +			.iov_base = &buf,
> +			.iov_len = sizeof(buf),
> +		};
> +	struct msghdr hdr = {
> +			.msg_name = &addr,
> +			.msg_namelen = sizeof(addr),
> +			.msg_iov = &iov,
> +			.msg_iovlen = 1,
> +		};
> +	pid_t pid;
> +
> +	test_init(argc, argv);
> +
> +	srv = socket(PF_UNIX, SOCK_DGRAM | SOCK_NONBLOCK, 0);
> +	if (srv < 0) {
> +		fail("socket");
> +		exit(1);
> +	}
> +
> +	addr.sun_family = AF_UNIX;
> +	memcpy(addr.sun_path, SK_SRV, sizeof(SK_SRV));
> +	addrlen = sizeof(addr.sun_family) + sizeof(SK_SRV);
> +
> +	if (bind(srv, &addr, addrlen)) {
> +		fail("bind\n");
> +		exit(1);
> +	}
> +
> +	for (i = 0; i < 3; i++) {
> +		clnt[i] = socket(PF_UNIX, SOCK_DGRAM, 0);
> +
> +		if (sk_names[i]) {
> +			addr.sun_family = AF_UNIX;
> +			memcpy(addr.sun_path, sk_names[i], sk_name_len(sk_names[i]));
> +			addrlen = sizeof(addr.sun_family) + sk_name_len(sk_names[i]);;
> +
> +			if (bind(clnt[i], &addr, addrlen)) {
> +				fail("bind\n");
> +				exit(1);
> +			}
> +		}
> +
> +		memcpy(addr.sun_path, SK_SRV, sizeof(SK_SRV));
> +		addrlen = sizeof(addr.sun_family) + sizeof(SK_SRV);
> +		if (connect(clnt[i], &addr, addrlen)) {
> +			fail("connect\n");
> +			exit(1);
> +		}
> +	}
> +
> +	pid = fork();
> +	if (pid == 0) {
> +		close(srv);
> +		exit(do_client(clnt));
> +	} else if (pid != -1) {
> +		for (i = 0; i < 2; i++)
> +			close(clnt[i]);
> +	} else {
> +		fail("fork");
> +		exit(1);
> +	}
> +
> +	test_daemon();
> +	test_waitsig();
> +
> +	kill(pid, SIGTERM);
> +
> +	if (wait(&status) != pid) {
> +		fail("wait");
> +		exit(1);
> +	}
> +
> +	if (status != 0) {
> +		fail("%d:%d:%d:%d", WIFEXITED(status), WEXITSTATUS(status),
> +				    WIFSIGNALED(status), WTERMSIG(status));
> +		return 1;
> +	}
> +
> +	for (i = 0; i < 6; i++) {
> +		const char *sk_name = sk_names[i % 3];
> +		hdr.msg_namelen = sizeof(addr);
> +		memset(addr.sun_path, 0, sizeof(addr.sun_path));
> +		ret = recvmsg(srv, &hdr, MSG_DONTWAIT);
> +		buf[ret > 0 ? ret : 0] = 0;
> +		if (ret != sizeof(MSG)) {
> +			fail("%d: %s", ret, buf);
> +			return 1;
> +		}
> +
> +		if (!sk_name && !hdr.msg_namelen)
> +			continue;
> +		if (hdr.msg_namelen != sk_name_len(sk_name) + sizeof(addr.sun_family)) {
> +			fail("Name len is mismatch: iter=%d, %d %d", i, hdr.msg_namelen, sk_name_len(sk_name));
> +			return 1;
> +		}
> +		if (sk_name_len(sk_name) && memcmp(addr.sun_path, sk_name, sk_name_len(sk_name))) {
> +			fail("A sender address is mismatch");
> +			return 1;
> +		}
> +	}
> +
> +	pass();
> +	return 0;
> +}
> 
> _______________________________________________
> CRIU mailing list
> CRIU@openvz.org
> https://lists.openvz.org/mailman/listinfo/criu
Kirill Tkhai June 1, 2016, 4:02 p.m.
On 01.06.2016 18:44, Andrew Vagin wrote:
> On Wed, Jun 01, 2016 at 06:13:37PM +0300, Kirill Tkhai wrote:
>> Send messages from client to server, and check their msg_names.
>> Client sockets stay alive during suspend/restore, so we check
>> that criu properly sends them to server, and it restores its
>> promiscous queue right.
>>
>> Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
>> ---
>>  test/zdtm/static/Makefile            |    1 
>>  test/zdtm/static/socket_snd_addr01.c |  166 ++++++++++++++++++++++++++++++++++
>>  2 files changed, 167 insertions(+)
>>  create mode 100644 test/zdtm/static/socket_snd_addr01.c
>>
>> diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
>> index b6ed8f3..d6041e8 100644
>> --- a/test/zdtm/static/Makefile
>> +++ b/test/zdtm/static/Makefile
>> @@ -37,6 +37,7 @@ TST_NOFILE	=				\
>>  		socket_aio			\
>>  		socket_close_data		\
>>  		socket_snd_addr			\
>> +		socket_snd_addr01		\
>>  		socket_dgram_data		\
>>  		packet_sock			\
>>  		packet_sock_mmap		\
>> diff --git a/test/zdtm/static/socket_snd_addr01.c b/test/zdtm/static/socket_snd_addr01.c
>> new file mode 100644
>> index 0000000..f9065d5
>> --- /dev/null
>> +++ b/test/zdtm/static/socket_snd_addr01.c
>> @@ -0,0 +1,166 @@
>> +#define _GNU_SOURCE
>> +#include <errno.h>
>> +#include <unistd.h>
>> +#include <fcntl.h>
>> +#include <stdlib.h>
>> +#include <string.h>
>> +#include <sys/types.h>
>> +#include <sys/socket.h>
>> +#include <sys/un.h>
>> +#include <sys/wait.h>
>> +#include <limits.h>
>> +#include <sys/time.h>
>> +#include <sys/resource.h>
>> +
>> +#include "zdtmtst.h"
>> +
>> +/* Based on socket_snd_addr test */
>> +const char *test_doc	= "Check that sender addresses are restored correctly";
>> +const char *test_author	= "Kirill Tkhai <ktkhai@virtuozzo.com";
>> +
>> +#define SK_SRV "\0socket_snd_srv"
>> +#define SK_NAMEA "\0A-socket_snd_clnt"
>> +#define SK_NAMEB "\0B-socket_snd_clnt"
>> +
>> +char *sk_names[3] = {
>> +		SK_NAMEA,
>> +		SK_NAMEB,
>> +		NULL,
>> +	};
>> +
>> +#define MSG "hello"
>> +
>> +static inline int sk_name_len(const char *name)
>> +{
>> +	if (!name)
>> +		return 0;
>> +	/* '\0' prefix and '\0' postfix */
>> +	return 1 + strlen(name + 1) + 1;
>> +}
>> +
>> +int do_client(int clnt[])
>> +{
>> +	int i;
>> +
>> +	for (i = 0; i < 6; i++) {
>> +		if (send(clnt[i%3], MSG, sizeof(MSG), 0) != sizeof(MSG)) {
>> +			pr_perror("write");
>> +			return 1;
>> +		}
>> +	}
>> +
> 
> You need to signal a parent from here that it can be daemonized. You can
> look at zdtm/static/fd for example.

Ok, I see, thanks
 
>> +	test_waitsig();
>> +	return 0;
>> +}
>> +
>> +int main(int argc, char **argv)
>> +{
>> +	struct sockaddr_un addr;
>> +	unsigned int addrlen;
>> +	int srv, clnt[3] = {-1, -1, -1}, ret, i, status;
>> +	char buf[1024];
>> +	struct iovec iov = {
>> +			.iov_base = &buf,
>> +			.iov_len = sizeof(buf),
>> +		};
>> +	struct msghdr hdr = {
>> +			.msg_name = &addr,
>> +			.msg_namelen = sizeof(addr),
>> +			.msg_iov = &iov,
>> +			.msg_iovlen = 1,
>> +		};
>> +	pid_t pid;
>> +
>> +	test_init(argc, argv);
>> +
>> +	srv = socket(PF_UNIX, SOCK_DGRAM | SOCK_NONBLOCK, 0);
>> +	if (srv < 0) {
>> +		fail("socket");
>> +		exit(1);
>> +	}
>> +
>> +	addr.sun_family = AF_UNIX;
>> +	memcpy(addr.sun_path, SK_SRV, sizeof(SK_SRV));
>> +	addrlen = sizeof(addr.sun_family) + sizeof(SK_SRV);
>> +
>> +	if (bind(srv, &addr, addrlen)) {
>> +		fail("bind\n");
>> +		exit(1);
>> +	}
>> +
>> +	for (i = 0; i < 3; i++) {
>> +		clnt[i] = socket(PF_UNIX, SOCK_DGRAM, 0);
>> +
>> +		if (sk_names[i]) {
>> +			addr.sun_family = AF_UNIX;
>> +			memcpy(addr.sun_path, sk_names[i], sk_name_len(sk_names[i]));
>> +			addrlen = sizeof(addr.sun_family) + sk_name_len(sk_names[i]);;
>> +
>> +			if (bind(clnt[i], &addr, addrlen)) {
>> +				fail("bind\n");
>> +				exit(1);
>> +			}
>> +		}
>> +
>> +		memcpy(addr.sun_path, SK_SRV, sizeof(SK_SRV));
>> +		addrlen = sizeof(addr.sun_family) + sizeof(SK_SRV);
>> +		if (connect(clnt[i], &addr, addrlen)) {
>> +			fail("connect\n");
>> +			exit(1);
>> +		}
>> +	}
>> +
>> +	pid = fork();
>> +	if (pid == 0) {
>> +		close(srv);
>> +		exit(do_client(clnt));
>> +	} else if (pid != -1) {
>> +		for (i = 0; i < 2; i++)
>> +			close(clnt[i]);
>> +	} else {
>> +		fail("fork");
>> +		exit(1);
>> +	}
>> +
>> +	test_daemon();
>> +	test_waitsig();
>> +
>> +	kill(pid, SIGTERM);
>> +
>> +	if (wait(&status) != pid) {
>> +		fail("wait");
>> +		exit(1);
>> +	}
>> +
>> +	if (status != 0) {
>> +		fail("%d:%d:%d:%d", WIFEXITED(status), WEXITSTATUS(status),
>> +				    WIFSIGNALED(status), WTERMSIG(status));
>> +		return 1;
>> +	}
>> +
>> +	for (i = 0; i < 6; i++) {
>> +		const char *sk_name = sk_names[i % 3];
>> +		hdr.msg_namelen = sizeof(addr);
>> +		memset(addr.sun_path, 0, sizeof(addr.sun_path));
>> +		ret = recvmsg(srv, &hdr, MSG_DONTWAIT);
>> +		buf[ret > 0 ? ret : 0] = 0;
>> +		if (ret != sizeof(MSG)) {
>> +			fail("%d: %s", ret, buf);
>> +			return 1;
>> +		}
>> +
>> +		if (!sk_name && !hdr.msg_namelen)
>> +			continue;
>> +		if (hdr.msg_namelen != sk_name_len(sk_name) + sizeof(addr.sun_family)) {
>> +			fail("Name len is mismatch: iter=%d, %d %d", i, hdr.msg_namelen, sk_name_len(sk_name));
>> +			return 1;
>> +		}
>> +		if (sk_name_len(sk_name) && memcmp(addr.sun_path, sk_name, sk_name_len(sk_name))) {
>> +			fail("A sender address is mismatch");
>> +			return 1;
>> +		}
>> +	}
>> +
>> +	pass();
>> +	return 0;
>> +}
>>
>> _______________________________________________
>> CRIU mailing list
>> CRIU@openvz.org
>> https://lists.openvz.org/mailman/listinfo/criu