david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i386/monitor.c: make addresses canonical for "info mem" and "info tlb"

Browse Source 
Correct the output of the "info mem" and "info tlb" monitor commands to
correctly show canonical addresses.

In 48-bit addressing mode, the upper 16 bits of linear addresses are
equal to bit 47. In 57-bit addressing mode (LA57), the upper 7 bits of
linear addresses are equal to bit 56.

Signed-off-by: Doug Gale <doug16k@gmail.com>
Message-Id: <20180617084025.29198-1-doug16k@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Doug Gale 2018-06-17 04:40:25 -04:00 committed by Paolo Bonzini
parent fe441054bb
commit 3afc969a6e
1 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
target/i386/monitor.c
View File

@ -35,21 +35,28 @@
#include "sev_i386.h" #include "sev_i386.h"
#include "qapi/qapi-commands-misc.h" #include "qapi/qapi-commands-misc.h"
/* Perform linear address sign extension */
static void print_pte(Monitor *mon, CPUArchState *env, hwaddr addr, static hwaddr addr_canonical(CPUArchState *env, hwaddr addr)
hwaddr pte, hwaddr mask)
{ {
#ifdef TARGET_X86_64 #ifdef TARGET_X86_64
if (env->cr[4] & CR4_LA57_MASK) { if (env->cr[4] & CR4_LA57_MASK) {
if (addr & (1ULL << 56)) { if (addr & (1ULL << 56)) {
addr |= -1LL << 57; addr |= (hwaddr)-(1LL << 57);
} }
} else { } else {
if (addr & (1ULL << 47)) { if (addr & (1ULL << 47)) {
addr |= -1LL << 48; addr |= (hwaddr)-(1LL << 48);
} }
} }
#endif #endif
return addr;
}
static void print_pte(Monitor *mon, CPUArchState *env, hwaddr addr,
hwaddr pte, hwaddr mask)
{
addr = addr_canonical(env, addr);
monitor_printf(mon, TARGET_FMT_plx ": " TARGET_FMT_plx monitor_printf(mon, TARGET_FMT_plx ": " TARGET_FMT_plx
" %c%c%c%c%c%c%c%c%c\n", " %c%c%c%c%c%c%c%c%c\n",
addr, addr,
@ -243,8 +250,8 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict)
} }
} }
static void mem_print(Monitor *mon, hwaddr *pstart, static void mem_print(Monitor *mon, CPUArchState *env,
int *plast_prot, hwaddr *pstart, int *plast_prot,
hwaddr end, int prot) hwaddr end, int prot)
{ {
int prot1; int prot1;
@ -253,7 +260,9 @@ static void mem_print(Monitor *mon, hwaddr *pstart,
if (*pstart != -1) { if (*pstart != -1) {
monitor_printf(mon, TARGET_FMT_plx "-" TARGET_FMT_plx " " monitor_printf(mon, TARGET_FMT_plx "-" TARGET_FMT_plx " "
TARGET_FMT_plx " %c%c%c\n", TARGET_FMT_plx " %c%c%c\n",
*pstart, end, end - *pstart, addr_canonical(env, *pstart),
addr_canonical(env, end),
addr_canonical(env, end - *pstart),
prot1 & PG_USER_MASK ? 'u' : '-', prot1 & PG_USER_MASK ? 'u' : '-',
'r', 'r',
prot1 & PG_RW_MASK ? 'w' : '-'); prot1 & PG_RW_MASK ? 'w' : '-');
@ -283,7 +292,7 @@ static void mem_info_32(Monitor *mon, CPUArchState *env)
if (pde & PG_PRESENT_MASK) { if (pde & PG_PRESENT_MASK) {
if ((pde & PG_PSE_MASK) && (env->cr[4] & CR4_PSE_MASK)) { if ((pde & PG_PSE_MASK) && (env->cr[4] & CR4_PSE_MASK)) {
prot = pde & (PG_USER_MASK | PG_RW_MASK | PG_PRESENT_MASK); prot = pde & (PG_USER_MASK | PG_RW_MASK | PG_PRESENT_MASK);
mem_print(mon, &start, &last_prot, end, prot); mem_print(mon, env, &start, &last_prot, end, prot);
} else { } else {
for(l2 = 0; l2 < 1024; l2++) { for(l2 = 0; l2 < 1024; l2++) {
cpu_physical_memory_read((pde & ~0xfff) + l2 * 4, &pte, 4); cpu_physical_memory_read((pde & ~0xfff) + l2 * 4, &pte, 4);
@ -295,16 +304,16 @@ static void mem_info_32(Monitor *mon, CPUArchState *env)
} else { } else {
prot = 0; prot = 0;
} }
mem_print(mon, &start, &last_prot, end, prot); mem_print(mon, env, &start, &last_prot, end, prot);
} }
} }
} else { } else {
prot = 0; prot = 0;
mem_print(mon, &start, &last_prot, end, prot); mem_print(mon, env, &start, &last_prot, end, prot);
} }
} }
/* Flush last range */ /* Flush last range */
mem_print(mon, &start, &last_prot, (hwaddr)1 << 32, 0); mem_print(mon, env, &start, &last_prot, (hwaddr)1 << 32, 0);
} }
static void mem_info_pae32(Monitor *mon, CPUArchState *env) static void mem_info_pae32(Monitor *mon, CPUArchState *env)
@ -332,7 +341,7 @@ static void mem_info_pae32(Monitor *mon, CPUArchState *env)
if (pde & PG_PSE_MASK) { if (pde & PG_PSE_MASK) {
prot = pde & (PG_USER_MASK | PG_RW_MASK | prot = pde & (PG_USER_MASK | PG_RW_MASK |
PG_PRESENT_MASK); PG_PRESENT_MASK);
mem_print(mon, &start, &last_prot, end, prot); mem_print(mon, env, &start, &last_prot, end, prot);
} else { } else {
pt_addr = pde & 0x3fffffffff000ULL; pt_addr = pde & 0x3fffffffff000ULL;
for (l3 = 0; l3 < 512; l3++) { for (l3 = 0; l3 < 512; l3++) {
@ -345,21 +354,21 @@ static void mem_info_pae32(Monitor *mon, CPUArchState *env)
} else { } else {
prot = 0; prot = 0;
} }
mem_print(mon, &start, &last_prot, end, prot); mem_print(mon, env, &start, &last_prot, end, prot);
} }
} }
} else { } else {
prot = 0; prot = 0;
mem_print(mon, &start, &last_prot, end, prot); mem_print(mon, env, &start, &last_prot, end, prot);
} }
} }
} else { } else {
prot = 0; prot = 0;
mem_print(mon, &start, &last_prot, end, prot); mem_print(mon, env, &start, &last_prot, end, prot);
} }
} }
/* Flush last range */ /* Flush last range */
mem_print(mon, &start, &last_prot, (hwaddr)1 << 32, 0); mem_print(mon, env, &start, &last_prot, (hwaddr)1 << 32, 0);
} }
@ -389,7 +398,7 @@ static void mem_info_la48(Monitor *mon, CPUArchState *env)
prot = pdpe & (PG_USER_MASK | PG_RW_MASK | prot = pdpe & (PG_USER_MASK | PG_RW_MASK |
PG_PRESENT_MASK); PG_PRESENT_MASK);
prot &= pml4e; prot &= pml4e;
mem_print(mon, &start, &last_prot, end, prot); mem_print(mon, env, &start, &last_prot, end, prot);
} else { } else {
pd_addr = pdpe & 0x3fffffffff000ULL; pd_addr = pdpe & 0x3fffffffff000ULL;
for (l3 = 0; l3 < 512; l3++) { for (l3 = 0; l3 < 512; l3++) {
@ -401,7 +410,8 @@ static void mem_info_la48(Monitor *mon, CPUArchState *env)
prot = pde & (PG_USER_MASK | PG_RW_MASK | prot = pde & (PG_USER_MASK | PG_RW_MASK |
PG_PRESENT_MASK); PG_PRESENT_MASK);
prot &= pml4e & pdpe; prot &= pml4e & pdpe;
mem_print(mon, &start, &last_prot, end, prot); mem_print(mon, env, &start,
&last_prot, end, prot);
} else { } else {
pt_addr = pde & 0x3fffffffff000ULL; pt_addr = pde & 0x3fffffffff000ULL;
for (l4 = 0; l4 < 512; l4++) { for (l4 = 0; l4 < 512; l4++) {
@ -418,27 +428,29 @@ static void mem_info_la48(Monitor *mon, CPUArchState *env)
} else { } else {
prot = 0; prot = 0;
} }
mem_print(mon, &start, &last_prot, end, prot); mem_print(mon, env, &start,
&last_prot, end, prot);
} }
} }
} else { } else {
prot = 0; prot = 0;
mem_print(mon, &start, &last_prot, end, prot); mem_print(mon, env, &start,
&last_prot, end, prot);
} }
} }
} }
} else { } else {
prot = 0; prot = 0;
mem_print(mon, &start, &last_prot, end, prot); mem_print(mon, env, &start, &last_prot, end, prot);
} }
} }
} else { } else {
prot = 0; prot = 0;
mem_print(mon, &start, &last_prot, end, prot); mem_print(mon, env, &start, &last_prot, end, prot);
} }
} }
/* Flush last range */ /* Flush last range */
mem_print(mon, &start, &last_prot, (hwaddr)1 << 48, 0); mem_print(mon, env, &start, &last_prot, (hwaddr)1 << 48, 0);
} }
static void mem_info_la57(Monitor *mon, CPUArchState *env) static void mem_info_la57(Monitor *mon, CPUArchState *env)
@ -457,7 +469,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env)
end = l0 << 48; end = l0 << 48;
if (!(pml5e & PG_PRESENT_MASK)) { if (!(pml5e & PG_PRESENT_MASK)) {
prot = 0; prot = 0;
mem_print(mon, &start, &last_prot, end, prot); mem_print(mon, env, &start, &last_prot, end, prot);
continue; continue;
} }
@ -468,7 +480,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env)
end = (l0 << 48) + (l1 << 39); end = (l0 << 48) + (l1 << 39);
if (!(pml4e & PG_PRESENT_MASK)) { if (!(pml4e & PG_PRESENT_MASK)) {
prot = 0; prot = 0;
mem_print(mon, &start, &last_prot, end, prot); mem_print(mon, env, &start, &last_prot, end, prot);
continue; continue;
} }
@ -479,7 +491,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env)
end = (l0 << 48) + (l1 << 39) + (l2 << 30); end = (l0 << 48) + (l1 << 39) + (l2 << 30);
if (pdpe & PG_PRESENT_MASK) { if (pdpe & PG_PRESENT_MASK) {
prot = 0; prot = 0;
mem_print(mon, &start, &last_prot, end, prot); mem_print(mon, env, &start, &last_prot, end, prot);
continue; continue;
} }
@ -487,7 +499,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env)
prot = pdpe & (PG_USER_MASK | PG_RW_MASK | prot = pdpe & (PG_USER_MASK | PG_RW_MASK |
PG_PRESENT_MASK); PG_PRESENT_MASK);
prot &= pml5e & pml4e; prot &= pml5e & pml4e;
mem_print(mon, &start, &last_prot, end, prot); mem_print(mon, env, &start, &last_prot, end, prot);
continue; continue;
} }
@ -498,7 +510,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env)
end = (l0 << 48) + (l1 << 39) + (l2 << 30) + (l3 << 21); end = (l0 << 48) + (l1 << 39) + (l2 << 30) + (l3 << 21);
if (pde & PG_PRESENT_MASK) { if (pde & PG_PRESENT_MASK) {
prot = 0; prot = 0;
mem_print(mon, &start, &last_prot, end, prot); mem_print(mon, env, &start, &last_prot, end, prot);
continue; continue;
} }
@ -506,7 +518,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env)
prot = pde & (PG_USER_MASK | PG_RW_MASK | prot = pde & (PG_USER_MASK | PG_RW_MASK |
PG_PRESENT_MASK); PG_PRESENT_MASK);
prot &= pml5e & pml4e & pdpe; prot &= pml5e & pml4e & pdpe;
mem_print(mon, &start, &last_prot, end, prot); mem_print(mon, env, &start, &last_prot, end, prot);
continue; continue;
} }
@ -523,14 +535,14 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env)
} else { } else {
prot = 0; prot = 0;
} }
mem_print(mon, &start, &last_prot, end, prot); mem_print(mon, env, &start, &last_prot, end, prot);
} }
} }
} }
} }
} }
/* Flush last range */ /* Flush last range */
mem_print(mon, &start, &last_prot, (hwaddr)1 << 57, 0); mem_print(mon, env, &start, &last_prot, (hwaddr)1 << 57, 0);
} }
#endif /* TARGET_X86_64 */ #endif /* TARGET_X86_64 */