From nobody Tue Nov 17 20:04:57 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 4jTbLK49Qvz71mKH for ; Tue, 17 Nov 2026 20:04:57 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTbLK1rvsz3M6x for ; Tue, 17 Nov 2026 20:04:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794945897; 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=VbW+LatNTeXPuf1mMQOHd0WO3dJ0ZUpYqs7n5K7lwgw=; b=SZW+5COVqcF9oOpvvERXjlznKqugnt6w/GwSoDUvsm7hBJqgT4TvReUQO/6hU0STNwlJlf kYsuPm+QvqJo/hor+EqqYwFPXnQeP69xK9P0dYd8dLfwVCaQlwNt3SzXzW2T3h5ICzYSnJ M9A7KjiSHSaWFLDZEiiDdaauaANfx4mY99H95vzor90TSxU/JYOt/5j3fJt/B/z5kUSnAX kgc6HgN5/93w1zkauWoDNuyAfQq13bV0xVOhbIGjzyc03ZoMD0e5H7w3fDh1uCgK8fK8Nj HRi61yg9Ed7Gf3t1JJ1sVx3DIyRnDwbzBbPlJins+i04B6JKU8kLEsVYG/KGDg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794945897; b=J+zpVQtd2mrtptWgahd58G1BH8RJM9fPuajPR8FPojuZhj15vHA0COS5cfzKUqd5Jg2Ps5 yQLmUdugTj3FQ0mOHG5iVaAcO7nXSnvS7fbBEYRUw8k34jD+uPuod2PwayyHrvHzPfqz0M EwRPqVnZtUC3O3o9AgDMo9uyNFEJ4tvoXhBZnkklax3XIXUVwn5T4b5v3lPEekTafUWtAz oANQQW8KvFk4PooYTVLLCaU3FQHV97DhB9Ai8RBvy16wmWc2oFpdLYR4O3A4Mfm1DhTbXD yVZktVRDKcbzonDjemzSE8yd3HTgRIkV/d1h8EwsSmmuzlL62y/qIKSUzhh3Kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794945897; 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=VbW+LatNTeXPuf1mMQOHd0WO3dJ0ZUpYqs7n5K7lwgw=; b=kE4Z6h19q1XMMQ04XL7xre/rU1dO4wgcsC+dI3R3S42JlZfyvH7Df9BzdAi/66IC4TaUEr gOm3gDG27ekQazP6hHoXQPa6i6OFPR8D8YYKejB7rkdgIWsQ/TbvWCx5/CZQ3MD928au3z V2lO0CSbTBoq6QNT/+D5jwstxPUa+F1RTltQBDB+gKjeTNinXfIh97jpST7a24YF/5ucq8 G4RSqFUtqZ+O/Rc+VgDcOxv6kOQF3hrmPKpblPO5wn2kc/WUX4xBt00Mmz3lOj+id6V8rv HfoQyzft+JDrrmY8lAdDwRWVteB0MAXrMLIM2RC+PXUvGqqUdCWmT4mZzu2c+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jTbLK0dFHzxY3 for ; Tue, 17 Nov 2026 20:04:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 13496 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 20:04:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: df20cc34b9f8 - main - tests/ssl_sendfile: fix flakyness under load List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: df20cc34b9f8bee3795dc7f636bddcc3df1eb2a0 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 20:04:57 +0000 Message-Id: <6afcb369.13496.4d66ed66@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=df20cc34b9f8bee3795dc7f636bddcc3df1eb2a0 commit df20cc34b9f8bee3795dc7f636bddcc3df1eb2a0 Author: Gleb Smirnoff AuthorDate: 2026-11-17 19:44:41 +0000 Commit: Gleb Smirnoff CommitDate: 2026-11-17 20:04:44 +0000 tests/ssl_sendfile: fix flakyness under load When loopback TCP delivery is faster than our sending thread it may take several writes to full buffer reliably. PR: 299447 --- tests/sys/kern/ssl_sendfile.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/tests/sys/kern/ssl_sendfile.c b/tests/sys/kern/ssl_sendfile.c index 8b8c1f95db25..f62105430514 100644 --- a/tests/sys/kern/ssl_sendfile.c +++ b/tests/sys/kern/ssl_sendfile.c @@ -482,7 +482,7 @@ ATF_TC_BODY(eagain_vs_eof, tc) { struct ctx c; char buf[16 * 1024]; - ssize_t nread; + ssize_t nread, offset = 0; int n; common_init(&c); @@ -492,7 +492,7 @@ ATF_TC_BODY(eagain_vs_eof, tc) * socket. Internal sendfile(2) returns -1 and errno == EAGAIN. */ ATF_REQUIRE(pthread_mutex_lock(&c.mtx) == 0); - sendme_locked_wait(&c, 0, FSIZE, true); + sendme_locked_wait(&c, offset, FSIZE, true); ATF_REQUIRE_MSG(c.sbytes > 0, "c.sbytes <= 0: %zd", c.sbytes); ATF_REQUIRE(SSL_get_error(c.srv, c.sbytes) == 0); #if 0 /* see https://github.com/openssl/openssl/issues/29742 */ @@ -500,16 +500,23 @@ ATF_TC_BODY(eagain_vs_eof, tc) #endif /* - * Exercise second attempt on already full buffer. + * Keep writing until both buffers are full. May be executed just once + * or may loop a few times in the case if our sending thread is slower + * than loopback TCP processing. */ - sendme_locked_wait(&c, 0, FSIZE, true); - ATF_REQUIRE_MSG(c.sbytes == -1, "c.sbytes != -1: %zd", c.sbytes); + do { + offset += c.sbytes; + sendme_locked_wait(&c, offset, FSIZE, true); +#if 0 /* see https://github.com/openssl/openssl/issues/29742 */ + ATF_REQUIRE(BIO_should_retry(SSL_get_wbio(c.srv))); +#endif + } while (c.sbytes != -1); ATF_REQUIRE(SSL_get_error(c.srv, c.sbytes) == SSL_ERROR_WANT_WRITE); ATF_REQUIRE(BIO_should_retry(SSL_get_wbio(c.srv))); /* Clear the buffer. */ nread = 0; - while (nread < c.sbytes && + while (nread < offset && (n = SSL_read_b(c.cln, buf, sizeof(buf))) > 0) { ATF_REQUIRE(memcmp((char *)c.mfd + nread, buf, n) == 0); nread += n; @@ -555,4 +562,4 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, eagain_vs_eof); return atf_no_error(); -} \ No newline at end of file +}