diff options
| author | Alex Wilson <alex.wilson@joyent.com> | 2018-03-12 11:20:26 -0700 |
|---|---|---|
| committer | Alex Wilson <alex.wilson@joyent.com> | 2018-03-12 18:31:40 +0000 |
| commit | d85fbfe15cf9925f83722b6d62da49d549af615c (patch) | |
| tree | edd88a89a2065378767b7a3a64cd0ccc827330e1 /usr/src/cmd/mdb/i86pc/modules/unix/unix.c | |
| parent | 8005f4ee748b1fe324b3f234a2defe0dd557611b (diff) | |
| download | illumos-joyent-d85fbfe15cf9925f83722b6d62da49d549af615c.tar.gz | |
OS-6547 Implement KPTI
Reviewed by: John Levon <john.levon@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Approved by: Jerry Jelinek <jerry.jelinek@joyent.com>
Diffstat (limited to 'usr/src/cmd/mdb/i86pc/modules/unix/unix.c')
| -rw-r--r-- | usr/src/cmd/mdb/i86pc/modules/unix/unix.c | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/usr/src/cmd/mdb/i86pc/modules/unix/unix.c b/usr/src/cmd/mdb/i86pc/modules/unix/unix.c index 5d8a0f222f..95e588eed6 100644 --- a/usr/src/cmd/mdb/i86pc/modules/unix/unix.c +++ b/usr/src/cmd/mdb/i86pc/modules/unix/unix.c @@ -432,6 +432,9 @@ ttrace_dumpregs(trap_trace_rec_t *rec) mdb_printf(THREEREGS, DUMP(gs), "trp", regs->r_trapno, DUMP(err)); mdb_printf(THREEREGS, DUMP(rip), DUMP(cs), DUMP(rfl)); mdb_printf(THREEREGS, DUMP(rsp), DUMP(ss), "cr2", rec->ttr_cr2); + mdb_printf(" %3s: %16lx %3s: %16lx\n", + "fsb", regs->__r_fsbase, + "gsb", regs->__r_gsbase); mdb_printf("\n"); } @@ -753,7 +756,18 @@ ptable_help(void) "Given a PFN holding a page table, print its contents, and\n" "the address of the corresponding htable structure.\n" "\n" - "-m Interpret the PFN as an MFN (machine frame number)\n"); + "-m Interpret the PFN as an MFN (machine frame number)\n" + "-l force page table level (3 is top)\n"); +} + +static void +ptmap_help(void) +{ + mdb_printf( + "Report all mappings represented by the page table hierarchy\n" + "rooted at the given cr3 value / physical address.\n" + "\n" + "-w run ::whatis on mapping start addresses\n"); } static const char *const scalehrtime_desc = @@ -1000,10 +1014,10 @@ crregs_dcmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) mdb_printf("%%cr2 = 0x%08x <%a>\n", cr2, cr2); if ((cr4 & CR4_PCIDE)) { - mdb_printf("%%cr3 = 0x%08x <pfn:%lu pcid:%u>\n", + mdb_printf("%%cr3 = 0x%08x <pfn:0x%lx pcid:%u>\n", cr3 >> MMU_PAGESHIFT, cr3 & MMU_PAGEOFFSET); } else { - mdb_printf("%%cr3 = 0x%08x <pfn:%lu flags:%b>\n", cr3, + mdb_printf("%%cr3 = 0x%08x <pfn:0x%lx flags:%b>\n", cr3, cr3 >> MMU_PAGESHIFT, cr3, cr3_flag_bits); } @@ -1024,9 +1038,11 @@ static const mdb_dcmd_t dcmds[] = { report_maps_dcmd, report_maps_help }, { "htables", "", "Given hat_t *, lists all its htable_t * values", htables_dcmd, htables_help }, - { "ptable", ":[-m]", "Given PFN, dump contents of a page table", + { "ptable", ":[-lm]", "Given PFN, dump contents of a page table", ptable_dcmd, ptable_help }, - { "pte", ":[-p XXXXX] [-l N]", "print human readable page table entry", + { "ptmap", ":", "Given a cr3 value, dump all mappings", + ptmap_dcmd, ptmap_help }, + { "pte", ":[-l N]", "print human readable page table entry", pte_dcmd }, { "pfntomfn", ":", "convert physical page to hypervisor machine page", pfntomfn_dcmd }, |