From nobody Sun Apr 10 08:56:19 2022 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 4A2801A93A98; Sun, 10 Apr 2022 08:56:20 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kbm780x5gz3n3B; Sun, 10 Apr 2022 08:56:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649580980; 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=DxLfP+PA5kKt2dCB3iANGuJzjf6bvWBBIna9eQ6BDCg=; b=NLaSh07ocfRHTyDErlOoxnLNTf1lqp3mTIS+sbHr4daYHiyKBRehTx1Jnovs45l9pSnCSO QLcZwVtAeNzkyeq/P67yvxRGZeZ/JdQ5BRE5GKYW4MVfpQ2cdgEGCzOOMqhJ+DUrhHkD0H hPtp3l4qctUu5x3lLbfdcAwxqCp5EGo5Uasd6mhN0sNrV5HKC5P3rOuatO78PiiBODNiAK YZMHdy4VO4h9zR44omm03sFMPlOCoDaVzovWlz8M2kQOW44oOfPvt/48bIRatY3z49UOnu glyIxnUaYKX0RfDbAfrOsKyLDzMyzrcAArnbEryEM+R01hZFA495UN3R0KdnwQ== 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 E660033DD; Sun, 10 Apr 2022 08:56:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23A8uJSp094432; Sun, 10 Apr 2022 08:56:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23A8uJcl094431; Sun, 10 Apr 2022 08:56:19 GMT (envelope-from git) Date: Sun, 10 Apr 2022 08:56:19 GMT Message-Id: <202204100856.23A8uJcl094431@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: f3ef799f5645 - main - Only return a mapped address from efi_phys_to_kva 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f3ef799f564515b58a24a328739a4c749a02b110 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649580980; 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=DxLfP+PA5kKt2dCB3iANGuJzjf6bvWBBIna9eQ6BDCg=; b=fr1LPyn1J79jFiUD98c/YxgZLAoS9zph/ITHJ0QgfzKaYXZgPZotcT5DWCXdtCAgNvIx61 EdeWegm+zKTilD/ug2EMAX+sVR8HdMM2NKJN1E/4vDTgE5gbaA3mzydYo5GL+iMRiDAPzn fCXa5PIvFcu61DshyoH0tlw2TSZ+5FOcJpHoufRhdEmTHGDATLPUM3JDAqcSV0BIxqozpz afXj55CDEr5KwwXv964Jfav9PSmpfDgycc3/LVMDdkrnAxTlMRZVfOkLVhEOfx82ah/OO+ 1dmEuxVYm4C9Swdbpf3r/63FroWqOu71m4DYHA+2JnjUdgrHJcNTZejPuOcpyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649580980; a=rsa-sha256; cv=none; b=ZMI3VrbvFdCfOoYxH9Ze+yrvw4dA1KucqGUh0/4ml8ygE4rTvzQgmKT4XGD/2ValsgUQsS ow9eNGn52+RL3K3GjPxt0wUi+lcgllTTnoyaN6ff5lzNsao+6+GyHWLyeiOsDYfEWf8+ka z0T817R+cPWRzNDz6rpauInusXKQAuFTekJaiI4eDUqbNscsDadrffPWPcZsnImRLHnATE 9+tgxGLAzwfddIFm/lS2/5tcypgmasmNa6n322vaUSGh667DmAXIrQnnlrVKbu3wGF0WWg 7m5QrKc9rleeBsuhyndO8qclWz83GklIej1Nb//fc1Dkm9k6O7HEunIxM8nq3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f3ef799f564515b58a24a328739a4c749a02b110 commit f3ef799f564515b58a24a328739a4c749a02b110 Author: Andrew Turner AuthorDate: 2022-04-09 11:43:08 +0000 Commit: Andrew Turner CommitDate: 2022-04-10 08:41:54 +0000 Only return a mapped address from efi_phys_to_kva On some hardware the EFI system table is not in memory mapped in the DMAP section. Rather than panic the kernel check if it is mapped and return a failure if not from efi_phys_to_kva. Reported by: kevans Differential Revision: https://reviews.freebsd.org/D34858 --- sys/arm64/arm64/efirt_machdep.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/efirt_machdep.c b/sys/arm64/arm64/efirt_machdep.c index 6e6541900efb..727c9c37f94d 100644 --- a/sys/arm64/arm64/efirt_machdep.c +++ b/sys/arm64/arm64/efirt_machdep.c @@ -150,10 +150,17 @@ efi_1t1_l3(vm_offset_t va) vm_offset_t efi_phys_to_kva(vm_paddr_t paddr) { + vm_offset_t vaddr; - if (!PHYS_IN_DMAP(paddr)) - return (0); - return (PHYS_TO_DMAP(paddr)); + if (PHYS_IN_DMAP(paddr)) { + vaddr = PHYS_TO_DMAP(paddr); + if (pmap_klookup(vaddr, NULL)) + return (vaddr); + } + + /* TODO: Map memory not in the DMAP */ + + return (0); } /*