From owner-svn-src-head@freebsd.org Mon May 28 17:09:30 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5E59CF717E9; Mon, 28 May 2018 17:09:30 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0CD4977DD3; Mon, 28 May 2018 17:09:30 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C9969102EE; Mon, 28 May 2018 17:09:29 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4SH9Tfq015128; Mon, 28 May 2018 17:09:29 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4SH9Ttc015127; Mon, 28 May 2018 17:09:29 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201805281709.w4SH9Ttc015127@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Mon, 28 May 2018 17:09:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334289 - head/sys/arm64/arm64 X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: head/sys/arm64/arm64 X-SVN-Commit-Revision: 334289 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 May 2018 17:09:30 -0000 Author: andrew Date: Mon May 28 17:09:29 2018 New Revision: 334289 URL: https://svnweb.freebsd.org/changeset/base/334289 Log: Create a new function to walk the EFI memory table & run a callback for each entry. We can then use this to ensure the RunTime data is mapped in the DMAP, but not in phys_avail. Sponsored by: DARPA, AFRL Modified: head/sys/arm64/arm64/machdep.c Modified: head/sys/arm64/arm64/machdep.c ============================================================================== --- head/sys/arm64/arm64/machdep.c Mon May 28 17:08:37 2018 (r334288) +++ head/sys/arm64/arm64/machdep.c Mon May 28 17:09:29 2018 (r334289) @@ -720,8 +720,10 @@ typedef struct { uint64_t attr; } EFI_MEMORY_DESCRIPTOR; +typedef void (*efi_map_entry_cb)(struct efi_md *); + static void -add_efi_map_entries(struct efi_map_header *efihdr) +foreach_efi_map_entry(struct efi_map_header *efihdr, efi_map_entry_cb cb) { struct efi_md *map, *p; const char *type; @@ -797,25 +799,69 @@ add_efi_map_entries(struct efi_map_header *efihdr) printf("\n"); } - switch (p->md_type) { - case EFI_MD_TYPE_CODE: - case EFI_MD_TYPE_DATA: - case EFI_MD_TYPE_BS_CODE: - case EFI_MD_TYPE_BS_DATA: - case EFI_MD_TYPE_FREE: - /* - * We're allowed to use any entry with these types. - */ - break; - default: - continue; - } + cb(p); + } +} +static void +exclude_efi_map_entry(struct efi_md *p) +{ + + switch (p->md_type) { + case EFI_MD_TYPE_CODE: + case EFI_MD_TYPE_DATA: + case EFI_MD_TYPE_BS_CODE: + case EFI_MD_TYPE_BS_DATA: + case EFI_MD_TYPE_FREE: + /* + * We're allowed to use any entry with these types. + */ + break; + default: + arm_physmem_exclude_region(p->md_phys, p->md_pages * PAGE_SIZE, + EXFLAG_NOALLOC); + } +} + +static void +exclude_efi_map_entries(struct efi_map_header *efihdr) +{ + + foreach_efi_map_entry(efihdr, exclude_efi_map_entry); +} + +static void +add_efi_map_entry(struct efi_md *p) +{ + + switch (p->md_type) { + case EFI_MD_TYPE_RT_DATA: + /* + * Runtime data will be excluded after the DMAP + * region is created to stop it from being added + * to phys_avail. + */ + case EFI_MD_TYPE_CODE: + case EFI_MD_TYPE_DATA: + case EFI_MD_TYPE_BS_CODE: + case EFI_MD_TYPE_BS_DATA: + case EFI_MD_TYPE_FREE: + /* + * We're allowed to use any entry with these types. + */ arm_physmem_hardware_region(p->md_phys, p->md_pages * PAGE_SIZE); + break; } } +static void +add_efi_map_entries(struct efi_map_header *efihdr) +{ + + foreach_efi_map_entry(efihdr, add_efi_map_entry); +} + #ifdef FDT static void try_load_dtb(caddr_t kmdp) @@ -1001,6 +1047,9 @@ initarm(struct arm64_bootparams *abp) /* Bootstrap enough of pmap to enter the kernel proper */ pmap_bootstrap(abp->kern_l0pt, abp->kern_l1pt, KERNBASE - abp->kern_delta, lastaddr - KERNBASE); + /* Exclude entries neexed in teh DMAP region, but not phys_avail */ + if (efihdr != NULL) + exclude_efi_map_entries(efihdr); arm_physmem_init_kernel_globals(); devmap_bootstrap(0, NULL);