From nobody Fri Aug 8 00:39:02 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 4bylX66Jynz63kfS; Fri, 08 Aug 2025 00:39:02 +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 4bylX629LYz3WlS; Fri, 08 Aug 2025 00:39:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754613542; 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=xgBdjPWRXa6z/aVSS6Tg8Ap6Rg8hkBv5lCGPuIyRYB0=; b=ZVT4XyvP2jTj/ow9e/6pvVqE9ID0pR021XKU6iVHpmPmFEQlPpBzgpkFiHu7iuXOnWj8Ws BEtR709uR0zT4NM3m4lALWbZyzweV7t0dOK/sM3nUl3hh37z46G6bLVNUSWmGhp+BYrlFs isMh0prsoWzjGrsVYUiicDLx/4IeMg26p57xY3JEC/A0QN4vKMNQbBvq+QITv07HbdH3GE h2Ov6CmuONpMKkkPWtxpSJOO4R2wl+sWVvSbrlaELXsDehB99aKDu9m+ojAVrM+IdYWbSF 5PIMx5ojr/kweqCg2sgHHMJWCEN2vL/U1ARIX/eaOGePUzBxMvJur0NaEpMGnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754613542; 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=xgBdjPWRXa6z/aVSS6Tg8Ap6Rg8hkBv5lCGPuIyRYB0=; b=uxOa+T9sP4yWyJHlMbcX57So0DOucwICNO4PdSa5kG5RjjE9wikZT9pmjPu30gR6XVmtKh hYjwZyRjENiel/HXNHWT3FuOwVGHGfe8O8O0rnF6DQT2UV0AsdRvqLM55JDn2gKMzlhbgY Pi1z0uaJEs+P54QDg5H0ZbQNeAYqWNHKMycWfFDNJ8DCRWzyeM8igTE8PbFC8tsJBZWszY Hepd5CUQRYY4IMNoifd1bieOHVivbsz16vcaIWoVxDWLOAGB5xjrFND/MiVMt0b0oIAoSy QE2UJZyi9u4mGunbeHJ9X8Lf3zcOsrjvwO1jAN38v/wXOot0jFl81BDpCybjfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754613542; a=rsa-sha256; cv=none; b=nXOyM1cC3iiZ3I+Ay4JAzIK3U+QNXs83Vx7PwWpCzi8rIUeizCpl3RTKRZZMczbOW/gNe4 wylAr8vWyaFcmX4vFmZzkdlB8n1iUL2ZLlbFvAYTly1n5d5wGbOpjZLcg9QSR4ySxqWyvI RFgoob1QjybbwKGyCU6C3eyRtH/CTKRN1i2i3u+VblhJ0AfnrmOVc5VFe/PhsCgjAUK1dw rrZEKoT6MSa0E7Z+qIOAHrIbO5TxuMVlnB+CWsGL60z8W7X1yGne7Fs8VgAkAPYNGi+YRt zzMyVajA8iWXoVvxyGdUk5bErX66JWSvr2T9pNovvyLwlHOUTPtCOMcdBELImQ== 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 4bylX61NV6z1Rxw; Fri, 08 Aug 2025 00:39:02 +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 5780d29o073624; Fri, 8 Aug 2025 00:39:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5780d2JD073621; Fri, 8 Aug 2025 00:39:02 GMT (envelope-from git) Date: Fri, 8 Aug 2025 00:39:02 GMT Message-Id: <202508080039.5780d2JD073621@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: ce4fe4c4bfcd - releng/14.3 - Add a new sysctl in order to diffrentiate UEFI architectures 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: ce4fe4c4bfcd5908b5f4121623f6640e15261bc8 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=ce4fe4c4bfcd5908b5f4121623f6640e15261bc8 commit ce4fe4c4bfcd5908b5f4121623f6640e15261bc8 Author: Ahmad Khalifa AuthorDate: 2024-06-03 01:40:43 +0000 Commit: Gordon Tetlow CommitDate: 2025-08-07 23:10:00 +0000 Add a new sysctl in order to diffrentiate UEFI architectures With the new 32-bit UEFI loader, it's convenient to have a sysctl to figure out how we booted. Can be accessed at machdep.efi_arch Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1098 (cherry picked from commit b538d4911004ca541507166b8ec9689d2e87d1aa) (cherry picked from commit 0e8890a425bc778d323566c881e26bad7c54baf2) Approved by: so Security: FreeBSD-EN-25:12.efi --- stand/efi/loader/bootinfo.c | 8 +++++++- sys/amd64/amd64/machdep.c | 21 +++++++++++++++++++++ sys/x86/include/metadata.h | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c index 5afb4c78353e..2961b8b97fb7 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -447,9 +447,15 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) module = *modulep; file_addmetadata(kfp, MODINFOMD_MODULEP, sizeof(module), &module); #endif -#if defined(EFI) && !defined(__i386__) +#ifdef EFI +#ifndef __i386__ file_addmetadata(kfp, MODINFOMD_FW_HANDLE, sizeof(ST), &ST); #endif +#if defined(__amd64__) || defined(__i386__) + file_addmetadata(kfp, MODINFOMD_EFI_ARCH, sizeof(MACHINE_ARCH), + MACHINE_ARCH); +#endif +#endif #ifdef LOADER_GELI_SUPPORT geli_export_key_metadata(kfp); #endif diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index ea0f164b2e56..9644e167d54d 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1691,6 +1691,27 @@ SYSCTL_PROC(_machdep, OID_AUTO, efi_map, efi_map_sysctl_handler, "S,efi_map_header", "Raw EFI Memory Map"); +static int +efi_arch_sysctl_handler(SYSCTL_HANDLER_ARGS) +{ + char *arch; + caddr_t kmdp; + + kmdp = preload_search_by_type("elf kernel"); + if (kmdp == NULL) + kmdp = preload_search_by_type("elf64 kernel"); + + arch = (char *)preload_search_info(kmdp, + MODINFO_METADATA | MODINFOMD_EFI_ARCH); + if (arch == NULL) + return (0); + + return (SYSCTL_OUT_STR(req, arch)); +} +SYSCTL_PROC(_machdep, OID_AUTO, efi_arch, + CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0, + efi_arch_sysctl_handler, "A", "EFI Firmware Architecture"); + void spinlock_enter(void) { diff --git a/sys/x86/include/metadata.h b/sys/x86/include/metadata.h index dbc6d3275e53..b3eb4b16c1ba 100644 --- a/sys/x86/include/metadata.h +++ b/sys/x86/include/metadata.h @@ -34,6 +34,7 @@ #define MODINFOMD_EFI_FB 0x1005 #define MODINFOMD_MODULEP 0x1006 #define MODINFOMD_VBE_FB 0x1007 +#define MODINFOMD_EFI_ARCH 0x1008 struct efi_map_header { uint64_t memory_size;