mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/i386: allow modifying TCG phys-addr-bits

Browse Source 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2021-03-18 09:35:56 -04:00
parent 6d9abb6de9
commit b818413583
4 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
target/i386/cpu.c
View File

@ -6785,21 +6785,14 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
cpu->phys_bits = cpu->host_phys_bits_limit; cpu->phys_bits = cpu->host_phys_bits_limit;
} }
} }
}
if (cpu->phys_bits && if (cpu->phys_bits &&
(cpu->phys_bits > TARGET_PHYS_ADDR_SPACE_BITS || (cpu->phys_bits > TARGET_PHYS_ADDR_SPACE_BITS ||
cpu->phys_bits < 32)) { cpu->phys_bits < 32)) {
error_setg(errp, "phys-bits should be between 32 and %u " error_setg(errp, "phys-bits should be between 32 and %u "
" (but is %u)", " (but is %u)",
TARGET_PHYS_ADDR_SPACE_BITS, cpu->phys_bits); TARGET_PHYS_ADDR_SPACE_BITS, cpu->phys_bits);
return; return;
}
} else {
if (cpu->phys_bits && cpu->phys_bits != TCG_PHYS_ADDR_BITS) {
error_setg(errp, "TCG only supports phys-bits=%u",
TCG_PHYS_ADDR_BITS);
return;
}
} }
/* 0 means it was not explicitly set by the user (or by machine /* 0 means it was not explicitly set by the user (or by machine
* compat_props or by the host code above). In this case, the default * compat_props or by the host code above). In this case, the default

1
target/i386/cpu.h
View File

@ -290,7 +290,6 @@ typedef enum X86Seg {
#define PG_GLOBAL_MASK (1 << PG_GLOBAL_BIT) #define PG_GLOBAL_MASK (1 << PG_GLOBAL_BIT)
#define PG_PSE_PAT_MASK (1 << PG_PSE_PAT_BIT) #define PG_PSE_PAT_MASK (1 << PG_PSE_PAT_BIT)
#define PG_ADDRESS_MASK 0x000ffffffffff000LL #define PG_ADDRESS_MASK 0x000ffffffffff000LL
#define PG_HI_RSVD_MASK (PG_ADDRESS_MASK & ~PHYS_ADDR_MASK)
#define PG_HI_USER_MASK 0x7ff0000000000000LL #define PG_HI_USER_MASK 0x7ff0000000000000LL
#define PG_PKRU_MASK (15ULL << PG_PKRU_BIT) #define PG_PKRU_MASK (15ULL << PG_PKRU_BIT)
#define PG_NX_MASK (1ULL << PG_NX_BIT) #define PG_NX_MASK (1ULL << PG_NX_BIT)

7
target/i386/tcg/excp_helper.c
View File

@ -142,8 +142,9 @@ void raise_exception_ra(CPUX86State *env, int exception_index, uintptr_t retaddr
static hwaddr get_hphys(CPUState *cs, hwaddr gphys, MMUAccessType access_type, static hwaddr get_hphys(CPUState *cs, hwaddr gphys, MMUAccessType access_type,
int *prot) int *prot)
{ {
CPUX86State *env = &X86_CPU(cs)->env; X86CPU *cpu = X86_CPU(cs);
uint64_t rsvd_mask = PG_HI_RSVD_MASK; CPUX86State *env = &cpu->env;
uint64_t rsvd_mask = PG_ADDRESS_MASK & ~MAKE_64BIT_MASK(0, cpu->phys_bits);
uint64_t ptep, pte; uint64_t ptep, pte;
uint64_t exit_info_1 = 0; uint64_t exit_info_1 = 0;
target_ulong pde_addr, pte_addr; target_ulong pde_addr, pte_addr;
@ -358,7 +359,7 @@ static int handle_mmu_fault(CPUState *cs, vaddr addr, int size,
int error_code = 0; int error_code = 0;
int is_dirty, prot, page_size, is_write, is_user; int is_dirty, prot, page_size, is_write, is_user;
hwaddr paddr; hwaddr paddr;
uint64_t rsvd_mask = PG_HI_RSVD_MASK; uint64_t rsvd_mask = PG_ADDRESS_MASK & ~MAKE_64BIT_MASK(0, cpu->phys_bits);
uint32_t page_offset; uint32_t page_offset;
target_ulong vaddr; target_ulong vaddr;
uint32_t pkr; uint32_t pkr;

12
target/i386/tcg/helper-tcg.h
View File

@ -25,17 +25,13 @@
/* Maximum instruction code size */ /* Maximum instruction code size */
#define TARGET_MAX_INSN_SIZE 16 #define TARGET_MAX_INSN_SIZE 16
/* #if defined(TARGET_X86_64)
* XXX: This value should match the one returned by CPUID
* and in exec.c
*/
# if defined(TARGET_X86_64)
# define TCG_PHYS_ADDR_BITS 40 # define TCG_PHYS_ADDR_BITS 40
# else #else
# define TCG_PHYS_ADDR_BITS 36 # define TCG_PHYS_ADDR_BITS 36
# endif #endif
#define PHYS_ADDR_MASK MAKE_64BIT_MASK(0, TCG_PHYS_ADDR_BITS) QEMU_BUILD_BUG_ON(TCG_PHYS_ADDR_BITS > TARGET_PHYS_ADDR_SPACE_BITS);
/** /**
* x86_cpu_do_interrupt: * x86_cpu_do_interrupt: