From owner-dev-commits-src-all@freebsd.org Thu Jun 17 14:12:32 2021 Return-Path: <owner-dev-commits-src-all@freebsd.org> Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 78F836535E5; Thu, 17 Jun 2021 14:12:32 +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 4G5PC42mJFz4s9s; Thu, 17 Jun 2021 14:12:32 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 45ABD10F86; Thu, 17 Jun 2021 14:12:32 +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 15HECWM8056922; Thu, 17 Jun 2021 14:12:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15HECWJ0056914; Thu, 17 Jun 2021 14:12:32 GMT (envelope-from git) Date: Thu, 17 Jun 2021 14:12:32 GMT Message-Id: <202106171412.15HECWJ0056914@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov <kib@FreeBSD.org> Subject: git: 0247c33e89ad - main - amd64 efirt: initialize vm_pages backing EFI runtime memory MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0247c33e89adaf0c7159b847ef7bae9566e55395 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-all>, <mailto:dev-commits-src-all-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-all/> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Help: <mailto:dev-commits-src-all-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all>, <mailto:dev-commits-src-all-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 17 Jun 2021 14:12:32 -0000 The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0247c33e89adaf0c7159b847ef7bae9566e55395 commit 0247c33e89adaf0c7159b847ef7bae9566e55395 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2021-06-16 01:59:06 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2021-06-17 13:58:51 +0000 amd64 efirt: initialize vm_pages backing EFI runtime memory so that PHYS_TO_VM_PAGE() and consequently physcopyin() work for them Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D30785 --- sys/amd64/amd64/efirt_machdep.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/amd64/amd64/efirt_machdep.c b/sys/amd64/amd64/efirt_machdep.c index 3c8392bee86f..6fb64816385e 100644 --- a/sys/amd64/amd64/efirt_machdep.c +++ b/sys/amd64/amd64/efirt_machdep.c @@ -180,6 +180,7 @@ efi_create_1t1_map(struct efi_md *map, int ndesc, int descsz) struct efi_md *p; pt_entry_t *pte; void *pml; + vm_page_t m; vm_offset_t va; uint64_t idx; int bits, i, mode; @@ -247,6 +248,14 @@ efi_create_1t1_map(struct efi_md *map, int ndesc, int descsz) va += PAGE_SIZE) { pte = efi_1t1_pte(va); pte_store(pte, va | bits); + + m = PHYS_TO_VM_PAGE(va); + if (m != NULL && VM_PAGE_TO_PHYS(m) == 0) { + vm_page_init_page(m, va, -1); + m->order = VM_NFREEORDER + 1; /* invalid */ + m->pool = VM_NFREEPOOL + 1; /* invalid */ + pmap_page_set_memattr(m, mode); + } } VM_OBJECT_WUNLOCK(obj_1t1_pt); }