From nobody Tue May 3 14:04:48 2022 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 D5EA01ABA434; Tue, 3 May 2022 14:04:49 +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 4Kt1tT1H7Tz3R0f; Tue, 3 May 2022 14:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651586689; 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=WJuw6JrM5nZj+w7k2iBacd2n1cAuFM8Oo9RWcZlZcHA=; b=fQb3RYqqCvCkZGeMQGRAcLHCdXNLHqXTDwibDbjtJoWe9rfR3lPA2Wleav4vi3Znl68Jcf hGxd2G6C22RkdQSGx7aVkc7ZAJrTEs4cJ93fX/zhiSDeqWvAQBHy7g+8WPoBIBxAfFpnkU TorXd9MWXG1bnBhGVLiVEIGtjBOHMSMSrfYvNHW7pABI2tsuJRZsU6fntWMOo0oHfDhoQ3 i5PLH0NGshmmZNslxMZ54k3AR0Now/yTpithAc/k+ZUScV+NPPAKIp9ms7NzuWD5WPIfdu 7e86AUfVdZ4ZKnlyOLtY/9MeCaROf0ERNvMbfE5DV3dVQA2Ca83kNy/FwEGrZA== 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 578D81FB17; Tue, 3 May 2022 14:04:48 +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 243E4mYP078001; Tue, 3 May 2022 14:04:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 243E4mCW078000; Tue, 3 May 2022 14:04:48 GMT (envelope-from git) Date: Tue, 3 May 2022 14:04:48 GMT Message-Id: <202205031404.243E4mCW078000@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 0625715977d9 - stable/13 - Only return a mapped address from efi_phys_to_kva 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 0625715977d9cb125299b2b9b364842ef250887e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651586689; 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=WJuw6JrM5nZj+w7k2iBacd2n1cAuFM8Oo9RWcZlZcHA=; b=B7dYNKnZrt3FGTh3pwp+zICAXY05dFaTgyB55RxwjuELNc0P74xB2kaKSzs6CpQqsFbdfR xqEhFY+vLZRGTmDIavzxr5y77CDGNkywGXpdE/mtiOoSMadaF3lSj4NMeUUpXbM9hGRd89 K5S0NXfoNAuUW0wzTNwrAL0GfQcRs4Vwu/XYDf5lUGxcePcIm6lVcJDJF/XrUAdpKsopx3 3iQTKnokWCLIPZtuOY70Ts9qhaF5ODHyJNwrzBLz3AeSuMkc3i8PIF3bJtiPF+hHNkotGP pSbW82Fwopsnz4fvjZ0v9hDFbZUIryJgjszHk1QQyFxhE4ZO0DkDq6rOWfymFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651586689; a=rsa-sha256; cv=none; b=UugoLbhLmuHNRZnuotkFKrBbsEUKESAdO4GtqQGO/WWh9eR2WgUpNmWRB489E1RnlTgCUQ TGDlAwR1GMwbOm2t1TJd8djJCirIQFz0pG7n40LbyHhyzijAitryqu5NIGYnZDQpVMuHn/ 3g+wNqr89PGUa/l+EFe/LrdtYdrPMZY+BvYjTynpC3SMbaKNdqiDbkao6j5f+8ubkEXkqL iYwhJTnrPS7FUWHvRqPYYknJ9kTvZsgaj9h7uWQznzImwuPFO7VgOGg5yXe6lGKgnrdGR8 Lv5pbv5Z4Ib1RCXc8hnERgfY4BlFNUIEv511I+bK3mdibEIdxqPZCm3cref7iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=0625715977d9cb125299b2b9b364842ef250887e commit 0625715977d9cb125299b2b9b364842ef250887e Author: Andrew Turner AuthorDate: 2022-04-09 11:43:08 +0000 Commit: Andrew Turner CommitDate: 2022-05-03 14:04:04 +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 (cherry picked from commit f3ef799f564515b58a24a328739a4c749a02b110) --- 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 717b6cc86e17..343235a7d255 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); } /*