From nobody Wed Oct 28 20:41:33 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 4jFK5p4TsRz6x71S for ; Wed, 28 Oct 2026 20:41:34 +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 4jFK5n4ypWz4b0n for ; Wed, 28 Oct 2026 20:41:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793220093; 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=SyKqra568yXGRUdQVZVgcYpaxzmJZtIG+5FXx3wrQZU=; b=G+JRaNUC91WxdbIRPwD2BvDObriXRlEbMWHmqWpnKtcr+psJ885bKMv9QbTqC3z6Z2lnp1 BZJyZIoGqK++usgNmGZ3d4WjxaWyqLoVxT68hPt2Hm+eYU6RFOjowyvu8+SHNg6NLKi8hN G294L1s214PtIlTz6VfRcpp1DZ+507fCZA4Yw5kLUetGqWOyavqJzBwvFv6W6EuDpu2CHe /t32o2P9Dq6lYBiL/bPtALQ3fY8mzDzfobiHXXil6WIGRLHQXIgf0P5Oh2s3hSCSxVFr1l MDW/0BdD5Qo1qXMkxJhyVEkR5KrxklUlvuKC5nzUkQvyIT9kRuTi1vern6aLvA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793220093; b=CINme8Wb5JkxX96dQaAtXIQrPtzlEVZsVmMFccn/LIPGb61e4AC2oCoZfGbnvXQtXRBnFu N+l50MsErr8nZFEfV7J8huzdJ50sWI9hz3eS8HPEQzzdnzmk8h9CIoUAH5ClLqA9hNBaZY ug9azUHxOiHrgsVDa77zY2EbfK5b3jBielqemOatPiwS60Rmt2tvkxvSNKiwZPTqDPcNQX GhkeuxT52PuVny8gXRAIAY2gRka+pgRTP1QwtdCbK590LYLSODRNQthBYxkMlKwTi/8yL/ l/RgJxIK9wprljwpMrL0nvVfBRelHW5Ocj31wbZWOy3jwmVJs+6P1wMamDH5Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793220093; 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=SyKqra568yXGRUdQVZVgcYpaxzmJZtIG+5FXx3wrQZU=; b=sNjuyQIsWouE9IyZIPnm5N2dYqFwvYfM66xxSQt4BngZF/PmxfdfywOhuYzatyzBEDl1DI rniwD6Hl84s1c0QCjeiGoAI7qJIHb1WUAdpWGlgVETgp/FakIoGLu6gLh6NfSBoYxT1Dob XP0YSW+LMls9bSJkC3aejcuRgaqhgaBjkUiYWvUCHtzCvUX/B2p+dBCZ8wWoZiAS0qDda+ JpNS5B2OjD7sJ73mJDiZLxetA/bzVLRYVBnSfo1KxlNxs3BiNSve8N4xF96l5nkVKoGfGF gW6lfrkmBV0MOzlSA3xUqlp5b1twOxFndwuSngKrlqHrpwuig/rvYScBN0Zznw== 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 4jFK5n4ckhz1Mkg for ; Wed, 28 Oct 2026 20:41:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e2b1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 20:41:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: R. Christian McDonald Subject: git: c730caf617d7 - stable/14 - pf: Drain the overload task before a vnet's rules are freed 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/14 X-Git-Reftype: branch X-Git-Commit: c730caf617d74422010472a66a4d8abd68a2c03e Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 20:41:33 +0000 Message-Id: <6ae25dfd.1e2b1.346cc1f3@gitrepo.freebsd.org> The branch stable/14 has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=c730caf617d74422010472a66a4d8abd68a2c03e commit c730caf617d74422010472a66a4d8abd68a2c03e Author: R. Christian McDonald AuthorDate: 2026-10-12 11:52:34 +0000 Commit: R. Christian McDonald CommitDate: 2026-10-28 20:38:07 +0000 pf: Drain the overload task before a vnet's rules are freed pf_src_connlimit() queues an entry for pf_overload_task() when a source exceeds max-src-conn or max-src-conn-rate and the rule has an overload table. The entry holds a pointer to the rule, and the task runs from taskqueue_swi with the vnet of the queue. Nothing drained the task when the vnet went away: an entry queued just before could be applied to a rule pf_unload_vnet_purge() had freed, or to a vnet that was gone. Drain the task at the start of pf_unload_vnet_purge(), before the unlinked rules are freed. No packet can queue another by then, as the hooks are already removed. Reviewed by: kp MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D60529 (cherry picked from commit 92d66a6b474fa6fe42fbe08002803d79a5af6594) --- sys/netpfil/pf/pf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 7c1f43a8b9bd..9cd1c2897cb3 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -2261,6 +2261,9 @@ void pf_unload_vnet_purge(void) { + /* Overload entries reference rules: apply them before rules are freed. */ + taskqueue_drain(taskqueue_swi, &V_pf_overloadtask); + /* * To cleanse up all kifs and rules we need * two runs: first one clears reference flags,