From nobody Mon Apr 27 01:18:36 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 4g3m0x5B1tz6bPpq for ; Mon, 27 Apr 2026 01:18:41 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g3m0x4QkSz3VbT for ; Mon, 27 Apr 2026 01:18:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777252721; 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=p2GMdK6ickVQHmAIc17/ojysywMDpDUhEeLg6PfJlQQ=; b=hwb2tzWO37kaUet0/XG6aD5Ew1EakrR3j1Zq3K5gIBvsZu+DYsegy/qhjJMwDsN1avMSMS dKWzTQ17pYKB5kbQEJdf36e1WJnMZ7P8k5VUrIlJ5hQwH/RRj13U1GeWXPGdruJM1wnTFy z0n+g041YYiyxuAsEyY3/ZQi35+Pnp2GHBAZ+dRkjl09yTv7tW/njmgGNGTU2LHo9fIN3I EpOSdqGVWj86fxHt3qRkhL1jA1ejtxnmG+D/2J2tc6QQCbxU5obb/Xn4HE6Tg9TJQ0uep9 7JEBzwZLHV2gQuBBFCtrGhKwhVtmhIApdUWSXAuz53hO17G5rwFY+bts2OKxvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777252721; a=rsa-sha256; cv=none; b=uO1sTs+UiECANacDc3vxGoOoh03VTuoscQuvoksvQ1/VS2lLxpfm2yxotsd9QVZH/iiHlw wxdbRBwwHezo6QggnWgV3jjKCCCH5StUk23DYHYhmbB1DKwLu41aM6X5IsRHx/Ofm6HbHo KycrxIHgL06mfWH9ga9CdfYrZfWLDsJsIS//NGGLVz6JW2TEEn7wE51R9iyv8stdFFa3PX IrwPhMzvlkiw77+ET5X68dJ4qu9qymTh7poNwevmkUjYv6OSemXIxM/AtJyZuyJNwkFfIH 6On2HT9kv/PD64TSrqLgjDF4+CfLrSnv8PHVorX2//DxTRhnkpA2yq9EkkT5mQ== 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=1777252721; 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=p2GMdK6ickVQHmAIc17/ojysywMDpDUhEeLg6PfJlQQ=; b=AbDoPaEZ6UUVLMdXIww50g5w2MO+vqPfml1/spV2HVcb57iZ25Jn8uY6eS8Diz1UXxc6/D AUm1BGNOmNl5nXgcMOEoGZ7Oub4OXM20AuXuEvBG8AcaOLZFFEzKrr5pSgiNBDNV73f37f aiIfO113LXh2NL5MbWzvdFNIOBIguXD/MmdYC0x7wkoDD+TDGsMQkQg4aSWNaNbTqjKTvz QAFl6xXYyLSVyRNgepE+hHk/g89NlKUqvTgtA8rG7706Ao+Lj7+Bw4zW/sA9D7JACGrnwD 4B65GSsKVtlNhYX6i3kLpjPIYgTI7SLn+0C3hlorD3di1fa4nsZqABc/3GG6IQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3m0x3rVZzlmJ for ; Mon, 27 Apr 2026 01:18:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25497 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Apr 2026 01:18:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: f7bf9fd6199c - main - tests/tcp_hpts_test: Fix resource leaks 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7bf9fd6199c99284dbc899928d8ad62861da414 Auto-Submitted: auto-generated Date: Mon, 27 Apr 2026 01:18:36 +0000 Message-Id: <69eeb96c.25497.3455786a@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f7bf9fd6199c99284dbc899928d8ad62861da414 commit f7bf9fd6199c99284dbc899928d8ad62861da414 Author: Mark Johnston AuthorDate: 2026-04-27 01:17:36 +0000 Commit: Mark Johnston CommitDate: 2026-04-27 01:17:36 +0000 tests/tcp_hpts_test: Fix resource leaks When a KTEST_EQUAL assertion fails, the test function returns, but this can cause it to leak locks, which can trigger a panic under witness. Add a variant which causes control flow to jump to a label in case of failure, and use that to prevent this problem. Reviewed by: Nick Banks , tuexen MFC after: 1 weeks Differential Revision: https://reviews.freebsd.org/D56647 --- sys/netinet/tcp_hpts_test.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/sys/netinet/tcp_hpts_test.c b/sys/netinet/tcp_hpts_test.c index a664e9fafcc3..bc61b64b8c58 100644 --- a/sys/netinet/tcp_hpts_test.c +++ b/sys/netinet/tcp_hpts_test.c @@ -90,6 +90,18 @@ SYSCTL_INT(_net_inet_tcp_hpts_test, OID_AUTO, exit_on_failure, CTLFLAG_RW, } \ } while (0) +#define KTEST_EQUAL_GOTO(x, y, label) do { \ + if ((x) != (y)) { \ + KTEST_ERR(ctx, "FAIL: %s != %s (%d != %d)", #x, #y, (x), (y)); \ + if (test_exit_on_failure) { \ + error = EINVAL; \ + goto label; \ + } \ + } else { \ + KTEST_LOG(ctx, "PASS: %s == %s", #x, #y); \ + } \ +} while (0) + #define KTEST_NEQUAL(x, y) do { \ if ((x) == (y)) { \ KTEST_ERR(ctx, "FAIL: %s == %s (%d == %d)", #x, #y, (x), (y)); \ @@ -1461,6 +1473,7 @@ KTEST_FUNC(direct_wake_mechanism) struct tcp_hptsi *pace; struct tcpcb *tp; struct tcp_hpts_entry *hpts; + int error; test_hpts_init(); @@ -1477,8 +1490,8 @@ KTEST_FUNC(direct_wake_mechanism) hpts->p_on_queue_cnt = 50; /* Below threshold */ hpts->p_hpts_wake_scheduled = 0; tcp_hpts_wake(hpts); - KTEST_EQUAL(hpts->p_hpts_wake_scheduled, 1); - KTEST_EQUAL(call_counts[CCNT_SWI_SCHED], 1); + KTEST_EQUAL_GOTO(hpts->p_hpts_wake_scheduled, 1, cleanup_locked); + KTEST_EQUAL_GOTO(call_counts[CCNT_SWI_SCHED], 1, cleanup_locked); HPTS_UNLOCK(hpts); /* Reset for next test */ @@ -1490,9 +1503,9 @@ KTEST_FUNC(direct_wake_mechanism) hpts->p_on_queue_cnt = 200; /* Above threshold */ hpts->p_direct_wake = 1; /* Request direct wake */ tcp_hpts_wake(hpts); - KTEST_EQUAL(hpts->p_hpts_wake_scheduled, 0); /* Should be inhibited */ - KTEST_EQUAL(hpts->p_direct_wake, 0); /* Should be cleared */ - KTEST_EQUAL(call_counts[CCNT_SWI_SCHED], 0); /* No SWI scheduled */ + KTEST_EQUAL_GOTO(hpts->p_hpts_wake_scheduled, 0, cleanup_locked); + KTEST_EQUAL_GOTO(hpts->p_direct_wake, 0, cleanup_locked); + KTEST_EQUAL_GOTO(call_counts[CCNT_SWI_SCHED], 0, cleanup_locked); HPTS_UNLOCK(hpts); test_hpts_free_tcpcb(tp); @@ -1500,6 +1513,10 @@ KTEST_FUNC(direct_wake_mechanism) tcp_hptsi_destroy(pace); return (0); + +cleanup_locked: + HPTS_UNLOCK(hpts); + return (error); } /*