From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.216.46 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794017359; b=rmYTdz9mxfztmf6KZExe9B2xBv208x7g5n90ts0cbgcX7P/CqOT03E44o/XsPl4E7h5Y e7yYUBpxRf9hVCc+FZw1Di5KODp2tJXLcs+LWN+H4lnXcfgjiV/aVer51C0AvZGUANFG2 6QeD9x9qKOb62ygMmDmUdRg11ZUD9kc0l3Es5j8knhrZiNUnxe4tOJRyt2oY2s4cgvBcu N9eAOELDdCoITmKBZ1JnwCnFtKONSN+CEscPx23w6S1qm2O0azYgl/IxPAsHzS9Lz157g l9y0+UpElnWze6cgrS1IamLPwi2y/NtLZejDpAX4uiltitbSmCgGButDHz6+8DIShgQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794017359; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: Content-Type:Date:Message-Id:Cc:Subject:From:To:In-Reply-To: References:Content-Transfer-Encoding:MIME-Version; bh=oWCm5sO2ZJcIfwM/bU9hgd9OcLaoRmJrQ2OQCAcOYQw=; b=qT2/Yjt5AJH3sFSLfq4yaBhByYIreBnA6PsDlsUnunq1++80kAtrXr4Vrb4GOegpzM4d TPsxnvRB5W7gxEsz2R8cyMlIkzs2YX77GNrWYymvohurewTFDZp/qlpvgALw0kFrkx2rI KSP7fEpgjvXOeayh0VIAB+CxOYxn14nvmob3jm2PYsIXdmvya+qxJFHVg6JJ4Qm4fsCbJ e29nLI3xlpKRa5buhTvYuM5tw+aHYUcAwzC912NDSmXWw9NTAflihuK0PX2Afd3VPBdH7 ZNbi0bQLqUaQ+q8HBwkN1zHqqC5mYz4DA4H6PgWl66wR+7U5JEqsGejC9IjMqpZRXog== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=H+8vyume; arc=none smtp.remote-ip=209.85.216.46 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 63CED606A330 for ; Sat, 7 Nov 2026 02:09:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 63CED606A330 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=H+8vyume Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-3b0e61a4decso852581a91.2 for ; Fri, 06 Nov 2026 18:09:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794017359; x=1794622159; darn=vger.kernel.org; h=mime-version:content-transfer-encoding:references:in-reply-to:to :from:subject:cc:message-id:date:content-type:from:to:cc:subject :date:message-id:reply-to:content-type; bh=oWCm5sO2ZJcIfwM/bU9hgd9OcLaoRmJrQ2OQCAcOYQw=; b=H+8vyume+obI271XmNk+PDu48Q19jOLc/Va8iCJp+YPAfevLZPbtqZKst6ucyXtfSw SesmJ3do6CgH0DvagS2lCWl//emQ8A8R9ws51AQTEijOWlvGxTR2vpKj7HFj7HUNesAD Iz/tqmsd4wcjINMkFThPdh82py3fh0hdETwaSNa/7BESxLI2fFYv4JdsIe5+Yh+iNqwi GuQQxgL9obB3jiEMRpDE9NQASENmDbDCM9g7vOrH4FzP3N/mV41LFrwuOV+fbmrRkUkI PlnkIn5ku0EaxwHF2d31ktU40mx5GyEtw9tUQotInc5smSPvSCczAu0/CGscJ/0+rKLR LO6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794017359; x=1794622159; h=mime-version:content-transfer-encoding:references:in-reply-to:to :from:subject:cc:message-id:date:content-type:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=oWCm5sO2ZJcIfwM/bU9hgd9OcLaoRmJrQ2OQCAcOYQw=; b=A1xxMN4lk/Ak5ER5JUGGBCbrLf2WK7Ogh1P2SvdwJNKRpbfbDLFzDxuyfcYwTYkR1U zoaUVA6rSrB93jBsjHIGpz1ocR96/WjtaJItI1t1A9iDFxoKSTd2AzoyrYMRQ6zlT0/p 76uzyi54xmUlC8KYKRIP/1iWqtf+YUNo01OxB9Wl34ETLkFmZ3EpLMEKX0azHiwVouZR KBRqgL/j/mv8zPc3sR8iVDsZscT2M+kCiEJyQarsQP9GCRajfJaUwXVpKbBKq2kuiycr mEYdEZXERPGwgnXVFDzfCTV6MG0lS98teaYt9B1DTVDdrk/AKKSBbYQNCDrqutfT6uxs lw/g== X-Forwarded-Encrypted: i=1; AL+hErHCLULsHJUiQZfpBTk9t3a3fiMu+d2ULFCxQWZjNIjKgOcuZ3P6/N/9QP/ZhZ2JPePaD4w/r6w=@vger.kernel.org X-Gm-Message-State: APuU4Z/CFZzda0dKVPE+65jgIAFYsaUCZtVIKqLK+RlXzUeHOna5U6pN FqMQF51tr8mZWWv0FX6sBRefCN2+lf2hHcjD/StUfd70S7f8Du8wcMFH X-Gm-Gg: AYBFou2Np4qDkgcE8MnybujJ9QnU/Q0HJx+OuJdWNUAtivI5zQl287eHj2cAxIMuOPq IHrZgyoEild9MY+RqmGWW/12jJWvZ4j6VhzWcVDPTitxf5n/O9p82kMCasyT05a+M9JO56AzTop zWAXAU3sNn5Z9+6+/w1FzFWYsH8Ws0UrOf5XnpEOXV1FKuQF3e3sQ5K4u0IEZ3b+USwdARpuR8Z 0IxEkLGgmdOSkoKGkmaenEuyRqoDbwlqA/aE0F818k5RZ8pjgjs0PHYK2XdPdqVspFZphBtijjR 9vzyP4dbcZVbS6Ee+eYoXrFPYqpSfl959g1ockLCtknG8ByNIfoezXr4CkL7xNWoFHPfhfjk2YF FHi8aIcnryo4mgoGfnWtadeFG7shqPwCxOz+wYA/vlLJzqbGffuB43WKBsxMzfUieeuHWT00Eca tz6h+wW5lqvpTOcdjim/0Si5Y+BS659/7P1R/yU3dHsqshuuX1Iu+E3NgYqpouM7S/3gDNRpxYT GY2QCqN8QVvIobhp78G0/1WHVh6RN+0+wH1URGBGl+XoQfFZoPX0sTpZdqtsM0NG5aafdjYJ3Sd 7vr0Wc/ukwYIR0zOmg6DXb+yvxMMgaMiC0y5OjJMNTzkglWlGbbnlgua1L3I94D6nMv8fZ+9NsX s6msR979dSQnOf6192kKTGB8oUjnntCptAw== X-Received: by 2002:a17:90b:1a91:b0:3b0:ae41:2707 with SMTP id 98e67ed59e1d1-3b0db6fe133mr4547927a91.45.1794017358501; Fri, 06 Nov 2026 18:09:18 -0800 (PST) Received: from localhost ([153.61.198.246]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3b105864375sm1156571a91.4.2026.11.06.18.09.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 06 Nov 2026 18:09:18 -0800 (PST) Content-Type: text/plain; charset=UTF-8 Date: Sat, 07 Nov 2026 02:09:17 +0000 Message-Id: Cc: "Michal Luczaj" , , , , , Subject: Re: [PATCH net v4 1/2] vsock/bpf: release sock lock while waiting for data in recvmsg From: "Alexei Starovoitov" To: , "Stefano Garzarella" , "Bobby Eshleman" , "David S. Miller" , "Eric Dumazet" , "Jakub Kicinski" , "Paolo Abeni" , "Simon Horman" , "Michael S. Tsirkin" In-Reply-To: <20261106-kbh3-1-022-fix-v2-v4-1-c7d36703814d@eldare.de> References: <20261106-kbh3-1-022-fix-v2-v4-0-c7d36703814d@eldare.de> <20261106-kbh3-1-022-fix-v2-v4-1-c7d36703814d@eldare.de> Content-Transfer-Encoding: 8bit X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 On Fri, Nov 06, 2026 at 01:57 PM Jerome Mohm via B4 Relay wrote: > example by a credit update. So the wait also loops until data arrives > or one of the native exits applies: a socket error, a local or peer > shutdown, a socket that is no longer connected, the timeout or a > pending signal. The loop alone, with the lock still held, keeps the > deadlock, so the fix needs both halves and stays one patch. No need for a 2nd copy of the return values. The old code returns true on RCV_SHUTDOWN. The psock queue is empty, so the caller goes to __vsock_recvmsg(), which picks the return value. tcp_bpf, udp_bpf and unix_bpf do the same. Do it for sk_err, peer_shutdown and sk_state too. __vsock_recvmsg() doesn't wait in any of these states. It handles len == 0, MSG_OOB and MSG_ERRQUEUE as well. The copy differs from a socket that is not in a sockmap in four cases. The diff differs in one, the last row: recv() no sockmap this series the diff ------------------------------ ------------ ------------ ----------- after a virtio reset -ENOTCONN -ECONNRESET -ENOTCONN after a reset, len == 0 -ENOTCONN 0 -ENOTCONN after a reset, MSG_OOB -ENOTCONN -EOPNOTSUPP -ENOTCONN after peer shutdown, SO_INQ on 0 + SCM_INQ 0 0 + SCM_INQ asleep when the reset comes -ECONNRESET -ECONNRESET -ENOTCONN Instead of patches 1 and 2 (compile tested only): diff --git a/net/vmw_vsock/vsock_bpf.c b/net/vmw_vsock/vsock_bpf.c index 9049d26..3cf017d 100644 --- a/net/vmw_vsock/vsock_bpf.c +++ b/net/vmw_vsock/vsock_bpf.c @@ -34,24 +34,34 @@ static bool vsock_has_data(struct sock *sk, struct sk_psock *psock) return vsock_sk_has_data(sk, psock); } -static bool vsock_msg_wait_data(struct sock *sk, struct sk_psock *psock, long timeo) +/* __vsock_recvmsg() doesn't wait in these states and knows what to return. */ +static bool vsock_rx_done(struct sock *sk) { - bool ret; - - DEFINE_WAIT_FUNC(wait, woken_wake_function); + return sk->sk_err || sk->sk_state != TCP_ESTABLISHED || + (sk->sk_shutdown & RCV_SHUTDOWN) || + (vsock_sk(sk)->peer_shutdown & SEND_SHUTDOWN); +} - if (sk->sk_shutdown & RCV_SHUTDOWN) - return true; +static int vsock_msg_wait_data(struct sock *sk, struct sk_psock *psock, long timeo) +{ + int ret = 0; - if (!timeo) - return false; + DEFINE_WAIT_FUNC(wait, woken_wake_function); add_wait_queue(sk_sleep(sk), &wait); sk_set_bit(SOCKWQ_ASYNC_WAITDATA, sk); - ret = vsock_has_data(sk, psock); - if (!ret) { - wait_woken(&wait, TASK_INTERRUPTIBLE, timeo); - ret = vsock_has_data(sk, psock); + while (!vsock_has_data(sk, psock) && !vsock_rx_done(sk)) { + if (!timeo) { + ret = -EAGAIN; + break; + } + if (signal_pending(current)) { + ret = sock_intr_errno(timeo); + break; + } + release_sock(sk); + timeo = wait_woken(&wait, TASK_INTERRUPTIBLE, timeo); + lock_sock(sk); } sk_clear_bit(SOCKWQ_ASYNC_WAITDATA, sk); remove_wait_queue(sk_sleep(sk), &wait); @@ -80,6 +90,9 @@ static int vsock_bpf_recvmsg(struct sock *sk, struct msghdr *msg, struct vsock_sock *vsk; int copied; + if (unlikely(!len || (flags & (MSG_OOB | MSG_ERRQUEUE)))) + return __vsock_recvmsg(sk, msg, len, flags); + psock = sk_psock_get(sk); if (unlikely(!psock)) return __vsock_recvmsg(sk, msg, len, flags); @@ -102,10 +115,9 @@ static int vsock_bpf_recvmsg(struct sock *sk, struct msghdr *msg, while (copied == 0) { long timeo = sock_rcvtimeo(sk, flags & MSG_DONTWAIT); - if (!vsock_msg_wait_data(sk, psock, timeo)) { - copied = -EAGAIN; + copied = vsock_msg_wait_data(sk, psock, timeo); + if (copied) break; - } if (sk_psock_queue_empty(psock)) { release_sock(sk); [...] > guest's virtio-vsock device. With the series applied they behave as on > a native socket, except for the reset case above, and the vsock > vmtest.sh single-VM tests and the BPF sockmap test_progs pass. None of these tests sleeps in vsock_msg_wait_data(). The sockmap tests call select() before recv() or pass MSG_DONTWAIT. vmtest.sh doesn't use sockmap. pw-bot: cr