From nobody Sun Jul 6 19:28:22 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 4bZy8R3LTJz61bKD; Sun, 06 Jul 2025 19:28:23 +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 4bZy8R09LXz3KBq; Sun, 06 Jul 2025 19:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751830103; 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=+vyNn6xHllGSHWDCBxjto+s+S8ph/0c5NkKlwyfxitU=; b=MxHQkxEaawUjepZrXj46oidHeWwoMzpLaCaXHt0kSxzQ58+zA6qEOlA6kTqJP9e52bPR3X fa0/1O1u2Dwl+dOnC57SQecM41qVh5zWZuX8D2sVONOdoIEH0hMQeQvtxCs2JNJIGxOAO4 /WzB+RMxr7MPN5qtgnz/mm7hgTA/37JY1YIH7/rFqFoUhy1yA54Qx5A6lMRukJUHE8p334 Y9RVfml1/pGtHlHIzQTWT+IzknRvw5dNA03+TbtAzzhck4ROwtO/45iYpQkfbmUcoFDEG9 3/DzYAs0Dud3msB/LJ0LVmfRrV9kZtfWJbDZpvKixVTKJ/vtppMiP72VCGyK5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751830103; 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=+vyNn6xHllGSHWDCBxjto+s+S8ph/0c5NkKlwyfxitU=; b=MMpRo/ahdzvvY8ZpGeol386VEtiTbYF5ohR24hpJuu3gLTxUPeiOloxgCHflgWL6Esf3DL A1W+Zvf/lOsPMUnNPVuDUaTaR37G2FJDo3iC1HOGId78OKrBcYr6b3yQhABGjx2bycwGPY 0NRAA5sz6lmKTfZH1/bOII1fEIS8BSjOEvXsugRjy4fEraqCXPn9ol/Ea6eqIxM6zdGEVI dfJPjtFiHp3fag3fcCDInkqXKddKQSQ4vFQ0l4XjbSAeNQcc+GAHubPXbgrqbdrvtjY+CU r0QLXpF768jYR55qTAWHW1uaq8piU7ZNKCoZdUiA5eaudOrbRpwgMEppCjytjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751830103; a=rsa-sha256; cv=none; b=qeqKpBxAncYPtc3xWZVttWi9OPoYybF4HBtZZ8vbTxn8isesOyuM3I9Eh5ZNqumprwo74d e5r+4daynuba4bcal4PzZJes+arc/V7sNeg+8cHGB3UVF6CM2Fp3nZI6KkyZPByLAKXTly i0S1OU3SzVGPDT463AG4wWyKEN7WDKbsxQjrb6OUc0pMRKpbS74tKpDxRsfpJMTxzpsK11 E09sQ7fLMp/XYLTJEdaz/BbIwS7gyioAdeYGCdaRFj0QZzZVEtePVrd4Yknj519qsTkBdH KpvtRykgy7gAauHtohA3yiYyx5P7ATxSuDm8r59B+Uhlggt1F4ofWVlaE6nghQ== 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 4bZy8Q6nNwz3QY; Sun, 06 Jul 2025 19:28:22 +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 566JSMkp097001; Sun, 6 Jul 2025 19:28:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 566JSMMu096998; Sun, 6 Jul 2025 19:28:22 GMT (envelope-from git) Date: Sun, 6 Jul 2025 19:28:22 GMT Message-Id: <202507061928.566JSMMu096998@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: 4add1a7a46b5 - main - amd64/efirt: always map the first page 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: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4add1a7a46b5cb261223d1c51c94fde417cc33c0 Auto-Submitted: auto-generated The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=4add1a7a46b5cb261223d1c51c94fde417cc33c0 commit 4add1a7a46b5cb261223d1c51c94fde417cc33c0 Author: Ahmad Khalifa AuthorDate: 2025-07-06 19:10:58 +0000 Commit: Ahmad Khalifa CommitDate: 2025-07-06 19:26:07 +0000 amd64/efirt: always map the first page Some BIOSes tend to access physical address zero when executing runtime EFI functions. Map it regardless of the runtime attribute. PR: 287422 Reviewed by: imp, kib Approved by: imp (mentor) Differential Revision: https://reviews.freebsd.org/D51147 --- sys/amd64/amd64/efirt_machdep.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sys/amd64/amd64/efirt_machdep.c b/sys/amd64/amd64/efirt_machdep.c index 75c357f6e3df..f70e235a0150 100644 --- a/sys/amd64/amd64/efirt_machdep.c +++ b/sys/amd64/amd64/efirt_machdep.c @@ -190,6 +190,7 @@ efi_create_1t1_map(struct efi_md *map, int ndesc, int descsz) vm_offset_t va; uint64_t idx; int bits, i, mode; + bool map_pz = true; obj_1t1_pt = vm_pager_allocate(OBJT_PHYS, NULL, ptoa(1 + NPML4EPG + NPML4EPG * NPDPEPG + NPML4EPG * NPDPEPG * NPDEPG), @@ -272,6 +273,22 @@ efi_create_1t1_map(struct efi_md *map, int ndesc, int descsz) } } VM_OBJECT_WUNLOCK(obj_1t1_pt); + if (p->md_phys == 0) + map_pz = false; + } + + /* + * Some BIOSes tend to access phys 0 during efirt calls, + * so map it if we haven't yet. + */ + if (map_pz) { + VM_OBJECT_WLOCK(obj_1t1_pt); + pte = efi_1t1_pte(0); + /* Assume Write-Back */ + bits = pmap_cache_bits(kernel_pmap, VM_MEMATTR_WRITE_BACK, + false) | X86_PG_RW | X86_PG_V; + pte_store(pte, bits); + VM_OBJECT_WUNLOCK(obj_1t1_pt); } return (true);