From nobody Wed Jul 9 15:40:29 2025 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 4bchy71HyVz60Zf3; Wed, 09 Jul 2025 15:40:31 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bchy56kHGz3ZhC; Wed, 09 Jul 2025 15:40:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752075630; 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=fTg04CL1VKAYcgLh1OOI95NXh3Ys6ornKNIMqnpo1vM=; b=LO1901wp4h9YaSoYbNlMgAhmrcaeNXoy8ZuIjpGAvzAjDnZ+DJRUv2FaMyQ0nmiNI+tOiL FNMb4lZ1RCofjxy5nHT1dhdCWWbOfNxx3+pkJRBHNwI4sVNG2s7nneuqX7/lJVPOkztw+7 y2ZyKbcqCuMeGw/h7JvfRe/IWWO7x5TGtx8OQiJlE4O+bu5tII8tOPNfwMRdh+M0OibpM0 322fVvJUYruogZSIKpingewFvhwJxlGQb53H85rfUB6u4jwBvUnXDDrDmg1iwMy4JDAtnx PIUsimBpBGUCbd5lcQtqikzQqDxaeveIDSOzXPW67Glu88YXv0TOsFeOWLJ2rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752075630; 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=fTg04CL1VKAYcgLh1OOI95NXh3Ys6ornKNIMqnpo1vM=; b=jb0Jm7BAFwSXwSoylgvIljkkbhcZ/PZq+dO4Owg+YHZPTwS6+mbydUqH3Z65lfcJspxV1f MHZMLkbWGyhJKpZ0EM3EJkuAVBPqXY5xrKgv2QNu2y1NkZaudcfNoVZgIyY9EU5ZEkTuYh OGNyXDCiiV+6Odx6MvQSA0q+MdWsEjwjeN6ZZ0sZnoJcQRgJVibo0AptO3AwGyzo4L+ZMH VpM+qxRInNSMCJYLzZv+A/1PKSRwR912iJdmibxznQlMAjp/WEzHjqnDFc4cjjSHDQQWaT KeKBauZS7koepLukjTh2fdksb4tUiRoLH4r1n+obPEIrt19VSGUn0LHR0ApBTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752075630; a=rsa-sha256; cv=none; b=eEvSOtDmWrZCvuamEqIO2VgwmAxCArzaTMO5ADh2ZoG6gedraUHGUZu6qqpwGBOzmtLKbz 7rRM9ERjpNB/D6K9dS9B/+hbKEzWLtcC4KYqMmm+tESF38frH9pJ6xpKMHTWOJLFPakNkB SB594kJWLnTXry41kEOJ8dJM2MRszJo4V9rnsrqz17zyoe5GyMgzpGCmm8XhaZTwPhx3xj QHaV/5J+3ZxmiU360chDE4xc8gpJ5G3hgsHxzybS7zJ7TMKrQICmEyr0OlELiapfxBKtqV /qG7M5jJ46J4BVNmZNc2kGFsQ5Hfw1OCX9OQQrz+xscPG1sZ0Oq6HRWafilZCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bchy514qJzCkr; Wed, 09 Jul 2025 15:40:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 569FeTnI008554; Wed, 9 Jul 2025 15:40:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 569FeTYq008551; Wed, 9 Jul 2025 15:40:29 GMT (envelope-from git) Date: Wed, 9 Jul 2025 15:40:29 GMT Message-Id: <202507091540.569FeTYq008551@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 4f822ad2854e - main - pfsync: count failed state insertions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f822ad2854e4434407456757d9c0ba671f120b0 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4f822ad2854e4434407456757d9c0ba671f120b0 commit 4f822ad2854e4434407456757d9c0ba671f120b0 Author: Kristof Provost AuthorDate: 2025-07-08 15:18:03 +0000 Commit: Kristof Provost CommitDate: 2025-07-09 15:38:08 +0000 pfsync: count failed state insertions If we fail to import a state, for whatever reason, count this as a bad action. We should not drop states without at least incrementing an error count. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/if_pfsync.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index f21bdf15093c..2391edaf1a5a 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -1114,9 +1114,8 @@ pfsync_in_ins(struct mbuf *m, int offset, int count, int flags, int action) continue; } - if (pfsync_state_import(sp, flags, msg_version) == ENOMEM) - /* Drop out, but process the rest of the actions. */ - break; + if (pfsync_state_import(sp, flags, msg_version) != 0) + V_pfsyncstats.pfsyncs_badact++; } return (total_len);