From: Stefano Garzarella <sgarzare@redhat.com>
To: Arseniy Krasnov <AVKrasnov@sberdevices.ru>
Cc: "edumazet@google.com" <edumazet@google.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Bobby Eshleman <bobby.eshleman@bytedance.com>,
Krasnov Arseniy <oxffffaa@gmail.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"virtualization@lists.linux-foundation.org"
<virtualization@lists.linux-foundation.org>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
kernel <kernel@sberdevices.ru>
Subject: Re: [RFC PATCH v3 2/4] test/vsock: rework message bounds test
Date: Mon, 5 Dec 2022 14:24:03 +0100 [thread overview]
Message-ID: <20221205132403.oobyrog4chcdqk4z@sgarzare-redhat> (raw)
In-Reply-To: <bdecf9ed-6c9d-ecf8-f159-d4610d5e7cb1@sberdevices.ru>
On Sun, Dec 04, 2022 at 07:20:52PM +0000, Arseniy Krasnov wrote:
>This updates message bound test making it more complex. Instead of
>sending 1 bytes messages with one MSG_EOR bit, it sends messages of
>random length(one half of messages are smaller than page size, second
>half are bigger) with random number of MSG_EOR bits set. Receiver
>also don't know total number of messages.
>
>Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru>
>---
> tools/testing/vsock/control.c | 28 +++++++
> tools/testing/vsock/control.h | 2 +
> tools/testing/vsock/util.c | 13 ++++
> tools/testing/vsock/util.h | 1 +
> tools/testing/vsock/vsock_test.c | 124 +++++++++++++++++++++++++++----
> 5 files changed, 155 insertions(+), 13 deletions(-)
>
>diff --git a/tools/testing/vsock/control.c b/tools/testing/vsock/control.c
>index 4874872fc5a3..d2deb4b15b94 100644
>--- a/tools/testing/vsock/control.c
>+++ b/tools/testing/vsock/control.c
>@@ -141,6 +141,34 @@ void control_writeln(const char *str)
> timeout_end();
> }
>
>+void control_writeulong(unsigned long value)
>+{
>+ char str[32];
>+
>+ if (snprintf(str, sizeof(str), "%lu", value) >= sizeof(str)) {
>+ perror("snprintf");
>+ exit(EXIT_FAILURE);
>+ }
>+
>+ control_writeln(str);
>+}
>+
>+unsigned long control_readulong(void)
>+{
>+ unsigned long value;
>+ char *str;
>+
>+ str = control_readln();
>+
>+ if (!str)
>+ exit(EXIT_FAILURE);
>+
>+ value = strtoul(str, NULL, 10);
>+ free(str);
>+
>+ return value;
>+}
>+
> /* Return the next line from the control socket (without the trailing newline).
> *
> * The program terminates if a timeout occurs.
>diff --git a/tools/testing/vsock/control.h b/tools/testing/vsock/control.h
>index 51814b4f9ac1..c1f77fdb2c7a 100644
>--- a/tools/testing/vsock/control.h
>+++ b/tools/testing/vsock/control.h
>@@ -9,7 +9,9 @@ void control_init(const char *control_host, const char *control_port,
> void control_cleanup(void);
> void control_writeln(const char *str);
> char *control_readln(void);
>+unsigned long control_readulong(void);
> void control_expectln(const char *str);
> bool control_cmpln(char *line, const char *str, bool fail);
>+void control_writeulong(unsigned long value);
>
> #endif /* CONTROL_H */
>diff --git a/tools/testing/vsock/util.c b/tools/testing/vsock/util.c
>index 2acbb7703c6a..01b636d3039a 100644
>--- a/tools/testing/vsock/util.c
>+++ b/tools/testing/vsock/util.c
>@@ -395,3 +395,16 @@ void skip_test(struct test_case *test_cases, size_t test_cases_len,
>
> test_cases[test_id].skip = true;
> }
>+
>+unsigned long hash_djb2(const void *data, size_t len)
>+{
>+ unsigned long hash = 5381;
>+ int i = 0;
>+
>+ while (i < len) {
>+ hash = ((hash << 5) + hash) + ((unsigned char *)data)[i];
>+ i++;
>+ }
>+
>+ return hash;
>+}
>diff --git a/tools/testing/vsock/util.h b/tools/testing/vsock/util.h
>index a3375ad2fb7f..fb99208a95ea 100644
>--- a/tools/testing/vsock/util.h
>+++ b/tools/testing/vsock/util.h
>@@ -49,4 +49,5 @@ void run_tests(const struct test_case *test_cases,
> void list_tests(const struct test_case *test_cases);
> void skip_test(struct test_case *test_cases, size_t test_cases_len,
> const char *test_id_str);
>+unsigned long hash_djb2(const void *data, size_t len);
> #endif /* UTIL_H */
>diff --git a/tools/testing/vsock/vsock_test.c b/tools/testing/vsock/vsock_test.c
>index bb6d691cb30d..a5904ee39e91 100644
>--- a/tools/testing/vsock/vsock_test.c
>+++ b/tools/testing/vsock/vsock_test.c
>@@ -284,10 +284,14 @@ static void test_stream_msg_peek_server(const struct test_opts *opts)
> close(fd);
> }
>
>-#define MESSAGES_CNT 7
>-#define MSG_EOR_IDX (MESSAGES_CNT / 2)
>+#define SOCK_BUF_SIZE (2 * 1024 * 1024)
>+#define MAX_MSG_SIZE (32 * 1024)
>+
> static void test_seqpacket_msg_bounds_client(const struct test_opts *opts)
> {
>+ unsigned long curr_hash;
>+ int page_size;
>+ int msg_count;
> int fd;
>
> fd = vsock_seqpacket_connect(opts->peer_cid, 1234);
>@@ -296,18 +300,79 @@ static void test_seqpacket_msg_bounds_client(const struct test_opts *opts)
> exit(EXIT_FAILURE);
> }
>
>- /* Send several messages, one with MSG_EOR flag */
>- for (int i = 0; i < MESSAGES_CNT; i++)
>- send_byte(fd, 1, (i == MSG_EOR_IDX) ? MSG_EOR : 0);
>+ /* Wait, until receiver sets buffer size. */
>+ control_expectln("SRVREADY");
>+
>+ curr_hash = 0;
>+ page_size = getpagesize();
>+ msg_count = SOCK_BUF_SIZE / MAX_MSG_SIZE;
>+
>+ for (int i = 0; i < msg_count; i++) {
>+ ssize_t send_size;
>+ size_t buf_size;
>+ int flags;
>+ void *buf;
>+
>+ /* Use "small" buffers and "big" buffers. */
>+ if (i & 1)
>+ buf_size = page_size +
>+ (rand() % (MAX_MSG_SIZE - page_size));
>+ else
>+ buf_size = 1 + (rand() % page_size);
>+
>+ buf = malloc(buf_size);
>+
>+ if (!buf) {
>+ perror("malloc");
>+ exit(EXIT_FAILURE);
>+ }
>+
>+ memset(buf, rand() & 0xff, buf_size);
>+ /* Set at least one MSG_EOR + some random. */
>+ if (i == (msg_count / 2) || (rand() & 1)) {
>+ flags = MSG_EOR;
>+ curr_hash++;
>+ } else {
>+ flags = 0;
>+ }
>+
>+ send_size = send(fd, buf, buf_size, flags);
>+
>+ if (send_size < 0) {
>+ perror("send");
>+ exit(EXIT_FAILURE);
>+ }
>+
>+ if (send_size != buf_size) {
>+ fprintf(stderr, "Invalid send size\n");
>+ exit(EXIT_FAILURE);
>+ }
>+
>+ /*
>+ * Hash sum is computed at both client and server in
>+ * the same way:
>+ * H += hash('message data')
>+ * Such hash "contols" both data integrity and message
Little typo s/contols/controls. Maybe is better to use checks.
>+ * bounds. After data exchange, both sums are compared
>+ * using control socket, and if message bounds wasn't
>+ * broken - two values must be equal.
>+ */
>+ curr_hash += hash_djb2(buf, buf_size);
>+ free(buf);
>+ }
>
> control_writeln("SENDDONE");
>+ control_writeulong(curr_hash);
> close(fd);
> }
>
> static void test_seqpacket_msg_bounds_server(const struct test_opts *opts)
> {
>+ unsigned long sock_buf_size;
>+ unsigned long remote_hash;
>+ unsigned long curr_hash;
> int fd;
>- char buf[16];
>+ char buf[MAX_MSG_SIZE];
> struct msghdr msg = {0};
> struct iovec iov = {0};
>
>@@ -317,25 +382,57 @@ static void test_seqpacket_msg_bounds_server(const struct test_opts *opts)
> exit(EXIT_FAILURE);
> }
>
>+ sock_buf_size = SOCK_BUF_SIZE;
>+
>+ if (setsockopt(fd, AF_VSOCK, SO_VM_SOCKETS_BUFFER_MAX_SIZE,
>+ &sock_buf_size, sizeof(sock_buf_size))) {
>+ perror("getsockopt");
s/getsockopt/setsockopt
I would add also the SO_VM_SOCKETS_BUFFER_MAX_SIZE, I mean something
like this:
perror("setsockopt(SO_VM_SOCKETS_BUFFER_MAX_SIZE)");
>+ exit(EXIT_FAILURE);
>+ }
>+
>+ if (setsockopt(fd, AF_VSOCK, SO_VM_SOCKETS_BUFFER_SIZE,
>+ &sock_buf_size, sizeof(sock_buf_size))) {
>+ perror("getsockopt");
Ditto.
>+ exit(EXIT_FAILURE);
>+ }
>+
>+ /* Ready to receive data. */
>+ control_writeln("SRVREADY");
>+ /* Wait, until peer sends whole data. */
> control_expectln("SENDDONE");
> iov.iov_base = buf;
> iov.iov_len = sizeof(buf);
> msg.msg_iov = &iov;
> msg.msg_iovlen = 1;
>
>- for (int i = 0; i < MESSAGES_CNT; i++) {
>- if (recvmsg(fd, &msg, 0) != 1) {
>- perror("message bound violated");
>- exit(EXIT_FAILURE);
>- }
>+ curr_hash = 0;
>
>- if ((i == MSG_EOR_IDX) ^ !!(msg.msg_flags & MSG_EOR)) {
>- perror("MSG_EOR");
>+ while (1) {
>+ ssize_t recv_size;
>+
>+ recv_size = recvmsg(fd, &msg, 0);
>+
>+ if (!recv_size)
>+ break;
>+
>+ if (recv_size < 0) {
>+ perror("recvmsg");
> exit(EXIT_FAILURE);
> }
>+
>+ if (msg.msg_flags & MSG_EOR)
>+ curr_hash++;
>+
>+ curr_hash += hash_djb2(msg.msg_iov[0].iov_base, recv_size);
> }
>
> close(fd);
>+ remote_hash = control_readulong();
>+
>+ if (curr_hash != remote_hash) {
>+ fprintf(stderr, "Message bounds broken\n");
>+ exit(EXIT_FAILURE);
>+ }
> }
>
> #define MESSAGE_TRUNC_SZ 32
>@@ -837,6 +934,7 @@ int main(int argc, char **argv)
> .peer_cid = VMADDR_CID_ANY,
> };
>
>+ srand(time(NULL));
> init_signals();
>
> for (;;) {
>--
>2.25.1
next prev parent reply other threads:[~2022-12-05 13:25 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-04 19:17 [RFC PATCH v3 0/4] vsock: update tools and error handling Arseniy Krasnov
2022-12-04 19:19 ` [RFC PATCH v3 1/4] vsock: return errors other than -ENOMEM to socket Arseniy Krasnov
2022-12-05 13:16 ` Stefano Garzarella
2022-12-04 19:20 ` [RFC PATCH v3 2/4] test/vsock: rework message bounds test Arseniy Krasnov
2022-12-05 13:24 ` Stefano Garzarella [this message]
2022-12-04 19:22 ` [RFC PATCH v3 3/4] test/vsock: add big message test Arseniy Krasnov
2022-12-04 19:24 ` [RFC PATCH v3 4/4] test/vsock: vsock_perf utility Arseniy Krasnov
2022-12-05 14:00 ` Stefano Garzarella
2022-12-06 5:25 ` Arseniy Krasnov
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=20221205132403.oobyrog4chcdqk4z@sgarzare-redhat \
--to=sgarzare@redhat.com \
--cc=AVKrasnov@sberdevices.ru \
--cc=bobby.eshleman@bytedance.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kernel@sberdevices.ru \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=oxffffaa@gmail.com \
--cc=pabeni@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
/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
all inboxes | Powered by JetHome®