From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D863D541E77 for ; Tue, 22 Sep 2026 14:49:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790088557; cv=none; b=CKblHEhKXmja8ooFolTr62ejHbJOfazWRrEbUadD96R/feWLdlPvD9N1uum6GthD/XpPlfhSVw56oRAmzpCGCPCZ0TKokpKjyQnyYOH64xIthmNR2QZZoEueVzZ2QHZJTGwjl107DwmRVsGogrgoUFxFlRRhSjELLmYG5SCYs4s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790088557; c=relaxed/simple; bh=UxKZDEjByunVRhpBdiEHA4lVszn7c/xwz4sFrzirDbM=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: In-Reply-To:Content-Type:Content-Disposition; b=IeKVW7OlsJCeKVN/VHyx+Ocl5sz6fIr+udRqOJmfLSYxzAUI8QVIGpvRHuuK7P4LDJ8cRBvbYof0Vw6uzP0G+MVAiiYgKULTT3Hdt6PBvpmlvmykDLghPssmBYfRjYnJLuwRKfFTOMSnW4eWGGwQCWr1WsT4ayL8dakR/JYET3g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=WArv8ikU; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="WArv8ikU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790088553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=iw4CTk0iW47NSV3WHeuH9qz99UVvDdoWrM85ghkzkys=; b=WArv8ikUP74b95jn/ruw0gcGb8B/V8BfCtkBpHrXib7TSiZphNe0r+mmeQsaaAi/zV5C3T szCe4E1dd8tEoa3gBpdUyuGm0buaozD6ssi6PWHwuXwnmvgprElr6J6SvtpoEl/VS7yf6R G+awn58KQvtZzTBqVdmcoBK6VS+cU0Q= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-686-FcLRtPrjNsqmo14rE8F7Jg-1; Tue, 22 Sep 2026 10:49:12 -0400 X-MC-Unique: FcLRtPrjNsqmo14rE8F7Jg-1 X-Mimecast-MFC-AGG-ID: FcLRtPrjNsqmo14rE8F7Jg_1790088551 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-487038a4a88so11192f8f.0 for ; Tue, 22 Sep 2026 07:49:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790088551; x=1790693351; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=iw4CTk0iW47NSV3WHeuH9qz99UVvDdoWrM85ghkzkys=; b=MZnFLnshT2Wh9OuWDUFvI3nm0uP0gxTbOkxtxSoCM8rlMwNpDawH14qd0MPHbwq7hm jpyZgcLZFD9wasVg+StwbUxVc+5xDRzo3LxnhQUufxUZccX+yuhd3gVL9xQa6S3Aascg 7rTSS3/DErM9xxqQkKllSHDObnN0zlA+jXGNRYTvJF2+eYUC+cjUczrqRfAHn1GM+fPZ nKDJQM95S5aRxcfn+dcqUNwFXvkF3z8KY2BfYZWoUYNopRSy50/pMAge5UkXxr2h4C9d 1gTgTLX71szM8Vo2WD/yJqVy1qM8ePEFWau0lUo4IFPe/+vWN4MKk6Rn1yzYY9gEEqM5 XIiQ== X-Forwarded-Encrypted: i=1; AKwUvBzmNt/VKGDdsrQ7U6veeA+gT9cGZG5YnvQ93Nc+c4B8K9ZRxQdTGBH7aJnIZm4AzxjAw6BTbfUCdVaNTPQ9CQ==@lists.linux.dev X-Gm-Message-State: AFuF++kBjP4aFEut50lgfssRKYOzTCkJQ7w4fgdPLJ4T5RNBkMYTqmQg HjNd6Q/4h7OP55ICl/iJSOjqKlQpKqkdFLBg4wbbqEXJA1ImlwooPEDoHO/fgyz6x80DD34FJ/2 IP0To5zeTXm48SMxdb0NKQn/zl3Uvlfas8rV/7cclKHoZYPKpCW0BwsJIWa5Ot2JwqqVd X-Gm-Gg: AYBFou08DuBeFeDOaJJpt6yu7dRP+VafpJ2sgmHChwKYPblS6gsGB7OE15oDyQl++gf 7ej2cvElbHFEel+R5Jfj4XRcqBn5tXNdhDkNtNGr8TdB6Ko5RehGNz6aFlqCwpdR0buzaTayc62 QDzRXeKgiB4ZPDTZbNHzV7hnFbrWOgiSBMbjlFA0AMZv61MyW8EKPyoOo0YZNgyLPwvQyHeuRIu Mc5Xl31kzRL7G82OI0h8Vx1u7xxNfMtBuS2EjV1ioSxR8Kwq2gwG44KRU0EXytybCKybQoE1ZMM 8WUmEI1ikkkmhsXkHAVc4hdYW+YmhpOufHKZId75rJ3tG0z2DcObaXmcrs4hOQ+MD/W0l9aARAQ 9ZXZlEoCUDypP6ysMCmjLnJ8EsyiGVWhaO3ucuPbSRupg7tL4WGE= X-Received: by 2002:a05:6000:2001:b0:487:725:8210 with SMTP id ffacd0b85a97d-4871e2273eamr23277266f8f.21.1790088550810; Tue, 22 Sep 2026 07:49:10 -0700 (PDT) X-Received: by 2002:a05:6000:2001:b0:487:725:8210 with SMTP id ffacd0b85a97d-4871e2273eamr23277227f8f.21.1790088550277; Tue, 22 Sep 2026 07:49:10 -0700 (PDT) Received: from sgarzare-redhat (host-82-53-134-131.retail.telecomitalia.it. [82.53.134.131]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48862731a53sm5611371f8f.4.2026.09.22.07.49.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2026 07:49:09 -0700 (PDT) Date: Tue, 22 Sep 2026 16:49:05 +0200 From: Stefano Garzarella To: David Carlier Cc: netdev@vger.kernel.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org Subject: Re: [PATCH net-next 2/2] vsock/test: cover receive queue hints Message-ID: References: <20260920194710.1114748-1-devnexen@gmail.com> <20260920194710.1114748-3-devnexen@gmail.com> Precedence: bulk X-Mailing-List: virtualization@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In-Reply-To: <20260920194710.1114748-3-devnexen@gmail.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: zlGKBGk6E9OONstL7K1cSjStiObPRDNclVzs_T7G6eM_1790088551 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline On Sun, Sep 20, 2026 at 08:47:10PM +0100, David Carlier wrote: >Add io_uring receive tests checking IORING_CQE_F_SOCK_NONEMPTY across a >partial receive, draining while the peer stays connected, EOF, a >nonblocking receive on an empty queue, a zero-length request, and a >multishot receive with provided buffers. > >Signed-off-by: David Carlier >--- > tools/testing/vsock/vsock_uring_test.c | 367 +++++++++++++++++++++++++ > 1 file changed, 367 insertions(+) > >diff --git a/tools/testing/vsock/vsock_uring_test.c b/tools/testing/vsock/vsock_uring_test.c >index 5c3078969659..318e17bd28bc 100644 >--- a/tools/testing/vsock/vsock_uring_test.c >+++ b/tools/testing/vsock/vsock_uring_test.c >@@ -13,7 +13,10 @@ > #include > #include > #include >+#include > #include >+#include >+#include > #include > > #include "util.h" >@@ -28,6 +31,10 @@ > > #define VSOCK_TEST_DATA_MAX_IOV 3 > >+#define HINT_CHUNK_SIZE 4096 >+#define HINT_BUF_GROUP 1 >+#define HINT_BUF_ENTRIES 4 >+ > struct vsock_io_uring_test { > /* Number of valid elements in 'vecs'. */ > int vecs_cnt; >@@ -211,6 +218,341 @@ void test_stream_uring_msg_zc_client(const struct test_opts *opts) > vsock_io_uring_client(opts, &test_data_array[i], true); > } > >+struct uring_inq_ctx { >+ struct io_uring ring; >+ int fd; >+}; >+ >+static void inq_server_init(struct uring_inq_ctx *ctx, >+ const struct test_opts *opts) >+{ >+ ctx->fd = vsock_stream_accept(VMADDR_CID_ANY, opts->peer_port, NULL); >+ if (ctx->fd < 0) { >+ perror("accept"); >+ exit(EXIT_FAILURE); >+ } >+ >+ if (io_uring_queue_init(RING_ENTRIES_NUM, &ctx->ring, 0)) >+ error(1, errno, "io_uring_queue_init"); >+} >+ >+static void inq_server_exit(struct uring_inq_ctx *ctx) >+{ >+ io_uring_queue_exit(&ctx->ring); >+ close(ctx->fd); >+} >+ >+/* Submit a single receive and report both its result and its CQE flags. */ >+static int inq_recv(struct uring_inq_ctx *ctx, void *buf, size_t len, >+ int flags, unsigned int *cflags) >+{ >+ struct io_uring_sqe *sqe; >+ struct io_uring_cqe *cqe; >+ int res; >+ >+ sqe = io_uring_get_sqe(&ctx->ring); >+ io_uring_prep_recv(sqe, ctx->fd, buf, len, flags); >+ >+ if (io_uring_submit(&ctx->ring) != 1) >+ error(1, errno, "io_uring_submit"); >+ >+ if (io_uring_wait_cqe(&ctx->ring, &cqe)) >+ error(1, errno, "io_uring_wait_cqe"); >+ >+ res = cqe->res; >+ *cflags = cqe->flags; >+ io_uring_cqe_seen(&ctx->ring, cqe); >+ >+ return res; >+} >+ >+static void expect_res(int res, int expected, const char *what) Maybe this can go in util.c/h so we can reuse in the future. >+{ >+ if (res != expected) { >+ fprintf(stderr, "%s: expected %d, got %d\n", what, expected, >+ res); >+ exit(EXIT_FAILURE); >+ } >+} >+ >+static void expect_nonempty(unsigned int cflags, bool expected, nit: can you add uring or something like that in the function name since it seem io_uring related. >+ const char *what) >+{ >+ bool nonempty = !!(cflags & IORING_CQE_F_SOCK_NONEMPTY); >+ >+ if (nonempty != expected) { >+ fprintf(stderr, "%s: expected SOCK_NONEMPTY %d, got %d\n", >+ what, expected, nonempty); >+ exit(EXIT_FAILURE); >+ } >+} >+ >+/* Wait until the whole payload is queued, so the hint is deterministic. */ >+static void inq_wait_queued(int fd, int len) >+{ >+ if (!vsock_ioctl_int(fd, SIOCINQ, len)) { >+ fprintf(stderr, "SIOCINQ not supported\n"); >+ exit(EXIT_FAILURE); Should we avoid to fail if it isn't supported and just skip the test? >+ } >+} >+ >+static void inq_send_chunks(const struct test_opts *opts, int chunks) >+{ >+ char buf[HINT_CHUNK_SIZE]; >+ int fd, i; >+ >+ fd = vsock_stream_connect(opts->peer_cid, opts->peer_port); >+ if (fd < 0) { >+ perror("connect"); >+ exit(EXIT_FAILURE); >+ } >+ >+ memset(buf, 0xa5, sizeof(buf)); >+ for (i = 0; i < chunks; i++) >+ send_buf(fd, buf, sizeof(buf), 0, sizeof(buf)); >+ >+ control_writeln("SENT"); >+ control_expectln("DONE"); >+ close(fd); >+} >+ >+static void test_stream_uring_inq_client(const struct test_opts *opts) >+{ >+ inq_send_chunks(opts, 2); >+} >+ >+static void test_stream_uring_inq_server(const struct test_opts *opts) >+{ >+ char buf[HINT_CHUNK_SIZE]; >+ struct uring_inq_ctx ctx; >+ unsigned int cflags; >+ int res; >+ >+ inq_server_init(&ctx, opts); >+ >+ control_expectln("SENT"); >+ inq_wait_queued(ctx.fd, 2 * HINT_CHUNK_SIZE); >+ >+ /* Data remains after this receive, so the flag must be set. */ >+ res = inq_recv(&ctx, buf, sizeof(buf), 0, &cflags); >+ expect_res(res, HINT_CHUNK_SIZE, "partial receive"); >+ expect_nonempty(cflags, true, "partial receive"); >+ >+ /* This receive drains the queue while the peer stays connected. */ >+ res = inq_recv(&ctx, buf, sizeof(buf), 0, &cflags); >+ expect_res(res, HINT_CHUNK_SIZE, "draining receive"); >+ expect_nonempty(cflags, false, "draining receive"); >+ >+ control_writeln("DONE"); >+ inq_server_exit(&ctx); >+} >+ >+static void test_stream_uring_inq_eof_client(const struct test_opts *opts) >+{ >+ char buf[HINT_CHUNK_SIZE]; >+ int fd; >+ >+ fd = vsock_stream_connect(opts->peer_cid, opts->peer_port); >+ if (fd < 0) { >+ perror("connect"); >+ exit(EXIT_FAILURE); >+ } >+ >+ memset(buf, 0x5a, sizeof(buf)); >+ send_buf(fd, buf, sizeof(buf), 0, sizeof(buf)); >+ control_writeln("SENT"); >+ >+ control_expectln("DRAINED"); >+ close(fd); >+ control_writeln("CLOSED"); >+ >+ control_expectln("DONE"); Why we need this barrier? Note: the test runners already add barriers before starting new tests, please check if we need it. Also in the other tests, maybe we need some of them (e.g. to avoid the peer will close the socket), but I'm not sure if we need all of them. Thanks, Stefano >+} >+ >+static void test_stream_uring_inq_eof_server(const struct test_opts *opts) >+{ >+ char buf[HINT_CHUNK_SIZE]; >+ struct uring_inq_ctx ctx; >+ unsigned int cflags; >+ int res; >+ >+ inq_server_init(&ctx, opts); >+ >+ control_expectln("SENT"); >+ inq_wait_queued(ctx.fd, HINT_CHUNK_SIZE); >+ >+ res = inq_recv(&ctx, buf, sizeof(buf), 0, &cflags); >+ expect_res(res, HINT_CHUNK_SIZE, "drain before EOF"); >+ expect_nonempty(cflags, false, "drain before EOF"); >+ >+ control_writeln("DRAINED"); >+ control_expectln("CLOSED"); >+ >+ /* The queue is empty and the peer is gone. The hint stays non-zero >+ * so that this receive happens and reports EOF, as TCP does after a >+ * FIN. >+ */ >+ res = inq_recv(&ctx, buf, sizeof(buf), 0, &cflags); >+ expect_res(res, 0, "receive at EOF"); >+ expect_nonempty(cflags, true, "receive at EOF"); >+ >+ control_writeln("DONE"); >+ inq_server_exit(&ctx); >+} >+ >+static void test_stream_uring_inq_empty_client(const struct test_opts *opts) >+{ >+ int fd; >+ >+ fd = vsock_stream_connect(opts->peer_cid, opts->peer_port); >+ if (fd < 0) { >+ perror("connect"); >+ exit(EXIT_FAILURE); >+ } >+ >+ control_writeln("READY"); >+ control_expectln("DONE"); >+ close(fd); >+} >+ >+static void test_stream_uring_inq_empty_server(const struct test_opts *opts) >+{ >+ char buf[HINT_CHUNK_SIZE]; >+ struct uring_inq_ctx ctx; >+ unsigned int cflags; >+ int res; >+ >+ inq_server_init(&ctx, opts); >+ >+ control_expectln("READY"); >+ >+ /* A failed receive must not leave a stale positive hint. */ >+ res = inq_recv(&ctx, buf, sizeof(buf), MSG_DONTWAIT, &cflags); >+ expect_res(res, -EAGAIN, "empty nonblocking receive"); >+ expect_nonempty(cflags, false, "empty nonblocking receive"); >+ >+ control_writeln("DONE"); >+ inq_server_exit(&ctx); >+} >+ >+static void test_stream_uring_inq_zerolen_client(const struct test_opts *opts) >+{ >+ inq_send_chunks(opts, 1); >+} >+ >+static void test_stream_uring_inq_zerolen_server(const struct test_opts *opts) >+{ >+ char buf[HINT_CHUNK_SIZE]; >+ struct uring_inq_ctx ctx; >+ unsigned int cflags; >+ int res; >+ >+ inq_server_init(&ctx, opts); >+ >+ control_expectln("SENT"); >+ inq_wait_queued(ctx.fd, HINT_CHUNK_SIZE); >+ >+ /* A zero-length request is not an error and still describes the >+ * queue behind it. >+ */ >+ res = inq_recv(&ctx, buf, 0, 0, &cflags); >+ expect_res(res, 0, "zero-length receive"); >+ expect_nonempty(cflags, true, "zero-length receive"); >+ >+ control_writeln("DONE"); >+ inq_server_exit(&ctx); >+} >+ >+static void test_stream_uring_inq_mshot_client(const struct test_opts *opts) >+{ >+ char buf[HINT_CHUNK_SIZE]; >+ int fd; >+ >+ fd = vsock_stream_connect(opts->peer_cid, opts->peer_port); >+ if (fd < 0) { >+ perror("connect"); >+ exit(EXIT_FAILURE); >+ } >+ >+ memset(buf, 0x3c, sizeof(buf)); >+ send_buf(fd, buf, sizeof(buf), 0, sizeof(buf)); >+ control_writeln("SENT"); >+ >+ control_expectln("DRAINED"); >+ close(fd); >+ control_writeln("CLOSED"); >+ >+ control_expectln("DONE"); >+} >+ >+static void test_stream_uring_inq_mshot_server(const struct test_opts *opts) >+{ >+ static char bufs[HINT_BUF_ENTRIES][HINT_CHUNK_SIZE]; >+ struct io_uring_buf_ring *br; >+ struct uring_inq_ctx ctx; >+ struct io_uring_sqe *sqe; >+ struct io_uring_cqe *cqe; >+ int i, ret; >+ >+ inq_server_init(&ctx, opts); >+ >+ br = io_uring_setup_buf_ring(&ctx.ring, HINT_BUF_ENTRIES, >+ HINT_BUF_GROUP, 0, &ret); >+ if (!br) { >+ fprintf(stderr, "io_uring_setup_buf_ring: %d\n", ret); >+ exit(EXIT_FAILURE); >+ } >+ >+ for (i = 0; i < HINT_BUF_ENTRIES; i++) >+ io_uring_buf_ring_add(br, bufs[i], HINT_CHUNK_SIZE, i, >+ io_uring_buf_ring_mask(HINT_BUF_ENTRIES), >+ i); >+ io_uring_buf_ring_advance(br, HINT_BUF_ENTRIES); >+ >+ sqe = io_uring_get_sqe(&ctx.ring); >+ io_uring_prep_recv_multishot(sqe, ctx.fd, NULL, 0, 0); >+ sqe->flags |= IOSQE_BUFFER_SELECT; >+ sqe->buf_group = HINT_BUF_GROUP; >+ >+ if (io_uring_submit(&ctx.ring) != 1) >+ error(1, errno, "io_uring_submit"); >+ >+ control_expectln("SENT"); >+ >+ /* The payload completion drains the queue and keeps the request >+ * armed, so the hint must report the queue as empty. >+ */ >+ if (io_uring_wait_cqe(&ctx.ring, &cqe)) >+ error(1, errno, "io_uring_wait_cqe"); >+ >+ expect_res(cqe->res, HINT_CHUNK_SIZE, "multishot payload"); >+ expect_nonempty(cqe->flags, false, "multishot payload"); >+ if (!(cqe->flags & IORING_CQE_F_MORE)) { >+ fprintf(stderr, "multishot payload: request not rearmed\n"); >+ exit(EXIT_FAILURE); >+ } >+ io_uring_cqe_seen(&ctx.ring, cqe); >+ >+ control_writeln("DRAINED"); >+ control_expectln("CLOSED"); >+ >+ /* EOF ends multishot regardless of the hint. */ >+ if (io_uring_wait_cqe(&ctx.ring, &cqe)) >+ error(1, errno, "io_uring_wait_cqe"); >+ >+ expect_res(cqe->res, 0, "multishot EOF"); >+ if (cqe->flags & IORING_CQE_F_MORE) { >+ fprintf(stderr, "multishot EOF: request still armed\n"); >+ exit(EXIT_FAILURE); >+ } >+ io_uring_cqe_seen(&ctx.ring, cqe); >+ >+ control_writeln("DONE"); >+ io_uring_free_buf_ring(&ctx.ring, br, HINT_BUF_ENTRIES, >+ HINT_BUF_GROUP); >+ inq_server_exit(&ctx); >+} >+ > static struct test_case test_cases[] = { > { > .name = "SOCK_STREAM io_uring test", >@@ -222,6 +564,31 @@ static struct test_case test_cases[] = { > .run_server = test_stream_uring_msg_zc_server, > .run_client = test_stream_uring_msg_zc_client, > }, >+ { >+ .name = "SOCK_STREAM io_uring receive queue hint", >+ .run_server = test_stream_uring_inq_server, >+ .run_client = test_stream_uring_inq_client, >+ }, >+ { >+ .name = "SOCK_STREAM io_uring receive hint at EOF", >+ .run_server = test_stream_uring_inq_eof_server, >+ .run_client = test_stream_uring_inq_eof_client, >+ }, >+ { >+ .name = "SOCK_STREAM io_uring receive hint on empty queue", >+ .run_server = test_stream_uring_inq_empty_server, >+ .run_client = test_stream_uring_inq_empty_client, >+ }, >+ { >+ .name = "SOCK_STREAM io_uring receive hint zero-length", >+ .run_server = test_stream_uring_inq_zerolen_server, >+ .run_client = test_stream_uring_inq_zerolen_client, >+ }, >+ { >+ .name = "SOCK_STREAM io_uring multishot receive hint", >+ .run_server = test_stream_uring_inq_mshot_server, >+ .run_client = test_stream_uring_inq_mshot_client, >+ }, > {}, > }; > >-- >2.55.0 >