From nobody Wed Oct 28 20:35:52 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 4jFJzF3R3Xz6x6KS for ; Wed, 28 Oct 2026 20:35:53 +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 4jFJzD6Wf1z4RJJ for ; Wed, 28 Oct 2026 20:35:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793219752; 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=PomiYvu+3hXcUeshMgpit93NL6XT7jsDB/iqDqRzj7M=; b=JtUrhExRLgSYfhUkLEgnp4ZfO/Q9NxtuU6yFyulLPXTpSmwuehH8iF7KCay6bfKw3zQwut GmQiy47LYxHUSthNc2vCJQ905IepbQRhRK9YTuSN6z1HRq1xnmgqT7rgWuUzKoGbOK5BT5 n07gLlNo4vBOatcASmCVu9q8F3A1/DiHlWb7sYIPz+q2EA5a4VPBehH1Pr+/yPJ/Dgl3AE oaZaH9Ua2e36Ob3U5ZnaOKpWXZe26qE1A7LieQQu8d51XMNnLS1DD3deVeLzAyCGT0wck8 jsSG+ee+bVMDt3lfFNCbj+SXsIgOQ5Bpat3jfQv8OBQ+GDE/FFAfT6Df3u4PUw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793219752; b=BRq2YqtOncJDtteMEPcDCRsw+AzDN1SDZ43ZQWv7BJ9ioHbKs21/I09mvef0TzxpH9t+W1 NVu2kNNtAA/Cz94X2O8+kM2iZFEQBK1kaOyCRS5bNQwGQae08bSl7o/P9F/X2uMFYRnqBb k7x2JW9VUBvn+iXpjOl6hqI9t/HFSLR1MmfmD8aEqfn+CIFhVhOb59yGaIAOz4rPSLq6ek L81g80NUbnWMwceGU4bnlc276Gf9Ha8eHvQgOLHWJld5d8RCzggRMSW1zcrdrrA604g8ev ORs/Iyrf8S3TEboMG/KKfkhqcpwbQG6tAsaK/O2Z/cA2eWTfkIwz5vPM3REkug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793219752; 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=PomiYvu+3hXcUeshMgpit93NL6XT7jsDB/iqDqRzj7M=; b=qLo81sJOz+dSmhgdw5fF8a6WJzbcQI402PPtWwePL8j1HX+mWW6R7s7Q5JL0pJDYWn0j4a 60sJjdpvgsm9FIr4mHFSWXpq7k4IphAMvDVzvAq+FJUCCPTtsDUfBWWjk0JB5FyLFnG/Bz RUtRPuATsOgu0Y7nAvHAKbNRMG2BhxtM+fOKwHxED1LXqVCzt7NY6X5Q++4iHLSmKxy8wM Y7SKgz9u77QE6Hbl5Fum/nlCQvX1FE8xCe9hPNxDLPS1MbGEnwykH8ma2tQtzimJ2bPy68 QDuddrxmiPrwSR0AO5ZPTRIn/tPeWk4ZADAUb6nmSVTcS8vmJac1dVa2sH948A== 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 4jFJzD6B30z1Mk9 for ; Wed, 28 Oct 2026 20:35:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d622 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 20:35:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: R. Christian McDonald Subject: git: 6c339d4c7289 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 6c339d4c72895233d117ff31a9ba015f7b3c7075 Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 20:35:52 +0000 Message-Id: <6ae25ca8.1d622.5645a9e3@gitrepo.freebsd.org> The branch stable/15 has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=6c339d4c72895233d117ff31a9ba015f7b3c7075 commit 6c339d4c72895233d117ff31a9ba015f7b3c7075 Author: R. Christian McDonald AuthorDate: 2026-10-12 11:52:34 +0000 Commit: R. Christian McDonald CommitDate: 2026-10-28 20:34:11 +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 b710c15085d6..dc17969cd9d4 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -2713,6 +2713,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,