From nobody Wed Nov 11 02:32:06 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 4jPSGH0g85z6y7Nv for ; Wed, 11 Nov 2026 02:32:07 +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 4jPSGG3xwNz3G01 for ; Wed, 11 Nov 2026 02:32:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794364326; 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=mnCm80+srxSwvbKqiCkK/A7KyRIC1iFYhgSVmWsgL/I=; b=lbV8li7gBvZuLASm4GDDTk8QWK4knDnw6oxU3BqmA8PDM0VY4kLPnMATdDIKO//PVzT++K Y5c1/FP/rq+lP0NouWR00qJaeRBq5HW++hlfy57UHTlBaLwuz9MkpmJbuj2p3tSU7m0IQb Nz3GiLxyrF0vePyIQol92AxF2rxKZSehoUQqUjSiF4d3bK+qSNQisfDARPs6ieQnBDZRb2 VmEUo8Y0EHkOQxbpF869w8fac7T+bXPzzf/Jf/ir4O8GmXunIdPXp4Szhkz1acpNAkjNc7 uQogXGcM+SXQLj/CwrFEBIuLctiiuVqgRZUcZuu7SX1E7mZKuJ9+8CaPMyILFA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794364326; b=E8BkbRuokIt5B8t/1cvhZajz8ZoTOxsAktBwM8lSN8AEZeUgDrQ2pVu48e08WgXK3FBNee tnZF2PD852QmaPC0G/o44aLmiXT40OntehiAG5iZp4zjI64NHyTiYGN8QLrzYaI4Fp5uzV fRtuw3lT5Y+xIXBNMT4GOcMK/XErth7obVfe7pXaYHo7fB5D3z9cyPDzaiE/2q2mZq2fh8 xCnyDFK1c7gjCemLel3lUhMLnApBmBKgEctBPlOsDiz8fxZUUIuMFKiL+7vRwHrYlH9r6Q cNDBu5dTrmpC8qE2S1ABzB3VTZWLRBPPFA+gKBimsYzGSAb84e4y3OfGjjpztw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794364326; 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=mnCm80+srxSwvbKqiCkK/A7KyRIC1iFYhgSVmWsgL/I=; b=OHPMJWbfnfcOhP93CrBmCXLzfzsSacinpI9rY+UA79gE2eJmdh/ids5DFO8+8UE/5+VvA6 bF34P0w0bOwKlRRCfCtdNAD0CROwKBd9vEdPaJd7m0I/HDkuF8pnm5RpJK2FYOAWYBs+rO vpnwE7yKRWeJlG/RViDzRyayuvgIGDj9GSaJvjcZt8o8tlA2G72HAqWkmxx3eFvc/c2jEb IMujz9XcXLr362Xx5uqDwpqO9EXV8YUSaVdru0BGIjC07Z2fu82eVpi70LoSf6YYjTb9Bw MQpdEuANEetX2DV4QSuzyGddmr+T3DchNlNoSdScC8wvfAmEjT3Ap2cluCi8vg== 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 4jPSGG3B11zw7R for ; Wed, 11 Nov 2026 02:32:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45f8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Nov 2026 02:32:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: R. Christian McDonald Subject: git: 2af08ab3f125 - main - netipsec: Release the sahtree lock on the AH and IPComp EAGAIN paths 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: rcm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2af08ab3f125ce5988a641c32c777afc52f917e1 Auto-Submitted: auto-generated Date: Wed, 11 Nov 2026 02:32:06 +0000 Message-Id: <6af3d3a6.45f8.33ff2a57@gitrepo.freebsd.org> The branch main has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=2af08ab3f125ce5988a641c32c777afc52f917e1 commit 2af08ab3f125ce5988a641c32c777afc52f917e1 Author: R. Christian McDonald AuthorDate: 2026-11-11 02:31:22 +0000 Commit: R. Christian McDonald CommitDate: 2026-11-11 02:31:22 +0000 netipsec: Release the sahtree lock on the AH and IPComp EAGAIN paths 183513d15f22 made the AH, ESP and IPComp input callbacks hold the sahtree read lock, but only esp_input_cb() drops it before resubmitting a request that the crypto framework completed with EAGAIN. ah_input_cb() and ipcomp_input_cb() return with the lock still held. crypto_invoke() completes requests with EAGAIN while their driver detaches. Detaching ossl(4) under inbound AH traffic then hangs the next rmlock writer, and the system panics with "spin lock held too long" in smp_rendezvous_cpus() called from _rm_wlock(). Release the lock as esp_input_cb() does. Reported by: llm-postcr Reviewed by: kib Fixes: 183513d15f22 ("sys/netipsec: ensure sah stability during input callback processing") MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D61399 --- sys/netipsec/xform_ah.c | 1 + sys/netipsec/xform_ipcomp.c | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/netipsec/xform_ah.c b/sys/netipsec/xform_ah.c index 7b913bfcce08..cea329eaa827 100644 --- a/sys/netipsec/xform_ah.c +++ b/sys/netipsec/xform_ah.c @@ -729,6 +729,7 @@ ah_input_cb(struct cryptop *crp) if (ipsec_updateid(sav, &crp->crp_session, &cryptoid) != 0) crypto_freesession(cryptoid); xd->cryptoid = crp->crp_session; + ipsec_sahtree_runlock(&sahtree_tracker); CURVNET_RESTORE(); return (crypto_dispatch(crp)); } diff --git a/sys/netipsec/xform_ipcomp.c b/sys/netipsec/xform_ipcomp.c index f7d4f08ffae9..aecaf79f39bd 100644 --- a/sys/netipsec/xform_ipcomp.c +++ b/sys/netipsec/xform_ipcomp.c @@ -321,6 +321,7 @@ ipcomp_input_cb(struct cryptop *crp) if (ipsec_updateid(sav, &crp->crp_session, &cryptoid) != 0) crypto_freesession(cryptoid); xd->cryptoid = crp->crp_session; + ipsec_sahtree_runlock(&sahtree_tracker); CURVNET_RESTORE(); return (crypto_dispatch(crp)); }