From nobody Thu Nov 13 14:58:18 2025 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 4d6k0q0skrz6H06w; Thu, 13 Nov 2025 14:58:19 +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 4d6k0p494pz3Qhq; Thu, 13 Nov 2025 14:58:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763045898; 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=VdMwVgqtl0wMIBwPiOcTdswrBIOjW1e8PPIAY/eS8ZQ=; b=tuPadCbcezzdNU3zaDVxKrU2HEABC6zz8ZrLUcRMMBHx3OwFA3rHUKG6yyeROCrPyLTCed wAHIiqqad/uUxPN0cppce4nmH4SC6e0gGjcfP3woCCav0Xw3ZTq3zsEsoDFIiMPx2qJ3/t gYRzHQuiZ49/owra4L5nKE0Bi22+jgcuwcsPLKQA6840b96y9PAsTBssHeyqpb1250s6v6 Uk7kSeik2gx1JwYxoY5afLLcP60FbkwuC0I1h+vrXT0sV2HsBZuffP1A0JrZBHjz5FmL42 VD1ihdSzFU3w/wuQPiWV9YzyG+JcGZcN10XcKqYMe/vhEOuAHyXG1DdVc9wApg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763045898; 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=VdMwVgqtl0wMIBwPiOcTdswrBIOjW1e8PPIAY/eS8ZQ=; b=gYK0BTgB0Zb6gR8quHxvGlS7g/Jc2XM2HEyKj48cobTtp7kWeoZIIJSKMx95sHBFz1grm6 BSMZ9KvIrOfCtz5CGLAgoawIZCC53Ke8OtctsvEQU7e92Xe/6kUQ3DubRKvYuNwYIIdYGd muH2/Ojz+vMzWD8VKGrU8UkFgcoT2SUE6DfdD+/ZDNWhPxoksCkC6lzqgWYd5QoK1dzOB3 ahUZUYVfPemThDu0HeH0yH9Oo04KEfWEZrAV/grYI80iecrMxDIoDS7WOgAzYny9CHmzoZ iJ03gO3vxV+Kyxhc67djOItbQtYmTuf83gCdgBD2udYBjs0ufeM8KGv1e8207A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763045898; a=rsa-sha256; cv=none; b=tTfgHYFqSZh+j6v9zpSq7ks+zGDIdsIAqc/6TgxrQXBlmzMg0wCHMYmF1yDFN6o/cb/Phz 6AzRj06ydaD+rS3cESiLQUQkYyO81yEz4q+iL5ke3U3ANA8EY+6DAxy0ikh3tRhKBWpkE1 lVPdfQOY3BMxCALE/vXEUfGA4CSH/YnrfXH6KgtIY4VvkPSgVo6puNoJTZYhZZ9Xc33/Lo 944LQ/bmPAm/R3lgv5kNysArlTpufqxoekT7Wfx6rrn9pIl5k5mtj3p+OZulxh6BAj/KO7 /0sLNbzL8guvfEXtBRJiBwdD3Fhcde/zuKl5AzZ39rJ8xemCRGjzCtHREuxWBg== 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 4d6k0p3QcBz9M6; Thu, 13 Nov 2025 14:58:18 +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 5ADEwIxX082970; Thu, 13 Nov 2025 14:58:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ADEwIdX082967; Thu, 13 Nov 2025 14:58:18 GMT (envelope-from git) Date: Thu, 13 Nov 2025 14:58:18 GMT Message-Id: <202511131458.5ADEwIdX082967@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 587490dabc64 - main - arm64: Fix calculating kernel size for preload metadata List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 587490dabc649b58f0c7966e749aa80a0f16796b Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=587490dabc649b58f0c7966e749aa80a0f16796b commit 587490dabc649b58f0c7966e749aa80a0f16796b Author: Hesham Almatary AuthorDate: 2025-11-13 14:57:54 +0000 Commit: John Baldwin CommitDate: 2025-11-13 14:57:54 +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 --- 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. */