From nobody Thu Dec 18 22:57:35 2025 X-Original-To: dev-commits-src-branches@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 4dXQzg3Mrbz6Lyyj for ; Thu, 18 Dec 2025 22:57:35 +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 4dXQzg1ld1z3qVS for ; Thu, 18 Dec 2025 22:57:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766098655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qeGzqhY4qI2wegTqjKGCZ6cUUFUfqbV3/gejt1FEtG8=; b=WDkQ6i70IbZVumv+F9iqUfqGHseVx8mkcIGNt53EkPokr/tpbBy12Mh3/R5/OZf5go+vOC lvxwCYiokgls7Rs/PVrXC2e1CgvLeHdVZ5QYx3EFbTCjqo0m3gyJ4hW/EEuKY4XD2SbLAI IHd18oMa24D9uj+O3fmx1jIa1IbTtXkYSLoQKaG1W1bMIDcNSPt3sFtz/pSpnr2jRifjEZ eX5WoJM5MMgucEAPcOjXtRtdVYYGLrPtFnCIRQRnNmC7sNMCk36DBRDmnJkyWdHElFtByj npULNPCPghUYqBrCf5htRGvASUFe6rkktjmpuHlJJ+amHQg7raqG2Vkq/NwVhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766098655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qeGzqhY4qI2wegTqjKGCZ6cUUFUfqbV3/gejt1FEtG8=; b=JNwHnWy9XATZi0wDykaAFDc00kzW/QPaQz35tWLAAmf1/oK5JgVIFeSakb+aiUGYQPlFAe tylmjYKY4Ie5OYyxjNcLtOv86B+KwQz+JMm30PgPZI+QRva/pG0II9HejNfybNOI8/NSaD dPd5HS9MmXPJsoogzRC5IaxdfgFZiYEpOXpB0cCmYMii6G5FlgO5R2VFmqT2PforFH7QVL z7gZvQjagXNjRIw/q1x9XZTxI+HRfod+acBcUgxpgJSnR17o+1Djv0KaqnFRcXOuSLKGal IBa53bfzP/1+Fo9cawjdgX4djFTY2jyfLGEJJmmwVcyTl65OXR93af/SOVWNHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766098655; a=rsa-sha256; cv=none; b=kHsOc2TWhk9H1H2UCRwZx9Vnc6qYREJpzHjzSEhX5fm0tkOlVBLZYr83T0d0iFDFkszOEW 6oU6n6w2xfro3ph2ag8fAiAxu50BxBS0ohrHrNU78i7DWDBV9XvyjBqgZhZ9Ai4eoETAwv Eu1kPJ0nq0JGBh+SMhK46ZuMCvgFpB/NrbRGC5qhRE8XnwD6Wavf3+pQSTuBnu6qbRJ3L0 0YKKG2rKA9Cb3FBbV26oeigZRCK/Kfi6igTCCN8kErVcGZ1xMHmke+9CHbbtTG4tZVY0D+ EOVi2AJbT1Zq8Ee23BR8s+HlGW4UO4+7MoChQKjwm6PRoQwAjgelzXB4MUaJkg== 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 4dXQzg19XHzxpH for ; Thu, 18 Dec 2025 22:57:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a1a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 18 Dec 2025 22:57:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Hesham Almatary From: John Baldwin Subject: git: 37e9b420b23a - stable/15 - arm64: Fix calculating kernel size for preload metadata List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 37e9b420b23a4d39400a5f8d1fe0c15bc1e04230 Auto-Submitted: auto-generated Date: Thu, 18 Dec 2025 22:57:35 +0000 Message-Id: <694486df.a1a4.1cfe0a45@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=37e9b420b23a4d39400a5f8d1fe0c15bc1e04230 commit 37e9b420b23a4d39400a5f8d1fe0c15bc1e04230 Author: Hesham Almatary AuthorDate: 2025-11-13 14:57:54 +0000 Commit: John Baldwin CommitDate: 2025-12-18 22:51:50 +0000 arm64: Fix calculating kernel size for preload metadata Cast &end to vm_offset_t before subtracting VM_MIN_KERNEL_ADDRESS to ensure the resulting size is correct for PRELOAD_PUSH_VALUE. Previously the correct size was effectively divided by sizeof(void *). Reviewed by: andrew Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D53699 (cherry picked from commit 587490dabc649b58f0c7966e749aa80a0f16796b) --- sys/arm64/arm64/machdep_boot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/machdep_boot.c b/sys/arm64/arm64/machdep_boot.c index 83bd74ea7317..1c5e8189e436 100644 --- a/sys/arm64/arm64/machdep_boot.c +++ b/sys/arm64/arm64/machdep_boot.c @@ -106,7 +106,8 @@ fake_preload_metadata(void *dtb_ptr, size_t dtb_size) PRELOAD_PUSH_VALUE(uint32_t, MODINFO_SIZE); PRELOAD_PUSH_VALUE(uint32_t, sizeof(size_t)); - PRELOAD_PUSH_VALUE(uint64_t, (size_t)(&end - VM_MIN_KERNEL_ADDRESS)); + PRELOAD_PUSH_VALUE(uint64_t, + (size_t)((vm_offset_t)&end - VM_MIN_KERNEL_ADDRESS)); if (dtb_ptr != NULL) { /* Copy DTB to KVA space and insert it into module chain. */