From nobody Thu Aug 6 16:56:55 2026 X-Original-To: dev-commits-src-all@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 4hGD306YCCz6nLj6 for ; Thu, 06 Aug 2026 16:57:00 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hGD305xZBz3Z6c for ; Thu, 06 Aug 2026 16:57:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786035420; 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=erEQDvYDg2J4JspjIEIeI/nOzUDkgKVmCvrGg2OSgcI=; b=yRs1wlsG4RilgDX3TPWJj6e8hzhol5DyVcHmpnsVHOlVhvi97f8dXt8P4SfwL/MlIFBgu/ fPHomiybtV3/xdqvyMpYEHRZ86rDvLNHfOqq73w8Hil/6bj2yYIQqUjyWdeFD9Nj2Vlewo QnSVJGIK18RyedFltxOpeeXcv6YZHL3MI6E344kW7s2bv6+gqeMuGJhJ6S/1vKMNCkt5tM wIrvSsjbIcRo1eNzHRfub8jdNgcmPykt6ZcFbYQNg21dOkIcmsuz6yO8oeENgPTPVCpAB5 SaU+Q19Nlk/LC/H4Qs4pEseoJLNIqbgSWFD1GPQ4I6y+zluOrfNryZb3BUs1Kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786035420; a=rsa-sha256; cv=none; b=ehf0Sx0zTf1KNZ6IoUYMU/+ztICrnVwryctPfY/kuxFH9qkkIb9QT0w4n/u9denzEAiFpL h5KJGyIShkwZGzlrntl+905prJRNeaFqNpygRkbhEcYMlHfj+oJPSHS6Cn5Y0IIvh/WEol eDuyci1HSkA/ePjO6O2EPsWIcKlVWcW4zuT2jsjPLksb8fKYA3BMSEpOfKUzQFxG9pOljM F/x16B/UVOQ+K/0kTC4HGHN+WemnQIMzE1cm0W+bVc7W0vuej8w8IA8l6QfDf/iGWczJyX nKFMXBQ+WiXVsqBAmLtUF2RX8qTK4a0uK6vK1SXsMlEaPwEs8eV4xgYEi1UNIg== 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=1786035420; 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=erEQDvYDg2J4JspjIEIeI/nOzUDkgKVmCvrGg2OSgcI=; b=XI98epEPMrQxB/7rz8FRzpYoVwVPIcHuocO2dM6RgOZtBJ29X8aTjVMUW76Vy5gUXIO6f6 4B4FXAh0rQYWP+5gl2RMuFWdZCQqSww7RFDBbiq34f54YxuOWPJnwfeY8dtcZPpwGVJd7S llp326X1hQRFTOhvhFxz38jU0nOhORVT09ilfA6Ojbj262WUvnm0ssto7YKNPDta3iuj9o 6eN9CfGjCMzxc0yMqVxqXf5ybHHrNwE4jIRqsckN/S+vlaZycYbNGl8JBm7s4nkpOVL3Vv 38pVyWncE2kOwMSC4UigADd785R7Y23XdSoIT6KgXrMcVPucKtvjuOqTjBXwKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hGD304XlVzDS5 for ; Thu, 06 Aug 2026 16:57:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23e44 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 06 Aug 2026 16:56:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 1b8d19dea462 - stable/14 - Revert "loopback: improve checksum offloading" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1b8d19dea4624cba3c96fb4fdcf05f681562ee0b Auto-Submitted: auto-generated Date: Thu, 06 Aug 2026 16:56:55 +0000 Message-Id: <6a74bcd7.23e44.73fb694e@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1b8d19dea4624cba3c96fb4fdcf05f681562ee0b commit 1b8d19dea4624cba3c96fb4fdcf05f681562ee0b Author: Michael Tuexen AuthorDate: 2026-08-06 14:54:45 +0000 Commit: Michael Tuexen CommitDate: 2026-08-06 14:54:45 +0000 Revert "loopback: improve checksum offloading" This reverts commit d6c4cea7740d5c5c673a06ba37e4f1bdcddb2ece. It is done because this change interferes with the ipfilter NAT functionality. So Back it out until ipfilter has been fixed. --- share/man/man4/lo.4 | 23 +++++++++++++---------- sys/net/if_loop.c | 42 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 49 insertions(+), 16 deletions(-) diff --git a/share/man/man4/lo.4 b/share/man/man4/lo.4 index 5b808153559a..f1ac67c7d7db 100644 --- a/share/man/man4/lo.4 +++ b/share/man/man4/lo.4 @@ -29,7 +29,7 @@ .\" .\" @(#)lo.4 8.1 (Berkeley) 6/5/93 .\" -.Dd June 28, 2026 +.Dd June 23, 2024 .Dt LO 4 .Os .Sh NAME @@ -56,16 +56,19 @@ The loopback should be configured first unless no hardware interfaces exist. .Pp -If the transmit checksum offload capability is enabled on a loopback interface, -checksums will not be generated by IP, UDP, TCP, or SCTP for packets sent on the -interface. -By default, this capability is enabled to avoid the overhead of checksumming for -local communication where data corruption is unlikely. +If the transmit checksum offload capability flag is enabled on a loopback +interface, checksums will not be generated by IP, UDP, TCP, or SCTP for packets +sent on the interface. .Pp -If the receive checksum offload capability is disabled on a loopback interface, -the flags that indicate a valid checksum will be unset if set previously. -By default, this capability is enabled to avoid another checksum validation if -it has already been validated. +If the receive checksum offload capability flag is enabled on a loopback +interface, checksums will not be validated by IP, UDP, TCP, or SCTP for packets +received on the interface. +.Pp +By default, both receive and transmit checksum flags will be enabled, in +order to avoid the overhead of checksumming for local communication where +data corruption is unlikely. +If transmit checksum generation is disabled, then validation should also be +disabled in order to avoid packets being dropped due to invalid checksums. .Sh DIAGNOSTICS .Bl -diag .It lo%d: can't handle af%d. diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c index 97a534e43212..92740bfb6cfb 100644 --- a/sys/net/if_loop.c +++ b/sys/net/if_loop.c @@ -230,22 +230,38 @@ looutput(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst, else af = RO_GET_FAMILY(ro, dst); +#if 1 /* XXX */ switch (af) { case AF_INET: - if ((ifp->if_capenable & IFCAP_RXCSUM) == 0) { - m->m_pkthdr.csum_flags &= ~LO_CSUM_SET; + if (ifp->if_capenable & IFCAP_RXCSUM) { + m->m_pkthdr.csum_data = 0xffff; + m->m_pkthdr.csum_flags = LO_CSUM_SET; } + m->m_pkthdr.csum_flags &= ~LO_CSUM_FEATURES; break; case AF_INET6: - if ((ifp->if_capenable & IFCAP_RXCSUM_IPV6) == 0) { - m->m_pkthdr.csum_flags &= ~LO_CSUM_SET; +#if 0 + /* + * XXX-BZ for now always claim the checksum is good despite + * any interface flags. This is a workaround for 9.1-R and + * a proper solution ought to be sought later. + */ + if (ifp->if_capenable & IFCAP_RXCSUM_IPV6) { + m->m_pkthdr.csum_data = 0xffff; + m->m_pkthdr.csum_flags = LO_CSUM_SET; } +#else + m->m_pkthdr.csum_data = 0xffff; + m->m_pkthdr.csum_flags = LO_CSUM_SET; +#endif + m->m_pkthdr.csum_flags &= ~LO_CSUM_FEATURES6; break; default: printf("looutput: af=%d unexpected\n", af); m_freem(m); return (EAFNOSUPPORT); } +#endif return (if_simloop(ifp, m, af, 0)); } @@ -399,15 +415,29 @@ loioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_capenable ^= IFCAP_RXCSUM; if ((mask & IFCAP_TXCSUM) != 0) ifp->if_capenable ^= IFCAP_TXCSUM; - if ((mask & IFCAP_RXCSUM_IPV6) != 0) + if ((mask & IFCAP_RXCSUM_IPV6) != 0) { +#if 0 ifp->if_capenable ^= IFCAP_RXCSUM_IPV6; - if ((mask & IFCAP_TXCSUM_IPV6) != 0) +#else + error = EOPNOTSUPP; + break; +#endif + } + if ((mask & IFCAP_TXCSUM_IPV6) != 0) { +#if 0 ifp->if_capenable ^= IFCAP_TXCSUM_IPV6; +#else + error = EOPNOTSUPP; + break; +#endif + } ifp->if_hwassist = 0; if (ifp->if_capenable & IFCAP_TXCSUM) ifp->if_hwassist = LO_CSUM_FEATURES; +#if 0 if (ifp->if_capenable & IFCAP_TXCSUM_IPV6) ifp->if_hwassist |= LO_CSUM_FEATURES6; +#endif break; default: