2023-09-15 19:54:22

by Stefano Garzarella

Subject: [PATCH net-next 5/5] vsock/test: track bytes in MSG_PEEK test for SOCK_SEQPACKET

The test was a bit complicated to read.
Added variables to keep track of the bytes read and to be read
in each step. Also some comments.

The test is unchanged.

Signed-off-by: Stefano Garzarella <[email protected]>
---
tools/testing/vsock/vsock_test.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/tools/testing/vsock/vsock_test.c b/tools/testing/vsock/vsock_test.c
index b18acbaf92e2..5743dcae2350 100644
--- a/tools/testing/vsock/vsock_test.c
+++ b/tools/testing/vsock/vsock_test.c
@@ -1002,6 +1002,7 @@ static void test_stream_virtio_skb_merge_client(const struct test_opts *opts)

static void test_stream_virtio_skb_merge_server(const struct test_opts *opts)
{
+ size_t read = 0, to_read;
unsigned char buf[64];
int fd;

@@ -1014,14 +1015,21 @@ static void test_stream_virtio_skb_merge_server(const struct test_opts *opts)
control_expectln("SEND0");

/* Read skbuff partially. */
- recv_buf(fd, buf, 2, 0, 2);
+ to_read = 2;
+ recv_buf(fd, buf + read, to_read, 0, to_read);
+ read += to_read;

control_writeln("REPLY0");
control_expectln("SEND1");

- recv_buf(fd, buf + 2, 8, 0, 8);
+ /* Read the rest of both buffers */
+ to_read = strlen(HELLO_STR WORLD_STR) - read;
+ recv_buf(fd, buf + read, to_read, 0, to_read);
+ read += to_read;

- recv_buf(fd, buf, sizeof(buf) - 8 - 2, MSG_DONTWAIT, -EAGAIN);
+ /* No more bytes should be there */
+ to_read = sizeof(buf) - read;
+ recv_buf(fd, buf + read, to_read, MSG_DONTWAIT, -EAGAIN);

if (memcmp(buf, HELLO_STR WORLD_STR, strlen(HELLO_STR WORLD_STR))) {
fprintf(stderr, "pattern mismatch\n");
--
2.41.0

2023-09-16 00:45:08

by Arseniy Krasnov

Subject: Re: [PATCH net-next 5/5] vsock/test: track bytes in MSG_PEEK test for SOCK_SEQPACKET

Small remark on 'Subject' - this is not MSG_PEEK test, it is test for sk_buff merging.

Considering that:

Reviewed-by: Arseniy Krasnov <[email protected]>

Thanks, Arseniy

On 15.09.2023 15:14, Stefano Garzarella wrote:
> The test was a bit complicated to read.
> Added variables to keep track of the bytes read and to be read
> in each step. Also some comments.
>
> The test is unchanged.
>
> Signed-off-by: Stefano Garzarella <[email protected]>
> ---
> tools/testing/vsock/vsock_test.c | 14 +++++++++++---
> 1 file changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/tools/testing/vsock/vsock_test.c b/tools/testing/vsock/vsock_test.c
> index b18acbaf92e2..5743dcae2350 100644
> --- a/tools/testing/vsock/vsock_test.c
> +++ b/tools/testing/vsock/vsock_test.c
> @@ -1002,6 +1002,7 @@ static void test_stream_virtio_skb_merge_client(const struct test_opts *opts)
>
> static void test_stream_virtio_skb_merge_server(const struct test_opts *opts)
> {
> + size_t read = 0, to_read;
> unsigned char buf[64];
> int fd;
>
> @@ -1014,14 +1015,21 @@ static void test_stream_virtio_skb_merge_server(const struct test_opts *opts)
> control_expectln("SEND0");
>
> /* Read skbuff partially. */
> - recv_buf(fd, buf, 2, 0, 2);
> + to_read = 2;
> + recv_buf(fd, buf + read, to_read, 0, to_read);
> + read += to_read;
>
> control_writeln("REPLY0");
> control_expectln("SEND1");
>
> - recv_buf(fd, buf + 2, 8, 0, 8);
> + /* Read the rest of both buffers */
> + to_read = strlen(HELLO_STR WORLD_STR) - read;
> + recv_buf(fd, buf + read, to_read, 0, to_read);
> + read += to_read;
>
> - recv_buf(fd, buf, sizeof(buf) - 8 - 2, MSG_DONTWAIT, -EAGAIN);
> + /* No more bytes should be there */
> + to_read = sizeof(buf) - read;
> + recv_buf(fd, buf + read, to_read, MSG_DONTWAIT, -EAGAIN);
>
> if (memcmp(buf, HELLO_STR WORLD_STR, strlen(HELLO_STR WORLD_STR))) {
> fprintf(stderr, "pattern mismatch\n");