From nobody Tue Aug 26 04:37:14 2025 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 4c9vyg1SWNz66CRF; Tue, 26 Aug 2025 04:37:15 +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 4c9vyg0mtNz3H2k; Tue, 26 Aug 2025 04:37:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756183035; 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=LO+fZuu8VBBsBQu5PLLr6kUPTiOREaiwsPoLQY82UOE=; b=ONYtyEzBKR1y91yaLZl0Gx0JmiCjt2JiqUVpAumMyKgyUdBkbdfrKA5fY593qkwpM8mWoh rI0fgcMuivt5NAqCty09s37IQxHGI41XpZ5IM09mGZ+9LHsY2BztrbkhZZB2eVH776GFUz 3fvNj2QSlQXvfi0WTc5RuRny6K47q5j/ZILXEvoAH2rZfHzOaekiRlH0+PHHoZT+Hs03Q1 AvrwcT+SDH8b7yiKl2JRBH9OSvrO61m3s8xvIzDefAxSy88GHjKcSxNqXqifKBLF2FvTw3 H9VV/ryeLGuTyqb60zvci5/D9kkqe2/z7pcn8FrOVLV/OfEJGE4jHzl08JVi9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756183035; 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=LO+fZuu8VBBsBQu5PLLr6kUPTiOREaiwsPoLQY82UOE=; b=uBW1Wzjq0OZR3/GcXIi/IyNnntgKWADPIPcfFhoazU90ihik7f8a19NQcSQgR04afWyFK+ NCZfmSqZHuisRYdrRBbyoXFErUV9L0uw6KUqobb8K7E2qcYHyfpJvdnzbQMcCekcGcCUt4 x6x4Pv9ey+wkheGsr8S/rgqiYDPe520/s63l3WWMH2Wi8X/Fx/gJYr+CPBaS5OvHRXlRUa bLq+gknwfha5etLmjJb8KSgElw6aAYoZH9NjkA1tZ2Y5pRLiiErj21yiwFU5tl2OdjFAuz Ks1T7Y4wh7h5UVpYp+6gY8wuz5ZV/4s8PHvEmnrNDLndYJAfr1zNjP+o+KxAHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756183035; a=rsa-sha256; cv=none; b=AiMggAk3EHSYBfmRxJYtmnVO3T8ASKSihkDQUjuvHEc5RfViHJLKTPoEyAAtC9+joyE6qq TYSG7FCSYg0CTV87lMMmthpukFi0K/YrJu0/88zsSFk+H6EH7N2WOQOuXhfgIkKdGtAwGr TQCgSCJJt75xn0CRFDFHp9tINA7yBite3LKCK9McF3X9rXEfrcOG4fgbstdzMnQX1Z1ICj o+IjJwVPBwdf30VQIy4H0JTcDcWQQzGKK6sm+rCmZ2eQq7nc+/NUobRx2RUI6xL4Y9aCih sxdLK6Q/7jBnTLlQIA0zFv5dXT8fHAaJRVTL+HojFalPbMaqL43uK8H6ZMyibA== 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 4c9vyg0FVyz57y; Tue, 26 Aug 2025 04:37:15 +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 57Q4bEE0043073; Tue, 26 Aug 2025 04:37:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57Q4bEPC043070; Tue, 26 Aug 2025 04:37:14 GMT (envelope-from git) Date: Tue, 26 Aug 2025 04:37:14 GMT Message-Id: <202508260437.57Q4bEPC043070@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Sobolev Subject: git: 5feb38e37847 - main - netinet: provide "at offset" variant of the in_delayed_cksum() API 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sobomax X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5feb38e37847c10af86f5c75dc768518973c6aaa Auto-Submitted: auto-generated The branch main has been updated by sobomax: URL: https://cgit.FreeBSD.org/src/commit/?id=5feb38e37847c10af86f5c75dc768518973c6aaa commit 5feb38e37847c10af86f5c75dc768518973c6aaa Author: Maxim Sobolev AuthorDate: 2025-08-25 22:12:56 +0000 Commit: Maxim Sobolev CommitDate: 2025-08-26 04:34:45 +0000 netinet: provide "at offset" variant of the in_delayed_cksum() API The need for such a variant comes from the fact that we need to re-calculate checksum aftet ng_nat(4) transformations while getting mbufs from the layer 2 (ethernet) directly. Reviewed by: markj, tuexen Approved by: tuexen Sponsored by: Sippy Software, Inc. Differential Revision: https://reviews.freebsd.org/D49677 MFC After: 2 weeks --- sys/netinet/ip_output.c | 13 ++++++++++--- sys/netinet/ip_var.h | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index ec6ba8d92015..ef08b9cfd3d6 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1044,14 +1044,14 @@ done: } void -in_delayed_cksum(struct mbuf *m) +in_delayed_cksum_o(struct mbuf *m, uint16_t iph_offset) { struct ip *ip; struct udphdr *uh; uint16_t cklen, csum, offset; - ip = mtod(m, struct ip *); - offset = ip->ip_hl << 2 ; + ip = (struct ip *)mtodo(m, iph_offset); + offset = iph_offset + (ip->ip_hl << 2); if (m->m_pkthdr.csum_flags & CSUM_UDP) { /* if udp header is not in the first mbuf copy udplen */ @@ -1078,6 +1078,13 @@ in_delayed_cksum(struct mbuf *m) *(u_short *)mtodo(m, offset) = csum; } +void +in_delayed_cksum(struct mbuf *m) +{ + + in_delayed_cksum_o(m, 0); +} + /* * IP socket option processing. */ diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index f782ebc53eb0..c113484079a3 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -271,6 +271,7 @@ VNET_DECLARE(struct pfil_head *, inet_local_pfil_head); #define PFIL_INET_LOCAL_NAME "inet-local" void in_delayed_cksum(struct mbuf *m); +void in_delayed_cksum_o(struct mbuf *m, uint16_t o); /* Hooks for ipfw, dummynet, divert etc. Most are declared in raw_ip.c */ /*