From nobody Thu Mar 20 03:13:57 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 4ZJ9dx4qmcz5r9pG; Thu, 20 Mar 2025 03:13:57 +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 4ZJ9dx2s3Rz3w0P; Thu, 20 Mar 2025 03:13:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440437; 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=jFk61KsQNmtplk/PegP1zloNg62TD5I/k7xMcfkXXjQ=; b=SADYIZBuKFX4QQKk1k7phwZEjmjxnlgATsYE8dZfyE1Sk4xUuErOQd58MBFurbTcdamTai dTZiDVzc30aupWpiYxS5sXnf8qep1xOGJlXjUbro9lI5gUXeW5RaYqcD+Fpqma5gTkB0Kd nQOoAEfcnZLYL9Sn6QDgmgriLB5w+Ao+tdIQFNf1XmuX+5AlBoDMKzz5IETOdbmWi0mxWa A/GiTWPU1d8hMTyKjddcqmcg4nrKDQjfuxangl7LXmwoC2r6oqASKNqcFi32JrT7mvm+Kc vXtNwdrGZ2CLnTfKJnYJpKhfxsU6JecqIRsSimA3npo/aUXIFKjlxQTscXP15A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440437; a=rsa-sha256; cv=none; b=aWExvQjZv9QjV+rmxIv/8fWWmdmFf4XM9d/11000H4OI7oMQtPAAzS0/boBl3ld8LUGS6A p5d786vN4rDzAuaWnQ5nDqQcu+gvSLb2/0Eh4XoffAKqRMSApmKcIJKMUtVHAWyPvdqRI4 yQOuJ/73p0134u5aFXnYq2FwU28rg5m0WJohX97jvR3PUKQeQlF88nCAZAf7GK2PacdFUD JqDHmY1MMhFEQ/oy8eMwVceWa5oxukiRY9Q25a4zvCcbp0N1CwDhk5Foy4yMglb/q4VF/0 PddCkmqR4w13DxcjLW20IBK4fkY1xWDrI5NVq41ZQ0D+iWMHQC0SAj3Bajwyiw== 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=1742440437; 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=jFk61KsQNmtplk/PegP1zloNg62TD5I/k7xMcfkXXjQ=; b=Fv/lVW5+9jNZCag6vXvy+a4YP0OUHaiiOrUR3hBLONNTLJfZPNHta7i/fNuaAwVraIZd1/ 0PmVyYwUZxUlP2b7jcvcVJZfn5ySr4bPnjg8G76zARavnTl5M7qkflIkWUBkQMWbYAik8G E6zFVMRdDYWGUHRQVo7yn0lzTOk809HzCG0AmSuNCvY5zi3mfJeTDgj2AmjvqZEQsDErAI Xb0Mg5TVX++/wK5W+9Bl9aG1TWW+JtN871wR0QIW3m9yrnK4npXLP2n7yfruP7l3UHF1Dt jnDpne65JXkpWG/lNjkmbgT1iqn+tpn8lxdpJTPwLn9bX6NSYL0ahysbtzWOtA== 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 4ZJ9dx25SBznsp; Thu, 20 Mar 2025 03:13:57 +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 52K3DvH7085922; Thu, 20 Mar 2025 03:13:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3Dvpt085919; Thu, 20 Mar 2025 03:13:57 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:13:57 GMT Message-Id: <202503200313.52K3Dvpt085919@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 4ad84614e490 - stable/14 - ip6_cksum.c: generalize in6_cksum_partial() to allow L2 headers in passed mbuf 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4ad84614e490cf2d59d670081b1ee1b065d89c15 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4ad84614e490cf2d59d670081b1ee1b065d89c15 commit 4ad84614e490cf2d59d670081b1ee1b065d89c15 Author: Konstantin Belousov AuthorDate: 2025-02-19 12:38:34 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:36 +0000 ip6_cksum.c: generalize in6_cksum_partial() to allow L2 headers in passed mbuf (cherry picked from commit fcf81de12f27d34a5c18168fd0c756c371a62076) --- sys/netinet6/in6.h | 2 ++ sys/netinet6/in6_cksum.c | 25 +++++++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h index 0a4377638de1..b62da99f9293 100644 --- a/sys/netinet6/in6.h +++ b/sys/netinet6/in6.h @@ -666,6 +666,8 @@ struct ip6_hdr; int in6_cksum(struct mbuf *, uint8_t, uint32_t, uint32_t); int in6_cksum_partial(struct mbuf *, uint8_t, uint32_t, uint32_t, uint32_t); +int in6_cksum_partial_l2(struct mbuf *m, uint8_t nxt, uint32_t off_l3, + uint32_t off_l4, uint32_t len, uint32_t cov); int in6_cksum_pseudo(struct ip6_hdr *, uint32_t, uint8_t, uint16_t); int in6_localaddr(struct in6_addr *); diff --git a/sys/netinet6/in6_cksum.c b/sys/netinet6/in6_cksum.c index cb2d89065f74..40d4d80ea4fb 100644 --- a/sys/netinet6/in6_cksum.c +++ b/sys/netinet6/in6_cksum.c @@ -250,14 +250,15 @@ in6_cksum_partial_one(void *_arg, void *data, u_int len) /* * m MUST contain a contiguous IP6 header. - * off is an offset where TCP/UDP/ICMP6 header starts. + * off_l3 is an offset where ipv6 header starts. + * off_l4 is an offset where TCP/UDP/ICMP6 header starts. * len is a total length of a transport segment. * (e.g. TCP header + TCP payload) * cov is the number of bytes to be taken into account for the checksum */ int -in6_cksum_partial(struct mbuf *m, uint8_t nxt, uint32_t off, uint32_t len, - uint32_t cov) +in6_cksum_partial_l2(struct mbuf *m, uint8_t nxt, uint32_t off_l3, + uint32_t off_l4, uint32_t len, uint32_t cov) { struct in6_cksum_partial_arg arg; union l_util l_util; @@ -275,9 +276,10 @@ in6_cksum_partial(struct mbuf *m, uint8_t nxt, uint32_t off, uint32_t len, } uph; /* Sanity check. */ - KASSERT(m->m_pkthdr.len >= off + len, ("%s: mbuf len (%d) < off(%d)+" - "len(%d)", __func__, m->m_pkthdr.len, off, len)); - KASSERT(m->m_len >= sizeof(*ip6), + KASSERT(m->m_pkthdr.len >= off_l4 + len, + ("%s: mbuf len (%d) < off(%d)+len(%d)", + __func__, m->m_pkthdr.len, off_l4, len)); + KASSERT(m->m_len >= off_l3 + sizeof(*ip6), ("%s: mbuf len %d < sizeof(ip6)", __func__, m->m_len)); /* @@ -291,7 +293,7 @@ in6_cksum_partial(struct mbuf *m, uint8_t nxt, uint32_t off, uint32_t len, sum = uph.phs[0]; sum += uph.phs[1]; sum += uph.phs[2]; sum += uph.phs[3]; - ip6 = mtod(m, struct ip6_hdr *); + ip6 = mtodo(m, off_l3); /* IPv6 source address. */ scope = in6_getscope(&ip6->ip6_src); @@ -315,7 +317,7 @@ in6_cksum_partial(struct mbuf *m, uint8_t nxt, uint32_t off, uint32_t len, */ arg.sum = sum; arg.rlen = 0; - (void)m_apply(m, off, cov, in6_cksum_partial_one, &arg); + (void)m_apply(m, off_l4, cov, in6_cksum_partial_one, &arg); sum = arg.sum; /* @@ -330,6 +332,13 @@ in6_cksum_partial(struct mbuf *m, uint8_t nxt, uint32_t off, uint32_t len, return (~sum & 0xffff); } +int +in6_cksum_partial(struct mbuf *m, uint8_t nxt, uint32_t off, uint32_t len, + uint32_t cov) +{ + return (in6_cksum_partial_l2(m, nxt, 0, off, len, cov)); +} + int in6_cksum(struct mbuf *m, uint8_t nxt, uint32_t off, uint32_t len) {