From nobody Wed May 07 15:36:31 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zszrb4g5Lz5wQ6X; Wed, 07 May 2025 15:36:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zszrb3KXxz3tLY; Wed, 07 May 2025 15:36:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746632191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KXG3iIrXNNu4hN+MDAMl6wYn9mijtNFyrvciLBHHf0M=; b=EujrGtkI2jQfHYmj3//L/W97XKy2MiiRR/mc1PpBKCQxh9ta2EPQu+T2T7PUqLsrm9uE0/ EdPnX0Doq/odOLwX0HsClndd+Gp39SdA5QcvYyc1zLY9nrVM4DMiKCDzbqj/GyrulEqi+d /4qNblhLC0ZWLFALLrIHCQSU9ivJZdhWIZc3CzTOridXG2WcbmZ2k6vAxKbYsJ+loXIDen ppSKiDvJRIyf2CqoZXT9IWr7I6GS+C9MYgzYetxDd0vZBtmlOYPFs405xqFrHwSJz4t1nX 8u8JCzGh2vt6Wl1y91z31WlT28qe8YBIBGvnXkvqNFkrVzLEmfKRzCVaOC0PZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746632191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KXG3iIrXNNu4hN+MDAMl6wYn9mijtNFyrvciLBHHf0M=; b=s8xHqyiBREDlLPMCR5KEE0+dG1nCCopfTjjl8OpyVeDgE2kvrCP2/iDcUjg9g9pN1ztvNk lU6Ef8LNvY1HjlyIQKG5yh7w96YOeJ2lwtgSPsxSfX2+kWWA6cO4ZL70/0YOXILbWSa/Co TAgNC+GBqnU9EVYXGLlNif9CRkwYqBfEzzhK0Mvz2/SknBzSZzgOQCYxyD3QpY7yT5wC7F briJUfgJqj1SiR7/JLzd3TSNHMaG5TC9w2scWQZOB7lhL7A2pEYJTR6z2iSHYb2bYUbb/E dlUCg5UZJCM2JIip/6zXta/DQ75jxxmH71OOuVX7hyc37q4kvDQjvvTC1G7fUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746632191; a=rsa-sha256; cv=none; b=aeYy89bMlbmP+kZEv6/67J8XaOSgHFuDJfKRlRTnZQNnZccqbPrbKtJ/JjCjNFAM+vICKX lqpza7Y17BQEykqaw1EcPKpjUAgqQ1Kr6CTdpuK4GYipqHNRHn23vaa4/WmO8Kx9Vpb9Pq 3v+IWvWjgg0TdAS8cHClJ4K5p9OzrbSAMGQhLHbNgVbL9uSRioV+ijipJlHjOhF/Moe5YX nAi9oaWA1ByFGOApEkuHzx935H4EzNHu/GRnc/kaGCgGrnYpovqM9eb7jB9/Y8LTahrGOz wWnOaav+K35elY99MsM4ptCUftwOsDyky4cJ2ATw+Hpz0zF9dLIvC7eBLyeyVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zszrb2jk5zbPl; Wed, 07 May 2025 15:36:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547FaVVo015262; Wed, 7 May 2025 15:36:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547FaVFe015259; Wed, 7 May 2025 15:36:31 GMT (envelope-from git) Date: Wed, 7 May 2025 15:36:31 GMT Message-Id: <202505071536.547FaVFe015259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 1df3097d5525 - main - unix/stream: fix wakeup race between pr_poll and pr_soreceive List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1df3097d5525509020fa0ced391377554aad2918 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=1df3097d5525509020fa0ced391377554aad2918 commit 1df3097d5525509020fa0ced391377554aad2918 Author: Gleb Smirnoff AuthorDate: 2025-05-07 15:32:26 +0000 Commit: Gleb Smirnoff CommitDate: 2025-05-07 15:36:04 +0000 unix/stream: fix wakeup race between pr_poll and pr_soreceive Both selrecord(9) and UXST_PEER_SEL marking should happen under the receive buffer lock. Otherwise, there is a race window, when a reading thread would issue wakeup(9) before a polling thread have entered sleep(9). Reported by: cy Fixes: d15792780760ef94647af9b377b5f0a80e1826bc --- sys/kern/uipc_usrreq.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 1722a43a800e..0836652b6a24 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1681,11 +1681,12 @@ uipc_sopoll_stream_or_seqpacket(struct socket *so, int events, (POLLOUT | POLLWRNORM); if (sb->sb_state & SBS_CANTRCVMORE) revents |= POLLHUP; - if (!(revents & (POLLOUT | POLLWRNORM))) + if (!(revents & (POLLOUT | POLLWRNORM))) { so2->so_rcv.uxst_flags |= UXST_PEER_SEL; + selrecord(td, &so->so_wrsel); + } SOCK_RECVBUF_UNLOCK(so2); - } - if (!(revents & (POLLOUT | POLLWRNORM))) + } else selrecord(td, &so->so_wrsel); } }