Resend: forgot to reply all...
> On Mon, Jun 30, 2025 at 03:57:27PM +0800, Xuewei Niu wrote:
> >Add SIOCINQ ioctl tests for both SOCK_STREAM and SOCK_SEQPACKET.
> >
> >The client waits for the server to send data, and checks if the SIOCINQ
> >ioctl value matches the data size. After consuming the data, the client
> >checks if the SIOCINQ value is 0.
> >
> >Signed-off-by: Xuewei Niu <niuxuewei.nxw@xxxxxxxxxxxx>
> >---
> > tools/testing/vsock/vsock_test.c | 80 ++++++++++++++++++++++++++++++++
> > 1 file changed, 80 insertions(+)
> >
> >diff --git a/tools/testing/vsock/vsock_test.c b/tools/testing/vsock/vsock_test.c
> >index f669baaa0dca..1f525a7e0098 100644
> >--- a/tools/testing/vsock/vsock_test.c
> >+++ b/tools/testing/vsock/vsock_test.c
> >@@ -1305,6 +1305,56 @@ static void test_unsent_bytes_client(const struct test_opts *opts, int type)
> > close(fd);
> > }
> >
> >+static void test_unread_bytes_server(const struct test_opts *opts, int type)
> >+{
> >+ unsigned char buf[MSG_BUF_IOCTL_LEN];
> >+ int client_fd;
> >+
> >+ client_fd = vsock_accept(VMADDR_CID_ANY, opts->peer_port, NULL, type);
> >+ if (client_fd < 0) {
> >+ perror("accept");
> >+ exit(EXIT_FAILURE);
> >+ }
> >+
> >+ for (int i = 0; i < sizeof(buf); i++)
> >+ buf[i] = rand() & 0xFF;
> >+
> >+ send_buf(client_fd, buf, sizeof(buf), 0, sizeof(buf));
> >+ control_writeln("SENT");
> >+
> >+ close(client_fd);
> >+}
> >+
> >+static void test_unread_bytes_client(const struct test_opts *opts, int type)
> >+{
> >+ unsigned char buf[MSG_BUF_IOCTL_LEN];
> >+ int fd;
> >+ int sock_bytes_unread;
> >+
> >+ fd = vsock_connect(opts->peer_cid, opts->peer_port, type);
> >+ if (fd < 0) {
> >+ perror("connect");
> >+ exit(EXIT_FAILURE);
> >+ }
> >+
> >+ control_expectln("SENT");
> >+ /* The data has arrived but has not been read. The expected is
> >+ * MSG_BUF_IOCTL_LEN.
> >+ */
> >+ if (!vsock_ioctl_int(fd, TIOCINQ, &sock_bytes_unread,
>
> I know that TIOCINQ is the same of SIOCINQ, but IMO is confusing, why
> not using SIOCINQ ?
I tried to use `SIOCINQ` but got:
```
vsock_test.c: In function 'test_unread_bytes_client':
vsock_test.c:1344:34: error: 'SIOCINQ' undeclared (first use in this function); did you mean 'TIOCINQ'?
1344 | if (!vsock_ioctl_int(fd, SIOCINQ, &sock_bytes_unread,
| ^~~~~~~
| TIOCINQ
vsock_test.c:1344:34: note: each undeclared identifier is reported only once for each function it appears in
```
I just followed the compiler suggestion, and replaced it with `TIOCINQ`.
Following your comments, I found that `SIOCINQ` is defined in `linux/sockios.h`, as documented in [1].
The documentation suggests that we can use `FIONREAD` alternatively.
In order to avoid confusion, I'd like to choose `SIOCINQ`.
1: https://man7.org/linux/man-pages/man7/unix.7.html
Thanks,
Xuewei
> The rest LGTM.
>
> Thanks,
> Stefano
>
> >+ MSG_BUF_IOCTL_LEN)) {
> >+ fprintf(stderr, "Test skipped, TIOCINQ not supported.\n");
> >+ goto out;
> >+ }
> >+
> >+ recv_buf(fd, buf, sizeof(buf), 0, sizeof(buf));
> >+ /* All data has been consumed, so the expected is 0. */
> >+ vsock_ioctl_int(fd, TIOCINQ, &sock_bytes_unread, 0);
> >+
> >+out:
> >+ close(fd);
> >+}
> >+
> > static void test_stream_unsent_bytes_client(const struct test_opts *opts)
> > {
> > test_unsent_bytes_client(opts, SOCK_STREAM);
> >@@ -1325,6 +1375,26 @@ static void test_seqpacket_unsent_bytes_server(const struct test_opts *opts)
> > test_unsent_bytes_server(opts, SOCK_SEQPACKET);
> > }
> >
> >+static void test_stream_unread_bytes_client(const struct test_opts *opts)
> >+{
> >+ test_unread_bytes_client(opts, SOCK_STREAM);
> >+}
> >+
> >+static void test_stream_unread_bytes_server(const struct test_opts *opts)
> >+{
> >+ test_unread_bytes_server(opts, SOCK_STREAM);
> >+}
> >+
> >+static void test_seqpacket_unread_bytes_client(const struct test_opts *opts)
> >+{
> >+ test_unread_bytes_client(opts, SOCK_SEQPACKET);
> >+}
> >+
> >+static void test_seqpacket_unread_bytes_server(const struct test_opts *opts)
> >+{
> >+ test_unread_bytes_server(opts, SOCK_SEQPACKET);
> >+}
> >+
> > #define RCVLOWAT_CREDIT_UPD_BUF_SIZE (1024 * 128)
> > /* This define is the same as in 'include/linux/virtio_vsock.h':
> > * it is used to decide when to send credit update message during
> >@@ -2051,6 +2121,16 @@ static struct test_case test_cases[] = {
> > .run_client = test_stream_nolinger_client,
> > .run_server = test_stream_nolinger_server,
> > },
> >+ {
> >+ .name = "SOCK_STREAM ioctl(SIOCINQ) functionality",
> >+ .run_client = test_stream_unread_bytes_client,
> >+ .run_server = test_stream_unread_bytes_server,
> >+ },
> >+ {
> >+ .name = "SOCK_SEQPACKET ioctl(SIOCINQ) functionality",
> >+ .run_client = test_seqpacket_unread_bytes_client,
> >+ .run_server = test_seqpacket_unread_bytes_server,
> >+ },
> > {},
> > };
> >
> >--
> >2.34.1
> >
