From nobody Thu Dec 18 22:57:57 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 4dXR054QJNz6Lywg for ; Thu, 18 Dec 2025 22:57: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dXR052qwrz3qw9 for ; Thu, 18 Dec 2025 22:57:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766098677; 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=ugQpiXXPwCtldbegZ+KIFUB1CSefwQoJNbaYZYqn3TM=; b=sYEJsnzs3eez+wq6gPj5rXK7uNGzsiVWEIO5CRZQ/2sd9qE7MRrhM9cJWL3PPU/w+yi8jw xH3zcQKxwuTL8cLGv8n2emw8Z2UhthmAbtSi+TWIQp4ewbynnfIBFuWMD1VmU0MhVIyoUB 5tRiQi1x4J7AQM8factQSayn4eQJVF9vjurdaN4bjecCfI7iNp5mlbUGZcu7rdqMF79Ju/ oEhAHlcdEm5XWheEh3oygjG6yDZTNOFzWKPsUuTHOWlz7eppt/IYyXzQ6nfBNpp3l4e/dy FFfxGKumKdB3nMcHlEwq7PPXYzapWctvRc+6/N5nStIi7gig3m28ySuybxmgAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766098677; 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=ugQpiXXPwCtldbegZ+KIFUB1CSefwQoJNbaYZYqn3TM=; b=lgRNAhCJx86Hz8+GTTf5VDTV2ddjgX4iuCc7YVExIm2vZa91OBh4ELxbzQXmVgppzDpPhO lGzTzK1n5p4pNrfrI1GP3CnDgloYcEkOlano9wLUxulVUKzFE3szcXGR8PKxr3K9YxSgFa ECS1VYB5cYEoUx1baD2nRahTTmp+T9TyNKHee4HEWzPlstGANB9EjVzFnstWjLMJ8GWlrH WWQqbBqcyjPeLapnleRNgJc9iogmAOaKFhPThOU32WA1IyDMX5vwlPQHBnb9ZLzrVQ4efD k4zNv8wwHg43V0auXaXMvuo5jnw1NsuF+wgQM3Vp8nS0RKqR/N9ZulxMYY4Tkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766098677; a=rsa-sha256; cv=none; b=ivTKd4dcmW75UzRTxYxUL/wK5rPX0KOxHBFJzWjGcAQ90eDz2wG6zdxZvv74P957zA/LFB +wzmPcHE06jVf2VafMG+uc736eRhkn7wvkmfcsIVCPm1Ed3+laBFpWlyweF+kyic8HphiB 9JZnQ1CtFsNxZwOEi+2ApFGVLaBOC27lEF/D1BZ4vSBW+3UGJFZo/KEs/KQSlI1PotThK1 cq9s5YZrEBzCLRRw7qE36ijApeBtzJuts3pBNnBdRydufCfMzybV+tKNLxMoDdfhuYnow9 ZO92ZgZw9sTXRPKuzX+7MYM02lfs4J25wlplFyElLz6kEjKVX8N6XksnQPABkQ== 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 4dXR052NKXzyN4 for ; Thu, 18 Dec 2025 22:57:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8948 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 18 Dec 2025 22:57:57 +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: bed9eb6af70a - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: bed9eb6af70a8afb922089239ec892c6b73e72cd Auto-Submitted: auto-generated Date: Thu, 18 Dec 2025 22:57:57 +0000 Message-Id: <694486f5.8948.7f123995@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bed9eb6af70a8afb922089239ec892c6b73e72cd commit bed9eb6af70a8afb922089239ec892c6b73e72cd Author: Hesham Almatary AuthorDate: 2025-11-13 14:57:54 +0000 Commit: John Baldwin CommitDate: 2025-12-18 22:51:55 +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 4ce38140a570..d9d3401eaeb7 100644 --- a/sys/arm64/arm64/machdep_boot.c +++ b/sys/arm64/arm64/machdep_boot.c @@ -102,7 +102,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. */