From nobody Mon Oct 12 04:01:01 2026 X-Original-To: dev-commits-src-all@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 4j33fk16H1z6vPR8 for ; Mon, 12 Oct 2026 04:01:02 +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 4j33fk01Vjz4jNn for ; Mon, 12 Oct 2026 04:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791777662; 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=IULPK6THby5cDJ+m9qGcBNeeN7fpaHu2vQ3LG6sYumo=; b=HL/brvgiWDb9UxTu4dDwSlsIEl3YO484dXbkfJta441UH3yg8Tgu0nH/sq3R8MawPwJtYe PE0cP7L7d/ihhudzxMUbjlUmOYZM6hodn179J6VXeKurk2urDyoqWB4iZHa4s8mgTd92Q8 LzD4vAq/fwEavzVRA028GWqXGogjyRzCMyL5rs6AO3Eg9B9wM/XPGQqfLrUALI2qtr7YBY BzwksS3kx0fFPU3xmQHiNBbLyl1Kee/u0dSEwSoo6ebzqp/C42ERrlUA8hOJ8WgX5/nD/+ J7zQOnXoIRXs0oxK7Q7kT5jnxeqy7WssFDdLORTUvh7TO59AKSq+d3fg0GNGgw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791777662; b=WuaupZ7cqG2XM7szINEUH3RzIdWUov9fjHiPsbVlrhpDCfO21UgHznuQWeZACiHWLoj8Qc JmJ1PiKTu5Gal+qaZ7MybEo3MgV9EPbVpHkG+QllHJH1ZyJxbxA0qEvDy2w4UUyr7Jqzcj uI37IbAbxKdS6ps1Zmju+G/4CLTG9iwMRTsD9j1B0p+mXpcrgo1MWFAQrRIuQH5YpGy9/v ob6bAhDlIeUZRkaTMgRbh3fjSB5Sl/wnA7yCFFFw/VKI6D7Ui/PDviXcfsCF5yWgI5A2fH y1CLOP2Yb9FjWmyVueW30J0Hd07nxk8cbHlZAAi/+muo55jZ2IPl/JvUAX740g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791777662; 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=IULPK6THby5cDJ+m9qGcBNeeN7fpaHu2vQ3LG6sYumo=; b=bu4a7zEeIByR1zpQgqVL02g0oyMVbAyYbtpxaywPBYjh3TzqbCrWyvLWPA7I3iWB2ZGiSR a8peNp2DtomOOxougSUg2eK+rw7uFSMVTSq425VGyrc6wZGezsfb1UklFOn/yw2u0tCdNW 59aP3hLMJuRmH4jYfrZeLC8VDkzQShUXydBtCaJGgceYSf3kzkiFWdwjYXfmnP++IpD7CQ gISL60FpC2c1TnyZwi72Ta6BOpd0zxSFJuAqt6Mg/c33jgu4KtQH11j+O7ygqqaFXnY8ke zwEOZFjeoK4jCt4D7B0YYEO80W2iPB1kkhjUYdjbKLXdSN0c+SG2qyPOFrwLTQ== 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 4j33fj6CQYz1BLv for ; Mon, 12 Oct 2026 04:01:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19bfc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 12 Oct 2026 04:01:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Minsoo Choo Subject: git: 904efcc64398 - stable/14 - powerpc/radix: include page tables in minidumps List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 904efcc643981758ce2243df3eeb455bf9f5b08a Auto-Submitted: auto-generated Date: Mon, 12 Oct 2026 04:01:01 +0000 Message-Id: <6acc5b7d.19bfc.1da9cc68@gitrepo.freebsd.org> The branch stable/14 has been updated by mchoo: URL: https://cgit.FreeBSD.org/src/commit/?id=904efcc643981758ce2243df3eeb455bf9f5b08a commit 904efcc643981758ce2243df3eeb455bf9f5b08a Author: Minsoo Choo AuthorDate: 2026-09-16 04:12:30 +0000 Commit: Minsoo Choo CommitDate: 2026-10-12 04:00:21 +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 (cherry picked from commit a38a698704b0289db3260617116a455fecdd54f6) --- 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 f18e8259bef7..d64a9c143cf3 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, @@ -6127,6 +6135,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) {