From nobody Tue Sep 2 20:34:22 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 4cGcsq0gnjz65Nrg; Tue, 02 Sep 2025 20:34:23 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cGcsq018Gz3vMl; Tue, 02 Sep 2025 20:34:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756845263; 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=45d3Ji89HRsXjy9VW+RET5kSIFRbPLw3mzMtE6UKijI=; b=vyG5/uJhZP2WoORfWxAxFu9w8PhwW+RqQlWZ2ihFVstmR/5mGJQL4bD7xD+Xv0QSqSpKjQ BZ2cRLWmf96M1dyGd0fJVMHKnZqiTzSILYuCEg6Q1owg/kAk7UTiWUS1CJW6s5dzY3e2tC CuFgI7vzmXFHvoR0tthPuELLB9G7Fdt1MxHpRaoPkkG8wF+heY9suQQJ/xbAbiqtbzIZeM JZebeAKQ0bhTmi7toiTlofwuvfEmg6KUHTZzdl18OLI/zp69Q/eMbOzHMphreMetj1ZCNr cUgOVDtcs+b4Qr1kpweLcSS1fGqY4Y1Ypw5TANGbb3ffMXdfcnhOpA8hoM4/qQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756845263; 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=45d3Ji89HRsXjy9VW+RET5kSIFRbPLw3mzMtE6UKijI=; b=tnZKnhxVMPeCUULag0jWJl7fGhc3Kwb2Je9qDSO28X6/boZFmIoDxVnkKoHsKa1gaLfWki qD8vZUqPwIK4HU9lnF7yqUQnD4aWaSNVOaZ+uLBXzugMOBDOyy1xwKR4ia0F7rEJwm2wKD zJpmaqrOBvS741NIQv8/kbAzAEu2IKIl5d/IKsbyWWb8KKbtxjYQHTI8HXtUXbZpwLTcHD ngxYPjej6yu8xX29I6HOrLgQGLnHA8iteNowZegSJnPC6Bu7eeNH+xIwWXQjQyaxBsh+kr WA6AZl3Z0vzHT1sm2HgriBbgoXoOOzLT5VKA6Sl+BQykuhQzvoWhoQArZJ9ikg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756845263; a=rsa-sha256; cv=none; b=rjceulrRdd1zMUMHcubZNmIczHFNw+ZtlnvznStMFiLaU0+Ot6WY9dBFcuVsr4UyRbyF/1 RQXLvAG8RGaribyXfhQcfYAH1ytYibRx6omJ/N4vlz751cx4pO+rlLCDW7NxMUxhg7DaKO qvZoJzJ2VBUzIoIGlrgmzlaTnL2GQ9JsIQsqCuDmGUCJJYqOIqm+/YIQ65zTCtMUMaEsdc uzm8+LHhTcKX1dQohlyvVAoEJzUC4cejq0LoXG5KBQpQcfA1/8bg8TinxhGOU9JhvFxnwf A7/CxrWdEaxXhn2x5qIsCN194u00OUSwpIOAJKLzFSgfz0t0X5gurCgzzs2O4A== 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 4cGcsp6cRtz12FX; Tue, 02 Sep 2025 20:34:22 +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 582KYMr9068301; Tue, 2 Sep 2025 20:34:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 582KYMeX068298; Tue, 2 Sep 2025 20:34:22 GMT (envelope-from git) Date: Tue, 2 Sep 2025 20:34:22 GMT Message-Id: <202509022034.582KYMeX068298@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: 60d5a4216b34 - main - unix/stream: fix EVFILT_WRITE after we did shutdown(2) 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: 60d5a4216b3479a2d62eb65f2cb03b799546dcbb Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=60d5a4216b3479a2d62eb65f2cb03b799546dcbb commit 60d5a4216b3479a2d62eb65f2cb03b799546dcbb Author: Gleb Smirnoff AuthorDate: 2025-09-02 20:34:12 +0000 Commit: Gleb Smirnoff CommitDate: 2025-09-02 20:34:12 +0000 unix/stream: fix EVFILT_WRITE after we did shutdown(2) When fixing bug 286692, the change eafe5967ac558, that fixed a case when peer side does close(), also had regressed a case when our side does shutdown(SHUT_WR). These actually are two independent code paths, and the eafe5967ac558 shouldn't have touched the second block. The removal of 'kn->kn_flags |= EV_EOF' was incorrect and the statement on original behavior in the commit message was also incorrect. Do not add back so_error setting, since I failed to find a test case that would return anything but 0 in kevent.fflags when run on stable/14. This was found with help of https://github.com/tokio-rs/mio. Add a test case into our test suite for that. Fixes: eafe5967ac558de142d91660e18e9238289890e3 Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D52327 --- sys/kern/uipc_usrreq.c | 4 +--- tests/sys/kern/unix_stream.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 19870e989437..6138e543fae7 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1807,9 +1807,7 @@ uipc_filt_sowrite(struct knote *kn, long hint) kn->kn_data = uipc_stream_sbspace(&so2->so_rcv); if (so2->so_rcv.sb_state & SBS_CANTRCVMORE) { - /* - * XXXGL: maybe kn->kn_flags |= EV_EOF ? - */ + kn->kn_flags |= EV_EOF; return (1); } else if (kn->kn_sfflags & NOTE_LOWAT) return (kn->kn_data >= kn->kn_sdata); diff --git a/tests/sys/kern/unix_stream.c b/tests/sys/kern/unix_stream.c index bb811f78f620..49d621dc5b0a 100644 --- a/tests/sys/kern/unix_stream.c +++ b/tests/sys/kern/unix_stream.c @@ -467,6 +467,29 @@ ATF_TC_BODY(peershutdown_wakeup_kevent, tc) }); } +ATF_TC_WITHOUT_HEAD(ourshutdown_kevent); +ATF_TC_BODY(ourshutdown_kevent, tc) +{ + struct kevent kev; + int sv[2], kq; + + do_socketpair(sv); + ATF_REQUIRE(kq = kqueue()); + + EV_SET(&kev, sv[1], EVFILT_WRITE, EV_ADD, 0, 0, NULL); + ATF_REQUIRE(kevent(kq, &kev, 1, NULL, 0, NULL) == 0); + + ATF_REQUIRE(shutdown(sv[1], SHUT_WR) == 0); + + ATF_REQUIRE(kevent(kq, NULL, 0, &kev, 1, NULL) == 1); + ATF_REQUIRE(kev.ident == (uintptr_t)sv[1] && + kev.filter == EVFILT_WRITE && + kev.flags == EV_EOF); + + close(sv[0]); + close(sv[1]); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, getpeereid); @@ -482,6 +505,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, peershutdown_wakeup_select); ATF_TP_ADD_TC(tp, peershutdown_wakeup_poll); ATF_TP_ADD_TC(tp, peershutdown_wakeup_kevent); + ATF_TP_ADD_TC(tp, ourshutdown_kevent); return atf_no_error(); }