c18ad9a54b
fa48b43"target-ppc: Remove hack for ppc_hash64_load_hpte*() with HV KVM" purports to remove a hack in the handling of hash page tables (HPTs) managed by KVM instead of qemu. However, it actually went in the wrong direction. That patch requires anything looking for an external HPT (that is one not managed by the guest itself) to check both env->external_htab (for a qemu managed HPT) and kvmppc_kern_htab (for a KVM managed HPT). That's a problem because kvmppc_kern_htab is local to mmu-hash64.c, but some places which need to check for an external HPT are outside that, such as kvm_arch_get_registers(). The latter was subtly broken by the earlier patch such that gdbstub can no longer access memory. Basically a KVM managed HPT is much more like a qemu managed HPT than it is like a guest managed HPT, so the original "hack" was actually on the right track. This partially revertsfa48b43, so we again mark a KVM managed external HPT by putting a special but non-NULL value in env->external_htab. It then goes further, using that marker to eliminate the kvmppc_kern_htab global entirely. The ppc_hash64_set_external_hpt() helper function is extended to set that marker if passed a NULL value (if you're setting an external HPT, but don't have an actual HPT to set, the assumption is that it must be a KVM managed HPT). This also has some flow-on changes to the HPT access helpers, required by the above changes. Reported-by: Greg Kurz <gkurz@linux.vnet.ibm.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Greg Kurz <gkurz@linux.vnet.ibm.com> Tested-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
136 lines
5.2 KiB
C
136 lines
5.2 KiB
C
#if !defined (__MMU_HASH64_H__)
|
|
#define __MMU_HASH64_H__
|
|
|
|
#ifndef CONFIG_USER_ONLY
|
|
|
|
#ifdef TARGET_PPC64
|
|
void ppc_hash64_check_page_sizes(PowerPCCPU *cpu, Error **errp);
|
|
void dump_slb(FILE *f, fprintf_function cpu_fprintf, PowerPCCPU *cpu);
|
|
int ppc_store_slb(PowerPCCPU *cpu, target_ulong slot,
|
|
target_ulong esid, target_ulong vsid);
|
|
hwaddr ppc_hash64_get_phys_page_debug(PowerPCCPU *cpu, target_ulong addr);
|
|
int ppc_hash64_handle_mmu_fault(PowerPCCPU *cpu, target_ulong address, int rw,
|
|
int mmu_idx);
|
|
void ppc_hash64_store_hpte(PowerPCCPU *cpu, target_ulong index,
|
|
target_ulong pte0, target_ulong pte1);
|
|
void ppc_hash64_tlb_flush_hpte(PowerPCCPU *cpu,
|
|
target_ulong pte_index,
|
|
target_ulong pte0, target_ulong pte1);
|
|
unsigned ppc_hash64_hpte_page_shift_noslb(PowerPCCPU *cpu,
|
|
uint64_t pte0, uint64_t pte1,
|
|
unsigned *seg_page_shift);
|
|
#endif
|
|
|
|
/*
|
|
* SLB definitions
|
|
*/
|
|
|
|
/* Bits in the SLB ESID word */
|
|
#define SLB_ESID_ESID 0xFFFFFFFFF0000000ULL
|
|
#define SLB_ESID_V 0x0000000008000000ULL /* valid */
|
|
|
|
/* Bits in the SLB VSID word */
|
|
#define SLB_VSID_SHIFT 12
|
|
#define SLB_VSID_SHIFT_1T 24
|
|
#define SLB_VSID_SSIZE_SHIFT 62
|
|
#define SLB_VSID_B 0xc000000000000000ULL
|
|
#define SLB_VSID_B_256M 0x0000000000000000ULL
|
|
#define SLB_VSID_B_1T 0x4000000000000000ULL
|
|
#define SLB_VSID_VSID 0x3FFFFFFFFFFFF000ULL
|
|
#define SLB_VSID_PTEM (SLB_VSID_B | SLB_VSID_VSID)
|
|
#define SLB_VSID_KS 0x0000000000000800ULL
|
|
#define SLB_VSID_KP 0x0000000000000400ULL
|
|
#define SLB_VSID_N 0x0000000000000200ULL /* no-execute */
|
|
#define SLB_VSID_L 0x0000000000000100ULL
|
|
#define SLB_VSID_C 0x0000000000000080ULL /* class */
|
|
#define SLB_VSID_LP 0x0000000000000030ULL
|
|
#define SLB_VSID_ATTR 0x0000000000000FFFULL
|
|
#define SLB_VSID_LLP_MASK (SLB_VSID_L | SLB_VSID_LP)
|
|
#define SLB_VSID_4K 0x0000000000000000ULL
|
|
#define SLB_VSID_64K 0x0000000000000110ULL
|
|
#define SLB_VSID_16M 0x0000000000000100ULL
|
|
#define SLB_VSID_16G 0x0000000000000120ULL
|
|
|
|
/*
|
|
* Hash page table definitions
|
|
*/
|
|
|
|
#define HPTES_PER_GROUP 8
|
|
#define HASH_PTE_SIZE_64 16
|
|
#define HASH_PTEG_SIZE_64 (HASH_PTE_SIZE_64 * HPTES_PER_GROUP)
|
|
|
|
#define HPTE64_V_SSIZE_SHIFT 62
|
|
#define HPTE64_V_AVPN_SHIFT 7
|
|
#define HPTE64_V_AVPN 0x3fffffffffffff80ULL
|
|
#define HPTE64_V_AVPN_VAL(x) (((x) & HPTE64_V_AVPN) >> HPTE64_V_AVPN_SHIFT)
|
|
#define HPTE64_V_COMPARE(x, y) (!(((x) ^ (y)) & 0xffffffffffffff80ULL))
|
|
#define HPTE64_V_LARGE 0x0000000000000004ULL
|
|
#define HPTE64_V_SECONDARY 0x0000000000000002ULL
|
|
#define HPTE64_V_VALID 0x0000000000000001ULL
|
|
|
|
#define HPTE64_R_PP0 0x8000000000000000ULL
|
|
#define HPTE64_R_TS 0x4000000000000000ULL
|
|
#define HPTE64_R_KEY_HI 0x3000000000000000ULL
|
|
#define HPTE64_R_RPN_SHIFT 12
|
|
#define HPTE64_R_RPN 0x0ffffffffffff000ULL
|
|
#define HPTE64_R_FLAGS 0x00000000000003ffULL
|
|
#define HPTE64_R_PP 0x0000000000000003ULL
|
|
#define HPTE64_R_N 0x0000000000000004ULL
|
|
#define HPTE64_R_G 0x0000000000000008ULL
|
|
#define HPTE64_R_M 0x0000000000000010ULL
|
|
#define HPTE64_R_I 0x0000000000000020ULL
|
|
#define HPTE64_R_W 0x0000000000000040ULL
|
|
#define HPTE64_R_WIMG 0x0000000000000078ULL
|
|
#define HPTE64_R_C 0x0000000000000080ULL
|
|
#define HPTE64_R_R 0x0000000000000100ULL
|
|
#define HPTE64_R_KEY_LO 0x0000000000000e00ULL
|
|
#define HPTE64_R_KEY(x) ((((x) & HPTE64_R_KEY_HI) >> 60) | \
|
|
(((x) & HPTE64_R_KEY_LO) >> 9))
|
|
|
|
#define HPTE64_V_1TB_SEG 0x4000000000000000ULL
|
|
#define HPTE64_V_VRMA_MASK 0x4001ffffff000000ULL
|
|
|
|
void ppc_hash64_set_sdr1(PowerPCCPU *cpu, target_ulong value,
|
|
Error **errp);
|
|
void ppc_hash64_set_external_hpt(PowerPCCPU *cpu, void *hpt, int shift,
|
|
Error **errp);
|
|
|
|
uint64_t ppc_hash64_start_access(PowerPCCPU *cpu, target_ulong pte_index);
|
|
void ppc_hash64_stop_access(PowerPCCPU *cpu, uint64_t token);
|
|
|
|
static inline target_ulong ppc_hash64_load_hpte0(PowerPCCPU *cpu,
|
|
uint64_t token, int index)
|
|
{
|
|
CPUPPCState *env = &cpu->env;
|
|
uint64_t addr;
|
|
|
|
addr = token + (index * HASH_PTE_SIZE_64);
|
|
if (env->external_htab) {
|
|
return ldq_p((const void *)(uintptr_t)addr);
|
|
} else {
|
|
return ldq_phys(CPU(cpu)->as, addr);
|
|
}
|
|
}
|
|
|
|
static inline target_ulong ppc_hash64_load_hpte1(PowerPCCPU *cpu,
|
|
uint64_t token, int index)
|
|
{
|
|
CPUPPCState *env = &cpu->env;
|
|
uint64_t addr;
|
|
|
|
addr = token + (index * HASH_PTE_SIZE_64) + HASH_PTE_SIZE_64/2;
|
|
if (env->external_htab) {
|
|
return ldq_p((const void *)(uintptr_t)addr);
|
|
} else {
|
|
return ldq_phys(CPU(cpu)->as, addr);
|
|
}
|
|
}
|
|
|
|
typedef struct {
|
|
uint64_t pte0, pte1;
|
|
} ppc_hash_pte64_t;
|
|
|
|
#endif /* CONFIG_USER_ONLY */
|
|
|
|
#endif /* !defined (__MMU_HASH64_H__) */
|