From nobody Wed Oct 28 20:35:41 2026 X-Original-To: dev-commits-src-branches@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 4jFJz22CX3z6x615 for ; Wed, 28 Oct 2026 20:35:42 +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 4jFJz16Qvjz4QnD for ; Wed, 28 Oct 2026 20:35:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793219741; 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=wKw3r7yCjyW26XVH991V9WalcCRr4FleNI9TWNxm5/k=; b=sLDam0i8nxLOfyY3J0dq/7NYM1Ub9Cu0yWnc8T1fXF03c31YqLcnNwBO6xhDr1341SDvLd QokgHALHaxWx4SeabGlnEQnWYJoGh2SXOs5HDXwKxPXtVH7hZVIBOIgHcEuO2A7CSmGCqA z/U+UYY7vn5ejUvZIZ0/WU42urXlmu1hp3wpf5uWgLlRD8azGX6WHS8ZfXzM1RGg2t9GAM iiuNBhJT6M41/mwa0VMwLuG0LtFoOemj1NzN4fAXpHbPGfjZo2qYgrr+Y9xLByPccLveVy 2gxKkmCE3h0A2ZUYVs58+FnJnm4HZa1JJ+zDlQSgbqxnuY4LxFQSKpl1xg5Tug== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793219741; b=fuvKM+N7mKMOHC3f/47IK2EJYlfUUAlVz9w0MFt8OO95zZz6+NhRZiYOxm4gd92+nQZK2S gF8/YVjVO5OkcYOGCA5Fhf8CEq9NDU4T4tGsgYfDzkBxl2t2Xlrkm3BNpnKU1MlO7xAuWa URBNYKO56xropjg2UuyXH5Ak/5v1tSdm+XBzMzcHlsAMwFxD6EJd/J6nyrOOVlZ/LKX+0g JPTCR76X2WZvIg8BpoIFdnAVObVJI8fg7RAdX65t9UlgNKXxsj0OykPhodAUDDdCNYENdC JPJBKAYh34tLEwxDPrmM2IODPdfZ9zDDesVoE8av05y7yYUQTjSFE546oBD2Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793219741; 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=wKw3r7yCjyW26XVH991V9WalcCRr4FleNI9TWNxm5/k=; b=tgds4fIQTZKZL+vvvjm3t9SO9VGf+3GPPevUPG+U72uYSZRgYgVx5avG40vOqlNI8KX5+2 wHmToHRb0WnOaHn+0o7M0T9zDbDoBMrVmAIIPoAEAI29YPTxei1KtSocT55/LwMR3kijas u5xXXZDLL7jD+Hliu4Bv/WNjbFdUWwm5vkvboTnXCN5lbcrCblP3iSWGZkHKmpQqdhCrII 1GU9AMLNKvqDeKp2WWHoVRexPve33GdV1AsEo5eibqYSrp5BVoPxs0+piTnXZxLul42CSk THIJ22Qt1MrSUWLeYxlTwRGIqEffo1R+3EHno7pvLQkhiutwG6xhdHnumR/Jrw== 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 4jFJz15xRqz1MrN for ; Wed, 28 Oct 2026 20:35:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bfc2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 20:35:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: R. Christian McDonald Subject: git: 29c08481e7d4 - stable/15 - pf: leave the epoch to purge unlinked rules List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 29c08481e7d4ca650ab13a365bb34a4326429643 Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 20:35:41 +0000 Message-Id: <6ae25c9d.1bfc2.795eb0b4@gitrepo.freebsd.org> The branch stable/15 has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=29c08481e7d4ca650ab13a365bb34a4326429643 commit 29c08481e7d4ca650ab13a365bb34a4326429643 Author: R. Christian McDonald AuthorDate: 2026-09-30 23:30:54 +0000 Commit: R. Christian McDonald CommitDate: 2026-10-28 20:34:04 +0000 pf: leave the epoch to purge unlinked rules pf_purge_thread() calls pf_purge_unlinked_rules() in the network epoch, where sleeping is not allowed, and it takes pf_config_lock, an sx lock. If a rule is being added at the time, the purge thread can sleep on the lock, which panics with INVARIANTS. Reviewed by: kp Approved by: kp (mentor) Fixes: f92d9b1aad73 ("pflow: import from OpenBSD") MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D60160 (cherry picked from commit 82ab4adec95578b196eaf431d6ca87dd209aca6b) --- sys/netpfil/pf/pf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 8c2b905b4ba0..b710c15085d6 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -2689,7 +2689,13 @@ pf_purge_thread(void *unused __unused) */ pf_purge_expired_fragments(); pf_purge_expired_src_nodes(); + /* + * Takes the config lock, and may have to + * sleep for it. + */ + NET_EPOCH_EXIT(et); pf_purge_unlinked_rules(); + NET_EPOCH_ENTER(et); pfi_kkif_purge(); } CURVNET_RESTORE();