J Jerome Mohm via B4 Relay #
Message details and related content
On a vsock socket in a sockmap, a blocking recv() deadlocks with the virtio delivery worker and stops all vsock rx on that worker, and zero-length, MSG_OOB and MSG_ERRQUEUE reads spin with the lock held, wait, or consume stream bytes. Both come from the commit that added sockmap support. Patch 1 hands those reads to __vsock_recvmsg(), and patch 2 releases the lock around the wait and makes the wait loop. The deadlock and the MSG_ERRQUEUE case were found with the help of Anthropic's Claude, with Stefano adding the stream-byte part; the other cases come from the netdev Sashiko reviews and Alexei. The reproducers are available on request. Changes in v6: - Split into two patches, the zero-length, MSG_OOB and MSG_ERRQUEUE early return first, as Stefano preferred; the deadlock fix does not need it. This is the reverse of the v3 and v4 order, and 2/2 no longer argues for one patch. - 2/2: check the transport in the wait loop before the data, so a reader that wakes after a failed connect() has dropped the transport no longer calls the data check, which warns (netdev Sashiko review). I check the transport instead of swapping the two tests because hv_sock reports the peer's FIN from its has_data() callback. The WARN_ON_ONCE() at the top of vsock_bpf_recvmsg() is unchanged. - 2/2: reword the comment above vsock_rx_done() (Sashiko). - 2/2: leave Sashiko's signal-and-timeout point as is: such a reader gets -EAGAIN where a native one gets -EINTR (see my v5 reply). - Rebase onto current net. - Link to v5: https://patch.msgid.link/20261109-kbh3-1-022-fix-v2-v5-1-4d9af04f0fad@eldare.de Changes in v5: one patch on Alexei's approach, falling back to __vsock_recvmsg() instead of copying its return values, which also replaced the v4 comments; covers the Sashiko review of v4; don't cite the selftests as coverage of the wait (Alexei). Changes in v4: comments, one data <= 0 check and message changes (Stefano); rebase; retest with a new dataless-wakeup reproducer. Changes in v3: split into two patches after Michal's note; end the wait after a reset read with SO_ERROR, and MSG_OOB returns -EOPNOTSUPP (Sashiko). Changes in v2: loop in the wait and stop on sk_err and peer shutdown, len == 0 guard (Sashiko); MSG_ERRQUEUE to the native path.