From nobody Tue Apr 22 16:09:43 2025 X-Original-To: dev-commits-src-main@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 4ZhnHr1R6dz5sqKf; Tue, 22 Apr 2025 16:09:44 +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 4ZhnHr0v5dz3nCP; Tue, 22 Apr 2025 16:09:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745338184; 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=8oXcNfvn8C5KUpKmVxYBFPaPd116PerteYofEh5+W60=; b=D405d19oC0ty7JqSOXUuK/r7SBgsq6vjhsggcuxl/0rFvzvGfy32jfou+2a4EO76LUEWvV e6PFoubrzNFE2e+5K2EONd8Df0kKwaOhoMko4+2MFpnx8QikxDUKWl1Jy6xKGA8iioiAjv 8w2QkOaR+JUF7QPusgGmp7K9A0kW2MW46WW2c8H9CLqNjyRAHpS23vUTKGX3GhKhGgryLU PdxIoPbAbRnevpqUtJVxdn6VwBVFG7KhUjVqu/gvJFbmzcND+SKyKGm2cNgaEA7Yq20xWV D6IB8vDip/kd1nyDlLWQUGQlKx3sI6p4JpHkmWXkPLBLq7VU600/ABH5DpoZJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745338184; a=rsa-sha256; cv=none; b=jyNQ/atftY6XB2F1OU3UjXRQKz8dCBNPGVuuSGlkzdUaPO6kMtk5Xai97262M/l6LZdmwb Q9byvm21rxxTmVROb59hFn18QKXGVa1z2XL2FyupCb+t6KELo8J1rFP2LX2fkoVe1cvKTt yoYRZ5T3X5DM34GrX7fhVqGeeyFSCwJBOx+RxDdTrgo/NHS7MrdcGuoFC/TH5jYbKKbHLr rXhVuSB9sLXQXivPf1ovOmNg89Ev6V49T+/ZsBeFzOVZzsORPimFJvz80h71R/4RBKL0hg PaIfSN5nNmucg9DoueRBbNCaRhpG/DFCT1Xr+DpLqrXeZAzpvS4HWriUgiGgiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745338184; 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=8oXcNfvn8C5KUpKmVxYBFPaPd116PerteYofEh5+W60=; b=stsly+yO2jUpPT+ot68LDNDJAskQUci3I+0bdFMOozJIrGnNgTHtrhPxZSwW8qdwrXUfsZ Hg6xKzn6gCZKoGU9GVYAvH6AQtwZHjjO1MvCsOj7He0BN2eIoRf4s46Fc/fFYskZMbf/iG O3FA/zByO2G2YG0Ovf3Tbx1AFO2R8IAehVjmk/ZLjXWg2EX36Z7km6O94EoTkEJb9IaJV7 Xk1oFiDjZiQboFIE9JAs8eCoxH+FY36IJLNhWa+hTbMZabgZQp6vJkRzXvKlKryTCySrJo 925x6l+dNlD6XmFAGJOLDvKbUdJFWbU0YMaOijVQ9ubK4vEeONRclDPus0c0Ww== 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 4ZhnHq72WLz9l0; Tue, 22 Apr 2025 16:09:43 +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 53MG9h2W051245; Tue, 22 Apr 2025 16:09:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53MG9hXG051242; Tue, 22 Apr 2025 16:09:43 GMT (envelope-from git) Date: Tue, 22 Apr 2025 16:09:43 GMT Message-Id: <202504221609.53MG9hXG051242@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: 32bb6a6925c0 - main - arm64: Call pmap_bootstrap_dmap from initarm List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 32bb6a6925c02e26cbb113789280ebb4bff54dd2 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=32bb6a6925c02e26cbb113789280ebb4bff54dd2 commit 32bb6a6925c02e26cbb113789280ebb4bff54dd2 Author: Andrew Turner AuthorDate: 2025-04-22 15:57:29 +0000 Commit: Andrew Turner CommitDate: 2025-04-22 16:08:57 +0000 arm64: Call pmap_bootstrap_dmap from initarm Make pmap_bootstrap_dmap self contained and call it from initarm. This will allow us to have a better view of excluded physical address space when calling pmap_bootstrap. Reviewed by: imp, markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D49853 --- sys/arm64/arm64/machdep.c | 21 +++++++++++++++++--- sys/arm64/arm64/pmap.c | 49 ++++++++++++++++++++++++++--------------------- sys/arm64/include/pmap.h | 3 ++- 3 files changed, 47 insertions(+), 26 deletions(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index d3955d8c9863..ca393e11cef9 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -815,14 +815,29 @@ initarm(struct arm64_bootparams *abp) cache_setup(); - /* Bootstrap enough of pmap to enter the kernel proper */ - pmap_bootstrap(lastaddr - KERNBASE); - /* Exclude entries needed in the DMAP region, but not phys_avail */ + /* + * Perform a staged bootstrap of virtual memory. + * + * - First we create the DMAP region. This allows it to be used in + * later bootstrapping. + * - Next exclude memory that is needed in the DMAP region, but must + * not be used by FreeBSD. + * - Lastly complete the bootstrapping. It may use the physical + * memory map so any excluded memory must be marked as such before + * pmap_bootstrap() is called. + */ + pmap_bootstrap_dmap(lastaddr - KERNBASE); + /* + * Exclude EFI entries needed in the DMAP, e.g. EFI_MD_TYPE_RECLAIM + * may contain the ACPI tables but shouldn't be used by the kernel + */ if (efihdr != NULL) efi_map_exclude_entries(efihdr); /* Do the same for reserve entries in the EFI MEMRESERVE table */ if (efi_systbl_phys != 0) exclude_efi_memreserve(efi_systbl_phys); + /* Continue bootstrapping pmap */ + pmap_bootstrap(); /* * We carefully bootstrap the sanitizer map after we've excluded diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index e3b8e3bf01ee..30efd40573d2 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -1211,11 +1211,28 @@ pmap_bootstrap_l3_page(struct pmap_bootstrap_state *state, int i) MPASS(state->va == (state->pa - dmap_phys_base + DMAP_MIN_ADDRESS)); } -static void -pmap_bootstrap_dmap(void) +void +pmap_bootstrap_dmap(vm_size_t kernlen) { + vm_paddr_t start_pa, pa; + uint64_t tcr; int i; + tcr = READ_SPECIALREG(tcr_el1); + + /* Verify that the ASID is set through TTBR0. */ + KASSERT((tcr & TCR_A1) == 0, ("pmap_bootstrap: TCR_EL1.A1 != 0")); + + if ((tcr & TCR_DS) != 0) + pmap_lpa_enabled = true; + + pmap_l1_supported = L1_BLOCKS_SUPPORTED; + + start_pa = pmap_early_vtophys(KERNBASE); + + bs_state.freemempos = KERNBASE + kernlen; + bs_state.freemempos = roundup2(bs_state.freemempos, PAGE_SIZE); + /* Fill in physmap array. */ physmap_idx = physmem_avail(physmap, nitems(physmap)); @@ -1275,6 +1292,12 @@ pmap_bootstrap_dmap(void) } cpu_tlb_flushID(); + + bs_state.dmap_valid = true; + + /* Exclude the kernel and DMAP region */ + pa = pmap_early_vtophys(bs_state.freemempos); + physmem_exclude_region(start_pa, pa - start_pa, EXFLAG_NOALLOC); } static void @@ -1305,21 +1328,10 @@ pmap_bootstrap_l3(vm_offset_t va) * Bootstrap the system enough to run with virtual memory. */ void -pmap_bootstrap(vm_size_t kernlen) +pmap_bootstrap(void) { vm_offset_t dpcpu, msgbufpv; vm_paddr_t start_pa, pa; - uint64_t tcr; - - tcr = READ_SPECIALREG(tcr_el1); - - /* Verify that the ASID is set through TTBR0. */ - KASSERT((tcr & TCR_A1) == 0, ("pmap_bootstrap: TCR_EL1.A1 != 0")); - - if ((tcr & TCR_DS) != 0) - pmap_lpa_enabled = true; - - pmap_l1_supported = L1_BLOCKS_SUPPORTED; /* Set this early so we can use the pagetable walking functions */ kernel_pmap_store.pm_l0 = pagetable_l0_ttbr1; @@ -1334,20 +1346,13 @@ pmap_bootstrap(vm_size_t kernlen) kernel_pmap->pm_ttbr = kernel_pmap->pm_l0_paddr; kernel_pmap->pm_asid_set = &asids; - bs_state.freemempos = KERNBASE + kernlen; - bs_state.freemempos = roundup2(bs_state.freemempos, PAGE_SIZE); - - /* Create a direct map region early so we can use it for pa -> va */ - pmap_bootstrap_dmap(); - bs_state.dmap_valid = true; - /* * We only use PXN when we know nothing will be executed from it, e.g. * the DMAP region. */ bs_state.table_attrs &= ~TATTR_PXN_TABLE; - start_pa = pa = pmap_early_vtophys(KERNBASE); + start_pa = pmap_early_vtophys(bs_state.freemempos); /* * Create the l2 tables up to VM_MAX_KERNEL_ADDRESS. We assume that the diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h index 2503f1df8404..0f23f200f0f6 100644 --- a/sys/arm64/include/pmap.h +++ b/sys/arm64/include/pmap.h @@ -141,7 +141,8 @@ extern pt_entry_t pmap_sh_attr; #define pmap_vm_page_alloc_check(m) void pmap_activate_vm(pmap_t); -void pmap_bootstrap(vm_size_t); +void pmap_bootstrap_dmap(vm_size_t); +void pmap_bootstrap(void); int pmap_change_attr(vm_offset_t va, vm_size_t size, int mode); int pmap_change_prot(vm_offset_t va, vm_size_t size, vm_prot_t prot); void pmap_kenter(vm_offset_t sva, vm_size_t size, vm_paddr_t pa, int mode);