From: Arseniy Krasnov <avkrasnov@salutedevices.com>
To: Stefano Garzarella <sgarzare@redhat.com>, <netdev@vger.kernel.org>
Cc: <linux-kernel@vger.kernel.org>,
<virtualization@lists.linux-foundation.org>, <oxffffaa@gmail.com>,
Bobby Eshleman <bobby.eshleman@bytedance.com>
Subject: Re: [PATCH net-next 1/5] vsock/test: add recv_buf() utility function
Date: Fri, 15 Sep 2023 22:23:03 +0300 [thread overview]
Message-ID: <c47861a7-8e6d-360f-ef80-601c66fd853f@salutedevices.com> (raw)
In-Reply-To: <20230915121452.87192-2-sgarzare@redhat.com>
On 15.09.2023 15:14, Stefano Garzarella wrote:
> Move the code of recv_byte() out in a new utility function that
> can be used to receive a generic buffer.
>
> This new function can be used when we need to receive a custom
> buffer and not just a single 'A' byte.
>
> Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
> ---
> tools/testing/vsock/util.h | 1 +
> tools/testing/vsock/util.c | 88 +++++++++++++++++++++++---------------
> 2 files changed, 54 insertions(+), 35 deletions(-)
Reviewed-by: Arseniy Krasnov <avkrasnov@salutedevices.com>
>
> diff --git a/tools/testing/vsock/util.h b/tools/testing/vsock/util.h
> index fb99208a95ea..fe31f267e67e 100644
> --- a/tools/testing/vsock/util.h
> +++ b/tools/testing/vsock/util.h
> @@ -42,6 +42,7 @@ int vsock_stream_accept(unsigned int cid, unsigned int port,
> int vsock_seqpacket_accept(unsigned int cid, unsigned int port,
> struct sockaddr_vm *clientaddrp);
> void vsock_wait_remote_close(int fd);
> +void recv_buf(int fd, void *buf, size_t len, int flags, ssize_t expected_ret);
> void send_byte(int fd, int expected_ret, int flags);
> void recv_byte(int fd, int expected_ret, int flags);
> void run_tests(const struct test_case *test_cases,
> diff --git a/tools/testing/vsock/util.c b/tools/testing/vsock/util.c
> index 01b636d3039a..2826902706e8 100644
> --- a/tools/testing/vsock/util.c
> +++ b/tools/testing/vsock/util.c
> @@ -211,6 +211,58 @@ int vsock_seqpacket_accept(unsigned int cid, unsigned int port,
> return vsock_accept(cid, port, clientaddrp, SOCK_SEQPACKET);
> }
>
> +/* Receive bytes in a buffer and check the return value.
> + *
> + * expected_ret:
> + * <0 Negative errno (for testing errors)
> + * 0 End-of-file
> + * >0 Success (bytes successfully read)
> + */
> +void recv_buf(int fd, void *buf, size_t len, int flags, ssize_t expected_ret)
> +{
> + ssize_t nread = 0;
> + ssize_t ret;
> +
> + timeout_begin(TIMEOUT);
> + do {
> + ret = recv(fd, buf + nread, len - nread, flags);
> + timeout_check("recv");
> +
> + if (ret == 0 || (ret < 0 && errno != EINTR))
> + break;
> +
> + nread += ret;
> + } while (nread < len);
> + timeout_end();
> +
> + if (expected_ret < 0) {
> + if (ret != -1) {
> + fprintf(stderr, "bogus recv(2) return value %zd (expected %zd)\n",
> + ret, expected_ret);
> + exit(EXIT_FAILURE);
> + }
> + if (errno != -expected_ret) {
> + perror("recv");
> + exit(EXIT_FAILURE);
> + }
> + return;
> + }
> +
> + if (ret < 0) {
> + perror("recv");
> + exit(EXIT_FAILURE);
> + }
> +
> + if (nread != expected_ret) {
> + if (ret == 0)
> + fprintf(stderr, "unexpected EOF while receiving bytes\n");
> +
> + fprintf(stderr, "bogus recv(2) bytes read %zd (expected %zd)\n",
> + nread, expected_ret);
> + exit(EXIT_FAILURE);
> + }
> +}
> +
> /* Transmit one byte and check the return value.
> *
> * expected_ret:
> @@ -270,43 +322,9 @@ void send_byte(int fd, int expected_ret, int flags)
> void recv_byte(int fd, int expected_ret, int flags)
> {
> uint8_t byte;
> - ssize_t nread;
> -
> - timeout_begin(TIMEOUT);
> - do {
> - nread = recv(fd, &byte, sizeof(byte), flags);
> - timeout_check("read");
> - } while (nread < 0 && errno == EINTR);
> - timeout_end();
> -
> - if (expected_ret < 0) {
> - if (nread != -1) {
> - fprintf(stderr, "bogus recv(2) return value %zd\n",
> - nread);
> - exit(EXIT_FAILURE);
> - }
> - if (errno != -expected_ret) {
> - perror("read");
> - exit(EXIT_FAILURE);
> - }
> - return;
> - }
>
> - if (nread < 0) {
> - perror("read");
> - exit(EXIT_FAILURE);
> - }
> - if (nread == 0) {
> - if (expected_ret == 0)
> - return;
> + recv_buf(fd, &byte, sizeof(byte), flags, expected_ret);
>
> - fprintf(stderr, "unexpected EOF while receiving byte\n");
> - exit(EXIT_FAILURE);
> - }
> - if (nread != sizeof(byte)) {
> - fprintf(stderr, "bogus recv(2) return value %zd\n", nread);
> - exit(EXIT_FAILURE);
> - }
> if (byte != 'A') {
> fprintf(stderr, "unexpected byte read %c\n", byte);
> exit(EXIT_FAILURE);
next prev parent reply other threads:[~2023-09-15 19:30 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-15 12:14 [PATCH net-next 0/5] vsock/test: add recv_buf()/send_buf() utility functions and some improvements Stefano Garzarella
2023-09-15 12:14 ` [PATCH net-next 1/5] vsock/test: add recv_buf() utility function Stefano Garzarella
2023-09-15 19:23 ` Arseniy Krasnov [this message]
2023-09-15 12:14 ` [PATCH net-next 2/5] vsock/test: use recv_buf() in vsock_test.c Stefano Garzarella
2023-09-15 19:24 ` Arseniy Krasnov
2023-09-15 12:14 ` [PATCH net-next 3/5] vsock/test: add send_buf() utility function Stefano Garzarella
2023-09-15 19:25 ` Arseniy Krasnov
2023-09-15 12:14 ` [PATCH net-next 4/5] vsock/test: use send_buf() in vsock_test.c Stefano Garzarella
2023-09-15 19:26 ` Arseniy Krasnov
2023-09-15 12:14 ` [PATCH net-next 5/5] vsock/test: track bytes in MSG_PEEK test for SOCK_SEQPACKET Stefano Garzarella
2023-09-15 19:29 ` Arseniy Krasnov
2023-09-15 19:30 ` [PATCH net-next 0/5] vsock/test: add recv_buf()/send_buf() utility functions and some improvements Arseniy Krasnov
2023-09-17 16:50 ` patchwork-bot+netdevbpf
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=c47861a7-8e6d-360f-ef80-601c66fd853f@salutedevices.com \
--to=avkrasnov@salutedevices.com \
--cc=bobby.eshleman@bytedance.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=oxffffaa@gmail.com \
--cc=sgarzare@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®