From: netdev-bot+sashiko@kernel.org
To: bobbyeshleman@meta.com
Cc: sgarzare@redhat.com, davem@davemloft.net, edumazet@kernel.org,
kuba@kernel.org, pabeni@redhat.com, horms@kernel.org,
georgezhang@vmware.com, acking@vmware.com, dtor@vmware.com,
virtualization@lists.linux.dev, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, kylebot@openai.com, mhal@rbox.co
Subject: Re: [PATCH net v2] vsock: only undo SS_CONNECTING when connect() fails
Date: Thu, 19 Nov 2026 02:27:54 +0000 [thread overview]
Message-ID: <179505527459.3136.4929715245621080353@kernel.org> (raw)
In-Reply-To: <20261117-vsock-connect-close-v2-1-db5388323770@meta.com>
Thank you for your contribution! Sashiko AI review found 3 potential
issue(s) to consider.
Critical: 0 · High: 0 · Medium: 1 · Low: 2
If you believe none of the issues are legitimate, please reply to each
issue of Medium severity or higher and explain why the AI is wrong.
If any of them are legitimate and you plan to respin, please let patchwork
know by including "pw-bot: cr" as a separate line at the end of your reply
(one such reply per series is enough).
- [Medium] A connect() waiter that times out late can still abort a newer
connect attempt on the same socket.
- [Low] The commit message names the wrong trigger paths.
- [Low] If another thread calls shutdown() while a blocking connect() is
sleeping, a failed connect now leaves the socket in SS_DISCONNECTING…
--
vsock: only undo SS_CONNECTING when connect() fails
This patch adds a vsock_connect_close() helper. On a failed connect(), it
moves sk_state to TCP_CLOSE only if it is still TCP_SYN_SENT, and moves
sock->state to SS_UNCONNECTED only if it is still SS_CONNECTING. The goal
is to stop a socket that got connected and was then reset from going back
to SS_UNCONNECTED, and to stop a late waiter from overwriting TCP_LISTEN.
Link: https://lore.kernel.org/netdev/20260909-vsock-connect-reset-closing-v1-1-50298b9ccfbf@rbox.co/
> vsock_connect() sleeps with the socket unlocked. Meanwhile the transport
> can complete the handshake, setting sock->state to SS_CONNECTED, and then
> reset the connection, e.g. in vhost_vsock_reset_orphans(),
> virtio_vsock_reset_sock() or vmci_transport_handle_detach(). When
> connect() gets the lock back, it finds sk_err set and moves the socket
> back to SS_UNCONNECTED.
[Severity: Low]
Does this description hold for all three examples?
virtio_vsock_reset_sock() fits it: it sets sk_state = TCP_CLOSE and
sk_err = ECONNRESET.
vhost_vsock_reset_orphans() in drivers/vhost/vsock.c writes a socket_state
constant into sk_state:
sk->sk_state = SS_UNCONNECTED;
sk->sk_err = ECONNRESET;
SS_UNCONNECTED has the same value (1) as TCP_ESTABLISHED. This function
also only runs on sockets in vsock_connected_table, which are already
established. So a vsock_connect() that gets the lock back takes the early
exit:
if (sk->sk_state == TCP_ESTABLISHED ||
sk->sk_state == TCP_CLOSING) {
err = 0;
goto out_wait;
}
It returns 0 and never reaches the code this patch changes.
vmci_transport_handle_detach() sets sk_err only in the TCP_SYN_SENT branch.
For an established socket it only does this, and sk_err stays 0:
sk->sk_state = TCP_CLOSE;
connect() then goes back to sleep and reaches the reset through the
timeout/signal branch, not through the sock_error() branch.
The code change covers both reset sites, so only the description is
affected. Could the commit message say which transports actually reach
this, and by which path?
> diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
> index 1d7d53542724f..ce958b48295b9 100644
> --- a/net/vmw_vsock/af_vsock.c
> +++ b/net/vmw_vsock/af_vsock.c
> @@ -1704,6 +1704,19 @@ static void vsock_connect_timeout(struct work_struct *work)
> sock_put(sk);
> }
>
> +/* Avoid breaking the socket when another thread has changed its state while
> + * we were asleep.
> + */
> +static void vsock_connect_close(struct socket *sock)
> +{
> + struct sock *sk = sock->sk;
> +
> + if (sk->sk_state == TCP_SYN_SENT)
> + sk->sk_state = TCP_CLOSE;
> + if (sock->state == SS_CONNECTING)
> + sock->state = SS_UNCONNECTED;
[Severity: Low]
What happens if another thread calls shutdown() while a blocking connect()
is asleep?
vsock_shutdown() moves any socket that is not SS_UNCONNECTED to
SS_DISCONNECTING, including one that is still SS_CONNECTING:
} else {
sock->state = SS_DISCONNECTING;
err = 0;
}
Later the sleeping connect() times out, gets a signal, or sees sk_err.
vsock_connect_close() then moves sk_state from TCP_SYN_SENT to TCP_CLOSE,
but sock->state stays SS_DISCONNECTING. After that, every connect() takes
this path:
case SS_DISCONNECTING:
err = -EINVAL;
goto out;
listen() also fails its sock->state != SS_UNCONNECTED check. So a socket
that never connected can no longer be reused. Before this patch it went
back to SS_UNCONNECTED.
The non-blocking path in vsock_connect_timeout() still resets sock->state
without checking it:
if (sk->sk_state == TCP_SYN_SENT &&
(sk->sk_shutdown != SHUTDOWN_MASK)) {
sk->sk_state = TCP_CLOSE;
sk->sk_socket->state = SS_UNCONNECTED;
So the same shutdown-during-connect race now ends differently depending on
O_NONBLOCK.
SS_DISCONNECTING does need to stay when the connection was established
before shutdown() and the reset. Otherwise SS_CONNECTED ->
SS_DISCONNECTING -> reset brings the original problem back. Could the
helper tell the never-established case apart, for example by looking at
sk_state, instead of either always keeping or always clearing
SS_DISCONNECTING?
> +}
> +
[ ... ]
> @@ -1862,8 +1875,7 @@ static int vsock_connect(struct socket *sock, struct sockaddr_unsized *addr,
> * sk_state == TCP_SYN_SENT, which hereby we break.
> * In such case VIRTIO_VSOCK_OP_RST will follow.
> */
> - sk->sk_state = TCP_CLOSE;
> - sock->state = SS_UNCONNECTED;
> + vsock_connect_close(sock);
>
> /* Try to cancel VIRTIO_VSOCK_OP_REQUEST skb sent out by
> * transport->connect().
[Severity: Medium]
Can a connect() waiter that times out late still abort a newer connect
attempt on the same socket?
vsock_connect_close() only checks whether the socket looks like it is
connecting right now. It cannot tell whether TCP_SYN_SENT / SS_CONNECTING
belongs to this waiter's attempt or to a later connect() call.
Here is a possible sequence in vsock_connect():
Thread A
blocking connect(), sets TCP_SYN_SENT / SS_CONNECTING, sleeps
Thread B
connect() on the same socket, takes the SS_CONNECTING case (-EALREADY),
sleeps with a full connect_timeout
The peer rejects the handshake:
virtio_transport_recv_connecting()
sk->sk_state = TCP_CLOSE;
sk->sk_err = skerr;
sk_error_report(sk);
Thread A
wakes first, sock_error() clears sk_err to 0,
vsock_connect_close() sets SS_UNCONNECTED
Thread B
wakes, sees TCP_CLOSE with sk_err == 0, sleeps for the rest of its
timeout
Thread C
connect() takes the default branch, sets TCP_SYN_SENT, sends a REQUEST,
sets SS_CONNECTING
Thread B
timeout expires:
vsock_connect_close(sock); <- sees C's state, resets it
vsock_transport_cancel_pkt(vsk); <- cancels C's REQUEST
C is not woken and gets no error. It sleeps until its own timeout and
returns -ETIMEDOUT. A peer RESPONSE that arrives while the socket is in
TCP_CLOSE gets an RST.
This looks like the same stale-waiter problem that v2 fixes for
TCP_LISTEN. The new helper's comment says "Avoid breaking the socket when
another thread has changed its state while we were asleep". Should this
case be covered as well?
[ ... ]
--
Sashiko AI review · https://netdev-ai.bots.linux.dev/sashiko/#/patchset/20261117-vsock-connect-close-v2-1-db5388323770%40meta.com
prev parent reply other threads:[~2026-11-19 2:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 1:34 Bobby Eshleman
2026-11-18 1:38 ` netdev-bot+sinfo
2026-11-19 2:27 ` netdev-bot+sashiko [this message]
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=179505527459.3136.4929715245621080353@kernel.org \
--to=netdev-bot+sashiko@kernel.org \
--cc=acking@vmware.com \
--cc=bobbyeshleman@meta.com \
--cc=davem@davemloft.net \
--cc=dtor@vmware.com \
--cc=edumazet@kernel.org \
--cc=georgezhang@vmware.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=kylebot@openai.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mhal@rbox.co \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sgarzare@redhat.com \
--cc=virtualization@lists.linux.dev \
/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®