From nobody Tue Oct 7 21:07:15 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 4ch7xb5VFyz6C0gL; Tue, 07 Oct 2025 21:07:15 +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 4ch7xb4tFWz3C7G; Tue, 07 Oct 2025 21:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759871235; 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=eqZO8fdWUfeXz3IQ/pYzoGuIzbgbmUD68/G4NTOKYdE=; b=QHV09jW4csR4S7yiuw7p0NTT3wh2qCvn74QT8eeqaRRu/edulnZABzxGBkpMnpabKKFDvP g8Noxb4m4Bvk8ZVyk71cttdIDLU2Misz56sKbTkRI+Va58Wk4mTwN522Vx2nduY3KTTbxU L8H54E1oBEyteYSVAaMMmk6Lzd16ANXkXXdiYvJci+L7GkLVYNNCTcas941U42fxSrUOAq qRDddj2BY2zUhLe2FaqATAA6XQRkPBCus9WMeKG/atmTa9IsWyu+iPAZzln7cDc1ONHCLB NFJE7Eyr0n46v54rLaRRAA6+ZsaCd9UHiVk0UFGRFVyOzRpGT+IZjvCe71hXUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759871235; 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=eqZO8fdWUfeXz3IQ/pYzoGuIzbgbmUD68/G4NTOKYdE=; b=WDw00Mc/dns76FEQydX+85aeBTPHZi1VFNEepHDnP/QxczL8XIOmMLngLqgmZzfe0Wi6eG ijCdxQwLXuSFsJCwmS62JfKOp+xrK8KMf1lFwU52U6bE08YtHFuTldxasVPW7GBBpBNViH Bn7SOObpjTnjD0ty0ZRICep17sT7muHGhzPRtBSSZ5lhs43lCATCzkM7Vy2cIJTr48Wa0o xT9vsyKuyqtD3oio+7zc3sjwDVk3q9SA4BAZv8D7sDlSJPanww361cmrkL+CTNxfEc6Tv/ 6gHRjsGjVqdXiuSou+V+Ax31BxD53i9YqYJsr7toNeRzSHhq9r8nLbysh8384g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759871235; a=rsa-sha256; cv=none; b=ed/D1WWuSgXG+mpvT1WcywUC97cCBfkg/0VT4/aKVTzR0LLaPhE7l85eXwe71ON6UmHrpf AN49JIuXvBTKl+f7aPx/gO2XGOw7UlKhnT0Tyoi0T/Y+BtnmIhzYqY5SMoG0FxFr8eVxd+ 9yCiwmz0lVsgRVpW8xD3FQ4gYQwF2D0mwW/FA6iw6p+Efz0AnqSD8f6sPkt1NUTpefPhIF Hmtv8dfdKEKqff4vIb69i6fGh00zZuxCGyyOcTZSn9l3jaLWIhlcQ3A2h70Um3ExQAbaXX 1tE2qyfGdfeJ57aVZh38ilazyEf9Xpu5uZQ2J116p+FqtcjG9BoJks4S4YpBTw== 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 4ch7xb4TQwz11gF; Tue, 07 Oct 2025 21:07:15 +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 597L7F60006477; Tue, 7 Oct 2025 21:07:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 597L7Fmr006474; Tue, 7 Oct 2025 21:07:15 GMT (envelope-from git) Date: Tue, 7 Oct 2025 21:07:15 GMT Message-Id: <202510072107.597L7Fmr006474@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: d9c94e5eefc0 - main - tests/netinet: fix so_reuseport_lb_test flakyness 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: d9c94e5eefc0d1ed772cc3af15d92f1960ba73a6 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=d9c94e5eefc0d1ed772cc3af15d92f1960ba73a6 commit d9c94e5eefc0d1ed772cc3af15d92f1960ba73a6 Author: Gleb Smirnoff AuthorDate: 2025-10-07 21:02:29 +0000 Commit: Gleb Smirnoff CommitDate: 2025-10-07 21:02:29 +0000 tests/netinet: fix so_reuseport_lb_test flakyness Stop the threads before exiting test body. Otherwise there is a chance threads would use the softc that is stored on the main thread stack after it is destroyed and the test would fail. Stop the threads in the reverse order, so that listener is stopped after all connectors are stopped. Tested by: olivier --- tests/sys/netinet/so_reuseport_lb_test.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/sys/netinet/so_reuseport_lb_test.c b/tests/sys/netinet/so_reuseport_lb_test.c index fa9d6e425884..0479bd070ca6 100644 --- a/tests/sys/netinet/so_reuseport_lb_test.c +++ b/tests/sys/netinet/so_reuseport_lb_test.c @@ -375,6 +375,11 @@ ATF_TC_BODY(concurrent_add, tc) usleep(20000); } + + for (size_t j = nitems(threads); j > 0; j--) { + ATF_REQUIRE(pthread_cancel(threads[j - 1]) == 0); + ATF_REQUIRE(pthread_join(threads[j - 1], NULL) == 0); + } } /*