From nobody Mon Oct 12 11:54:55 2026 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 4j3G9W1yCNz6SyQ8 for ; Mon, 12 Oct 2026 11:54:55 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j3G9W1JcYz4d85 for ; Mon, 12 Oct 2026 11:54:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791806095; 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=qhGC5bocl3pQ4UTUGCD/eht7oEmTof/vS7AS8XEfKHU=; b=WsclWwUfUxPOegr4Q1eq2k5P+tEMfXfrk5Tz3DddwgbAGxwEnCbIGQWv8TnCtcoMDuiUIe P3rlkJWt+8hEqFpj9khHKqTmBn2mgpbwMyV592WBUTdTpRMipTG0JT7aylOrNbrfZrTJ2j 3YbvYdliG8iPQbSWaa5zfobK3DW5fdv7u24QZNVuZN0VrIgabnd8URAg0cpNiclHDNX8rE eKEaxa7SjmDHOk2IlETd6/ERmzsr2N4P6hrgg6QxZ9w/TThJMYRyFf9m6mnC8CgCqyIxoL 5JXThtCv3C+6m+0xYEG7V8M4117lVpKZv0r4STeILsEilalpDqrChkN0WUnWFQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791806095; b=S/H5xhiJOePhLwcac5LRq9SBJCER+O5vpChHzi3Wy2ol/v3w3l0rDD1+dDc+TiR7EAeJtw AG3y3IvIZ/J9v7bDXCz9PkALiH0Eg0fe8GteuJTg3rmLHA2w4g8ij7r7W+92Mpi+Hk3MtP 4chkyskXkeVPFYCDFiAme5KrChz8Eq+bSp0DUyF7EFutOSUiOB4JsqNmvTga8461rKZH38 x6+bgZX8hi/SsMBlp8X674D2MdBu85y9DWzyut5ls6K6rSNsPFiOHCdZUUdyc7+8CXWF5e z+HdXCgP0rkpvI3wf2chWiDlM1FLU/NyT7LTD7K1nxM3B1qEp4O6u1ZU6ivnMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791806095; 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=qhGC5bocl3pQ4UTUGCD/eht7oEmTof/vS7AS8XEfKHU=; b=ylD2c6PFdcScoeimSImqFNc53uwUKxnCjpLqIgPNRjuJFLutH6Ae4jn9nSPnVanMTB72WV lnCyCeO8Td6LjWigYJEv5y8gSh9U+y7+F5RfrVQlstELYoYii5+f3TxogSmwvsKU7YG7xA bgRsYi02o4q6ux1znGv85dflQKdiyF6VjeKPkDY15gngCsXpomW5wDsuTcqQph2J+wMzD3 dQmK9kA4xNWu1TQtnuM/5ZOgB6tdppn39+9NvWah7vN4rCy6Ay/ZsrkdWNZbEWcFm1JxC5 3wn1KpAPmskfeDzoM73irfdOqnkTc0Zdnz77XvzoHDD1cyutkvvuD14DV86bTg== 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 4j3G9W0NFpzQtZ for ; Mon, 12 Oct 2026 11:54:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33fe0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 12 Oct 2026 11:54:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: R. Christian McDonald Subject: git: 92d66a6b474f - main - pf: Drain the overload task before a vnet's rules are freed List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch 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: 92d66a6b474fa6fe42fbe08002803d79a5af6594 Auto-Submitted: auto-generated Date: Mon, 12 Oct 2026 11:54:55 +0000 Message-Id: <6accca8f.33fe0.4c101e3e@gitrepo.freebsd.org> The branch main has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=92d66a6b474fa6fe42fbe08002803d79a5af6594 commit 92d66a6b474fa6fe42fbe08002803d79a5af6594 Author: R. Christian McDonald AuthorDate: 2026-10-12 11:52:34 +0000 Commit: R. Christian McDonald CommitDate: 2026-10-12 11:52:34 +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 --- 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 d125a28a5b76..3dcb0c29e62a 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -2960,6 +2960,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,