From nobody Mon Aug 24 07:27:00 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 4hT2Y1061yz6X8Wn for ; Mon, 24 Aug 2026 07:27:01 +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 4hT2Y066NYz3hMB for ; Mon, 24 Aug 2026 07:27:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787556420; 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=gyhJCQ2kCP91XXc9vj8OKA7LsD8ve2CeDPE6XYW4Pxk=; b=MhFwf7RTm/2NBR3FMahOYSDx6C1bZ8d9ITlZL/oEJ8l4UEhmoaz+n+2bMLel0kiegHkPrU ZY7OnLodwPuPvvktBs/sm6fMDboTEqfBwn+3OcfTOzT67B2SBAFgcPBELiOmRvaqzTY5cd uZAcQIaTviz16jXceW3fNF79ZorZ8RccHjkqubi+OyXsMT/Dxn8W4WgjdoaWJqt8+qszVF 50504l205KT7ZbdzaWpC5/v3aaALsUPgnIr/9+2+BhI8Y9vfzehvQhj8PwKJ+HBs9t7RVn sOFtBZa63CXWjLvnROge5JWAvjbJAmMaMxOlJ1Vl0/HqwYHmvcEn78zAq0McEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787556420; a=rsa-sha256; cv=none; b=mhNAHUFaGYTKGbg3SEdIILRLRC1JGVpTYVakIAGjiFexjYJ4K3+y24PVUDvceqWR8aqeR+ vI3bRZbXF9GOX8kR88XNxm1D68d7SbCoXoFR/twoGbwf6rokCllb9jWGi2jjvdLz6yo286 cVkjw12h+hvNkKEt38jXKnYfsAeEAaQqLhTErZow6OK2R3340fDtoIp5Hudt4i7YPujecS TVgoYBZweLjaP/y06IBRFe4a9xR5FgbxqpXBZ7PxDYIuROM8zsW4OvNXXzBeginvpxHZs1 RD/nMqlVtWQyuuuPg9f0W72QOzm8SDZGICW8iPajhoWyjKiTRFGBMG4eClW2Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787556420; 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=gyhJCQ2kCP91XXc9vj8OKA7LsD8ve2CeDPE6XYW4Pxk=; b=SEK5YIOEkwdc8gXXe6Q4i8Mk+uQmXDFJNOcx3fgzBAkxqKL33WqY0XuiwrxZv5hxLwKU8/ qBHsVL2hGdQtIWWknvyURdimgEhwFKpimRwmH+bDHtKJGNRHl5c6chWnbJ9VQfpE8yTVdK l8jlQ7B75OySuuAHyDYYP/1bldeVn7FC45w/D0ECxT8ia/iEpzhVF9ppSpZ79xJs80ICPd o5jZFI69HEbHueqrNuC5tAH14uWeR8D8qSZvzyV3fH/hg1uKyB1XQZEZI1y+XiIHRsyIGD PvjugF9ANAp2o97MZpi6CdtP+AceiwtIJAdMv1w1aAdn1rfWt4Cv7SddFQfBQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hT2Y0534Nzv8X for ; Mon, 24 Aug 2026 07:27:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f003 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Aug 2026 07:27:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: ef676ecff1c3 - stable/15 - pfsync: handle large MTU pfsync interfaces List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ef676ecff1c36b9273394c5628313e65ba420a20 Auto-Submitted: auto-generated Date: Mon, 24 Aug 2026 07:27:00 +0000 Message-Id: <6a8bf244.3f003.38c8c5d4@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ef676ecff1c36b9273394c5628313e65ba420a20 commit ef676ecff1c36b9273394c5628313e65ba420a20 Author: Kristof Provost AuthorDate: 2026-08-07 14:07:09 +0000 Commit: Kristof Provost CommitDate: 2026-08-24 07:17:28 +0000 pfsync: handle large MTU pfsync interfaces pfsync packets were allocated with m_get2(), which can't return packets larger than MJUMPAGESIZE. As a result 9k MTU pfsync interfaces simply didn't work. Use m_get3(), which can allocate sufficiently large mbufs. Extend the pfsync:bulk test case to provoke this problem. PR: 297307 MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 7e2781fdcfdbe489cc07572d33dc36bca06a342d) --- sys/netpfil/pf/if_pfsync.c | 2 +- tests/sys/netpfil/pf/pfsync.sh | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index a64d0ef64a61..db7db987197b 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -2039,7 +2039,7 @@ pfsync_sendout(int schedswi, int c) return; } - m = m_get2(max_linkhdr + b->b_len, M_NOWAIT, MT_DATA, M_PKTHDR); + m = m_get3(max_linkhdr + b->b_len, M_NOWAIT, MT_DATA, M_PKTHDR); if (m == NULL) { if_inc_counter(sc->sc_ifp, IFCOUNTER_OERRORS, 1); V_pfsyncstats.pfsyncs_onomem++; diff --git a/tests/sys/netpfil/pf/pfsync.sh b/tests/sys/netpfil/pf/pfsync.sh index 9843c470c06f..8e639ca7c988 100644 --- a/tests/sys/netpfil/pf/pfsync.sh +++ b/tests/sys/netpfil/pf/pfsync.sh @@ -212,13 +212,14 @@ bulk_body() # pfsync interface jexec one ifconfig ${epair_sync}a 192.0.2.1/24 up + jexec one ifconfig ${epair_sync}a mtu 9000 jexec one ifconfig ${epair_one}a 198.51.100.1/24 up jexec one ifconfig pfsync0 \ syncdev ${epair_sync}a \ - maxupd 1\ - up + up mtu 9000 jexec two ifconfig ${epair_two}a 198.51.100.2/24 up jexec two ifconfig ${epair_sync}b 192.0.2.2/24 up + jexec two ifconfig ${epair_sync}b mtu 9000 # Enable pf jexec one pfctl -e @@ -232,7 +233,11 @@ bulk_body() ifconfig ${epair_one}b 198.51.100.254/24 up - # Create state prior to setting up pfsync + # Create states prior to setting up pfsync + ${common_dir}/pft_synflood.py \ + --sendif ${epair_one}b \ + --to 198.51.100.1 \ + --count 2500 ping -c 1 -S 198.51.100.254 198.51.100.1 # Wait before setting up pfsync on two, so we don't accidentally catch