From nobody Mon Feb 10 22:08:37 2025 X-Original-To: dev-commits-src-all@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 4YsJcl1d7Lz5msKR; Mon, 10 Feb 2025 22:08:39 +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 4YsJck0cK7z3XXj; Mon, 10 Feb 2025 22:08:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739225318; 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=1/lIlHOcCHHEZsG/FNCqxeSHJrmTlNghamS7hfYt7ws=; b=c9hrw8HnLhkurJdLFOZxRDiK9laNpSrcdQDRGhVRyqKpAO59/GDJVGIKOGb6zC5L3SjSq/ dXUBAnj2vdzfyCg/ErDftvCVMWPs2pST/LdfuMiGmEQY7wcAA3cuvijjjREYJzjBikEipC koTRDgtEI+r2svVvoMuL2ghAzn90NNpEntiOlxxKukJlLjmtmtqnla1hdEhZ8MnAfc/Gx2 kRAAx1VXrq278H8RoOMRyKjnaZ4QrBcAe+YolLWXRsWRjHKBOAd7uEa3NilNCauBxmHt+G GuwzO5WAXCiqZRhhpG4m6BErYhFrW2IaQIHKPlyqzzlU1ePr11iVmvxoiraNbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739225318; 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=1/lIlHOcCHHEZsG/FNCqxeSHJrmTlNghamS7hfYt7ws=; b=VcXkvlq/3YcHgA/+PMXVzmaziJ5URzXEB9VG53rGJuO+uiI9JVLJtOpyj/axYjitU+urKU x0xZ3UphndhNpdF7Xi5z4hvrqDuEAbUzPkBoemwEP139PIw/7mL/Z8EzQz4cec42/7ZsnW lLbWh7NWLL7xG4wcC91KOSkVwjQ5aQ/nqbgSn4qsP1HVjvINaYQ+IpcmkrJBUdWcJs7YhU WKwX0juRNQqzWkW+wy89YRDeguQPgSk0x1IQrzns48WCjKsmHsx5jqWiSzz9xiFfcv9ge5 q/O08WGPcwF8+/r1swE1VCYOSXzg7/XwwhCeaM//KNEcjqNOf6C0BhQjwRDrvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739225318; a=rsa-sha256; cv=none; b=Rb98a7ENYqWH7hx01D5LVP6UhcaGkI9iSN3D/GzbfTrTNd1WVcIUc2LNwtZADn/FVPrk27 4Kg85ThJb/RPL7sgyJ2sKEZpaT1rCA07rJgAV0hf8YLW7lasSvvEyKmJWTyS2EY8KaD6fm Sc19storyxs3b+Gd9HrekwvAHblSwYpqizGDmYTGLXoNN6swxaKF6GuCEpNN0xs1HwpIfz 1YpKyI7vo1SBJx+QDt9Q/JUwnZn+ZGYCPgJ5M+SgdUL9RgD82cWoBUPwqDOPFuiPOAP+ij 36hZihV/KQ8JVq8dtntGE4+MvuEsa731StL2KnerAh+7q+pbCwJrzQC0qSSUDg== 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 4YsJck0DCFzldF; Mon, 10 Feb 2025 22:08:38 +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 51AM8bHv039637; Mon, 10 Feb 2025 22:08:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AM8b5h039634; Mon, 10 Feb 2025 22:08:37 GMT (envelope-from git) Date: Mon, 10 Feb 2025 22:08:37 GMT Message-Id: <202502102208.51AM8b5h039634@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: bc7ee0b52a8d - main - tests/unix_stream: add test that checks a full socket isn't writable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: bc7ee0b52a8dd613711c7225244aac954b41e534 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=bc7ee0b52a8dd613711c7225244aac954b41e534 commit bc7ee0b52a8dd613711c7225244aac954b41e534 Author: Gleb Smirnoff AuthorDate: 2025-02-10 21:53:41 +0000 Commit: Gleb Smirnoff CommitDate: 2025-02-10 22:01:16 +0000 tests/unix_stream: add test that checks a full socket isn't writable --- tests/sys/kern/unix_stream.c | 86 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 81 insertions(+), 5 deletions(-) diff --git a/tests/sys/kern/unix_stream.c b/tests/sys/kern/unix_stream.c index d57cfad020fa..49aabdaa0943 100644 --- a/tests/sys/kern/unix_stream.c +++ b/tests/sys/kern/unix_stream.c @@ -26,14 +26,15 @@ */ #include -#include -#include -#include -#include #include +#include +#include #include - +#include +#include #include +#include +#include #include @@ -49,6 +50,18 @@ do_socketpair(int *sv) ATF_REQUIRE(sv[0] != sv[1]); } +static u_long +getsendspace(void) +{ + u_long sendspace; + + ATF_REQUIRE_MSG(sysctlbyname("net.local.stream.sendspace", &sendspace, + &(size_t){sizeof(u_long)}, NULL, 0) != -1, + "sysctl net.local.stream.sendspace failed: %s", strerror(errno)); + + return (sendspace); +} + /* getpeereid(3) should work with stream sockets created via socketpair(2) */ ATF_TC_WITHOUT_HEAD(getpeereid); ATF_TC_BODY(getpeereid, tc) @@ -86,11 +99,74 @@ ATF_TC_BODY(send_0, tc) close(sv[1]); } +static void +check_writable(int fd, int expect) +{ + fd_set wrfds; + struct pollfd pfd[1]; + struct kevent kev; + int nfds, kq; + + FD_ZERO(&wrfds); + FD_SET(fd, &wrfds); + nfds = select(fd + 1, NULL, &wrfds, NULL, + &(struct timeval){.tv_usec = 1000}); + ATF_REQUIRE_MSG(nfds == expect, + "select() returns %d errno %d", nfds, errno); + + pfd[0] = (struct pollfd){ + .fd = fd, + .events = POLLOUT | POLLWRNORM, + }; + nfds = poll(pfd, 1, 1); + ATF_REQUIRE_MSG(nfds == expect, + "poll() returns %d errno %d", nfds, errno); + + ATF_REQUIRE(kq = kqueue()); + EV_SET(&kev, fd, EVFILT_WRITE, EV_ADD, 0, 0, NULL); + ATF_REQUIRE(kevent(kq, &kev, 1, NULL, 0, NULL) == 0); + nfds = kevent(kq, NULL, 0, &kev, 1, + &(struct timespec){.tv_nsec = 1000000}); + ATF_REQUIRE_MSG(nfds == expect, + "kevent() returns %d errno %d", nfds, errno); + close(kq); +} + +/* + * Make sure that a full socket is not reported as writable by event APIs. + */ +ATF_TC_WITHOUT_HEAD(full_not_writable); +ATF_TC_BODY(full_not_writable, tc) +{ + void *buf; + u_long sendspace; + int sv[2]; + + sendspace = getsendspace(); + ATF_REQUIRE((buf = malloc(sendspace)) != NULL); + do_socketpair(sv); + ATF_REQUIRE(fcntl(sv[0], F_SETFL, O_NONBLOCK) != -1); + do {} while (send(sv[0], buf, sendspace, 0) == (ssize_t)sendspace); + ATF_REQUIRE(errno == EAGAIN); + ATF_REQUIRE(fcntl(sv[0], F_SETFL, 0) != -1); + + check_writable(sv[0], 0); + + /* Read some data and re-check. */ + ATF_REQUIRE(read(sv[1], buf, sendspace / 2) == sendspace / 2); + + check_writable(sv[0], 1); + + free(buf); + close(sv[0]); + close(sv[1]); +} ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, getpeereid); ATF_TP_ADD_TC(tp, send_0); + ATF_TP_ADD_TC(tp, full_not_writable); return atf_no_error(); }