From nobody Thu Sep 4 11:42:34 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 4cHczG3snjz65rql; Thu, 04 Sep 2025 11:42: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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHczG2tVGz4JDb; Thu, 04 Sep 2025 11:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756986154; 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=wb0FiHxYNtAKFSXaiyx5wzsJ77g2lI4wldQh+Z18B7o=; b=AmXdeQAjXwi1OuZJdZDd5vL2tjBhGMKdfKDGFofLS/os8tBtFKRmrE63+bQ1u4MGeeQbd4 EnvyETLfDfXMzLct0+4kVSjliM4hCN0d4cxyrtzH01zBen8dNetZ2KBPnS19FlmnILMjsG 14G4oM80uWJXEhcDNt1VnfRA8PZ+DNEiJZxVn/lZ3F0seixnNp4+CxEkFimwWQdNBZW6Dk W6uFWJZMibZnpvpvpcqOXHqhLPX5PmmfGDfGOPebumvURG0Hr19tezVBusYhXkbfdrcMpf RPfSdElzz+QW4dgfIx4OopgKXCZq18i2pIM9fSB7DDCfxY0VI9U7ZJ5PE95R8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756986154; 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=wb0FiHxYNtAKFSXaiyx5wzsJ77g2lI4wldQh+Z18B7o=; b=tBGkJ1UBKXryY6RBjdkYLfXC/0IGi9Wp99F/jGsVnXcDWESIrRbrn3fexN4ZzlQFpyCJKi nNuHnmMG9B+QeoJNnkPvqdWUpwb2o/KRDKF1wgLtQY/Mi06ZIAIkR5+SZ6ogOYzhcrju7d fXCrPC18P1klAq3RBaXrHtWtbzfzVc+O3oGZaxx1fWc6cKnEvXHv+DI+k2aF+CTqY+I+QU slwdw0NXNk/7r/KWPiqmxGih27dhk8j6PENUp/zEGkdUlvviKhpir46QI69su84i4/wZQg MjmJttV8sYgXEp/bGYhGs+Er3KsJtH99GOr7AFPED9sTsINdsujjNNT3jkoubw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756986154; a=rsa-sha256; cv=none; b=ZIMj3vkLUczA7U09LqZi7wdFuiK2zGhh73acJ552bD0Bp3HFtUoIqoK7s5hjELtxovEWNi z7keYsJelcMdkBZLHKkpV6tPyx4ophO2gn4hq2BiAqlsyo0lLxNTm3kmm4nrZIYwFPoJ94 Mez4RlN4yIbo236CfW+lRAt8s0PNF16m5fjllQzXxFty7WJM1tdoAEeMJ4RVZfFp2jSozK ZMOjXQFTFgMC/H56w/8/bC7vtZYNT4qS0bzhKhccxaLEpLXKxXEXE5sXHSk+jtVLFHYZgb KVFo72K0rqjx87zBAeF4iSxMOEgRFuL+swnqyZQnkBK3Rbkct7iWt/Q9gQdniQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cHczG2TWBz119b; Thu, 04 Sep 2025 11:42:34 +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 584BgYEw003576; Thu, 4 Sep 2025 11:42:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584BgYAL003573; Thu, 4 Sep 2025 11:42:34 GMT (envelope-from git) Date: Thu, 4 Sep 2025 11:42:34 GMT Message-Id: <202509041142.584BgYAL003573@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: e21c3dae6767 - main - pf: map checksum offloading flags for NAT64 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e21c3dae676776518b2abf69ef960084c13a21c1 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e21c3dae676776518b2abf69ef960084c13a21c1 commit e21c3dae676776518b2abf69ef960084c13a21c1 Author: Timo Völker AuthorDate: 2025-09-04 11:35:00 +0000 Commit: Michael Tuexen CommitDate: 2025-09-04 11:35:00 +0000 pf: map checksum offloading flags for NAT64 When doing NAT64, not only map the packet, but also map the csum_flags in the mbuf header. This fixes NAT64 when pf is used in combination with transmit checksum offloading. Reviewed by: kp, tuexen MFC after: 1 week --- sys/netpfil/pf/pf.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index d15a16c54f81..242152f17db0 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -3633,6 +3633,18 @@ pf_translate_af(struct pf_pdesc *pd) pd->src = (struct pf_addr *)&ip4->ip_src; pd->dst = (struct pf_addr *)&ip4->ip_dst; pd->off = sizeof(struct ip); + if (pd->m->m_pkthdr.csum_flags & CSUM_TCP_IPV6) { + pd->m->m_pkthdr.csum_flags &= ~CSUM_TCP_IPV6; + pd->m->m_pkthdr.csum_flags |= CSUM_TCP; + } + if (pd->m->m_pkthdr.csum_flags & CSUM_UDP_IPV6) { + pd->m->m_pkthdr.csum_flags &= ~CSUM_UDP_IPV6; + pd->m->m_pkthdr.csum_flags |= CSUM_UDP; + } + if (pd->m->m_pkthdr.csum_flags & CSUM_SCTP_IPV6) { + pd->m->m_pkthdr.csum_flags &= ~CSUM_SCTP_IPV6; + pd->m->m_pkthdr.csum_flags |= CSUM_SCTP; + } break; case AF_INET6: ip6 = mtod(pd->m, struct ip6_hdr *); @@ -3650,6 +3662,18 @@ pf_translate_af(struct pf_pdesc *pd) pd->src = (struct pf_addr *)&ip6->ip6_src; pd->dst = (struct pf_addr *)&ip6->ip6_dst; pd->off = sizeof(struct ip6_hdr); + if (pd->m->m_pkthdr.csum_flags & CSUM_TCP) { + pd->m->m_pkthdr.csum_flags &= ~CSUM_TCP; + pd->m->m_pkthdr.csum_flags |= CSUM_TCP_IPV6; + } + if (pd->m->m_pkthdr.csum_flags & CSUM_UDP) { + pd->m->m_pkthdr.csum_flags &= ~CSUM_UDP; + pd->m->m_pkthdr.csum_flags |= CSUM_UDP_IPV6; + } + if (pd->m->m_pkthdr.csum_flags & CSUM_SCTP) { + pd->m->m_pkthdr.csum_flags &= ~CSUM_SCTP; + pd->m->m_pkthdr.csum_flags |= CSUM_SCTP_IPV6; + } /* * If we're dealing with a reassembled packet we need to adjust