From nobody Tue Oct 13 15:40:35 2026 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 4j3z7S0KJVz6vXZV for ; Tue, 13 Oct 2026 15:40:36 +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 4j3z7R68Gqz4Mxd for ; Tue, 13 Oct 2026 15:40:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791906035; 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=HwdmJeIFMsY1jZRWgorKinVIWevT8pExoc7OV3lTTsE=; b=lHEddV1Pxvy2hWmYyWLRAxwoC71qvdfVSTGZdIoQyhwhyjoz0zlOCmxG/J40vM7MS3XIlH qcQ3pPt/gug7GD9o3A5TD7JjvO7uMtaWWIhLL7Mj0y12W9690E1Kxrhk+Sw7qeXEa31D9F Cu6PMo3JQNJ2uQA02csZMceMSinMGMFHEkXjYv80oiD5FMCGZ6vgYW/eKWMReHSEf2p6am 85HKURLpGD6JD/qddP+j4oda7ubanBgtLTDq8Itq0/Son0+i9MSQv0x/teURovjhA+CHse BgvGdRzoSh+l11esVYQBz6cWpYL9oqo3VUNjY5MyRb0pRX6QDIa07077qSbsrw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791906035; b=qhxMsAOQD3veuHQr+EGszb+LyHBOuON9gI/bAs4UuZVceCvkTOayO+kuLnHo2uQFvEmFEM OKbCJLQZoIOkKdxXZZuRQmnzYJZZIkRAUi1iOPCcLhPeOO0+xoxxHPMB5xx6FJL/DrFeIG TNzZad7lbRGkxCf55Cphkj5J36ItB/PsE8ZzIw5NA1PcznzCdbwEq3vgnK7V0KjstW+qiS OoDiWsrEuti3+s4Xy4tBTU2mCQvUtdt+1vVNSENpec6qEO4m1Yowo3H/oH3hTR266u2SBE Z3R0CYBMotTN4b1hUw2CYjf2LjjrhoXigLlUfFkyUbQodMR5t+3CrOfQbq0tlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791906035; 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=HwdmJeIFMsY1jZRWgorKinVIWevT8pExoc7OV3lTTsE=; b=unfF+gBhib7aDW1xcMi8hkiUNdnFTTZK1Lp0hJ+r03ShUIUWKV41WjkaJHGITleo2Zdw7y DFMawkxGWQ0XEnsH3h1ElQvS82bRgAfCG6wRyRIWPLpwo3rikWqimP3GiF390K9a540MPb wF4LraCFyjE2jzqwC9FRcdd0eJgusDuhLgJg+rsLyNuWAPJjNd8CISSfPE626bkvVrTj9/ rqp9YXdLlm9cNHHYK02oJzUyusv371wVmAnwTBWUkQR2uL2vz6gQsoDgmKgRvWD8YqTG4F +lVps5s/XWxCad6NvQzmqZhCJOLUVO9IjSns+R1yODBxbvxtfnBRykUY2TwISw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j3z7R4v46zKX7 for ; Tue, 13 Oct 2026 15:40:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20244 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 13 Oct 2026 15:40:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 9890a0d5e04a - main - mbuf: move leaf_rcv union farther back in the pkthdr List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository 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: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9890a0d5e04a1b4cd398a52be6374734b9496cd3 Auto-Submitted: auto-generated Date: Tue, 13 Oct 2026 15:40:35 +0000 Message-Id: <6ace50f3.20244.2ae78729@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=9890a0d5e04a1b4cd398a52be6374734b9496cd3 commit 9890a0d5e04a1b4cd398a52be6374734b9496cd3 Author: Andrew Gallatin AuthorDate: 2026-10-13 13:12:10 +0000 Commit: Andrew Gallatin CommitDate: 2026-10-13 15:39:17 +0000 mbuf: move leaf_rcv union farther back in the pkthdr When the leaf_rcv union was introduced to support ktls RX offload in 4d88d81c3166 it was put at the front of the pkthhdr, and pushed the more commonly accessed csum_flags and rsstype into the next cacheline. Given that csum_flags is accessed on every pkt sent and every pkt freed, but the leaf_rcv fields are only used for ktls rx offload, it makes more sense to have csum_flags in a cacheline that is already likely to be hot. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D60691 Sponsored by: Netflix --- sys/sys/mbuf.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index 504d2902b4fb..86b7f3770bf6 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -157,13 +157,6 @@ struct pkthdr { uint16_t rcvgen; /* ... and generation count */ }; }; - union { - struct ifnet *leaf_rcvif; /* leaf rcv interface */ - struct { - uint16_t leaf_rcvidx; /* leaf rcv interface index ... */ - uint16_t leaf_rcvgen; /* ... and generation count */ - }; - }; SLIST_HEAD(packet_tags, m_tag) tags; /* list of packet tags */ int32_t len; /* total packet length */ @@ -176,6 +169,13 @@ struct pkthdr { #if !defined(__LP64__) uint32_t pad; /* pad for 64bit alignment */ #endif + union { + struct ifnet *leaf_rcvif; /* leaf rcv interface */ + struct { + uint16_t leaf_rcvidx; /* leaf rcv interface index ... */ + uint16_t leaf_rcvgen; /* ... and generation count */ + }; + }; union { uint64_t rcv_tstmp; /* timestamp in ns */ struct {