From nobody Mon Sep 28 15:54:54 2026 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 4htm8v0Z0hz6Wr1v for ; Mon, 28 Sep 2026 15:54:55 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4htm8v003Pz4Rwn for ; Mon, 28 Sep 2026 15:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790610895; 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=Kn2ZLn3PhYrFFSqg1Gyd+DDumA97aSj/XCRx/VP2lnQ=; b=xZSrialbO42LkCKpUlElwPjZ40TeRtuKz68oOPaajfgJQEXtj7V8zLGI5bifgwhpC7AtxR vKJAtYDkcpkfbPdjcQ4jRWTdYFJsZj3RcApD69dvYj/YlWDdkWqXdMG5wC8yjir5QZp1AC 04/m5Ep3Gqj7hs0ID9frX5g1ee4bYoxNJ8/zMbWYPzN0LsbX4DAaRbwjHE8cnIqiq7tTnf UfNnL1zuAkUL91kn3asKSu8hmvC5DwhUvtzf2zydyJxVG3lbIzkvA5xGaFApnzvLoDKhsF 36MJ5O6Cz9NVyUGprNXqfH4//A1VaupwG/Mh+6cR1yyHZ1cmpF2Hyd20xXtgNA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790610895; b=wutwH5CYtx+wvDzF/RFRtpEFW5IU0nH1Ba7ZSqmLw3AVgFJJBGSS/8q4gCALYcJo5Uwcnp 5BTuYGLybDLEcmvVTVu23AMnSVZnd/iL5wvt6uHSfYe+Jr08aiRFqqD6Gj/r3I2pwpO32d ll5or3W6LYZcbevM/+ry89vnI1NM+gAoDZW0k0ZpsVa6Ah27O/oB77cnEkK8ImpG8Lrb+n NhT1e017kVU+KQCwW6i475L6wbB1idIXa2m2DaPJ1BO2NjLeSuArgR8OihANlPHOmVS/bZ hciEk4W7cNZ8SuGmwsq56bOZvlnpTeebsdUWr6GXryLvKN4/OH0hEmI91zyk6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790610895; 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=Kn2ZLn3PhYrFFSqg1Gyd+DDumA97aSj/XCRx/VP2lnQ=; b=Swxzv/uZThySg+Vyopjkb6znBrpd76WfmRG5aQnmDRni/oxI/CkM0gwvYnQ3ZDmuQ80zrw IAuIZMBrIrVuq61WdXbzhXGy2l2qowKWHmsD0dTtmcg5dfCBy+FV90mzQj8ChwIt8tPIaD I0ClszplY0K0kWcwyovuYRhsJWNItVmQjCwVwYh+knubPNPMlddjVIbuweVE2dB991Zd/p 9W4oaIGfPhDK1pjYxZx77a4Uy6xypvUKB61+/wtpRoUtB85dmqzTogRqM7QkhfQZJgP6lU +Jx4mPv72nsmYFzCux+jO6ErSwgIPtdv1kuM2qhPenqskBOdn32kggewtp9nOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4htm8t6870zbV6 for ; Mon, 28 Sep 2026 15:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2485f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 28 Sep 2026 15:54:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Minsoo Choo Subject: git: a38a698704b0 - main - powerpc/radix: include page tables in minidumps 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mchoo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a38a698704b0289db3260617116a455fecdd54f6 Auto-Submitted: auto-generated Date: Mon, 28 Sep 2026 15:54:54 +0000 Message-Id: <6aba8dce.2485f.1687bf4b@gitrepo.freebsd.org> The branch main has been updated by mchoo: URL: https://cgit.FreeBSD.org/src/commit/?id=a38a698704b0289db3260617116a455fecdd54f6 commit a38a698704b0289db3260617116a455fecdd54f6 Author: Minsoo Choo AuthorDate: 2026-09-16 04:12:30 +0000 Commit: Minsoo Choo CommitDate: 2026-09-28 15:53:00 +0000 powerpc/radix: include page tables in minidumps The radix pmap did not implement the minidump pmap callbacks, so radix minidumps were emitted with an empty pmap section. Such dumps do not contain enough information for libkvm to translate kernel virtual addresses. Snapshot the 64KB radix root table in the pmap section, add lower-level page-table pages to the sparse dump, and include pages backing non-DMAP kernel mappings. Keep the bulk direct map out of the dump while retaining the relocated kernel image. PR: 298532 Reviewed by: jhb Approved by: jhb (mentor) MFC after: 2 weeks Sponsored by: FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D59743 --- sys/powerpc/aim/mmu_radix.c | 157 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) diff --git a/sys/powerpc/aim/mmu_radix.c b/sys/powerpc/aim/mmu_radix.c index 772a3d4bc835..1a3f9bb39ebf 100644 --- a/sys/powerpc/aim/mmu_radix.c +++ b/sys/powerpc/aim/mmu_radix.c @@ -121,6 +121,8 @@ static void pmap_pte_walk(pml1_entry_t *l1, vm_offset_t va); extern int nkpt; extern caddr_t crashdumpmap; +extern unsigned char _etext[]; +extern unsigned char _end[]; #define RIC_FLUSH_TLB 0 #define RIC_FLUSH_PWC 1 @@ -493,6 +495,9 @@ static void mmu_radix_kenter_attr(vm_offset_t, vm_paddr_t, vm_memattr_t ma); static int mmu_radix_dev_direct_mapped(vm_paddr_t, vm_size_t); static void mmu_radix_dumpsys_map(vm_paddr_t pa, size_t sz, void **va); static void mmu_radix_scan_init(void); +static size_t mmu_radix_scan_pmap(struct bitset *dump_bitset); +static void *mmu_radix_dump_pmap_init(unsigned blkpgs); +static void *mmu_radix_dump_pmap(void *ctx, void *buf, u_long *nbytes); static void mmu_radix_cpu_bootstrap(int ap); static void mmu_radix_tlbie_all(void); @@ -515,6 +520,9 @@ static struct pmap_funcs mmu_radix_methods = { .dev_direct_mapped = mmu_radix_dev_direct_mapped, .dumpsys_pa_init = mmu_radix_scan_init, .dumpsys_map_chunk = mmu_radix_dumpsys_map, + .dumpsys_scan_pmap = mmu_radix_scan_pmap, + .dumpsys_dump_pmap_init = mmu_radix_dump_pmap_init, + .dumpsys_dump_pmap = mmu_radix_dump_pmap, .page_is_mapped = mmu_radix_page_is_mapped, .ps_enabled = mmu_radix_ps_enabled, .align_superpage = mmu_radix_align_superpage, @@ -6182,6 +6190,155 @@ mmu_radix_dev_direct_mapped(vm_paddr_t pa, vm_size_t size) return (mem_valid(pa, size)); } +static void +mmu_radix_dump_add_range(struct bitset *dump_bitset, vm_paddr_t pa, + vm_size_t size) +{ + vm_paddr_t end; + + end = pa + size; + for (; pa < end; pa += PAGE_SIZE) { + if (vm_phys_is_dumpable(pa)) + vm_page_dump_add(dump_bitset, pa); + } +} + +static void +mmu_radix_dump_add_leaf(struct bitset *dump_bitset, vm_offset_t va, + vm_paddr_t pa, vm_size_t size, vm_offset_t kstart, vm_offset_t kend) +{ + vm_offset_t end, start; + + /* + * Most DMAP mappings only provide aliases for memory already selected + * by the minidump bitmap. The relocated kernel image is the exception: + * its pages were allocated before regular minidump page tracking began. + */ + if (va < VM_MIN_KERNEL_ADDRESS) { + end = va + size; + if (end <= kstart || va >= kend) + return; + start = MAX(va, kstart); + end = MIN(end, kend); + pa += start - va; + size = end - start; + } + mmu_radix_dump_add_range(dump_bitset, pa, size); +} + +static size_t +mmu_radix_scan_pmap(struct bitset *dump_bitset) +{ + pt_entry_t *l1, *l2, *l3, *pt; + pt_entry_t l1e, l2e, l3e, pte; + vm_offset_t kstart, kend, va1, va2, va3, va; + vm_paddr_t pa; + u_int i, j, k, l; + + kstart = trunc_page((vm_offset_t)_etext); + kend = round_page((vm_offset_t)_end); + l1 = kernel_pmap->pm_pml1; + + PMAP_LOCK(kernel_pmap); + for (i = 0; i < RADIX_PGD_SIZE / sizeof(*l1); i++) { + l1e = be64toh(l1[i]); + if ((l1e & RPTE_VALID) == 0) + continue; + va1 = DMAP_BASE_ADDRESS | ((vm_offset_t)i << + L1_PAGE_SIZE_SHIFT); + if ((l1e & RPTE_LEAF) != 0) { + mmu_radix_dump_add_leaf(dump_bitset, va1, + l1e & RPTE_RPN_MASK, L1_PAGE_SIZE, kstart, kend); + continue; + } + + pa = l1e & RPDE_NLB_MASK; + mmu_radix_dump_add_range(dump_bitset, pa, PAGE_SIZE); + l2 = PHYS_TO_DMAP(pa); + for (j = 0; j < NL2EPG; j++) { + l2e = be64toh(l2[j]); + if ((l2e & RPTE_VALID) == 0) + continue; + va2 = va1 | ((vm_offset_t)j << L2_PAGE_SIZE_SHIFT); + if ((l2e & RPTE_LEAF) != 0) { + mmu_radix_dump_add_leaf(dump_bitset, va2, + l2e & RPTE_RPN_MASK, L2_PAGE_SIZE, kstart, + kend); + continue; + } + + pa = l2e & RPDE_NLB_MASK; + mmu_radix_dump_add_range(dump_bitset, pa, PAGE_SIZE); + l3 = PHYS_TO_DMAP(pa); + for (k = 0; k < NL3EPG; k++) { + l3e = be64toh(l3[k]); + if ((l3e & RPTE_VALID) == 0) + continue; + va3 = va2 | ((vm_offset_t)k << + L3_PAGE_SIZE_SHIFT); + if ((l3e & RPTE_LEAF) != 0) { + mmu_radix_dump_add_leaf(dump_bitset, va3, + l3e & RPTE_RPN_MASK, L3_PAGE_SIZE, + kstart, kend); + continue; + } + + pa = l3e & RPDE_NLB_MASK; + mmu_radix_dump_add_range(dump_bitset, pa, + PAGE_SIZE); + pt = PHYS_TO_DMAP(pa); + for (l = 0; l < RPTE_ENTRIES; l++) { + pte = be64toh(pt[l]); + if ((pte & (RPTE_VALID | RPTE_LEAF)) != + (RPTE_VALID | RPTE_LEAF)) + continue; + va = va3 | ((vm_offset_t)l << PAGE_SHIFT); + mmu_radix_dump_add_leaf(dump_bitset, va, + pte & RPTE_RPN_MASK, PAGE_SIZE, + kstart, kend); + } + } + } + } + PMAP_UNLOCK(kernel_pmap); + + return (RADIX_PGD_SIZE); +} + +struct radix_dump_context { + size_t off; + size_t blksz; +}; + +static struct radix_dump_context radix_dump_ctx; + +static void * +mmu_radix_dump_pmap_init(unsigned blkpgs) +{ + + radix_dump_ctx.off = 0; + radix_dump_ctx.blksz = blkpgs * PAGE_SIZE; + return (&radix_dump_ctx); +} + +static void * +mmu_radix_dump_pmap(void *ctx, void *buf __unused, u_long *nbytes) +{ + struct radix_dump_context *dctx; + void *p; + + dctx = ctx; + if (dctx->off == RADIX_PGD_SIZE) { + *nbytes = 0; + return (NULL); + } + + *nbytes = MIN(dctx->blksz, RADIX_PGD_SIZE - dctx->off); + p = (char *)kernel_pmap->pm_pml1 + dctx->off; + dctx->off += *nbytes; + return (p); +} + static void mmu_radix_scan_init(void) {