From nobody Tue Mar 10 21:03:59 2026 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 4fVmZl4JdLz6V3mM for ; Tue, 10 Mar 2026 21:03:59 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVmZl1Kdkz3NHN for ; Tue, 10 Mar 2026 21:03:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773176639; 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=8vK88qi4PllhlKW0xhQgN9rmZVCyEG5ey6paVkdr1Dk=; b=KUm1kRnUuNANAS3RdpGjPOQjJ80nlFQ4YrCj9HbUH9NG4aAijFrRKo5mNeFJVfoAIyWcqs n+nVickf4sJIJyJFNfRg40A7NP7gxarr0dME3vaBJw2Gaq2VgfQA9KgyDE4SOSWmCboIsS 06YZAPuRpglL3H4oT4U9Jh9dCDCa0KS4NXMWA4ayekoGW4jOz2BUrpOMqTNOLy7oibZpx7 kLWAnKHRa7KZZ540fQeFnY2SAAhVRnrQSgE1HCh3dukIAJ/08yh4eRQYD9YsCOXl/yEiri lor9GQoUUhQsolX7eLF6rIBfWE1xrdkvQv5dxTjfVxZeu2HATpBSdKkBY3MjVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773176639; a=rsa-sha256; cv=none; b=TXYlDwrXUs1fy727nw3k3bzeHYq9ev0OOvRisZ6Aa9+AwJNdxb88pxro06j8ARz9/POxGh z/fVCcINqslc0UOd2GxatPuuvTWlokOi4fy2b1TEd+L/YJu1fDkXnLVXbmEUrFxTZh3Gc9 2FmmlIuG9vLuNb2v4pWUBjFJpxEaefDqXIdtIkJYtS7IxeKK6gcq2R+H1xy5NORxym0oGO juNGNET2XAJRp6JQ/HN/5ih6SSUSOf2UAGdwN0f5E22hIxDxFE+4s6pbL9fDdnIylMO+Nh mhDmHtAW/87MvH7vvH+lSr9q3DGaUTEdVvlh3UllGPvm0RAwkZaNDoARuEdkKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773176639; 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=8vK88qi4PllhlKW0xhQgN9rmZVCyEG5ey6paVkdr1Dk=; b=aqakLYqLmuiCn49Gxi10b/zyTwJkAIDGpMOrRJiAFRhhoeRAWnvPkD5m7cdEuZh6rn148+ g4e+JdcbLDZ7E8PGEjaROLzaYF3FqaFW1rhy3X2W1bprO7ufxyrpfqpWm3xnglMl+d3WaE hyI1MRNwe20v4xxd8yfIPbjV/FKM3apPnPdSCrFEiKJZuoylI+fbnWG4J4YihUvcLbZvGy lDrZpZGSv7iksNfkTt24um1cdFB39EqRhz91HR+MyXl+f+wQZvZSCy61fuBJQtQ6tEPL5l ZVOtE2VEhHis1m33MgYOQi6xsd1f4BsZTHzlzP9bC+M5DZYWt2SywO/gLYGDpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVmZl0lcjzD7C for ; Tue, 10 Mar 2026 21:03:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38c1e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 21:03:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: ded881f9056d - main - tests/kern/ssl_sendfile: fix 'random' and 'basic' flakyness 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: ded881f9056d2ecb224490e56e95877af54164c4 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 21:03:59 +0000 Message-Id: <69b0873f.38c1e.49ef7c6e@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=ded881f9056d2ecb224490e56e95877af54164c4 commit ded881f9056d2ecb224490e56e95877af54164c4 Author: Gleb Smirnoff AuthorDate: 2026-03-10 21:02:02 +0000 Commit: Gleb Smirnoff CommitDate: 2026-03-10 21:03:25 +0000 tests/kern/ssl_sendfile: fix 'random' and 'basic' flakyness The read of c.sbytes needs to be synchronized with mutex. The problem was fixed for 'truncate' and 'grow' with 8a9508563542, but these two suffer from the same problem. Provide require_sbytes(), a locked wrapper around ATF_REQUIRE() to reduce copy and paste. Submitted by: olivier Differential Revision: https://reviews.freebsd.org/D55781 --- tests/sys/kern/ssl_sendfile.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/sys/kern/ssl_sendfile.c b/tests/sys/kern/ssl_sendfile.c index 066674f5fb03..c16640572bb1 100644 --- a/tests/sys/kern/ssl_sendfile.c +++ b/tests/sys/kern/ssl_sendfile.c @@ -285,6 +285,14 @@ SSL_read_b(SSL *ssl, void *buf, int size) return (rv); } +static void +require_sbytes(struct ctx *c, ssize_t expect) +{ + ATF_REQUIRE(pthread_mutex_lock(&c->mtx) == 0); + ATF_REQUIRE(c->sbytes == expect); + ATF_REQUIRE(pthread_mutex_unlock(&c->mtx) == 0); +} + ATF_TC_WITHOUT_HEAD(basic); ATF_TC_BODY(basic, tc) { @@ -302,7 +310,7 @@ ATF_TC_BODY(basic, tc) nread += n; } ATF_REQUIRE(nread == FSIZE); - ATF_REQUIRE(c.sbytes == FSIZE); + require_sbytes(&c, FSIZE); common_cleanup(&c); } @@ -332,7 +340,7 @@ ATF_TC_BODY(random, tc) nread += n; } ATF_REQUIRE(nread == expect); - ATF_REQUIRE(c.sbytes == (ssize_t)expect); + require_sbytes(&c, (ssize_t)expect); } common_cleanup(&c); @@ -367,9 +375,7 @@ ATF_TC_BODY(truncate, tc) nread += n; } ATF_REQUIRE(nread == TRUNC); - ATF_REQUIRE(pthread_mutex_lock(&c.mtx) == 0); - ATF_REQUIRE(c.sbytes == TRUNC); - ATF_REQUIRE(pthread_mutex_unlock(&c.mtx) == 0); + require_sbytes(&c, TRUNC); common_cleanup(&c); } @@ -418,9 +424,7 @@ ATF_TC_BODY(grow, tc) nread += n; } ATF_REQUIRE(nread == GROW); - ATF_REQUIRE(pthread_mutex_lock(&c.mtx) == 0); - ATF_REQUIRE(c.sbytes == FSIZE + GROW); - ATF_REQUIRE(pthread_mutex_unlock(&c.mtx) == 0); + require_sbytes(&c, FSIZE + GROW); common_cleanup(&c); }