openbsd/src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2026-06-18 07:13:36 +02:00
Code Activity

Adapt to random direct map by also extracting pmap_direct_base with nlist

Browse Source 
issue spotted by anton; discussion with mlarkin and guenther
This commit is contained in:
deraadt
2026-06-07 14:22:07 +00:00
parent e3237d075b
commit f2d2b3cd91
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
regress/sys/arch/amd64/dump_tables/dump_tables.c
+12 -5
View File
@@ -1,4 +1,4 @@
/* $OpenBSD: dump_tables.c,v 1.8 2023/05/11 22:28:38 guenther Exp $ */
/* $OpenBSD: dump_tables.c,v 1.9 2026/06/07 14:22:07 deraadt Exp $ */
/*
* Copyright (c) 2019,2023 Philip Guenther <guenther@openbsd.org>
*
@@ -78,7 +78,11 @@ pd_entry_t *pt[5];
int meltdown, hide_direct, hide_pte, reproducible, show[5], show_leaves;
int user_proc;
struct nlist proc0[] = { { "_proc0paddr" }, { NULL } };
struct nlist nl[] = {
{ "_proc0paddr" },
{ "_pmap_direct_base" },
{ NULL }
};
#define KGET(addr, var) \
KGETRET(addr, &var, sizeof var, #var)
@@ -103,6 +107,8 @@ const char * const ptname[] = {
[1] = "pt1",
};
vaddr_t pmap_direct_base;
/* Not currently used */
const pd_entry_t ign_normal[] = {
[4] = 0x0000000000000f40UL,
@@ -135,7 +141,7 @@ enum l4_type { T_NORMAL = 0, T_DIRECT, T_PTE, T_KERNBASE, };
static inline enum l4_type
l4type(int i)
{
if (i >= L4_SLOT_DIRECT && i < L4_SLOT_DIRECT + NUM_L4_SLOT_DIRECT)
if (i >= L4_SLOT_DIRECT && i < L4_SLOT_DIRECT + DIRECT_MAP_PML4_SLOTS)
return T_DIRECT;
if (i == L4_SLOT_PTE)
return T_PTE;
@@ -289,9 +295,10 @@ main(int argc, char **argv)
sizeof *kp, &cnt);
paddr = kp->p_addr;
} else {
if (kvm_nlist(k, proc0) != 0)
if (kvm_nlist(k, nl) != 0)
err(1, "nlist");
KGET(proc0[0].n_value, paddr);
KGET(nl[0].n_value, paddr);
KGET(nl[1].n_value, pmap_direct_base);
}
KGET(paddr, pcb);