KVM updates for the 2.6.34 merge window (batch 2/4)
cover KVM updates for the 2.6.34 merge window (batch 2/4)
This is the first of four batches of patches for the 2.6.34 merge window. KVM changes for this cycle include:
- rdtscp support
- powerpc server-class updates
- much improved large-guest scaling (now up to 64 vcpus)
- improved guest fpu handling
- initial Hyper-V emulation
- better swapping with EPT
- 1GB pages on Intel
- x86 emulator fixes
as well as the usual assortment of random fixes and improvements.
Alexander Graf (18):
KVM: PPC: Enable lightweight exits again
KVM: PPC: Use accessor functions for GPR access
KVM: PPC: Add helpers for CR, XER
KVM: PPC: Use PACA backed shadow vcpu
KVM: PPC: Implement 'skip instruction' mode
KVM: PPC: Get rid of unnecessary RFI
KVM: PPC: Call SLB patching code in interrupt safe manner
KVM: PPC: Emulate trap SRR1 flags properly
KVM: PPC: Fix HID5 setting code
KVM: PPC: Pass program interrupt flags to the guest
KVM: PPC: Pass through program interrupts
KVM: PPC: Make large pages work
KVM: PPC: Export __giveup_vsx
KVM: PPC: Add helper functions to call real mode loaders
KVM: PPC: Add support for FPU/Altivec/VSX
KVM: PPC: Fix initial GPR settings
KVM: PPC: Keep SRR1 flags around in shadow_msr
KVM: PPC: Move Shadow MSR calculation to function
Avi Kivity (11):
KVM: VMX: trace clts and lmsw instructions as cr accesses
KVM: Replace read accesses of vcpu->arch.cr0 by an accessor
KVM: VMX: Allow the guest to own some cr0 bits
KVM: Lazify fpu activation and deactivation
KVM: VMX: Give the guest ownership of cr0.ts when the fpu is active
KVM: Set cr0.et when the guest writes cr0
KVM: SVM: Fix SVM_CR0_SELECTIVE_MASK
KVM: SVM: Initialize fpu_active in init_vmcb()
KVM: SVM: Restore unconditional cr0 intercept under npt
KVM: SVM: Selective cr0 intercept
KVM: SVM: Lazy fpu with npt
Gleb Natapov (4):
KVM: Add HYPER-V header file
KVM: Implement bare minimum of HYPER-V MSRs
KVM: Add HYPER-V apic access MSRs
KVM: Implement NotifyLongSpinWait HYPER-V hypercall
Roel Kluin (1):
KVM: ia64: remove redundant kvm_get_exit_data() NULL tests
Sheng Yang (3):
KVM: x86: Moving PT_*_LEVEL to mmu.h
KVM: x86: Rename gb_page_enable() to get_lpage_level() in kvm_x86_ops
KVM: VMX: Enable EPT 1GB page support
Takuya Yoshikawa (2):
KVM: Fix the explanation of write_emulated
KVM: rename is_writeble_pte() to is_writable_pte()
arch/ia64/kvm/kvm_fw.c | 28 +-- arch/powerpc/include/asm/kvm_asm.h | 6 + arch/powerpc/include/asm/kvm_book3s.h | 11 +- arch/powerpc/include/asm/kvm_book3s_64_asm.h | 18 ++ arch/powerpc/include/asm/kvm_host.h | 21 ++- arch/powerpc/include/asm/kvm_ppc.h | 82 ++++++- arch/powerpc/include/asm/paca.h | 5 + arch/powerpc/include/asm/reg.h | 4 + arch/powerpc/kernel/asm-offsets.c | 33 +++- arch/powerpc/kernel/ppc_ksyms.c | 1 + arch/powerpc/kvm/44x_emulate.c | 25 +- arch/powerpc/kvm/44x_tlb.c | 20 +- arch/powerpc/kvm/book3s.c | 260 ++++++++++++++++++-- arch/powerpc/kvm/book3s_64_emulate.c | 77 +++--- arch/powerpc/kvm/book3s_64_exports.c | 8 + arch/powerpc/kvm/book3s_64_interrupts.S | 336 ++++++++++---------------- arch/powerpc/kvm/book3s_64_mmu.c | 10 +- arch/powerpc/kvm/book3s_64_rmhandlers.S | 119 ++++++++-- arch/powerpc/kvm/book3s_64_slb.S | 158 ++++++++----- arch/powerpc/kvm/booke.c | 27 +- arch/powerpc/kvm/booke_emulate.c | 107 ++++---- arch/powerpc/kvm/e500_emulate.c | 95 ++++---- arch/powerpc/kvm/e500_tlb.c | 4 +- arch/powerpc/kvm/emulate.c | 113 +++++---- arch/powerpc/kvm/powerpc.c | 21 +- arch/x86/include/asm/hyperv.h | 186 ++++++++++++++ arch/x86/include/asm/kvm_emulate.h | 2 +- arch/x86/include/asm/kvm_host.h | 11 +- arch/x86/include/asm/kvm_para.h | 1 + arch/x86/include/asm/svm.h | 2 +- arch/x86/include/asm/vmx.h | 1 + arch/x86/kvm/emulate.c | 6 +- arch/x86/kvm/kvm_cache_regs.h | 12 + arch/x86/kvm/lapic.c | 31 +++ arch/x86/kvm/lapic.h | 8 + arch/x86/kvm/mmu.c | 32 ++-- arch/x86/kvm/mmu.h | 6 +- arch/x86/kvm/paging_tmpl.h | 2 +- arch/x86/kvm/svm.c | 95 ++++---- arch/x86/kvm/trace.h | 32 +++ arch/x86/kvm/vmx.c | 73 ++++-- arch/x86/kvm/x86.c | 268 +++++++++++++++++++- include/linux/kvm.h | 3 + include/linux/kvm_host.h | 1 + 44 files changed, 1686 insertions(+), 675 deletions(-) create mode 100644 arch/x86/include/asm/hyperv.h
PATCH 1/39 KVM: PPC: Enable lightweight exits again
From: Alexander Graf <[email protected]>
The PowerPC C ABI defines that registers r14-r31 need to be preserved across function calls. Since our exit handler is written in C, we can make use of that and don't need to reload r14-r31 on every entry/exit cycle.
This technique is also used in the BookE code and is called "lightweight exits" there. To follow the tradition, it's called the same in Book3S.
So far this optimization was disabled though, as the code didn't do what it was expected to do, but failed to work.
This patch fixes and enables lightweight exits again.
--- arch/powerpc/kvm/book3s.c | 4 +- arch/powerpc/kvm/book3s_64_interrupts.S | 106 ++++++++++++++++--------------- 2 files changed, 57 insertions(+), 53 deletions(-)
arch/powerpc/kvm/book3s.c +1 -3
@@ -539,8 +539,6 @@ int kvmppc_handle_pagefault(struct kvm_run *run, struct kvm_vcpu *vcpu, r =kvmppc_emulate_mmio (run, vcpu);if ( r ==RESUME_HOST_NV ) r =RESUME_HOST ; -if ( r ==RESUME_GUEST_NV ) - r =RESUME_GUEST ; }return r;
@@ -645,7 +643,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, er =kvmppc_emulate_instruction (run, vcpu);switch (er) {case EMULATE_DONE : - r =RESUME_GUEST ; + r =RESUME_GUEST_NV ;break ;case EMULATE_FAIL : printk(KERN_CRIT "%s: emulation at %lx failed (%08x)\n",
arch/powerpc/kvm/book3s_64_interrupts.S +56 -50
161 lines not on this page · raw message
Signature · 1 line
1.6.5.3
PATCH 2/39 KVM: x86: Moving PT_*_LEVEL to mmu.h
In reply to Avi KivityFrom: Sheng Yang <[email protected]>
We can use them in x86.c and vmx.c now...
--- arch/x86/kvm/mmu.c | 4 ---- arch/x86/kvm/mmu.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/kvm/mmu.c +0 -4
@@ -143,10 +143,6 @@ module_param(oos_shadow, bool, 0644);#define PFERR_RSVD_MASK (1U << 3)#define PFERR_FETCH_MASK (1U << 4) -#define PT_PDPE_LEVEL 3 -#define PT_DIRECTORY_LEVEL 2 -#define PT_PAGE_TABLE_LEVEL 1 -#define RMAP_EXT 4#define ACC_EXEC_MASK 1
arch/x86/kvm/mmu.h +4 -0
@@ -38,6 +38,10 @@#define PT32_ROOT_LEVEL 2#define PT32E_ROOT_LEVEL 3 +#define PT_PDPE_LEVEL 3 +#define PT_DIRECTORY_LEVEL 2 +#define PT_PAGE_TABLE_LEVEL 1 +int kvm_mmu_get_spte_hierarchy (struct kvm_vcpu *vcpu,u64 addr,u64 sptes[4 ]);static inline void kvm_mmu_free_some_pages (struct kvm_vcpu *vcpu)
Signature · 1 line
1.6.5.3
PATCH 3/39 KVM: x86: Rename gb_page_enable() to get_lpage_level() in kvm_x86_ops
In reply to Avi KivityFrom: Sheng Yang <[email protected]>
Then the callback can provide the maximum supported large page level, which is more flexible.
Also move the gb page support into x86_64 specific.
--- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/svm.c | 6 +++--- arch/x86/kvm/vmx.c | 6 +++--- arch/x86/kvm/x86.c | 4 +++- 4 files changed, 10 insertions(+), 8 deletions(-)
arch/x86/include/asm/kvm_host.h +1 -1
@@ -528,7 +528,7 @@ struct kvm_x86_ops {int (*set_tss_addr)(struct kvm *kvm,unsigned int addr);int (*get_tdp_level)(void );u64 (*get_mt_mask)(struct kvm_vcpu *vcpu,gfn_t gfn,bool is_mmio); -bool (*gb_page_enable)(void ); +int (*get_lpage_level)(void );bool (*rdtscp_supported)(void );const struct trace_print_flags *exit_reasons_str;
arch/x86/kvm/svm.c +3 -3
@@ -2911,9 +2911,9 @@ static const struct trace_print_flags svm_exit_reasons_str[] = { { -1, NULL } }; -static bool svm_gb_page_enable (void ) +static int svm_get_lpage_level (void ) { -return true; +return PT_PDPE_LEVEL ; }static bool svm_rdtscp_supported (void )
@@ -2986,7 +2986,7 @@ static struct kvm_x86_ops svm_x86_ops = { .get_mt_mask = svm_get_mt_mask, .exit_reasons_str = svm_exit_reasons_str, - .gb_page_enable = svm_gb_page_enable, + .get_lpage_level = svm_get_lpage_level, .cpuid_update = svm_cpuid_update,
arch/x86/kvm/vmx.c +3 -3
@@ -4036,9 +4036,9 @@ static const struct trace_print_flags vmx_exit_reasons_str[] = {#undef _ER -static bool vmx_gb_page_enable (void ) +static int vmx_get_lpage_level (void ) { -return false; +return PT_DIRECTORY_LEVEL ; }static inline u32 bit (int bitno)
@@ -4131,7 +4131,7 @@ static struct kvm_x86_ops vmx_x86_ops = { .get_mt_mask = vmx_get_mt_mask, .exit_reasons_str = vmx_exit_reasons_str, - .gb_page_enable = vmx_gb_page_enable, + .get_lpage_level = vmx_get_lpage_level, .cpuid_update = vmx_cpuid_update,
arch/x86/kvm/x86.c +3 -1
@@ -1641,10 +1641,12 @@ static void do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, u32 index, int *nent, int maxnent) { unsigned f_nx = is_efer_nx() ? F(NX) : 0; -unsigned f_gbpages = kvm_x86_ops->gb_page_enable () ?F (GBPAGES ) :0 ;#ifdef CONFIG_X86_64 +unsigned f_gbpages = (kvm_x86_ops->get_lpage_level () ==PT_PDPE_LEVEL ) + ?F (GBPAGES ) :0 ;unsigned f_lm =F (LM );#else +unsigned f_gbpages =0 ;unsigned f_lm =0 ;#endif unsigned f_rdtscp = kvm_x86_ops->rdtscp_supported () ?F (RDTSCP ) :0 ;
Signature · 1 line
1.6.5.3
PATCH 4/39 KVM: VMX: Enable EPT 1GB page support
In reply to Avi KivityFrom: Sheng Yang <[email protected]>
--- arch/x86/include/asm/vmx.h | 1 + arch/x86/kvm/mmu.c | 8 +++++--- arch/x86/kvm/vmx.c | 11 ++++++++++- 3 files changed, 16 insertions(+), 4 deletions(-)
arch/x86/include/asm/vmx.h +1 -0
@@ -364,6 +364,7 @@ enum vmcs_field {#define VMX_EPTP_UC_BIT (1ull << 8)#define VMX_EPTP_WB_BIT (1ull << 14)#define VMX_EPT_2MB_PAGE_BIT (1ull << 16) +#define VMX_EPT_1GB_PAGE_BIT (1ull << 17)#define VMX_EPT_EXTENT_INDIVIDUAL_BIT (1ull << 24)#define VMX_EPT_EXTENT_CONTEXT_BIT (1ull << 25)#define VMX_EPT_EXTENT_GLOBAL_BIT (1ull << 26)
arch/x86/kvm/mmu.c +5 -3
@@ -500,8 +500,7 @@ out:static int mapping_level (struct kvm_vcpu *vcpu,gfn_t large_gfn) {struct kvm_memory_slot *slot; -int host_level; -int level =PT_PAGE_TABLE_LEVEL ; +int host_level, level, max_level; slot =gfn_to_memslot (vcpu->kvm, large_gfn);if (slot && slot->dirty_bitmap)
@@ -512,7 +511,10 @@ static int mapping_level(struct kvm_vcpu *vcpu, gfn_t large_gfn)if (host_level ==PT_PAGE_TABLE_LEVEL )return host_level; -for (level =PT_DIRECTORY_LEVEL ; level <= host_level; ++level) + max_level = kvm_x86_ops->get_lpage_level () < host_level ? + kvm_x86_ops->get_lpage_level () : host_level; + +for (level =PT_DIRECTORY_LEVEL ; level <= max_level; ++level)if (has_wrprotected_page (vcpu->kvm, large_gfn, level))break ;
arch/x86/kvm/vmx.c +10 -1
@@ -318,6 +318,11 @@ static inline bool cpu_has_vmx_ept_2m_page(void)return !!(vmx_capability.ept &VMX_EPT_2MB_PAGE_BIT ); } +static inline bool cpu_has_vmx_ept_1g_page (void ) +{ +return !!(vmx_capability.ept &VMX_EPT_1GB_PAGE_BIT ); +} +static inline int cpu_has_vmx_invept_individual_addr (void ) {return !!(vmx_capability.ept &VMX_EPT_EXTENT_INDIVIDUAL_BIT );
@@ -4038,7 +4043,11 @@ static const struct trace_print_flags vmx_exit_reasons_str[] = {static int vmx_get_lpage_level (void ) { -return PT_DIRECTORY_LEVEL ; +if (enable_ept && !cpu_has_vmx_ept_1g_page ()) +return PT_DIRECTORY_LEVEL ; +else +/* For shadow and EPT supported 1GB page */ +return PT_PDPE_LEVEL ; }static inline u32 bit (int bitno)
Signature · 1 line
1.6.5.3
PATCH 5/39 KVM: Fix the explanation of write_emulated
In reply to Avi KivityFrom: Takuya Yoshikawa <[email protected]>
The explanation of write_emulated is confused with that of read_emulated. This patch fix it.
--- arch/x86/include/asm/kvm_emulate.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/include/asm/kvm_emulate.h +1 -1
@@ -74,7 +74,7 @@ struct x86_emulate_ops { struct kvm_vcpu *vcpu);/* -* write_emulated: Read bytes from emulated/special memory area. +* write_emulated: Write bytes to emulated/special memory area. * @addr: [IN ] Linear address to which to write. * @val: [IN ] Value to write to memory (low-order bytes used as * required).
Signature · 1 line
1.6.5.3
PATCH 6/39 KVM: PPC: Use accessor functions for GPR access
In reply to Avi KivityFrom: Alexander Graf <[email protected]>
All code in PPC KVM currently accesses gprs in the vcpu struct directly.
While there's nothing wrong with that wrt the current way gprs are stored and loaded, it doesn't suffice for the PACA acceleration that will follow in this patchset.
So let's just create little wrapper inline functions that we call whenever a GPR needs to be read from or written to. The compiled code shouldn't really change at all for now.
--- arch/powerpc/include/asm/kvm_ppc.h | 26 ++++++++ arch/powerpc/kvm/44x_emulate.c | 25 ++++---- arch/powerpc/kvm/44x_tlb.c | 14 ++-- arch/powerpc/kvm/book3s.c | 8 +- arch/powerpc/kvm/book3s_64_emulate.c | 77 +++++++++++++------------ arch/powerpc/kvm/booke.c | 16 +++--- arch/powerpc/kvm/booke_emulate.c | 107 +++++++++++++++++----------------- arch/powerpc/kvm/e500_emulate.c | 95 ++++++++++++++++-------------- arch/powerpc/kvm/e500_tlb.c | 4 +- arch/powerpc/kvm/emulate.c | 106 ++++++++++++++++++--------------- arch/powerpc/kvm/powerpc.c | 21 ++++--- 11 files changed, 274 insertions(+), 225 deletions(-)
arch/powerpc/include/asm/kvm_ppc.h +26 -0
@@ -96,4 +96,30 @@ extern void kvmppc_booke_exit(void);extern void kvmppc_core_destroy_mmu (struct kvm_vcpu *vcpu); +#ifdef CONFIG_PPC_BOOK3S + +static inline void kvmppc_set_gpr (struct kvm_vcpu *vcpu,int num,ulong val) +{ + vcpu->arch.gpr[num] = val; +} + +static inline ulong kvmppc_get_gpr (struct kvm_vcpu *vcpu,int num) +{ +return vcpu->arch.gpr[num]; +} + +#else + +static inline void kvmppc_set_gpr (struct kvm_vcpu *vcpu,int num,ulong val) +{ + vcpu->arch.gpr[num] = val; +} + +static inline ulong kvmppc_get_gpr (struct kvm_vcpu *vcpu,int num) +{ +return vcpu->arch.gpr[num]; +} + +#endif +#endif /* __POWERPC_KVM_PPC_H__ */
arch/powerpc/kvm/44x_emulate.c +13 -12
@@ -65,13 +65,14 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,*/ switch (dcrn) {case DCRN_CPR0_CONFIG_ADDR : - vcpu->arch.gpr[rt] = vcpu->arch.cpr0_cfgaddr; +kvmppc_set_gpr (vcpu, rt, vcpu->arch.cpr0_cfgaddr);break ;case DCRN_CPR0_CONFIG_DATA :local_irq_disable ();mtdcr (DCRN_CPR0_CONFIG_ADDR , vcpu->arch.cpr0_cfgaddr); - vcpu->arch.gpr[rt] =mfdcr (DCRN_CPR0_CONFIG_DATA ); +kvmppc_set_gpr (vcpu, rt, +mfdcr (DCRN_CPR0_CONFIG_DATA ));local_irq_enable ();break ;default :
@@ -93,11 +94,11 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,/* emulate some access in kernel */ switch (dcrn) {case DCRN_CPR0_CONFIG_ADDR : - vcpu->arch.cpr0_cfgaddr = vcpu->arch.gpr[rs]; + vcpu->arch.cpr0_cfgaddr =kvmppc_get_gpr (vcpu, rs);break ;default : run->dcr.dcrn = dcrn; - run->dcr.data = vcpu->arch.gpr[rs]; + run->dcr.data =kvmppc_get_gpr (vcpu, rs); run->dcr.is_write =1 ; vcpu->arch.dcr_needed =1 ;kvmppc_account_exit (vcpu,DCR_EXITS );
@@ -146,13 +147,13 @@ int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs)switch (sprn) {case SPRN_PID : -kvmppc_set_pid (vcpu, vcpu->arch.gpr[rs]);break ; +kvmppc_set_pid (vcpu,kvmppc_get_gpr (vcpu, rs));break ;case SPRN_MMUCR : - vcpu->arch.mmucr = vcpu->arch.gpr[rs];break ; + vcpu->arch.mmucr =kvmppc_get_gpr (vcpu, rs);break ;case SPRN_CCR0 : - vcpu->arch.ccr0 = vcpu->arch.gpr[rs];break ; + vcpu->arch.ccr0 =kvmppc_get_gpr (vcpu, rs);break ;case SPRN_CCR1 : - vcpu->arch.ccr1 = vcpu->arch.gpr[rs];break ; + vcpu->arch.ccr1 =kvmppc_get_gpr (vcpu, rs);break ;default : emulated =kvmppc_booke_emulate_mtspr (vcpu, sprn, rs); }
@@ -167,13 +168,13 @@ int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt)switch (sprn) {case SPRN_PID : - vcpu->arch.gpr[rt] = vcpu->arch.pid;break ; +kvmppc_set_gpr (vcpu, rt, vcpu->arch.pid);break ;case SPRN_MMUCR : - vcpu->arch.gpr[rt] = vcpu->arch.mmucr;break ; +kvmppc_set_gpr (vcpu, rt, vcpu->arch.mmucr);break ;case SPRN_CCR0 : - vcpu->arch.gpr[rt] = vcpu->arch.ccr0;break ; +kvmppc_set_gpr (vcpu, rt, vcpu->arch.ccr0);break ;case SPRN_CCR1 : - vcpu->arch.gpr[rt] = vcpu->arch.ccr1;break ; +kvmppc_set_gpr (vcpu, rt, vcpu->arch.ccr1);break ;default : emulated =kvmppc_booke_emulate_mfspr (vcpu, sprn, rt); }
arch/powerpc/kvm/44x_tlb.c +7 -7
@@ -439,7 +439,7 @@ int kvmppc_44x_emul_tlbwe(struct kvm_vcpu *vcpu, u8 ra, u8 rs, u8 ws)struct kvmppc_44x_tlbe *tlbe;unsigned int gtlb_index; - gtlb_index = vcpu->arch.gpr[ra]; + gtlb_index =kvmppc_get_gpr (vcpu, ra);if (gtlb_index > KVM44x_GUEST_TLB_SIZE) {printk ("%s: index %d\n" , __func__, gtlb_index);kvmppc_dump_vcpu (vcpu);
@@ -455,15 +455,15 @@ int kvmppc_44x_emul_tlbwe(struct kvm_vcpu *vcpu, u8 ra, u8 rs, u8 ws)switch (ws) {case PPC44x_TLB_PAGEID: tlbe->tid =get_mmucr_stid (vcpu); - tlbe->word0 = vcpu->arch.gpr[rs]; + tlbe->word0 =kvmppc_get_gpr (vcpu, rs);break ;case PPC44x_TLB_XLAT: - tlbe->word1 = vcpu->arch.gpr[rs]; + tlbe->word1 =kvmppc_get_gpr (vcpu, rs);break ;case PPC44x_TLB_ATTRIB: - tlbe->word2 = vcpu->arch.gpr[rs]; + tlbe->word2 =kvmppc_get_gpr (vcpu, rs);break ;default :
@@ -500,9 +500,9 @@ int kvmppc_44x_emul_tlbsx(struct kvm_vcpu *vcpu, u8 rt, u8 ra, u8 rb, u8 rc)unsigned int as =get_mmucr_sts (vcpu);unsigned int pid =get_mmucr_stid (vcpu); - ea = vcpu->arch.gpr[rb]; + ea =kvmppc_get_gpr (vcpu, rb);if (ra) - ea += vcpu->arch.gpr[ra]; + ea +=kvmppc_get_gpr (vcpu, ra); gtlb_index =kvmppc_44x_tlb_index (vcpu, ea, pid, as);if (rc) {
@@ -511,7 +511,7 @@ int kvmppc_44x_emul_tlbsx(struct kvm_vcpu *vcpu, u8 rt, u8 ra, u8 rb, u8 rc)else vcpu->arch.cr |=0x20000000 ; } - vcpu->arch.gpr[rt] = gtlb_index; +kvmppc_set_gpr (vcpu, rt, gtlb_index);kvmppc_set_exit_type (vcpu,EMULATED_TLBSX_EXITS );return EMULATE_DONE ;
arch/powerpc/kvm/book3s.c +4 -4
@@ -658,7 +658,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, }case BOOK3S_INTERRUPT_SYSCALL :#ifdef EXIT_DEBUG -printk (KERN_INFO "Syscall Nr %d\n" , (int )vcpu->arch.gpr[0 ]); +printk (KERN_INFO "Syscall Nr %d\n" , (int )kvmppc_get_gpr (vcpu,0 ));#endif vcpu->stat.syscall_exits++;kvmppc_book3s_queue_irqprio (vcpu, exit_nr);
@@ -734,7 +734,7 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) regs->sprg7 = vcpu->arch.sprg6;for (i =0 ; i <ARRAY_SIZE (regs->gpr); i++) - regs->gpr[i] = vcpu->arch.gpr[i]; + regs->gpr[i] =kvmppc_get_gpr (vcpu, i);return 0 ; }
@@ -759,8 +759,8 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) vcpu->arch.sprg6 = regs->sprg5; vcpu->arch.sprg7 = regs->sprg6; -for (i =0 ; i <ARRAY_SIZE (vcpu->arch.gpr); i++) - vcpu->arch.gpr[i] = regs->gpr[i]; +for (i =0 ; i <ARRAY_SIZE (regs->gpr); i++) +kvmppc_set_gpr (vcpu, i, regs->gpr[i]);return 0 ; }
arch/powerpc/kvm/book3s_64_emulate.c +40 -37
205 lines not on this page · raw message
arch/powerpc/kvm/booke.c +8 -8
@@ -69,10 +69,10 @@ void kvmppc_dump_vcpu(struct kvm_vcpu *vcpu)for (i =0 ; i <32 ; i +=4 ) {printk ("gpr%02d: %08lx %08lx %08lx %08lx\n" , i, - vcpu->arch.gpr[i], - vcpu->arch.gpr[i+1 ], - vcpu->arch.gpr[i+2 ], - vcpu->arch.gpr[i+3 ]); +kvmppc_get_gpr (vcpu, i), +kvmppc_get_gpr (vcpu, i+1 ), +kvmppc_get_gpr (vcpu, i+2 ), +kvmppc_get_gpr (vcpu, i+3 )); } }
@@ -431,7 +431,7 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) { vcpu->arch.pc =0 ; vcpu->arch.msr =0 ; - vcpu->arch.gpr[1 ] = (16 <<20 ) -8 ;/* -8 for the callee-save LR slot */ +kvmppc_set_gpr (vcpu,1 , (16 <<20 ) -8 );/* -8 for the callee-save LR slot */ vcpu->arch.shadow_pid =1 ;
@@ -466,7 +466,7 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) regs->sprg7 = vcpu->arch.sprg6;for (i =0 ; i <ARRAY_SIZE (regs->gpr); i++) - regs->gpr[i] = vcpu->arch.gpr[i]; + regs->gpr[i] =kvmppc_get_gpr (vcpu, i);return 0 ; }
@@ -491,8 +491,8 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) vcpu->arch.sprg6 = regs->sprg5; vcpu->arch.sprg7 = regs->sprg6; -for (i =0 ; i <ARRAY_SIZE (vcpu->arch.gpr); i++) - vcpu->arch.gpr[i] = regs->gpr[i]; +for (i =0 ; i <ARRAY_SIZE (regs->gpr); i++) +kvmppc_set_gpr (vcpu, i, regs->gpr[i]);return 0 ; }
arch/powerpc/kvm/booke_emulate.c +54 -53
225 lines not on this page · raw message
arch/powerpc/kvm/e500_emulate.c +52 -43
169 lines not on this page · raw message
arch/powerpc/kvm/e500_tlb.c +2 -2
@@ -417,7 +417,7 @@ int kvmppc_e500_emul_tlbivax(struct kvm_vcpu *vcpu, int ra, int rb)int esel, tlbsel;gva_t ea; - ea = ((ra) ? vcpu->arch.gpr[ra] :0 ) + vcpu->arch.gpr[rb]; + ea = ((ra) ?kvmppc_get_gpr (vcpu, ra) :0 ) +kvmppc_get_gpr (vcpu, rb); ia = (ea >>2 ) &0x1 ;
@@ -470,7 +470,7 @@ int kvmppc_e500_emul_tlbsx(struct kvm_vcpu *vcpu, int rb)struct tlbe *gtlbe =NULL ;gva_t ea; - ea = vcpu->arch.gpr[rb]; + ea =kvmppc_get_gpr (vcpu, rb);for (tlbsel =0 ; tlbsel <2 ; tlbsel++) { esel =kvmppc_e500_tlb_index (vcpu_e500, ea, tlbsel, pid, as);
arch/powerpc/kvm/emulate.c +57 -49
269 lines not on this page · raw message
arch/powerpc/kvm/powerpc.c +11 -10
@@ -270,34 +270,35 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,static void kvmppc_complete_dcr_load (struct kvm_vcpu *vcpu,struct kvm_run *run) { -ulong *gpr = &vcpu->arch.gpr[vcpu->arch.io_gpr]; - *gpr = run->dcr.data; +kvmppc_set_gpr (vcpu, vcpu->arch.io_gpr, run->dcr.data); }static void kvmppc_complete_mmio_load (struct kvm_vcpu *vcpu,struct kvm_run *run) { -ulong *gpr = &vcpu->arch.gpr[vcpu->arch.io_gpr]; +ulong gpr; -if (run->mmio.len >sizeof (*gpr)) { +if (run->mmio.len >sizeof (gpr)) {printk (KERN_ERR "bad MMIO length: %d\n" , run->mmio.len);return ; }if (vcpu->arch.mmio_is_bigendian) {switch (run->mmio.len) { -case 4 : *gpr = *(u32 *)run->mmio.data;break ; -case 2 : *gpr = *(u16 *)run->mmio.data;break ; -case 1 : *gpr = *(u8 *)run->mmio.data;break ; +case 4 : gpr = *(u32 *)run->mmio.data;break ; +case 2 : gpr = *(u16 *)run->mmio.data;break ; +case 1 : gpr = *(u8 *)run->mmio.data;break ; } }else {/* Convert BE data from userland back to LE. */ switch (run->mmio.len) { -case 4 : *gpr =ld_le32 ((u32 *)run->mmio.data);break ; -case 2 : *gpr =ld_le16 ((u16 *)run->mmio.data);break ; -case 1 : *gpr = *(u8 *)run->mmio.data;break ; +case 4 : gpr =ld_le32 ((u32 *)run->mmio.data);break ; +case 2 : gpr =ld_le16 ((u16 *)run->mmio.data);break ; +case 1 : gpr = *(u8 *)run->mmio.data;break ; } } + +kvmppc_set_gpr (vcpu, vcpu->arch.io_gpr, gpr); } int kvmppc_handle_load(struct kvm_run *run, struct kvm_vcpu *vcpu,
Signature · 1 line
1.6.5.3
PATCH 7/39 KVM: PPC: Add helpers for CR, XER
In reply to Avi KivityFrom: Alexander Graf <[email protected]>
We now have helpers for the GPRs, so let's also add some for CR and XER.
Having them in the PACA simplifies code a lot, as we don't need to care about where to store CC or not to overflow any integers.
--- arch/powerpc/include/asm/kvm_ppc.h | 40 ++++++++++++++++++++++++++++++++++++ arch/powerpc/kvm/44x_tlb.c | 6 +++- arch/powerpc/kvm/book3s.c | 8 +++--- arch/powerpc/kvm/booke.c | 8 +++--- 4 files changed, 52 insertions(+), 10 deletions(-)
arch/powerpc/include/asm/kvm_ppc.h +40 -0
@@ -108,6 +108,26 @@ static inline ulong kvmppc_get_gpr(struct kvm_vcpu *vcpu, int num) return vcpu->arch.gpr[num]; } +static inline void kvmppc_set_cr (struct kvm_vcpu *vcpu,u32 val) +{ + vcpu->arch.cr = val; +} + +static inline u32 kvmppc_get_cr (struct kvm_vcpu *vcpu) +{ +return vcpu->arch.cr; +} + +static inline void kvmppc_set_xer (struct kvm_vcpu *vcpu,u32 val) +{ + vcpu->arch.xer = val; +} + +static inline u32 kvmppc_get_xer (struct kvm_vcpu *vcpu) +{ +return vcpu->arch.xer; +} +#else static inline void kvmppc_set_gpr (struct kvm_vcpu *vcpu,int num,ulong val)
@@ -120,6 +140,26 @@ static inline ulong kvmppc_get_gpr(struct kvm_vcpu *vcpu, int num)return vcpu->arch.gpr[num]; } +static inline void kvmppc_set_cr (struct kvm_vcpu *vcpu,u32 val) +{ + vcpu->arch.cr = val; +} + +static inline u32 kvmppc_get_cr (struct kvm_vcpu *vcpu) +{ +return vcpu->arch.cr; +} + +static inline void kvmppc_set_xer (struct kvm_vcpu *vcpu,u32 val) +{ + vcpu->arch.xer = val; +} + +static inline u32 kvmppc_get_xer (struct kvm_vcpu *vcpu) +{ +return vcpu->arch.xer; +} +#endif #endif /* __POWERPC_KVM_PPC_H__ */
arch/powerpc/kvm/44x_tlb.c +4 -2
@@ -506,10 +506,12 @@ int kvmppc_44x_emul_tlbsx(struct kvm_vcpu *vcpu, u8 rt, u8 ra, u8 rb, u8 rc) gtlb_index =kvmppc_44x_tlb_index (vcpu, ea, pid, as);if (rc) { +u32 cr =kvmppc_get_cr (vcpu); +if (gtlb_index <0 ) - vcpu->arch.cr &= ~0x20000000 ; +kvmppc_set_cr (vcpu, cr & ~0x20000000 );else - vcpu->arch.cr |=0x20000000 ; +kvmppc_set_cr (vcpu, cr |0x20000000 ); }kvmppc_set_gpr (vcpu, rt, gtlb_index);
arch/powerpc/kvm/book3s.c +4 -4
@@ -717,10 +717,10 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)int i; regs->pc = vcpu->arch.pc; - regs->cr = vcpu->arch.cr; + regs->cr =kvmppc_get_cr (vcpu); regs->ctr = vcpu->arch.ctr; regs->lr = vcpu->arch.lr; - regs->xer = vcpu->arch.xer; + regs->xer =kvmppc_get_xer (vcpu); regs->msr = vcpu->arch.msr; regs->srr0 = vcpu->arch.srr0; regs->srr1 = vcpu->arch.srr1;
@@ -744,10 +744,10 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)int i; vcpu->arch.pc = regs->pc; - vcpu->arch.cr = regs->cr; +kvmppc_set_cr (vcpu, regs->cr); vcpu->arch.ctr = regs->ctr; vcpu->arch.lr = regs->lr; - vcpu->arch.xer = regs->xer; +kvmppc_set_xer (vcpu, regs->xer);kvmppc_set_msr (vcpu, regs->msr); vcpu->arch.srr0 = regs->srr0; vcpu->arch.srr1 = regs->srr1;
arch/powerpc/kvm/booke.c +4 -4
@@ -449,10 +449,10 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)int i; regs->pc = vcpu->arch.pc; - regs->cr = vcpu->arch.cr; + regs->cr =kvmppc_get_cr (vcpu); regs->ctr = vcpu->arch.ctr; regs->lr = vcpu->arch.lr; - regs->xer = vcpu->arch.xer; + regs->xer =kvmppc_get_xer (vcpu); regs->msr = vcpu->arch.msr; regs->srr0 = vcpu->arch.srr0; regs->srr1 = vcpu->arch.srr1;
@@ -476,10 +476,10 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)int i; vcpu->arch.pc = regs->pc; - vcpu->arch.cr = regs->cr; +kvmppc_set_cr (vcpu, regs->cr); vcpu->arch.ctr = regs->ctr; vcpu->arch.lr = regs->lr; - vcpu->arch.xer = regs->xer; +kvmppc_set_xer (vcpu, regs->xer);kvmppc_set_msr (vcpu, regs->msr); vcpu->arch.srr0 = regs->srr0; vcpu->arch.srr1 = regs->srr1;
Signature · 1 line
1.6.5.3
PATCH 8/39 KVM: PPC: Use PACA backed shadow vcpu
In reply to Avi KivityFrom: Alexander Graf <[email protected]>
We're being horribly racy right now. All the entry and exit code hijacks random fields from the PACA that could easily be used by different code in case we get interrupted, for example by a #MC or even page fault.
After discussing this with Ben, we figured it's best to reserve some more space in the PACA and just shove off some vcpu state to there.
That way we can drastically improve the readability of the code, make it less racy and less complex.
--- arch/powerpc/include/asm/kvm_book3s.h | 2 + arch/powerpc/include/asm/kvm_book3s_64_asm.h | 19 +++ arch/powerpc/include/asm/kvm_host.h | 5 +- arch/powerpc/include/asm/kvm_ppc.h | 20 ++- arch/powerpc/include/asm/paca.h | 5 + arch/powerpc/kernel/asm-offsets.c | 33 ++++- arch/powerpc/kvm/book3s.c | 4 + arch/powerpc/kvm/book3s_64_interrupts.S | 216 +++++++++----------------- arch/powerpc/kvm/book3s_64_rmhandlers.S | 32 +--- arch/powerpc/kvm/book3s_64_slb.S | 150 +++++++++++------- 10 files changed, 249 insertions(+), 237 deletions(-)
arch/powerpc/include/asm/kvm_book3s.h +2 -0
@@ -23,6 +23,7 @@#include <linux/types.h> #include <linux/kvm_host.h> #include <asm/kvm_ppc.h> +#include <asm/kvm_book3s_64_asm.h> struct kvmppc_slb {u64 esid;
@@ -69,6 +70,7 @@ struct kvmppc_sid_map {struct kvmppc_vcpu_book3s {struct kvm_vcpu vcpu; +struct kvmppc_book3s_shadow_vcpu shadow_vcpu;struct kvmppc_sid_map sid_map[SID_MAP_NUM ];struct kvmppc_slb slb[64 ];struct {
arch/powerpc/include/asm/kvm_book3s_64_asm.h +19 -0
@@ -20,6 +20,8 @@#ifndef __ASM_KVM_BOOK3S_ASM_H__#define __ASM_KVM_BOOK3S_ASM_H__ +#ifdef __ASSEMBLY__ +#ifdef CONFIG_KVM_BOOK3S_64_HANDLER #include <asm/kvm_asm.h>
@@ -55,4 +57,21 @@ kvmppc_resume_\intno:#endif /* CONFIG_KVM_BOOK3S_64_HANDLER */ +#else /*__ASSEMBLY__ */ + +struct kvmppc_book3s_shadow_vcpu { +ulong gpr[14 ]; +u32 cr; +u32 xer; +ulong host_r1; +ulong host_r2; +ulong handler; +ulong scratch0; +ulong scratch1; +ulong vmhandler; +ulong rmhandler; +}; + +#endif /*__ASSEMBLY__ */ +#endif /* __ASM_KVM_BOOK3S_ASM_H__ */
arch/powerpc/include/asm/kvm_host.h +4 -1
@@ -175,10 +175,13 @@ struct kvm_vcpu_arch {ulong gpr[32 ];ulong pc; -u32 cr;ulong ctr;ulong lr; + +#ifdef CONFIG_BOOKE ulong xer; +u32 cr; +#endif ulong msr;#ifdef CONFIG_PPC64
arch/powerpc/include/asm/kvm_ppc.h +14 -6
@@ -98,34 +98,42 @@ extern void kvmppc_core_destroy_mmu(struct kvm_vcpu *vcpu);#ifdef CONFIG_PPC_BOOK3S +/* We assume we're always acting on the current vcpu */ +static inline void kvmppc_set_gpr (struct kvm_vcpu *vcpu,int num,ulong val) { - vcpu->arch.gpr[num] = val; +if ( num <14 ) +get_paca ()->shadow_vcpu.gpr[num] = val; +else + vcpu->arch.gpr[num] = val; }static inline ulong kvmppc_get_gpr (struct kvm_vcpu *vcpu,int num) { -return vcpu->arch.gpr[num]; +if ( num <14 ) +return get_paca ()->shadow_vcpu.gpr[num]; +else +return vcpu->arch.gpr[num]; }static inline void kvmppc_set_cr (struct kvm_vcpu *vcpu,u32 val) { - vcpu->arch.cr = val; +get_paca ()->shadow_vcpu.cr = val; }static inline u32 kvmppc_get_cr (struct kvm_vcpu *vcpu) { -return vcpu->arch.cr; +return get_paca ()->shadow_vcpu.cr; }static inline void kvmppc_set_xer (struct kvm_vcpu *vcpu,u32 val) { - vcpu->arch.xer = val; +get_paca ()->shadow_vcpu.xer = val; }static inline u32 kvmppc_get_xer (struct kvm_vcpu *vcpu) { -return vcpu->arch.xer; +return get_paca ()->shadow_vcpu.xer; }#else
arch/powerpc/include/asm/paca.h +5 -0
@@ -19,6 +19,9 @@#include <asm/mmu.h> #include <asm/page.h> #include <asm/exception-64e.h> +#ifdef CONFIG_KVM_BOOK3S_64_HANDLER +#include <asm/kvm_book3s_64_asm.h> +#endif registerstruct paca_struct *local_paca asm("r13" );
@@ -135,6 +138,8 @@ struct paca_struct {u64 esid; u64 vsid; } kvm_slb[64 ];/* guest SLB */ +/* We use this to store guest state in */ +struct kvmppc_book3s_shadow_vcpu shadow_vcpu;u8 kvm_slb_max;/* highest used guest slb entry */ u8 kvm_in_guest;/* are we inside the guest? */ #endif
arch/powerpc/kernel/asm-offsets.c +30 -3
@@ -194,6 +194,32 @@ int main(void)DEFINE (PACA_KVM_IN_GUEST , offsetof(struct paca_struct , kvm_in_guest));DEFINE (PACA_KVM_SLB , offsetof(struct paca_struct , kvm_slb));DEFINE (PACA_KVM_SLB_MAX , offsetof(struct paca_struct , kvm_slb_max)); + DEFINE(PACA_KVM_CR, offsetof(struct paca_struct, shadow_vcpu.cr)); + DEFINE(PACA_KVM_XER, offsetof(struct paca_struct, shadow_vcpu.xer)); + DEFINE(PACA_KVM_R0, offsetof(struct paca_struct, shadow_vcpu.gpr[0])); + DEFINE(PACA_KVM_R1, offsetof(struct paca_struct, shadow_vcpu.gpr[1])); + DEFINE(PACA_KVM_R2, offsetof(struct paca_struct, shadow_vcpu.gpr[2])); + DEFINE(PACA_KVM_R3, offsetof(struct paca_struct, shadow_vcpu.gpr[3])); + DEFINE(PACA_KVM_R4, offsetof(struct paca_struct, shadow_vcpu.gpr[4])); + DEFINE(PACA_KVM_R5, offsetof(struct paca_struct, shadow_vcpu.gpr[5])); + DEFINE(PACA_KVM_R6, offsetof(struct paca_struct, shadow_vcpu.gpr[6])); + DEFINE(PACA_KVM_R7, offsetof(struct paca_struct, shadow_vcpu.gpr[7])); + DEFINE(PACA_KVM_R8, offsetof(struct paca_struct, shadow_vcpu.gpr[8])); + DEFINE(PACA_KVM_R9, offsetof(struct paca_struct, shadow_vcpu.gpr[9])); + DEFINE(PACA_KVM_R10, offsetof(struct paca_struct, shadow_vcpu.gpr[10])); + DEFINE(PACA_KVM_R11, offsetof(struct paca_struct, shadow_vcpu.gpr[11])); + DEFINE(PACA_KVM_R12, offsetof(struct paca_struct, shadow_vcpu.gpr[12])); + DEFINE(PACA_KVM_R13, offsetof(struct paca_struct, shadow_vcpu.gpr[13])); + DEFINE(PACA_KVM_HOST_R1, offsetof(struct paca_struct, shadow_vcpu.host_r1)); + DEFINE(PACA_KVM_HOST_R2, offsetof(struct paca_struct, shadow_vcpu.host_r2)); +DEFINE (PACA_KVM_VMHANDLER , offsetof(struct paca_struct , + shadow_vcpu.vmhandler)); +DEFINE (PACA_KVM_RMHANDLER , offsetof(struct paca_struct , + shadow_vcpu.rmhandler)); +DEFINE (PACA_KVM_SCRATCH0 , offsetof(struct paca_struct , + shadow_vcpu.scratch0)); +DEFINE (PACA_KVM_SCRATCH1 , offsetof(struct paca_struct , + shadow_vcpu.scratch1));#endif #endif /* CONFIG_PPC64 */
@@ -389,8 +415,6 @@ int main(void) DEFINE(VCPU_HOST_PID, offsetof(struct kvm_vcpu, arch.host_pid)); DEFINE(VCPU_GPRS, offsetof(struct kvm_vcpu, arch.gpr)); DEFINE(VCPU_LR, offsetof(struct kvm_vcpu, arch.lr)); - DEFINE(VCPU_CR, offsetof(struct kvm_vcpu, arch.cr)); - DEFINE(VCPU_XER, offsetof(struct kvm_vcpu, arch.xer)); DEFINE(VCPU_CTR, offsetof(struct kvm_vcpu, arch.ctr)); DEFINE(VCPU_PC, offsetof(struct kvm_vcpu, arch.pc)); DEFINE(VCPU_MSR, offsetof(struct kvm_vcpu, arch.msr));
@@ -415,7 +439,10 @@ int main(void) DEFINE(VCPU_TRAMPOLINE_ENTER, offsetof(struct kvm_vcpu, arch.trampoline_enter)); DEFINE(VCPU_HIGHMEM_HANDLER, offsetof(struct kvm_vcpu, arch.highmem_handler)); DEFINE(VCPU_HFLAGS, offsetof(struct kvm_vcpu, arch.hflags)); -#endif +#else + DEFINE(VCPU_CR, offsetof(struct kvm_vcpu, arch.cr)); + DEFINE(VCPU_XER, offsetof(struct kvm_vcpu, arch.xer)); +#endif /* CONFIG_PPC64 */ #endif #ifdef CONFIG_44xDEFINE (PGD_T_LOG2 ,PGD_T_LOG2 );
arch/powerpc/kvm/book3s.c +4 -0
@@ -66,12 +66,16 @@ void kvmppc_core_load_guest_debugstate(struct kvm_vcpu *vcpu)void kvmppc_core_vcpu_load (struct kvm_vcpu *vcpu,int cpu) {memcpy (get_paca ()->kvm_slb,to_book3s (vcpu)->slb_shadow,sizeof (get_paca ()->kvm_slb)); +memcpy (&get_paca ()->shadow_vcpu, &to_book3s (vcpu)->shadow_vcpu, +sizeof (get_paca ()->shadow_vcpu));get_paca ()->kvm_slb_max =to_book3s (vcpu)->slb_shadow_max; }void kvmppc_core_vcpu_put (struct kvm_vcpu *vcpu) {memcpy (to_book3s (vcpu)->slb_shadow,get_paca ()->kvm_slb,sizeof (get_paca ()->kvm_slb)); +memcpy (&to_book3s (vcpu)->shadow_vcpu, &get_paca ()->shadow_vcpu, +sizeof (get_paca ()->shadow_vcpu));to_book3s (vcpu)->slb_shadow_max =get_paca ()->kvm_slb_max; }
arch/powerpc/kvm/book3s_64_interrupts.S +73 -143
301 lines not on this page · raw message
arch/powerpc/kvm/book3s_64_rmhandlers.S +8 -24
@@ -45,37 +45,21 @@ kvmppc_trampoline_\intno: * To distinguish, we check a magic byte in the PACA */ mfspr r13, SPRN_SPRG_PACA /* r13 = PACA */ - std r12, (PACA_EXMC + EX_R12)(r13) + std r12, PACA_KVM_SCRATCH0(r13) mfcr r12 - stw r12, (PACA_EXMC + EX_CCR)(r13) + stw r12, PACA_KVM_SCRATCH1(r13) lbz r12, PACA_KVM_IN_GUEST(r13) cmpwi r12, 0 bne ..kvmppc_handler_hasmagic_\intno /* No KVM guest? Then jump back to the Linux handler! */ - lwz r12, (PACA_EXMC + EX_CCR)(r13) + lwz r12, PACA_KVM_SCRATCH1(r13) mtcr r12 - ld r12, (PACA_EXMC + EX_R12)(r13) + ld r12, PACA_KVM_SCRATCH0(r13) mfspr r13, SPRN_SPRG_SCRATCH0 /* r13 = original r13 */ b kvmppc_resume_\intno /* Get back original handler */ /* Now we know we're handling a KVM guest */ ..kvmppc_handler_hasmagic_\intno: - /* Unset guest state */ - li r12, 0 - stb r12, PACA_KVM_IN_GUEST(r13) - - std r1, (PACA_EXMC+EX_R9)(r13) - std r10, (PACA_EXMC+EX_R10)(r13) - std r11, (PACA_EXMC+EX_R11)(r13) - std r2, (PACA_EXMC+EX_R13)(r13) - - mfsrr0 r10 - mfsrr1 r11 - - /* Restore R1/R2 so we can handle faults */ - ld r1, PACAR1(r13) - ld r2, (PACA_EXMC+EX_SRR0)(r13) - /* Let's store which interrupt we're handling */ li r12, \intno
@@ -106,16 +90,16 @@ INTERRUPT_TRAMPOLINE BOOK3S_INTERRUPT_VSX * * Input Registers: * - * R6 = SRR0 - * R7 = SRR1 + * R5 = SRR0 + * R6 = SRR1 * LR = real-mode IP * */ .global kvmppc_handler_lowmem_trampoline kvmppc_handler_lowmem_trampoline: - mtsrr0 r6 - mtsrr1 r7 + mtsrr0 r5 + mtsrr1 r6 blr kvmppc_handler_lowmem_trampoline_end:
arch/powerpc/kvm/book3s_64_slb.S +90 -60
198 lines not on this page · raw message
Signature · 1 line
1.6.5.3
PATCH 9/39 KVM: PPC: Implement 'skip instruction' mode
In reply to Avi KivityFrom: Alexander Graf <[email protected]>
To fetch the last instruction we were interrupted on, we enable DR in early exit code, where we are still in a very transitional phase between guest and host state.
Most of the time this seemed to work, but another CPU can easily flush our TLB and HTAB which makes us go in the Linux page fault handler which totally breaks because we still use the guest's SLB entries.
To work around that, let's introduce a second KVM guest mode that defines that whenever we get a trap, we don't call the Linux handler or go into the KVM exit code, but just jump over the faulting instruction.
That way a potentially bad lwz doesn't trigger any faults and we can later on interpret the invalid instruction we fetched as "fetch didn't work".
--- arch/powerpc/include/asm/kvm_asm.h | 6 ++++ arch/powerpc/kvm/book3s_64_rmhandlers.S | 39 ++++++++++++++++++++++++++++++- arch/powerpc/kvm/book3s_64_slb.S | 16 ++++++++---- arch/powerpc/kvm/emulate.c | 4 +++ 4 files changed, 59 insertions(+), 6 deletions(-)
arch/powerpc/include/asm/kvm_asm.h +6 -0
@@ -97,4 +97,10 @@#define RESUME_HOST RESUME_FLAG_HOST#define RESUME_HOST_NV (RESUME_FLAG_HOST|RESUME_FLAG_NV) +#define KVM_GUEST_MODE_NONE 0 +#define KVM_GUEST_MODE_GUEST 1 +#define KVM_GUEST_MODE_SKIP 2 + +#define KVM_INST_FETCH_FAILED -1 +#endif /* __POWERPC_KVM_ASM_H__ */
arch/powerpc/kvm/book3s_64_rmhandlers.S +38 -1
@@ -49,7 +49,7 @@ kvmppc_trampoline_\intno: mfcr r12 stw r12, PACA_KVM_SCRATCH1(r13) lbz r12, PACA_KVM_IN_GUEST(r13) - cmpwi r12, 0 + cmpwi r12, KVM_GUEST_MODE_NONE bne ..kvmppc_handler_hasmagic_\intno /* No KVM guest? Then jump back to the Linux handler! */ lwz r12, PACA_KVM_SCRATCH1(r13)
@@ -60,6 +60,11 @@ kvmppc_trampoline_\intno: /* Now we know we're handling a KVM guest */ ..kvmppc_handler_hasmagic_\intno: + + /* Should we just skip the faulting instruction? */ + cmpwi r12, KVM_GUEST_MODE_SKIP + beq kvmppc_handler_skip_ins + /* Let's store which interrupt we're handling */ li r12, \intno
@@ -86,6 +91,38 @@ INTERRUPT_TRAMPOLINE BOOK3S_INTERRUPT_ALTIVEC INTERRUPT_TRAMPOLINE BOOK3S_INTERRUPT_VSX /* + * Bring us back to the faulting code, but skip the + * faulting instruction. + * + * This is a generic exit path from the interrupt + * trampolines above. + * + * Input Registers: + * + * R12 = free + * R13 = PACA + * PACA.KVM.SCRATCH0 = guest R12 + * PACA.KVM.SCRATCH1 = guest CR + * SPRG_SCRATCH0 = guest R13 + * + */ +kvmppc_handler_skip_ins: + + /* Patch the IP to the next instruction */ + mfsrr0 r12 + addi r12, r12, 4 + mtsrr0 r12 + + /* Clean up all state */ + lwz r12, PACA_KVM_SCRATCH1(r13) + mtcr r12 + ld r12, PACA_KVM_SCRATCH0(r13) + mfspr r13, SPRN_SPRG_SCRATCH0 + + /* And get back into the code */ + RFI + +/* * This trampoline brings us back to a real mode handler * * Input Registers:
arch/powerpc/kvm/book3s_64_slb.S +11 -5
@@ -212,10 +212,6 @@ kvmppc_handler_trampoline_exit: mfdar r5 mfdsisr r6 - /* Unset guest state */ - li r9, 0 - stb r9, PACA_KVM_IN_GUEST(r13) - /* * In order for us to easily get the last instruction, * we got the #vmexit at, we exploit the fact that the
@@ -233,18 +229,28 @@ kvmppc_handler_trampoline_exit: ld_last_inst: /* Save off the guest instruction we're at */ + + /* Set guest mode to 'jump over instruction' so if lwz faults + * we'll just continue at the next IP. */ + li r9, KVM_GUEST_MODE_SKIP + stb r9, PACA_KVM_IN_GUEST(r13) + /* 1) enable paging for data */ mfmsr r9 ori r11, r9, MSR_DR /* Enable paging for data */ mtmsr r11 /* 2) fetch the instruction */ - /* XXX implement PACA_KVM_IN_GUEST=2 path to safely jump over this */ + li r0, KVM_INST_FETCH_FAILED /* In case lwz faults */ lwz r0, 0(r3) /* 3) disable paging again */ mtmsr r9 no_ld_last_inst: + /* Unset guest mode */ + li r9, KVM_GUEST_MODE_NONE + stb r9, PACA_KVM_IN_GUEST(r13) + /* Restore bolted entries from the shadow and fix it along the way */ /* We don't store anything in entry 0, so we don't need to take care of it */
arch/powerpc/kvm/emulate.c +4 -0
@@ -143,6 +143,10 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)pr_debug (KERN_INFO "Emulating opcode %d / %d\n" ,get_op (inst),get_xop (inst)); +/* Try again next time */ +if (inst ==KVM_INST_FETCH_FAILED ) +return EMULATE_DONE ; +switch (get_op (inst)) {case OP_TRAP :#ifdef CONFIG_PPC64
Signature · 1 line
1.6.5.3
PATCH 10/39 KVM: PPC: Get rid of unnecessary RFI
In reply to Avi KivityFrom: Alexander Graf <[email protected]>
Using an RFI in IR=1 is dangerous. We need to set two SRRs and then do an RFI without getting interrupted at all, because every interrupt could potentially overwrite the SRR values.
Fortunately, we don't need to RFI in at least this particular case of the code, so we can just replace it with an mtmsr and b.
--- arch/powerpc/kvm/book3s_64_interrupts.S | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-)
arch/powerpc/kvm/book3s_64_interrupts.S +11 -11
@@ -221,15 +221,8 @@ no_dcbz32_off: mflr r5 std r5, VCPU_LR(r7) - /* XXX convert to safe function call */ - /* Restore host msr -> SRR1 */ ld r6, VCPU_HOST_MSR(r7) - mtsrr1 r6 - - /* Restore host IP -> SRR0 */ - ld r5, VCPU_HOST_RETIP(r7) - mtsrr0 r5 /* * For some interrupts, we need to call the real Linux
@@ -246,8 +239,9 @@ no_dcbz32_off: cmpwi r12, BOOK3S_INTERRUPT_DECREMENTER beq call_linux_handler - /* Back to Interruptable Mode! (goto kvm_return_point) */ - RFI + /* Back to EE=1 */ + mtmsr r6 + b kvm_return_point call_linux_handler:
@@ -260,10 +254,16 @@ call_linux_handler: * interrupt handler! * * R3 still contains the exit code, - * R6 VCPU_HOST_RETIP and - * R7 VCPU_HOST_MSR + * R5 VCPU_HOST_RETIP and + * R6 VCPU_HOST_MSR */ + /* Restore host IP -> SRR0 */ + ld r5, VCPU_HOST_RETIP(r7) + + /* XXX Better move to a safe function? + * What if we get an HTAB flush in between mtsrr0 and mtsrr1? */ + mtlr r12 ld r4, VCPU_TRAMPOLINE_LOWMEM(r7)
Signature · 1 line
1.6.5.3
PATCH 11/39 KVM: PPC: Call SLB patching code in interrupt safe manner
In reply to Avi KivityFrom: Alexander Graf <[email protected]>
Currently we're racy when doing the transition from IR=1 to IR=0, from the module memory entry code to the real mode SLB switching code.
To work around that I took a look at the RTAS entry code which is faced with a similar problem and did the same thing:
A small helper in linear mapped memory that does mtmsr with IR=0 and then RFIs info the actual handler.
Thanks to that trick we can safely take page faults in the entry code and only need to be really wary of what to do as of the SLB switching part.
--- arch/powerpc/include/asm/kvm_book3s.h | 1 + arch/powerpc/include/asm/kvm_book3s_64_asm.h | 1 - arch/powerpc/include/asm/kvm_host.h | 1 + arch/powerpc/kernel/asm-offsets.c | 3 +-- arch/powerpc/kvm/book3s.c | 1 + arch/powerpc/kvm/book3s_64_exports.c | 1 + arch/powerpc/kvm/book3s_64_interrupts.S | 25 +++++++------------------ arch/powerpc/kvm/book3s_64_rmhandlers.S | 18 ++++++++++++++++++ arch/powerpc/kvm/book3s_64_slb.S | 4 ++++ 9 files changed, 34 insertions(+), 21 deletions(-)
arch/powerpc/include/asm/kvm_book3s.h +1 -0
@@ -121,6 +121,7 @@ extern void kvmppc_set_bat(struct kvm_vcpu *vcpu, struct kvmppc_bat *bat,extern u32 kvmppc_trampoline_lowmem;extern u32 kvmppc_trampoline_enter; +extern void kvmppc_rmcall (ulong srr0,ulong srr1);static inline struct kvmppc_vcpu_book3s *to_book3s (struct kvm_vcpu *vcpu) {
arch/powerpc/include/asm/kvm_book3s_64_asm.h +0 -1
@@ -69,7 +69,6 @@ struct kvmppc_book3s_shadow_vcpu {ulong scratch0;ulong scratch1; ulong vmhandler; - ulong rmhandler; };#endif /*__ASSEMBLY__ */
arch/powerpc/include/asm/kvm_host.h +1 -0
@@ -167,6 +167,7 @@ struct kvm_vcpu_arch {ulong trampoline_lowmem;ulong trampoline_enter;ulong highmem_handler; +ulong rmcall;ulong host_paca_phys;struct kvmppc_mmu mmu;#endif
arch/powerpc/kernel/asm-offsets.c +1 -2
@@ -214,8 +214,6 @@ int main(void) DEFINE(PACA_KVM_HOST_R2, offsetof(struct paca_struct, shadow_vcpu.host_r2));DEFINE (PACA_KVM_VMHANDLER , offsetof(struct paca_struct , shadow_vcpu.vmhandler)); -DEFINE (PACA_KVM_RMHANDLER , offsetof(struct paca_struct , - shadow_vcpu.rmhandler));DEFINE (PACA_KVM_SCRATCH0 , offsetof(struct paca_struct , shadow_vcpu.scratch0)); DEFINE(PACA_KVM_SCRATCH1, offsetof(struct paca_struct,
@@ -438,6 +436,7 @@ int main(void) DEFINE(VCPU_TRAMPOLINE_LOWMEM, offsetof(struct kvm_vcpu, arch.trampoline_lowmem)); DEFINE(VCPU_TRAMPOLINE_ENTER, offsetof(struct kvm_vcpu, arch.trampoline_enter)); DEFINE(VCPU_HIGHMEM_HANDLER, offsetof(struct kvm_vcpu, arch.highmem_handler)); + DEFINE(VCPU_RMCALL, offsetof(struct kvm_vcpu, arch.rmcall)); DEFINE(VCPU_HFLAGS, offsetof(struct kvm_vcpu, arch.hflags));#else DEFINE(VCPU_CR, offsetof(struct kvm_vcpu, arch.cr));
arch/powerpc/kvm/book3s.c +1 -0
@@ -919,6 +919,7 @@ struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm, unsigned int id) vcpu->arch.trampoline_lowmem = kvmppc_trampoline_lowmem; vcpu->arch.trampoline_enter = kvmppc_trampoline_enter; vcpu->arch.highmem_handler = (ulong )kvmppc_handler_highmem; + vcpu->arch.rmcall = *(ulong *)kvmppc_rmcall; vcpu->arch.shadow_msr =MSR_USER64 ;
arch/powerpc/kvm/book3s_64_exports.c +1 -0
@@ -22,3 +22,4 @@EXPORT_SYMBOL_GPL (kvmppc_trampoline_enter);EXPORT_SYMBOL_GPL (kvmppc_trampoline_lowmem); +EXPORT_SYMBOL_GPL (kvmppc_rmcall);
arch/powerpc/kvm/book3s_64_interrupts.S +7 -18
@@ -95,17 +95,14 @@ kvm_start_entry: ld r3, VCPU_HIGHMEM_HANDLER(r4) std r3, PACA_KVM_VMHANDLER(r13) - ld r3, VCPU_TRAMPOLINE_ENTER(r4) - std r3, PACA_KVM_RMHANDLER(r13) - kvm_start_lightweight: ld r9, VCPU_PC(r4) /* r9 = vcpu->arch.pc */ ld r10, VCPU_SHADOW_MSR(r4) /* r10 = vcpu->arch.shadow_msr */ /* Load some guest state in the respective registers */ - ld r3, VCPU_CTR(r4) /* r3 = vcpu->arch.ctr */ - mtctr r3 /* CTR = r3 */ + ld r5, VCPU_CTR(r4) /* r5 = vcpu->arch.ctr */ + /* will be swapped in by rmcall */ ld r3, VCPU_LR(r4) /* r3 = vcpu->arch.lr */ mtlr r3 /* LR = r3 */
@@ -131,22 +128,14 @@ kvm_start_lightweight: no_dcbz32_on: - /* This sets the Magic value for the trampoline */ - - /* XXX this needs to move into a safe function, so we can - be sure we don't get any interrupts */ - - li r11, 1 - stb r11, PACA_KVM_IN_GUEST(r13) - - ld r3, PACA_KVM_RMHANDLER(r13) - mtsrr0 r3 + ld r6, VCPU_RMCALL(r4) + mtctr r6 - LOAD_REG_IMMEDIATE(r3, MSR_KERNEL & ~(MSR_IR | MSR_DR)) - mtsrr1 r3 + ld r3, VCPU_TRAMPOLINE_ENTER(r4) + LOAD_REG_IMMEDIATE(r4, MSR_KERNEL & ~(MSR_IR | MSR_DR)) /* Jump to SLB patching handlder and into our guest */ - RFI + bctr /* * This is the handler in module memory. It gets jumped at from the
arch/powerpc/kvm/book3s_64_rmhandlers.S +18 -0
@@ -140,6 +140,24 @@ kvmppc_handler_lowmem_trampoline: blr kvmppc_handler_lowmem_trampoline_end: +/* + * Call a function in real mode + * + * Input Registers: + * + * R3 = function + * R4 = MSR + * R5 = CTR + * + */ +_GLOBAL(kvmppc_rmcall) + mtmsr r4 /* Disable relocation, so mtsrr + doesn't get interrupted */ + mtctr r5 + mtsrr0 r3 + mtsrr1 r4 + RFI + .global kvmppc_trampoline_lowmem kvmppc_trampoline_lowmem: .long kvmppc_handler_lowmem_trampoline - _stext
arch/powerpc/kvm/book3s_64_slb.S +4 -0
@@ -63,6 +63,10 @@ kvmppc_handler_trampoline_enter: mtsrr0 r9 mtsrr1 r10 + /* Activate guest mode, so faults get handled by KVM */ + li r11, KVM_GUEST_MODE_GUEST + stb r11, PACA_KVM_IN_GUEST(r13) + /* Remove LPAR shadow entries */ #if SLB_NUM_BOLTED == 3
Signature · 1 line
1.6.5.3
PATCH 12/39 KVM: PPC: Emulate trap SRR1 flags properly
In reply to Avi KivityFrom: Alexander Graf <[email protected]>
Book3S needs some flags in SRR1 to get to know details about an interrupt.
One such example is the trap instruction. It tells the guest kernel that a program interrupt is due to a trap using a bit in SRR1.
This patch implements above behavior, making WARN_ON behave like WARN_ON.
--- arch/powerpc/include/asm/kvm_book3s.h | 1 + arch/powerpc/include/asm/kvm_ppc.h | 2 +- arch/powerpc/include/asm/reg.h | 4 ++++ arch/powerpc/kvm/book3s.c | 7 +++++-- arch/powerpc/kvm/booke.c | 3 ++- arch/powerpc/kvm/emulate.c | 2 +- 6 files changed, 14 insertions(+), 5 deletions(-)
arch/powerpc/include/asm/kvm_book3s.h +1 -0
@@ -91,6 +91,7 @@ struct kvmppc_vcpu_book3s {u64 vsid_next;u64 vsid_max;int context_id; +ulong prog_flags;/* flags to inject when giving a 700 trap */ };#define CONTEXT_HOST 0
arch/powerpc/include/asm/kvm_ppc.h +1 -1
@@ -80,7 +80,7 @@ extern void kvmppc_core_vcpu_put(struct kvm_vcpu *vcpu);extern void kvmppc_core_deliver_interrupts (struct kvm_vcpu *vcpu);extern int kvmppc_core_pending_dec (struct kvm_vcpu *vcpu); -extern void kvmppc_core_queue_program (struct kvm_vcpu *vcpu); +extern void kvmppc_core_queue_program (struct kvm_vcpu *vcpu,ulong flags);extern void kvmppc_core_queue_dec (struct kvm_vcpu *vcpu);extern void kvmppc_core_dequeue_dec (struct kvm_vcpu *vcpu); extern void kvmppc_core_queue_external(struct kvm_vcpu *vcpu,
arch/powerpc/include/asm/reg.h +4 -0
@@ -426,6 +426,10 @@#define SRR1_WAKEMT 0x00280000/* mtctrl */ #define SRR1_WAKEDEC 0x00180000/* Decrementer interrupt */ #define SRR1_WAKETHERM 0x00100000/* Thermal management interrupt */ +#define SRR1_PROGFPE 0x00100000/* Floating Point Enabled */ +#define SRR1_PROGPRIV 0x00040000/* Privileged instruction */ +#define SRR1_PROGTRAP 0x00020000/* Trap */ +#define SRR1_PROGADDR 0x00010000/* SRR0 contains subsequent addr */ #define SPRN_HSRR0 0x13A/* Save/Restore Register 0 */ #define SPRN_HSRR1 0x13B/* Save/Restore Register 1 */
arch/powerpc/kvm/book3s.c +5 -2
@@ -168,8 +168,9 @@ void kvmppc_book3s_queue_irqprio(struct kvm_vcpu *vcpu, unsigned int vec) } -void kvmppc_core_queue_program (struct kvm_vcpu *vcpu) +void kvmppc_core_queue_program (struct kvm_vcpu *vcpu,ulong flags) { +to_book3s (vcpu)->prog_flags = flags;kvmppc_book3s_queue_irqprio (vcpu,BOOK3S_INTERRUPT_PROGRAM ); }
@@ -198,6 +199,7 @@ int kvmppc_book3s_irqprio_deliver(struct kvm_vcpu *vcpu, unsigned int priority) {int deliver =1 ;int vec =0 ; +ulong flags =0ULL ;switch (priority) {case BOOK3S_IRQPRIO_DECREMENTER :
@@ -231,6 +233,7 @@ int kvmppc_book3s_irqprio_deliver(struct kvm_vcpu *vcpu, unsigned int priority)break ;case BOOK3S_IRQPRIO_PROGRAM : vec =BOOK3S_INTERRUPT_PROGRAM ; + flags =to_book3s (vcpu)->prog_flags;break ;case BOOK3S_IRQPRIO_VSX : vec =BOOK3S_INTERRUPT_VSX ;
@@ -261,7 +264,7 @@ int kvmppc_book3s_irqprio_deliver(struct kvm_vcpu *vcpu, unsigned int priority)#endif if (deliver) -kvmppc_inject_interrupt (vcpu, vec,0ULL ); +kvmppc_inject_interrupt (vcpu, vec, flags);return deliver; }
arch/powerpc/kvm/booke.c +2 -1
@@ -82,8 +82,9 @@ static void kvmppc_booke_queue_irqprio(struct kvm_vcpu *vcpu,set_bit (priority, &vcpu->arch.pending_exceptions); } -void kvmppc_core_queue_program (struct kvm_vcpu *vcpu) +void kvmppc_core_queue_program (struct kvm_vcpu *vcpu,ulong flags) { +/* BookE does flags in ESR, so ignore those we get here */ kvmppc_booke_queue_irqprio (vcpu,BOOKE_IRQPRIO_PROGRAM ); }
arch/powerpc/kvm/emulate.c +1 -1
@@ -154,7 +154,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)#else vcpu->arch.esr |=ESR_PTR ;#endif -kvmppc_core_queue_program (vcpu); +kvmppc_core_queue_program (vcpu,SRR1_PROGTRAP ); advance =0 ;break ;
Signature · 1 line
1.6.5.3
PATCH 13/39 KVM: PPC: Fix HID5 setting code
In reply to Avi KivityFrom: Alexander Graf <[email protected]>
The code to unset HID5.dcbz32 is broken.
This patch makes it do the right rotate magic.
--- arch/powerpc/kvm/book3s_64_interrupts.S | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
arch/powerpc/kvm/book3s_64_interrupts.S +2 -1
@@ -177,8 +177,9 @@ kvmppc_handler_highmem: rldicl. r5, r5, 0, 63 /* CR = ((r5 & 1) == 0) */ beq no_dcbz32_off + li r4, 0 mfspr r5,SPRN_HID5 - rldimi r5,r5,6,56 + rldimi r5,r4,6,56 mtspr SPRN_HID5,r5 no_dcbz32_off:
Signature · 1 line
1.6.5.3
PATCH 14/39 KVM: PPC: Pass program interrupt flags to the guest
In reply to Avi KivityFrom: Alexander Graf <[email protected]>
When we need to reinject a program interrupt into the guest, we also need to reinject the corresponding flags into the guest.
--- arch/powerpc/kvm/book3s.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
arch/powerpc/kvm/book3s.c +5 -2
@@ -633,6 +633,9 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,case BOOK3S_INTERRUPT_PROGRAM : {enum emulation_result er; +ulong flags; + + flags = (vcpu->arch.shadow_msr &0x1f0000ull );if (vcpu->arch.msr &MSR_PR ) {#ifdef EXIT_DEBUG
@@ -640,7 +643,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,#endif if ((vcpu->arch.last_inst &0xff0007ff ) != (INS_DCBZ &0xfffffff7 )) { -kvmppc_book3s_queue_irqprio (vcpu, exit_nr); +kvmppc_core_queue_program (vcpu, flags); r =RESUME_GUEST ;break ; }
@@ -655,7 +658,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,case EMULATE_FAIL :printk (KERN_CRIT "%s: emulation at %lx failed (%08x)\n" , __func__, vcpu->arch.pc, vcpu->arch.last_inst); -kvmppc_book3s_queue_irqprio (vcpu, exit_nr); +kvmppc_core_queue_program (vcpu, flags); r =RESUME_GUEST ;break ;default :
Signature · 1 line
1.6.5.3
PATCH 15/39 KVM: PPC: Pass through program interrupts
In reply to Avi KivityFrom: Alexander Graf <[email protected]>
When we get a program interrupt in guest kernel mode, we try to emulate the instruction.
If that doesn't fail, we report to the user and try again - at the exact same instruction pointer. So if the guest kernel really does trigger an invalid instruction, we loop forever.
So let's better go and forward program exceptions to the guest when we don't know the instruction we're supposed to emulate.
--- arch/powerpc/kvm/emulate.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
arch/powerpc/kvm/emulate.c +1 -0
@@ -476,6 +476,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu) advance =0 ;printk (KERN_ERR "Couldn't emulate instruction 0x%08x " "(op %d xop %d)\n" , inst,get_op (inst),get_xop (inst)); +kvmppc_core_queue_program (vcpu,0 ); } }
Signature · 1 line
1.6.5.3
PATCH 16/39 KVM: PPC: Make large pages work
In reply to Avi KivityFrom: Alexander Graf <[email protected]>
An SLB entry contains two pieces of information related to size:
1) PTE size
2) SLB size
The L bit defines the PTE be "large" (usually means 16MB), SLB_VSID_B_1T defines that the SLB should span 1 GB instead of the default 256MB.
Apparently I messed things up and just put those two in one box, shaked it heavily and came up with the current code which handles large pages incorrectly, because it also treats large page SLB entries as "1TB" segment entries.
This patch splits those two features apart, making Linux guests boot even when they have > 256MB.
--- arch/powerpc/include/asm/kvm_book3s.h | 3 ++- arch/powerpc/kvm/book3s_64_mmu.c | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-)
arch/powerpc/include/asm/kvm_book3s.h +2 -1
@@ -34,7 +34,8 @@ struct kvmppc_slb {bool Ks;bool Kp;bool nx; -bool large; +bool large;/* PTEs are 16MB */ +bool tb;/* 1TB segment */ bool class; };
arch/powerpc/kvm/book3s_64_mmu.c +6 -4
@@ -54,7 +54,7 @@ static struct kvmppc_slb *kvmppc_mmu_book3s_64_find_slbe(if (!vcpu_book3s->slb[i].valid)continue ; -if (vcpu_book3s->slb[i].large) +if (vcpu_book3s->slb[i].tb) cmp_esid = esid_1t;if (vcpu_book3s->slb[i].esid == cmp_esid)
@@ -65,9 +65,10 @@ static struct kvmppc_slb *kvmppc_mmu_book3s_64_find_slbe( eaddr, esid, esid_1t);for (i =0 ; i < vcpu_book3s->slb_nr; i++) {if (vcpu_book3s->slb[i].vsid) -dprintk (" %d: %c%c %llx %llx\n" , i, +dprintk (" %d: %c%c%c %llx %llx\n" , i, vcpu_book3s->slb[i].valid ?'v' :' ' , vcpu_book3s->slb[i].large ?'l' :' ' , + vcpu_book3s->slb[i].tb ?'t' :' ' , vcpu_book3s->slb[i].esid, vcpu_book3s->slb[i].vsid); }
@@ -84,7 +85,7 @@ static u64 kvmppc_mmu_book3s_64_ea_to_vp(struct kvm_vcpu *vcpu, gva_t eaddr,if (!slb)return 0 ; -if (slb->large) +if (slb->tb)return (((u64 )eaddr >>12 ) &0xfffffff ) | (((u64 )slb->vsid) <<28 );
@@ -309,7 +310,8 @@ static void kvmppc_mmu_book3s_64_slbmte(struct kvm_vcpu *vcpu, u64 rs, u64 rb) slbe = &vcpu_book3s->slb[slb_nr]; slbe->large = (rs &SLB_VSID_L ) ?1 :0 ; - slbe->esid = slbe->large ? esid_1t : esid; + slbe->tb = (rs &SLB_VSID_B_1T ) ?1 :0 ; + slbe->esid = slbe->tb ? esid_1t : esid; slbe->vsid = rs >>12 ; slbe->valid = (rb &SLB_ESID_V ) ?1 :0 ; slbe->Ks = (rs &SLB_VSID_KS ) ?1 :0 ;
Signature · 1 line
1.6.5.3
PATCH 17/39 KVM: VMX: trace clts and lmsw instructions as cr accesses
In reply to Avi Kivityclts writes cr0.ts; lmsw writes cr0[0:15] - record that in ftrace.
--- arch/x86/kvm/vmx.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
arch/x86/kvm/vmx.c +4 -1
@@ -2997,6 +2997,7 @@ static int handle_cr(struct kvm_vcpu *vcpu)vmx_fpu_deactivate (vcpu); vcpu->arch.cr0 &= ~X86_CR0_TS ;vmcs_writel (CR0_READ_SHADOW , vcpu->arch.cr0); +trace_kvm_cr_write (0 , vcpu->arch.cr0);vmx_fpu_activate (vcpu);skip_emulated_instruction (vcpu);return 1 ;
@@ -3016,7 +3017,9 @@ static int handle_cr(struct kvm_vcpu *vcpu) }break ;case 3 :/* lmsw */ -kvm_lmsw (vcpu, (exit_qualification >>LMSW_SOURCE_DATA_SHIFT ) &0x0f ); + val = (exit_qualification >>LMSW_SOURCE_DATA_SHIFT ) &0x0f ; +trace_kvm_cr_write (0 , (vcpu->arch.cr0 & ~0xful ) | val); +kvm_lmsw (vcpu, val);skip_emulated_instruction (vcpu);return 1 ;
Signature · 1 line
1.6.5.3
PATCH 18/39 KVM: Replace read accesses of vcpu->arch.cr0 by an accessor
In reply to Avi KivitySince we'd like to allow the guest to own a few bits of cr0 at times, we need to know when we access those bits.
--- arch/x86/kvm/emulate.c | 6 +++--- arch/x86/kvm/kvm_cache_regs.h | 10 ++++++++++ arch/x86/kvm/mmu.c | 2 +- arch/x86/kvm/mmu.h | 2 +- arch/x86/kvm/svm.c | 9 +++++---- arch/x86/kvm/vmx.c | 16 ++++++++-------- arch/x86/kvm/x86.c | 20 ++++++++++---------- 7 files changed, 38 insertions(+), 27 deletions(-)
arch/x86/kvm/emulate.c +3 -3
@@ -1515,7 +1515,7 @@ emulate_syscall(struct x86_emulate_ctxt *ctxt)/* syscall is not available in real mode */ if (c->lock_prefix || ctxt->mode ==X86EMUL_MODE_REAL - || !(ctxt->vcpu->arch.cr0 &X86_CR0_PE )) + || !kvm_read_cr0_bits (ctxt->vcpu,X86_CR0_PE ))return -1 ;setup_syscalls_segments (ctxt, &cs, &ss);
@@ -1569,7 +1569,7 @@ emulate_sysenter(struct x86_emulate_ctxt *ctxt)/* inject #GP if in real mode or paging is disabled */ if (ctxt->mode ==X86EMUL_MODE_REAL || - !(ctxt->vcpu->arch.cr0 &X86_CR0_PE )) { + !kvm_read_cr0_bits (ctxt->vcpu,X86_CR0_PE )) {kvm_inject_gp (ctxt->vcpu,0 );return -1 ; }
@@ -1635,7 +1635,7 @@ emulate_sysexit(struct x86_emulate_ctxt *ctxt)/* inject #GP if in real mode or paging is disabled */ if (ctxt->mode ==X86EMUL_MODE_REAL - || !(ctxt->vcpu->arch.cr0 &X86_CR0_PE )) { + || !kvm_read_cr0_bits (ctxt->vcpu,X86_CR0_PE )) {kvm_inject_gp (ctxt->vcpu,0 );return -1 ; }
arch/x86/kvm/kvm_cache_regs.h +10 -0
@@ -38,6 +38,16 @@ static inline u64 kvm_pdptr_read(struct kvm_vcpu *vcpu, int index)return vcpu->arch.pdptrs[index]; } +static inline ulong kvm_read_cr0_bits (struct kvm_vcpu *vcpu,ulong mask) +{ +return vcpu->arch.cr0 & mask; +} + +static inline ulong kvm_read_cr0 (struct kvm_vcpu *vcpu) +{ +return kvm_read_cr0_bits (vcpu, ~0UL ); +} +static inline ulong kvm_read_cr4_bits (struct kvm_vcpu *vcpu,ulong mask) {if (mask & vcpu->arch.cr4_guest_owned_bits)
arch/x86/kvm/mmu.c +1 -1
@@ -226,7 +226,7 @@ EXPORT_SYMBOL_GPL(kvm_mmu_set_mask_ptes);static int is_write_protection (struct kvm_vcpu *vcpu) { -return vcpu->arch.cr0 &X86_CR0_WP ; +return kvm_read_cr0_bits (vcpu,X86_CR0_WP ); }static int is_cpuid_PSE36 (void )
arch/x86/kvm/mmu.h +1 -1
@@ -79,7 +79,7 @@ static inline int is_pse(struct kvm_vcpu *vcpu)static inline int is_paging (struct kvm_vcpu *vcpu) { -return vcpu->arch.cr0 &X86_CR0_PG ; +return kvm_read_cr0_bits (vcpu,X86_CR0_PG ); }static inline int is_present_gpte (unsigned long pte)
arch/x86/kvm/svm.c +5 -4
@@ -980,7 +980,7 @@ static void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)if (npt_enabled) goto set; -if ((vcpu->arch.cr0 &X86_CR0_TS ) && !(cr0 &X86_CR0_TS )) { +if (kvm_read_cr0_bits (vcpu,X86_CR0_TS ) && !(cr0 &X86_CR0_TS )) { svm->vmcb->control.intercept_exceptions &= ~(1 <<NM_VECTOR ); vcpu->fpu_active =1 ; }
@@ -1244,7 +1244,7 @@ static int ud_interception(struct vcpu_svm *svm)static int nm_interception (struct vcpu_svm *svm) { svm->vmcb->control.intercept_exceptions &= ~(1 <<NM_VECTOR ); -if (!(svm->vcpu.arch.cr0 &X86_CR0_TS )) +if (!kvm_read_cr0_bits (&svm->vcpu,X86_CR0_TS )) svm->vmcb->save.cr0 &= ~X86_CR0_TS ; svm->vcpu.fpu_active =1 ;
@@ -1743,7 +1743,7 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm) hsave->save.gdtr = vmcb->save.gdtr; hsave->save.idtr = vmcb->save.idtr; hsave->save.efer = svm->vcpu.arch.shadow_efer; - hsave->save.cr0 = svm->vcpu.arch.cr0; + hsave->save.cr0 =kvm_read_cr0 (&svm->vcpu); hsave->save.cr4 = svm->vcpu.arch.cr4; hsave->save.rflags = vmcb->save.rflags; hsave->save.rip = svm->next_rip;
@@ -2387,7 +2387,8 @@ static int handle_exit(struct kvm_vcpu *vcpu)if (npt_enabled) {int mmu_reload =0 ; -if ((vcpu->arch.cr0 ^ svm->vmcb->save.cr0) &X86_CR0_PG ) { +if ((kvm_read_cr0_bits (vcpu,X86_CR0_PG ) ^ svm->vmcb->save.cr0) + &X86_CR0_PG ) {svm_set_cr0 (vcpu, svm->vmcb->save.cr0); mmu_reload =1 ; }
arch/x86/kvm/vmx.c +8 -8
@@ -799,7 +799,7 @@ static void vmx_fpu_activate(struct kvm_vcpu *vcpu)return ; vcpu->fpu_active =1 ;vmcs_clear_bits (GUEST_CR0 ,X86_CR0_TS ); -if (vcpu->arch.cr0 &X86_CR0_TS ) +if (kvm_read_cr0_bits (vcpu,X86_CR0_TS ))vmcs_set_bits (GUEST_CR0 ,X86_CR0_TS );update_exception_bitmap (vcpu); }
@@ -1785,7 +1785,7 @@ static void vmx_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)vmx_flush_tlb (vcpu);vmcs_writel (GUEST_CR3 , guest_cr3); -if (vcpu->arch.cr0 &X86_CR0_PE ) +if (kvm_read_cr0_bits (vcpu,X86_CR0_PE ))vmx_fpu_deactivate (vcpu); }
@@ -1840,7 +1840,7 @@ static void vmx_get_segment(struct kvm_vcpu *vcpu,static int vmx_get_cpl (struct kvm_vcpu *vcpu) { -if (!(vcpu->arch.cr0 &X86_CR0_PE ))/* if real mode */ +if (!kvm_read_cr0_bits (vcpu,X86_CR0_PE ))/* if real mode */ return 0 ;if (vmx_get_rflags (vcpu) &X86_EFLAGS_VM )/* if virtual 8086 */
@@ -2095,7 +2095,7 @@ static bool cs_ss_rpl_check(struct kvm_vcpu *vcpu)static bool guest_state_valid (struct kvm_vcpu *vcpu) {/* real mode guest state checks */ -if (!(vcpu->arch.cr0 &X86_CR0_PE )) { +if (!kvm_read_cr0_bits (vcpu,X86_CR0_PE )) {if (!rmode_segment_valid (vcpu,VCPU_SREG_CS ))return false;if (!rmode_segment_valid (vcpu,VCPU_SREG_SS ))
@@ -2580,7 +2580,7 @@ static int vmx_vcpu_reset(struct kvm_vcpu *vcpu)vmcs_write16 (VIRTUAL_PROCESSOR_ID , vmx->vpid); vmx->vcpu.arch.cr0 =X86_CR0_NW |X86_CR0_CD |X86_CR0_ET ; -vmx_set_cr0 (&vmx->vcpu, vmx->vcpu.arch.cr0);/* enter rmode */ +vmx_set_cr0 (&vmx->vcpu,kvm_read_cr0 (vcpu));/* enter rmode */ vmx_set_cr4 (&vmx->vcpu,0 );vmx_set_efer (&vmx->vcpu,0 );vmx_fpu_activate (&vmx->vcpu);
@@ -2996,8 +2996,8 @@ static int handle_cr(struct kvm_vcpu *vcpu)case 2 :/* clts */ vmx_fpu_deactivate (vcpu); vcpu->arch.cr0 &= ~X86_CR0_TS ; -vmcs_writel (CR0_READ_SHADOW , vcpu->arch.cr0); -trace_kvm_cr_write (0 , vcpu->arch.cr0); +vmcs_writel (CR0_READ_SHADOW ,kvm_read_cr0 (vcpu)); +trace_kvm_cr_write (0 ,kvm_read_cr0 (vcpu));vmx_fpu_activate (vcpu);skip_emulated_instruction (vcpu);return 1 ;
@@ -3018,7 +3018,7 @@ static int handle_cr(struct kvm_vcpu *vcpu)break ;case 3 :/* lmsw */ val = (exit_qualification >>LMSW_SOURCE_DATA_SHIFT ) &0x0f ; -trace_kvm_cr_write (0 , (vcpu->arch.cr0 & ~0xful ) | val); +trace_kvm_cr_write (0 , (kvm_read_cr0 (vcpu) & ~0xful ) | val);kvm_lmsw (vcpu, val);skip_emulated_instruction (vcpu);
arch/x86/kvm/x86.c +10 -10
@@ -430,7 +430,7 @@ void kvm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0) {if (cr0 &CR0_RESERVED_BITS ) {printk (KERN_DEBUG "set_cr0: 0x%lx #GP, reserved bits 0x%lx\n" , - cr0, vcpu->arch.cr0); + cr0,kvm_read_cr0 (vcpu));kvm_inject_gp (vcpu,0 );return ; }
@@ -488,7 +488,7 @@ EXPORT_SYMBOL_GPL(kvm_set_cr0);void kvm_lmsw (struct kvm_vcpu *vcpu,unsigned long msw) { -kvm_set_cr0 (vcpu, (vcpu->arch.cr0 & ~0x0ful ) | (msw &0x0f )); +kvm_set_cr0 (vcpu,kvm_read_cr0_bits (vcpu, ~0x0ful ) | (msw &0x0f )); }EXPORT_SYMBOL_GPL (kvm_lmsw);
@@ -3095,7 +3095,7 @@ int emulate_invlpg(struct kvm_vcpu *vcpu, gva_t address)int emulate_clts (struct kvm_vcpu *vcpu) { - kvm_x86_ops->set_cr0 (vcpu, vcpu->arch.cr0 & ~X86_CR0_TS ); + kvm_x86_ops->set_cr0 (vcpu,kvm_read_cr0_bits (vcpu, ~X86_CR0_TS ));return X86EMUL_CONTINUE ; }
@@ -3714,7 +3714,7 @@ unsigned long realmode_get_cr(struct kvm_vcpu *vcpu, int cr)switch (cr) {case 0 : - value = vcpu->arch.cr0; + value =kvm_read_cr0 (vcpu);break ;case 2 : value = vcpu->arch.cr2;
@@ -3741,7 +3741,7 @@ void realmode_set_cr(struct kvm_vcpu *vcpu, int cr, unsigned long val, {switch (cr) {case 0 : -kvm_set_cr0 (vcpu,mk_cr_64 (vcpu->arch.cr0, val)); +kvm_set_cr0 (vcpu,mk_cr_64 (kvm_read_cr0 (vcpu), val)); *rflags =kvm_get_rflags (vcpu);break ;case 2 :
@@ -4335,7 +4335,7 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu, sregs->gdt.limit = dt.limit; sregs->gdt.base = dt.base; - sregs->cr0 = vcpu->arch.cr0; + sregs->cr0 =kvm_read_cr0 (vcpu); sregs->cr2 = vcpu->arch.cr2; sregs->cr3 = vcpu->arch.cr3; sregs->cr4 =kvm_read_cr4 (vcpu);
@@ -4521,7 +4521,7 @@ int kvm_load_segment_descriptor(struct kvm_vcpu *vcpu, u16 selector, {struct kvm_segment kvm_seg; -if (is_vm86_segment (vcpu, seg) || !(vcpu->arch.cr0 &X86_CR0_PE )) +if (is_vm86_segment (vcpu, seg) || !(kvm_read_cr0_bits (vcpu,X86_CR0_PE )))return kvm_load_realmode_segment (vcpu, selector, seg);if (load_segment_descriptor_to_kvm_desct (vcpu, selector, &kvm_seg))return 1 ;
@@ -4799,7 +4799,7 @@ int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int reason) &nseg_desc); } - kvm_x86_ops->set_cr0 (vcpu, vcpu->arch.cr0 |X86_CR0_TS ); + kvm_x86_ops->set_cr0 (vcpu,kvm_read_cr0 (vcpu) |X86_CR0_TS );seg_desct_to_kvm_desct (&nseg_desc, tss_selector, &tr_seg); tr_seg.type =11 ;kvm_set_segment (vcpu, &tr_seg,VCPU_SREG_TR );
@@ -4834,7 +4834,7 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, kvm_x86_ops->set_efer (vcpu, sregs->efer);kvm_set_apic_base (vcpu, sregs->apic_base); - mmu_reset_needed |= vcpu->arch.cr0 != sregs->cr0; + mmu_reset_needed |=kvm_read_cr0 (vcpu) != sregs->cr0; kvm_x86_ops->set_cr0 (vcpu, sregs->cr0); vcpu->arch.cr0 = sregs->cr0;
@@ -4873,7 +4873,7 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,/* Older userspace won't unhalt the vcpu on reset. */ if (kvm_vcpu_is_bsp (vcpu) &&kvm_rip_read (vcpu) ==0xfff0 && sregs->cs.selector ==0xf000 && sregs->cs.base ==0xffff0000 && - !(vcpu->arch.cr0 &X86_CR0_PE )) + !(kvm_read_cr0_bits (vcpu,X86_CR0_PE ))) vcpu->arch.mp_state =KVM_MP_STATE_RUNNABLE ;vcpu_put (vcpu);
Signature · 1 line
1.6.5.3
PATCH 19/39 KVM: VMX: Allow the guest to own some cr0 bits
In reply to Avi KivityWe will use this later to give the guest ownership of cr0.ts.
--- arch/x86/include/asm/kvm_host.h | 2 ++ arch/x86/kvm/kvm_cache_regs.h | 2 ++ arch/x86/kvm/svm.c | 5 +++++ arch/x86/kvm/vmx.c | 9 +++++++++ 4 files changed, 18 insertions(+), 0 deletions(-)
arch/x86/include/asm/kvm_host.h +2 -0
@@ -269,6 +269,7 @@ struct kvm_vcpu_arch {u32 regs_dirty;unsigned long cr0; +unsigned long cr0_guest_owned_bits;unsigned long cr2;unsigned long cr3;unsigned long cr4;
@@ -489,6 +490,7 @@ struct kvm_x86_ops {void (*set_segment)(struct kvm_vcpu *vcpu,struct kvm_segment *var,int seg);void (*get_cs_db_l_bits)(struct kvm_vcpu *vcpu,int *db,int *l); +void (*decache_cr0_guest_bits)(struct kvm_vcpu *vcpu);void (*decache_cr4_guest_bits)(struct kvm_vcpu *vcpu);void (*set_cr0)(struct kvm_vcpu *vcpu,unsigned long cr0);void (*set_cr3)(struct kvm_vcpu *vcpu,unsigned long cr3);
arch/x86/kvm/kvm_cache_regs.h +2 -0
@@ -40,6 +40,8 @@ static inline u64 kvm_pdptr_read(struct kvm_vcpu *vcpu, int index)static inline ulong kvm_read_cr0_bits (struct kvm_vcpu *vcpu,ulong mask) { +if (mask & vcpu->arch.cr0_guest_owned_bits) + kvm_x86_ops->decache_cr0_guest_bits (vcpu);return vcpu->arch.cr0 & mask; }
arch/x86/kvm/svm.c +5 -0
@@ -956,6 +956,10 @@ static void svm_set_gdt(struct kvm_vcpu *vcpu, struct descriptor_table *dt) svm->vmcb->save.gdtr.base = dt->base ; } +static void svm_decache_cr0_guest_bits (struct kvm_vcpu *vcpu) +{ +} +static void svm_decache_cr4_guest_bits (struct kvm_vcpu *vcpu) { }
@@ -2948,6 +2952,7 @@ static struct kvm_x86_ops svm_x86_ops = { .set_segment = svm_set_segment, .get_cpl = svm_get_cpl, .get_cs_db_l_bits = kvm_get_cs_db_l_bits, + .decache_cr0_guest_bits = svm_decache_cr0_guest_bits, .decache_cr4_guest_bits = svm_decache_cr4_guest_bits, .set_cr0 = svm_set_cr0, .set_cr3 = svm_set_cr3,
arch/x86/kvm/vmx.c +9 -0
@@ -1653,6 +1653,14 @@ static void vmx_flush_tlb(struct kvm_vcpu *vcpu)ept_sync_context (construct_eptp (vcpu->arch.mmu.root_hpa)); } +static void vmx_decache_cr0_guest_bits (struct kvm_vcpu *vcpu) +{ +ulong cr0_guest_owned_bits = vcpu->arch.cr0_guest_owned_bits; + + vcpu->arch.cr0 &= ~cr0_guest_owned_bits; + vcpu->arch.cr0 |=vmcs_readl (GUEST_CR0 ) & cr0_guest_owned_bits; +} +static void vmx_decache_cr4_guest_bits (struct kvm_vcpu *vcpu) {ulong cr4_guest_owned_bits = vcpu->arch.cr4_guest_owned_bits;
@@ -4106,6 +4114,7 @@ static struct kvm_x86_ops vmx_x86_ops = { .set_segment = vmx_set_segment, .get_cpl = vmx_get_cpl, .get_cs_db_l_bits = vmx_get_cs_db_l_bits, + .decache_cr0_guest_bits = vmx_decache_cr0_guest_bits, .decache_cr4_guest_bits = vmx_decache_cr4_guest_bits, .set_cr0 = vmx_set_cr0, .set_cr3 = vmx_set_cr3,
Signature · 1 line
1.6.5.3
PATCH 20/39 KVM: Lazify fpu activation and deactivation
In reply to Avi KivityDefer fpu deactivation as much as possible - if the guest fpu is loaded, keep it loaded until the next heavyweight exit (where we are forced to unload it). This reduces unnecessary exits.
We also defer fpu activation on clts; while clts signals the intent to use the fpu, we can't be sure the guest will actually use it.
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/svm.c | 35 +++++++++++++++++++++-------------- arch/x86/kvm/vmx.c | 25 +++++++++---------------- arch/x86/kvm/x86.c | 7 ++++++- include/linux/kvm_host.h | 1 + 5 files changed, 38 insertions(+), 31 deletions(-)
arch/x86/include/asm/kvm_host.h +1 -0
@@ -506,6 +506,7 @@ struct kvm_x86_ops {void (*cache_reg)(struct kvm_vcpu *vcpu,enum kvm_reg reg);unsigned long (*get_rflags)(struct kvm_vcpu *vcpu);void (*set_rflags)(struct kvm_vcpu *vcpu,unsigned long rflags); +void (*fpu_deactivate)(struct kvm_vcpu *vcpu);void (*tlb_flush)(struct kvm_vcpu *vcpu);
arch/x86/kvm/svm.c +21 -14
@@ -984,17 +984,11 @@ static void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)if (npt_enabled) goto set; -if (kvm_read_cr0_bits (vcpu,X86_CR0_TS ) && !(cr0 &X86_CR0_TS )) { - svm->vmcb->control.intercept_exceptions &= ~(1 <<NM_VECTOR ); - vcpu->fpu_active =1 ; - } - vcpu->arch.cr0 = cr0; cr0 |=X86_CR0_PG |X86_CR0_WP ; -if (!vcpu->fpu_active) { - svm->vmcb->control.intercept_exceptions |= (1 <<NM_VECTOR ); + +if (!vcpu->fpu_active) cr0 |=X86_CR0_TS ; - } set:/* * re-enable caching here because the QEMU bios
@@ -1250,6 +1244,8 @@ static int nm_interception(struct vcpu_svm *svm) svm->vmcb->control.intercept_exceptions &= ~(1 <<NM_VECTOR );if (!kvm_read_cr0_bits (&svm->vcpu,X86_CR0_TS )) svm->vmcb->save.cr0 &= ~X86_CR0_TS ; +else + svm->vmcb->save.cr0 |=X86_CR0_TS ; svm->vcpu.fpu_active =1 ;return 1 ;
@@ -2586,6 +2582,8 @@ static void svm_flush_tlb(struct kvm_vcpu *vcpu)static void svm_prepare_guest_switch (struct kvm_vcpu *vcpu) { +if (npt_enabled) + vcpu->fpu_active =1 ; }static inline void sync_cr8_to_lapic (struct kvm_vcpu *vcpu)
@@ -2805,12 +2803,6 @@ static void svm_set_cr3(struct kvm_vcpu *vcpu, unsigned long root) svm->vmcb->save.cr3 = root;force_new_asid (vcpu); - -if (vcpu->fpu_active) { - svm->vmcb->control.intercept_exceptions |= (1 <<NM_VECTOR ); - svm->vmcb->save.cr0 |=X86_CR0_TS ; - vcpu->fpu_active =0 ; - } }static int is_disabled (void )
@@ -2926,6 +2918,20 @@ static bool svm_rdtscp_supported(void)return false; } +static void svm_fpu_deactivate (struct kvm_vcpu *vcpu) +{ +struct vcpu_svm *svm =to_svm (vcpu); + +if (npt_enabled) { +/* hack: npt requires active fpu at this time */ + vcpu->fpu_active =1 ; +return ; + } + + svm->vmcb->control.intercept_exceptions |=1 <<NM_VECTOR ; + svm->vmcb->save.cr0 |=X86_CR0_TS ; +} +static struct kvm_x86_ops svm_x86_ops = { .cpu_has_kvm_support = has_svm, .disabled_by_bios = is_disabled,
@@ -2967,6 +2973,7 @@ static struct kvm_x86_ops svm_x86_ops = { .cache_reg = svm_cache_reg, .get_rflags = svm_get_rflags, .set_rflags = svm_set_rflags, + .fpu_deactivate = svm_fpu_deactivate, .tlb_flush = svm_flush_tlb,
arch/x86/kvm/vmx.c +9 -16
@@ -66,7 +66,7 @@ module_param(emulate_invalid_guest_state, bool, S_IRUGO);#define KVM_GUEST_CR0_MASK \ (KVM_GUEST_CR0_MASK_UNRESTRICTED_GUEST | X86_CR0_PG | X86_CR0_PE)#define KVM_VM_CR0_ALWAYS_ON_UNRESTRICTED_GUEST \ - (X86_CR0_WP | X86_CR0_NE | X86_CR0_TS | X86_CR0_MP) + (X86_CR0_WP | X86_CR0_NE | X86_CR0_MP)#define KVM_VM_CR0_ALWAYS_ON \ (KVM_VM_CR0_ALWAYS_ON_UNRESTRICTED_GUEST | X86_CR0_PG | X86_CR0_PE)#define KVM_CR4_GUEST_OWNED_BITS \
@@ -579,9 +579,8 @@ static void update_exception_bitmap(struct kvm_vcpu *vcpu) {u32 eb; - eb = (1u <<PF_VECTOR ) | (1u <<UD_VECTOR ) | (1u <<MC_VECTOR ); -if (!vcpu->fpu_active) - eb |=1u <<NM_VECTOR ; + eb = (1u <<PF_VECTOR ) | (1u <<UD_VECTOR ) | (1u <<MC_VECTOR ) + | (1u <<NM_VECTOR );/* * Unconditionally intercept #DB so we can maintain dr6 without * reading it every exit.
@@ -595,6 +594,8 @@ static void update_exception_bitmap(struct kvm_vcpu *vcpu) eb = ~0 ;if (enable_ept) eb &= ~(1u <<PF_VECTOR );/* bypass_guest_pf = 0 */ +if (vcpu->fpu_active) + eb &= ~(1u <<NM_VECTOR );vmcs_write32 (EXCEPTION_BITMAP , eb); }
@@ -806,9 +807,6 @@ static void vmx_fpu_activate(struct kvm_vcpu *vcpu)static void vmx_fpu_deactivate (struct kvm_vcpu *vcpu) { -if (!vcpu->fpu_active) -return ; - vcpu->fpu_active =0 ;vmcs_set_bits (GUEST_CR0 ,X86_CR0_TS );update_exception_bitmap (vcpu); }
@@ -1737,8 +1735,6 @@ static void vmx_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)else hw_cr0 = (cr0 & ~KVM_GUEST_CR0_MASK ) |KVM_VM_CR0_ALWAYS_ON ; -vmx_fpu_deactivate (vcpu); -if (vmx->rmode.vm86_active && (cr0 &X86_CR0_PE ))enter_pmode (vcpu);
@@ -1757,12 +1753,12 @@ static void vmx_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)if (enable_ept)ept_update_paging_mode_cr0 (&hw_cr0, cr0, vcpu); +if (!vcpu->fpu_active) + hw_cr0 |=X86_CR0_TS ; +vmcs_writel (CR0_READ_SHADOW , cr0);vmcs_writel (GUEST_CR0 , hw_cr0); vcpu->arch.cr0 = cr0; - -if (!(cr0 &X86_CR0_TS ) || !(cr0 &X86_CR0_PE )) -vmx_fpu_activate (vcpu); }static u64 construct_eptp (unsigned long root_hpa)
@@ -1793,8 +1789,6 @@ static void vmx_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)vmx_flush_tlb (vcpu);vmcs_writel (GUEST_CR3 , guest_cr3); -if (kvm_read_cr0_bits (vcpu,X86_CR0_PE )) -vmx_fpu_deactivate (vcpu); }static void vmx_set_cr4 (struct kvm_vcpu *vcpu,unsigned long cr4)
@@ -3002,11 +2996,9 @@ static int handle_cr(struct kvm_vcpu *vcpu) };break ;case 2 :/* clts */ -vmx_fpu_deactivate (vcpu); vcpu->arch.cr0 &= ~X86_CR0_TS ;vmcs_writel (CR0_READ_SHADOW ,kvm_read_cr0 (vcpu));trace_kvm_cr_write (0 ,kvm_read_cr0 (vcpu)); -vmx_fpu_activate (vcpu);skip_emulated_instruction (vcpu);return 1 ;case 1 :/*mov from cr*/
@@ -4127,6 +4119,7 @@ static struct kvm_x86_ops vmx_x86_ops = { .cache_reg = vmx_cache_reg, .get_rflags = vmx_get_rflags, .set_rflags = vmx_set_rflags, + .fpu_deactivate = vmx_fpu_deactivate, .tlb_flush = vmx_flush_tlb,
arch/x86/kvm/x86.c +6 -1
@@ -1509,8 +1509,8 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)void kvm_arch_vcpu_put (struct kvm_vcpu *vcpu) { - kvm_x86_ops->vcpu_put (vcpu);kvm_put_guest_fpu (vcpu); + kvm_x86_ops->vcpu_put (vcpu); }static int is_efer_nx (void )
@@ -4006,6 +4006,10 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) r =0 ; goto out; } +if (test_and_clear_bit (KVM_REQ_DEACTIVATE_FPU , &vcpu->requests)) { + vcpu->fpu_active =0 ; + kvm_x86_ops->fpu_deactivate (vcpu); + } }preempt_disable ();
@@ -5075,6 +5079,7 @@ void kvm_put_guest_fpu(struct kvm_vcpu *vcpu)kvm_fx_save (&vcpu->arch.guest_fx_image);kvm_fx_restore (&vcpu->arch.host_fx_image); ++vcpu->stat.fpu_reload; +set_bit (KVM_REQ_DEACTIVATE_FPU , &vcpu->requests); }EXPORT_SYMBOL_GPL (kvm_put_guest_fpu);
include/linux/kvm_host.h +1 -0
@@ -38,6 +38,7 @@#define KVM_REQ_MMU_SYNC 7#define KVM_REQ_KVMCLOCK_UPDATE 8#define KVM_REQ_KICK 9 +#define KVM_REQ_DEACTIVATE_FPU 10#define KVM_USERSPACE_IRQ_SOURCE_ID 0
Signature · 1 line
1.6.5.3
PATCH 21/39 KVM: VMX: Give the guest ownership of cr0.ts when the fpu is active
In reply to Avi KivityIf the guest fpu is loaded, there is nothing interesing about cr0.ts; let the guest play with it as it will. This makes context switches between fpu intensive guest processes faster, as we won't trap the clts and cr0 write instructions.
[marcelo: fix cr0 read shadow update on fpu deactivation; kills F8 install]
--- arch/x86/kvm/vmx.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-)
arch/x86/kvm/vmx.c +9 -2
@@ -803,12 +803,20 @@ static void vmx_fpu_activate(struct kvm_vcpu *vcpu)if (kvm_read_cr0_bits (vcpu,X86_CR0_TS ))vmcs_set_bits (GUEST_CR0 ,X86_CR0_TS );update_exception_bitmap (vcpu); + vcpu->arch.cr0_guest_owned_bits =X86_CR0_TS ; +vmcs_writel (CR0_GUEST_HOST_MASK , ~vcpu->arch.cr0_guest_owned_bits); } +static void vmx_decache_cr0_guest_bits (struct kvm_vcpu *vcpu); +static void vmx_fpu_deactivate (struct kvm_vcpu *vcpu) { +vmx_decache_cr0_guest_bits (vcpu);vmcs_set_bits (GUEST_CR0 ,X86_CR0_TS );update_exception_bitmap (vcpu); + vcpu->arch.cr0_guest_owned_bits =0 ; +vmcs_writel (CR0_GUEST_HOST_MASK , ~vcpu->arch.cr0_guest_owned_bits); +vmcs_writel (CR0_READ_SHADOW , vcpu->arch.cr0); }static unsigned long vmx_get_rflags (struct kvm_vcpu *vcpu)
@@ -2996,8 +3004,7 @@ static int handle_cr(struct kvm_vcpu *vcpu) };break ;case 2 :/* clts */ - vcpu->arch.cr0 &= ~X86_CR0_TS ; -vmcs_writel (CR0_READ_SHADOW ,kvm_read_cr0 (vcpu)); +vmx_set_cr0 (vcpu,kvm_read_cr0_bits (vcpu, ~X86_CR0_TS ));trace_kvm_cr_write (0 ,kvm_read_cr0 (vcpu));skip_emulated_instruction (vcpu);return 1 ;
Signature · 1 line
1.6.5.3
PATCH 22/39 KVM: Set cr0.et when the guest writes cr0
In reply to Avi KivityFollow the hardware.
--- arch/x86/kvm/x86.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/x86/kvm/x86.c +2 -0
@@ -428,6 +428,8 @@ out:void kvm_set_cr0 (struct kvm_vcpu *vcpu,unsigned long cr0) { + cr0 |=X86_CR0_ET ; +if (cr0 &CR0_RESERVED_BITS ) {printk (KERN_DEBUG "set_cr0: 0x%lx #GP, reserved bits 0x%lx\n" , cr0,kvm_read_cr0 (vcpu));
Signature · 1 line
1.6.5.3
PATCH 23/39 KVM: SVM: Fix SVM_CR0_SELECTIVE_MASK
In reply to Avi KivityInstead of selecting TS and MP as the comments say, the macro included TS and PE. Luckily the macro is unused now, but fix in order to save a few hours of debugging from anyone who attempts to use it.
--- arch/x86/include/asm/svm.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/include/asm/svm.h +1 -1
@@ -313,7 +313,7 @@ struct __attribute__ ((__packed__)) vmcb {#define SVM_EXIT_ERR -1 -#define SVM_CR0_SELECTIVE_MASK (1 << 3 | 1)/* TS and MP */ +#define SVM_CR0_SELECTIVE_MASK (X86_CR0_TS | X86_CR0_MP)#define SVM_VMLOAD ".byte 0x0f, 0x01, 0xda"#define SVM_VMRUN ".byte 0x0f, 0x01, 0xd8"
Signature · 1 line
1.6.5.3
PATCH 24/39 KVM: SVM: Initialize fpu_active in init_vmcb()
In reply to Avi Kivityinit_vmcb() sets up the intercepts as if the fpu is active, so initialize it there. This avoids an INIT from setting up intercepts inconsistent with fpu_active.
--- arch/x86/kvm/svm.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
arch/x86/kvm/svm.c +2 -1
@@ -540,6 +540,8 @@ static void init_vmcb(struct vcpu_svm *svm)struct vmcb_control_area *control = &svm->vmcb->control;struct vmcb_save_area *save = &svm->vmcb->save; + svm->vcpu.fpu_active =1 ; + control->intercept_cr_read =INTERCEPT_CR0_MASK |INTERCEPT_CR3_MASK |INTERCEPT_CR4_MASK ;
@@ -730,7 +732,6 @@ static struct kvm_vcpu *svm_create_vcpu(struct kvm *kvm, unsigned int id)init_vmcb (svm);fx_init (&svm->vcpu); - svm->vcpu.fpu_active =1 ; svm->vcpu.arch.apic_base =0xfee00000 |MSR_IA32_APICBASE_ENABLE ;if (kvm_vcpu_is_bsp (&svm->vcpu)) svm->vcpu.arch.apic_base |=MSR_IA32_APICBASE_BSP ;
Signature · 1 line
1.6.5.3
PATCH 25/39 KVM: SVM: Restore unconditional cr0 intercept under npt
In reply to Avi KivityCurrently we don't intercept cr0 at all when npt is enabled. This improves performance but requires us to activate the fpu at all times.
Remove this behaviour in preparation for adding selective cr0 intercepts.
--- arch/x86/kvm/svm.c | 29 +++++++---------------------- 1 files changed, 7 insertions(+), 22 deletions(-)
arch/x86/kvm/svm.c +7 -22
@@ -643,10 +643,8 @@ static void init_vmcb(struct vcpu_svm *svm) control->intercept &= ~((1ULL <<INTERCEPT_TASK_SWITCH ) | (1ULL <<INTERCEPT_INVLPG )); control->intercept_exceptions &= ~(1 <<PF_VECTOR ); - control->intercept_cr_read &= ~(INTERCEPT_CR0_MASK | -INTERCEPT_CR3_MASK ); - control->intercept_cr_write &= ~(INTERCEPT_CR0_MASK | -INTERCEPT_CR3_MASK ); + control->intercept_cr_read &= ~INTERCEPT_CR3_MASK ; + control->intercept_cr_write &= ~INTERCEPT_CR3_MASK ; save->g_pat =0x0007040600070406ULL ; save->cr3 =0 ; save->cr4 =0 ;
@@ -982,15 +980,13 @@ static void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0) } }#endif -if (npt_enabled) - goto set; - vcpu->arch.cr0 = cr0; - cr0 |=X86_CR0_PG |X86_CR0_WP ; + +if (!npt_enabled) + cr0 |=X86_CR0_PG |X86_CR0_WP ;if (!vcpu->fpu_active) cr0 |=X86_CR0_TS ; -set:/* * re-enable caching here because the QEMU bios * does not do it - this results in some delay at
@@ -2386,21 +2382,10 @@ static int handle_exit(struct kvm_vcpu *vcpu)svm_complete_interrupts (svm); -if (npt_enabled) { -int mmu_reload =0 ; -if ((kvm_read_cr0_bits (vcpu,X86_CR0_PG ) ^ svm->vmcb->save.cr0) - &X86_CR0_PG ) { -svm_set_cr0 (vcpu, svm->vmcb->save.cr0); - mmu_reload =1 ; - } +if (!(svm->vmcb->control.intercept_cr_write &INTERCEPT_CR0_MASK )) vcpu->arch.cr0 = svm->vmcb->save.cr0; +if (npt_enabled) vcpu->arch.cr3 = svm->vmcb->save.cr3; -if (mmu_reload) { -kvm_mmu_reset_context (vcpu); -kvm_mmu_load (vcpu); - } - } -if (svm->vmcb->control.exit_code ==SVM_EXIT_ERR ) { kvm_run->exit_reason =KVM_EXIT_FAIL_ENTRY ;
Signature · 1 line
1.6.5.3
PATCH 26/39 KVM: SVM: Selective cr0 intercept
In reply to Avi KivityIf two conditions apply:
- no bits outside TS and EM differ between the host and guest cr0
- the fpu is active
then we can activate the selective cr0 write intercept and drop the unconditional cr0 read and write intercept, and allow the guest to run with the host fpu state. This reduces cr0 exits due to guest fpu management while the guest fpu is loaded.
--- arch/x86/kvm/svm.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-)
arch/x86/kvm/svm.c +26 -6
@@ -571,6 +571,7 @@ static void init_vmcb(struct vcpu_svm *svm) control->intercept = (1ULL <<INTERCEPT_INTR ) | (1ULL <<INTERCEPT_NMI ) | (1ULL <<INTERCEPT_SMI ) | + (1ULL <<INTERCEPT_SELECTIVE_CR0 ) | (1ULL <<INTERCEPT_CPUID ) | (1ULL <<INTERCEPT_INVD ) | (1ULL << INTERCEPT_HLT) |
@@ -963,6 +964,27 @@ static void svm_decache_cr4_guest_bits(struct kvm_vcpu *vcpu) { } +static void update_cr0_intercept (struct vcpu_svm *svm) +{ +ulong gcr0 = svm->vcpu.arch.cr0; +u64 *hcr0 = &svm->vmcb->save.cr0; + +if (!svm->vcpu.fpu_active) + *hcr0 |=SVM_CR0_SELECTIVE_MASK ; +else + *hcr0 = (*hcr0 & ~SVM_CR0_SELECTIVE_MASK ) + | (gcr0 &SVM_CR0_SELECTIVE_MASK ); + + +if (gcr0 == *hcr0 && svm->vcpu.fpu_active) { + svm->vmcb->control.intercept_cr_read &= ~INTERCEPT_CR0_MASK ; + svm->vmcb->control.intercept_cr_write &= ~INTERCEPT_CR0_MASK ; + }else { + svm->vmcb->control.intercept_cr_read |=INTERCEPT_CR0_MASK ; + svm->vmcb->control.intercept_cr_write |=INTERCEPT_CR0_MASK ; + } +} +static void svm_set_cr0 (struct kvm_vcpu *vcpu,unsigned long cr0) {struct vcpu_svm *svm =to_svm (vcpu);
@@ -994,6 +1016,7 @@ static void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)*/ cr0 &= ~(X86_CR0_CD |X86_CR0_NW ); svm->vmcb->save.cr0 = cr0; +update_cr0_intercept (svm); }static void svm_set_cr4 (struct kvm_vcpu *vcpu,unsigned long cr4)
@@ -1239,11 +1262,8 @@ static int ud_interception(struct vcpu_svm *svm)static int nm_interception (struct vcpu_svm *svm) { svm->vmcb->control.intercept_exceptions &= ~(1 <<NM_VECTOR ); -if (!kvm_read_cr0_bits (&svm->vcpu,X86_CR0_TS )) - svm->vmcb->save.cr0 &= ~X86_CR0_TS ; -else - svm->vmcb->save.cr0 |=X86_CR0_TS ; svm->vcpu.fpu_active =1 ; +update_cr0_intercept (svm);return 1 ; }
@@ -2296,7 +2316,7 @@ static int (*svm_exit_handlers[])(struct vcpu_svm *svm) = { [SVM_EXIT_READ_CR3] = emulate_on_interception, [SVM_EXIT_READ_CR4] = emulate_on_interception, [SVM_EXIT_READ_CR8] = emulate_on_interception, -/* for now: */ + [SVM_EXIT_CR0_SEL_WRITE] = emulate_on_interception, [SVM_EXIT_WRITE_CR0] = emulate_on_interception, [SVM_EXIT_WRITE_CR3] = emulate_on_interception, [SVM_EXIT_WRITE_CR4] = emulate_on_interception,
@@ -2914,8 +2934,8 @@ static void svm_fpu_deactivate(struct kvm_vcpu *vcpu)return ; } +update_cr0_intercept (svm); svm->vmcb->control.intercept_exceptions |=1 <<NM_VECTOR ; - svm->vmcb->save.cr0 |=X86_CR0_TS ; }static struct kvm_x86_ops svm_x86_ops = {
Signature · 1 line
1.6.5.3
PATCH 27/39 KVM: SVM: Lazy fpu with npt
In reply to Avi KivityNow that we can allow the guest to play with cr0 when the fpu is loaded, we can enable lazy fpu when npt is in use.
--- arch/x86/kvm/svm.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-)
arch/x86/kvm/svm.c +0 -8
@@ -2588,8 +2588,6 @@ static void svm_flush_tlb(struct kvm_vcpu *vcpu)static void svm_prepare_guest_switch (struct kvm_vcpu *vcpu) { -if (npt_enabled) - vcpu->fpu_active =1 ; }static inline void sync_cr8_to_lapic (struct kvm_vcpu *vcpu)
@@ -2928,12 +2926,6 @@ static void svm_fpu_deactivate(struct kvm_vcpu *vcpu) {struct vcpu_svm *svm =to_svm (vcpu); -if (npt_enabled) { -/* hack: npt requires active fpu at this time */ - vcpu->fpu_active =1 ; -return ; - } -update_cr0_intercept (svm); svm->vmcb->control.intercept_exceptions |=1 <<NM_VECTOR ; }
Signature · 1 line
1.6.5.3
PATCH 28/39 KVM: ia64: remove redundant kvm_get_exit_data() NULL tests
In reply to Avi KivityFrom: Roel Kluin <[email protected]>
kvm_get_exit_data() cannot return a NULL pointer.
--- arch/ia64/kvm/kvm_fw.c | 28 +++++++++++++--------------- 1 files changed, 13 insertions(+), 15 deletions(-)
arch/ia64/kvm/kvm_fw.c +13 -15
@@ -75,7 +75,7 @@ static void set_pal_result(struct kvm_vcpu *vcpu,struct exit_ctl_data *p; p =kvm_get_exit_data (vcpu); -if (p && p->exit_reason ==EXIT_REASON_PAL_CALL ) { +if (p->exit_reason ==EXIT_REASON_PAL_CALL ) { p->u.pal_data.ret = result;return ; }
@@ -87,7 +87,7 @@ static void set_sal_result(struct kvm_vcpu *vcpu,struct exit_ctl_data *p; p =kvm_get_exit_data (vcpu); -if (p && p->exit_reason ==EXIT_REASON_SAL_CALL ) { +if (p->exit_reason ==EXIT_REASON_SAL_CALL ) { p->u.sal_data.ret = result;return ; }
@@ -322,7 +322,7 @@ static u64 kvm_get_pal_call_index(struct kvm_vcpu *vcpu)struct exit_ctl_data *p; p =kvm_get_exit_data (vcpu); -if (p && (p->exit_reason ==EXIT_REASON_PAL_CALL )) +if (p->exit_reason ==EXIT_REASON_PAL_CALL ) index = p->u.pal_data.gr28;return index;
@@ -646,18 +646,16 @@ static void kvm_get_sal_call_data(struct kvm_vcpu *vcpu, u64 *in0, u64 *in1, p =kvm_get_exit_data (vcpu); -if (p) { -if (p->exit_reason ==EXIT_REASON_SAL_CALL ) { - *in0 = p->u.sal_data.in0; - *in1 = p->u.sal_data.in1; - *in2 = p->u.sal_data.in2; - *in3 = p->u.sal_data.in3; - *in4 = p->u.sal_data.in4; - *in5 = p->u.sal_data.in5; - *in6 = p->u.sal_data.in6; - *in7 = p->u.sal_data.in7; -return ; - } +if (p->exit_reason ==EXIT_REASON_SAL_CALL ) { + *in0 = p->u.sal_data.in0; + *in1 = p->u.sal_data.in1; + *in2 = p->u.sal_data.in2; + *in3 = p->u.sal_data.in3; + *in4 = p->u.sal_data.in4; + *in5 = p->u.sal_data.in5; + *in6 = p->u.sal_data.in6; + *in7 = p->u.sal_data.in7; +return ; } *in0 =0 ; }
Signature · 1 line
1.6.5.3
PATCH 29/39 KVM: PPC: Export __giveup_vsx
In reply to Avi KivityFrom: Alexander Graf <[email protected]>
We need to explicitly only giveup VSX in KVM, so let's export that specific function to module space.
--- arch/powerpc/kernel/ppc_ksyms.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
arch/powerpc/kernel/ppc_ksyms.c +1 -0
@@ -107,6 +107,7 @@ EXPORT_SYMBOL(giveup_altivec);#endif /* CONFIG_ALTIVEC */ #ifdef CONFIG_VSX EXPORT_SYMBOL (giveup_vsx); +EXPORT_SYMBOL_GPL (__giveup_vsx);#endif /* CONFIG_VSX */ #ifdef CONFIG_SPE EXPORT_SYMBOL (giveup_spe);
Signature · 1 line
1.6.5.3
PATCH 30/39 KVM: PPC: Add helper functions to call real mode loaders
In reply to Avi KivityFrom: Alexander Graf <[email protected]>
Linux contains quite some bits of code to load FPU, Altivec and VSX lazily for a task. It calls those bits in real mode, coming from an interrupt handler.
For KVM we better reuse those, so let's wrap a bit of trampoline magic around them and then we can call them from normal module code.
--- arch/powerpc/include/asm/kvm_book3s.h | 3 ++ arch/powerpc/kvm/book3s_64_exports.c | 7 ++++++ arch/powerpc/kvm/book3s_64_rmhandlers.S | 34 +++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 0 deletions(-)
arch/powerpc/include/asm/kvm_book3s.h +3 -0
@@ -124,6 +124,9 @@ extern void kvmppc_set_bat(struct kvm_vcpu *vcpu, struct kvmppc_bat *bat,extern u32 kvmppc_trampoline_lowmem;extern u32 kvmppc_trampoline_enter;extern void kvmppc_rmcall (ulong srr0,ulong srr1); +extern void kvmppc_load_up_fpu (void ); +extern void kvmppc_load_up_altivec (void ); +extern void kvmppc_load_up_vsx (void );static inline struct kvmppc_vcpu_book3s *to_book3s (struct kvm_vcpu *vcpu) {
arch/powerpc/kvm/book3s_64_exports.c +7 -0
@@ -23,3 +23,10 @@EXPORT_SYMBOL_GPL (kvmppc_trampoline_enter);EXPORT_SYMBOL_GPL (kvmppc_trampoline_lowmem);EXPORT_SYMBOL_GPL (kvmppc_rmcall); +EXPORT_SYMBOL_GPL (kvmppc_load_up_fpu); +#ifdef CONFIG_ALTIVEC +EXPORT_SYMBOL_GPL (kvmppc_load_up_altivec); +#endif +#ifdef CONFIG_VSX +EXPORT_SYMBOL_GPL (kvmppc_load_up_vsx); +#endif
arch/powerpc/kvm/book3s_64_rmhandlers.S +34 -0
@@ -158,6 +158,40 @@ _GLOBAL(kvmppc_rmcall) mtsrr1 r4 RFI +/* + * Activate current's external feature (FPU/Altivec/VSX) + */ +#define define_load_up(what) \ + \ +_GLOBAL(kvmppc_load_up_ ## what); \ + subi r1, r1, INT_FRAME_SIZE; \ + mflr r3; \ + std r3, _LINK(r1); \ + mfmsr r4; \ + std r31, GPR3(r1); \ + mr r31, r4; \ + li r5, MSR_DR; \ + oris r5, r5, MSR_EE@h; \ + andc r4, r4, r5; \ + mtmsr r4; \ + \ + bl .load_up_ ## what; \ + \ + mtmsr r31; \ + ld r3, _LINK(r1); \ + ld r31, GPR3(r1); \ + addi r1, r1, INT_FRAME_SIZE; \ + mtlr r3; \ + blr + +define_load_up(fpu) +#ifdef CONFIG_ALTIVEC +define_load_up(altivec) +#endif +#ifdef CONFIG_VSX +define_load_up(vsx) +#endif + .global kvmppc_trampoline_lowmem kvmppc_trampoline_lowmem: .long kvmppc_handler_lowmem_trampoline - _stext
Signature · 1 line
1.6.5.3
PATCH 31/39 KVM: PPC: Add support for FPU/Altivec/VSX
In reply to Avi KivityFrom: Alexander Graf <[email protected]>
When our guest starts using either the FPU, Altivec or VSX we need to make sure Linux knows about it and sneak into its process switching code accordingly.
This patch makes accesses to the above parts of the system work inside the VM.
--- arch/powerpc/include/asm/kvm_host.h | 14 +++- arch/powerpc/kvm/book3s.c | 193 ++++++++++++++++++++++++++++++++++- 2 files changed, 201 insertions(+), 6 deletions(-)
arch/powerpc/include/asm/kvm_host.h +13 -1
@@ -172,9 +172,20 @@ struct kvm_vcpu_arch {struct kvmppc_mmu mmu;#endif -u64 fpr[32 ];ulong gpr[32 ]; +u64 fpr[32 ]; +u32 fpscr; + +#ifdef CONFIG_ALTIVEC +vector128 vr[32 ]; +vector128 vscr; +#endif + +#ifdef CONFIG_VSX +u64 vsr[32 ]; +#endif +ulong pc;ulong ctr;ulong lr;
@@ -188,6 +199,7 @@ struct kvm_vcpu_arch {#ifdef CONFIG_PPC64 ulong shadow_msr;ulong hflags; +ulong guest_owned_ext;#endif u32 mmucr;ulong sprg0;
arch/powerpc/kvm/book3s.c +188 -5
244 lines not on this page · raw message
Signature · 1 line
1.6.5.3
PATCH 32/39 KVM: PPC: Fix initial GPR settings
In reply to Avi KivityFrom: Alexander Graf <[email protected]>
Commit 7d01b4c3ed2bb33ceaf2d270cb4831a67a76b51b introduced PACA backed vcpu values. With this patch, when a userspace app was setting GPRs before it was actually first loaded, the set values get discarded.
This is because vcpu_load loads them from the vcpu backing store that we use whenever we're not owning the PACA.
That behavior is not really a major problem, because we don't need it for qemu. Other users (like kvmctl) do have problems with it though, so let's better do it right.
--- arch/powerpc/include/asm/kvm_book3s.h | 1 - arch/powerpc/include/asm/kvm_ppc.h | 10 ++++++++-- 2 files changed, 8 insertions(+), 3 deletions(-)
arch/powerpc/include/asm/kvm_book3s.h +0 -1
@@ -22,7 +22,6 @@#include <linux/types.h> #include <linux/kvm_host.h> -#include <asm/kvm_ppc.h> #include <asm/kvm_book3s_64_asm.h> struct kvmppc_slb {
arch/powerpc/include/asm/kvm_ppc.h +8 -2
@@ -28,6 +28,9 @@#include <linux/types.h> #include <linux/kvm_types.h> #include <linux/kvm_host.h> +#ifdef CONFIG_PPC_BOOK3S +#include <asm/kvm_book3s.h> +#endif enum emulation_result {EMULATE_DONE ,/* no further processing */
@@ -102,9 +105,10 @@ extern void kvmppc_core_destroy_mmu(struct kvm_vcpu *vcpu);static inline void kvmppc_set_gpr (struct kvm_vcpu *vcpu,int num,ulong val) { -if ( num <14 ) +if ( num <14 ) {get_paca ()->shadow_vcpu.gpr[num] = val; -else +to_book3s (vcpu)->shadow_vcpu.gpr[num] = val; + }else vcpu->arch.gpr[num] = val; }
@@ -119,6 +123,7 @@ static inline ulong kvmppc_get_gpr(struct kvm_vcpu *vcpu, int num)static inline void kvmppc_set_cr (struct kvm_vcpu *vcpu,u32 val) {get_paca ()->shadow_vcpu.cr = val; +to_book3s (vcpu)->shadow_vcpu.cr = val; }static inline u32 kvmppc_get_cr (struct kvm_vcpu *vcpu)
@@ -129,6 +134,7 @@ static inline u32 kvmppc_get_cr(struct kvm_vcpu *vcpu)static inline void kvmppc_set_xer (struct kvm_vcpu *vcpu,u32 val) {get_paca ()->shadow_vcpu.xer = val; +to_book3s (vcpu)->shadow_vcpu.xer = val; }static inline u32 kvmppc_get_xer (struct kvm_vcpu *vcpu)
Signature · 1 line
1.6.5.3
PATCH 33/39 KVM: PPC: Keep SRR1 flags around in shadow_msr
In reply to Avi KivityFrom: Alexander Graf <[email protected]>
SRR1 stores more information that just the MSR value. It also stores valuable information about the type of interrupt we received, for example whether the storage interrupt we just got was because of a missing htab entry or not.
We use that information to speed up the exit path.
Now if we get preempted before we can interpret the shadow_msr values, we get into vcpu_put which then calls the MSR handler, which then sets all the SRR1 information bits in shadow_msr to 0. Great.
So let's preserve the SRR1 specific bits in shadow_msr whenever we set the MSR. They don't hurt.
--- arch/powerpc/include/asm/kvm_host.h | 1 + arch/powerpc/kernel/asm-offsets.c | 1 + arch/powerpc/kvm/book3s.c | 13 +++++++------ arch/powerpc/kvm/book3s_64_interrupts.S | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-)
arch/powerpc/include/asm/kvm_host.h +1 -0
@@ -198,6 +198,7 @@ struct kvm_vcpu_arch {ulong msr;#ifdef CONFIG_PPC64 ulong shadow_msr; +ulong shadow_srr1;ulong hflags;ulong guest_owned_ext;#endif
arch/powerpc/kernel/asm-offsets.c +1 -0
@@ -433,6 +433,7 @@ int main(void) DEFINE(VCPU_HOST_R2, offsetof(struct kvm_vcpu, arch.host_r2)); DEFINE(VCPU_HOST_MSR, offsetof(struct kvm_vcpu, arch.host_msr)); DEFINE(VCPU_SHADOW_MSR, offsetof(struct kvm_vcpu, arch.shadow_msr)); + DEFINE(VCPU_SHADOW_SRR1, offsetof(struct kvm_vcpu, arch.shadow_srr1)); DEFINE(VCPU_TRAMPOLINE_LOWMEM, offsetof(struct kvm_vcpu, arch.trampoline_lowmem)); DEFINE(VCPU_TRAMPOLINE_ENTER, offsetof(struct kvm_vcpu, arch.trampoline_enter)); DEFINE(VCPU_HIGHMEM_HANDLER, offsetof(struct kvm_vcpu, arch.highmem_handler));
arch/powerpc/kvm/book3s.c +7 -6
@@ -524,14 +524,14 @@ int kvmppc_handle_pagefault(struct kvm_run *run, struct kvm_vcpu *vcpu,/* Page not found in guest PTE entries */ vcpu->arch.dear = vcpu->arch.fault_dear;to_book3s (vcpu)->dsisr = vcpu->arch.fault_dsisr; - vcpu->arch.msr |= (vcpu->arch.shadow_msr &0x00000000f8000000ULL ); + vcpu->arch.msr |= (vcpu->arch.shadow_srr1 &0x00000000f8000000ULL );kvmppc_book3s_queue_irqprio (vcpu, vec); }else if (page_found == -EPERM ) {/* Storage protection */ vcpu->arch.dear = vcpu->arch.fault_dear;to_book3s (vcpu)->dsisr = vcpu->arch.fault_dsisr & ~DSISR_NOHPTE ;to_book3s (vcpu)->dsisr |=DSISR_PROTFAULT ; - vcpu->arch.msr |= (vcpu->arch.shadow_msr &0x00000000f8000000ULL ); + vcpu->arch.msr |= (vcpu->arch.shadow_srr1 &0x00000000f8000000ULL );kvmppc_book3s_queue_irqprio (vcpu, vec); }else if (page_found == -EINVAL ) {/* Page not found in guest SLB */
@@ -693,7 +693,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,case BOOK3S_INTERRUPT_INST_STORAGE : vcpu->stat.pf_instruc++;/* only care about PTEG not found errors, but leave NX alone */ -if (vcpu->arch.shadow_msr &0x40000000 ) { +if (vcpu->arch.shadow_srr1 &0x40000000 ) { r =kvmppc_handle_pagefault (run, vcpu, vcpu->arch.pc, exit_nr); vcpu->stat.sp_instruc++; } else if (vcpu->arch.mmu.is_dcbz32(vcpu) &&
@@ -705,7 +705,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,*/ kvmppc_mmu_pte_flush (vcpu, vcpu->arch.pc, ~0xFFFULL ); }else { - vcpu->arch.msr |= (vcpu->arch.shadow_msr &0x58000000 ); + vcpu->arch.msr |= vcpu->arch.shadow_srr1 &0x58000000 ;kvmppc_book3s_queue_irqprio (vcpu, exit_nr);kvmppc_mmu_pte_flush (vcpu, vcpu->arch.pc, ~0xFFFULL ); r =RESUME_GUEST ;
@@ -753,7 +753,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,enum emulation_result er;ulong flags; - flags = (vcpu->arch.shadow_msr &0x1f0000ull ); + flags = vcpu->arch.shadow_srr1 &0x1f0000ull ;if (vcpu->arch.msr &MSR_PR ) {#ifdef EXIT_DEBUG
@@ -808,7 +808,8 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,break ;default :/* Ugh - bork here! What did we get? */ -printk (KERN_EMERG "exit_nr=0x%x | pc=0x%lx | msr=0x%lx\n" , exit_nr, vcpu->arch.pc, vcpu->arch.shadow_msr); +printk (KERN_EMERG "exit_nr=0x%x | pc=0x%lx | msr=0x%lx\n" , + exit_nr, vcpu->arch.pc, vcpu->arch.shadow_srr1); r =RESUME_HOST ;BUG ();break ;
arch/powerpc/kvm/book3s_64_interrupts.S +1 -1
@@ -169,7 +169,7 @@ kvmppc_handler_highmem: stw r0, VCPU_LAST_INST(r7) std r3, VCPU_PC(r7) - std r4, VCPU_SHADOW_MSR(r7) + std r4, VCPU_SHADOW_SRR1(r7) std r5, VCPU_FAULT_DEAR(r7) std r6, VCPU_FAULT_DSISR(r7)
Signature · 1 line
1.6.5.3
PATCH 34/39 KVM: PPC: Move Shadow MSR calculation to function
In reply to Avi KivityFrom: Alexander Graf <[email protected]>
We keep a copy of the MSR around that we use when we go into the guest context.
That copy is basically the normal process MSR flags OR some allowed guest specified MSR flags. We also AND the external providers into this, so we get traps on FPU usage when we haven't activated it on the host yet.
Currently this calculation is part of the set_msr function that we use whenever we set the guest MSR value. With the external providers, we also have the case that we don't modify the guest's MSR, but only want to update the shadow MSR.
So let's move the shadow MSR parts to a separate function that we then use whenever we only need to update it. That way we don't accidently kvm_vcpu_block within a preempt notifier context.
--- arch/powerpc/kvm/book3s.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-)
arch/powerpc/kvm/book3s.c +21 -6
@@ -94,6 +94,23 @@ static u32 kvmppc_get_dec(struct kvm_vcpu *vcpu) }#endif +static void kvmppc_recalc_shadow_msr (struct kvm_vcpu *vcpu) +{ + vcpu->arch.shadow_msr = vcpu->arch.msr; +/* Guest MSR values */ + vcpu->arch.shadow_msr &=MSR_FE0 |MSR_FE1 |MSR_SF |MSR_SE | +MSR_BE |MSR_DE ; +/* Process MSR values */ + vcpu->arch.shadow_msr |=MSR_ME |MSR_RI |MSR_IR |MSR_DR |MSR_PR | +MSR_EE ; +/* External providers the guest reserved */ + vcpu->arch.shadow_msr |= (vcpu->arch.msr & vcpu->arch.guest_owned_ext); +/* 64-bit Process MSR values */ +#ifdef CONFIG_PPC_BOOK3S_64 + vcpu->arch.shadow_msr |=MSR_ISF |MSR_HV ; +#endif +} +void kvmppc_set_msr (struct kvm_vcpu *vcpu,u64 msr) {ulong old_msr = vcpu->arch.msr;
@@ -101,12 +118,10 @@ void kvmppc_set_msr(struct kvm_vcpu *vcpu, u64 msr)#ifdef EXIT_DEBUG printk (KERN_INFO "KVM: Set MSR to 0x%llx\n" , msr);#endif + msr &=to_book3s (vcpu)->msr_mask; vcpu->arch.msr = msr; - vcpu->arch.shadow_msr = msr |MSR_USER32 ; - vcpu->arch.shadow_msr &= (MSR_FE0 |MSR_USER64 |MSR_SE |MSR_BE | -MSR_DE |MSR_FE1 ); - vcpu->arch.shadow_msr |= (msr & vcpu->arch.guest_owned_ext); +kvmppc_recalc_shadow_msr (vcpu);if (msr & (MSR_WE |MSR_POW )) {if (!vcpu->arch.pending_exceptions) {
@@ -610,7 +625,7 @@ static void kvmppc_giveup_ext(struct kvm_vcpu *vcpu, ulong msr) vcpu->arch.guest_owned_ext &= ~msr; current->thread.regs->msr &= ~msr; -kvmppc_set_msr (vcpu, vcpu->arch.msr); +kvmppc_recalc_shadow_msr (vcpu); }/* Handle external providers (FPU, Altivec, VSX) */
@@ -664,7 +679,7 @@ static int kvmppc_handle_ext(struct kvm_vcpu *vcpu, unsigned int exit_nr, vcpu->arch.guest_owned_ext |= msr; -kvmppc_set_msr (vcpu, vcpu->arch.msr); +kvmppc_recalc_shadow_msr (vcpu);return RESUME_GUEST ; }
Signature · 1 line
1.6.5.3
PATCH 35/39 KVM: Add HYPER-V header file
In reply to Avi KivityFrom: Gleb Natapov <[email protected]>
Provide HYPER-V related defines that will be used by following patches.
--- arch/x86/include/asm/hyperv.h | 186 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 186 insertions(+), 0 deletions(-) create mode 100644 arch/x86/include/asm/hyperv.h
arch/x86/include/asm/hyperv.h new file +186 -0
@@ -0,0 +1,186 @@ +#ifndef _ASM_X86_KVM_HYPERV_H +#define _ASM_X86_KVM_HYPERV_H + +#include <linux/types.h> + +/* +* The below CPUID leaves are present if VersionAndFeatures.HypervisorPresent +* is set by CPUID(HvCpuIdFunctionVersionAndFeatures). +*/ +#define HYPERV_CPUID_VENDOR_AND_MAX_FUNCTIONS 0x40000000 +#define HYPERV_CPUID_INTERFACE 0x40000001 +#define HYPERV_CPUID_VERSION 0x40000002 +#define HYPERV_CPUID_FEATURES 0x40000003 +#define HYPERV_CPUID_ENLIGHTMENT_INFO 0x40000004 +#define HYPERV_CPUID_IMPLEMENT_LIMITS 0x40000005 + +/* +* Feature identification. EAX indicates which features are available +* to the partition based upon the current partition privileges. +*/ + +/* VP Runtime (HV_X64_MSR_VP_RUNTIME) available */ +#define HV_X64_MSR_VP_RUNTIME_AVAILABLE (1 << 0) +/* Partition Reference Counter (HV_X64_MSR_TIME_REF_COUNT) available*/ +#define HV_X64_MSR_TIME_REF_COUNT_AVAILABLE (1 << 1) +/* +* Basic SynIC MSRs (HV_X64_MSR_SCONTROL through HV_X64_MSR_EOM +* and HV_X64_MSR_SINT0 through HV_X64_MSR_SINT15) available +*/ +#define HV_X64_MSR_SYNIC_AVAILABLE (1 << 2) +/* +* Synthetic Timer MSRs (HV_X64_MSR_STIMER0_CONFIG through +* HV_X64_MSR_STIMER3_COUNT) available +*/ +#define HV_X64_MSR_SYNTIMER_AVAILABLE (1 << 3) +/* +* APIC access MSRs (HV_X64_MSR_EOI, HV_X64_MSR_ICR and HV_X64_MSR_TPR) +* are available +*/ +#define HV_X64_MSR_APIC_ACCESS_AVAILABLE (1 << 4) +/* Hypercall MSRs (HV_X64_MSR_GUEST_OS_ID and HV_X64_MSR_HYPERCALL) available*/ +#define HV_X64_MSR_HYPERCALL_AVAILABLE (1 << 5) +/* Access virtual processor index MSR (HV_X64_MSR_VP_INDEX) available*/ +#define HV_X64_MSR_VP_INDEX_AVAILABLE (1 << 6) +/* Virtual system reset MSR (HV_X64_MSR_RESET) is available*/ +#define HV_X64_MSR_RESET_AVAILABLE (1 << 7) +/* +* Access statistics pages MSRs (HV_X64_MSR_STATS_PARTITION_RETAIL_PAGE, +* HV_X64_MSR_STATS_PARTITION_INTERNAL_PAGE, HV_X64_MSR_STATS_VP_RETAIL_PAGE, +* HV_X64_MSR_STATS_VP_INTERNAL_PAGE) available +*/ +#define HV_X64_MSR_STAT_PAGES_AVAILABLE (1 << 8) + +/* +* Feature identification: EBX indicates which flags were specified at +* partition creation. The format is the same as the partition creation +* flag structure defined in section Partition Creation Flags. +*/ +#define HV_X64_CREATE_PARTITIONS (1 << 0) +#define HV_X64_ACCESS_PARTITION_ID (1 << 1) +#define HV_X64_ACCESS_MEMORY_POOL (1 << 2) +#define HV_X64_ADJUST_MESSAGE_BUFFERS (1 << 3) +#define HV_X64_POST_MESSAGES (1 << 4) +#define HV_X64_SIGNAL_EVENTS (1 << 5) +#define HV_X64_CREATE_PORT (1 << 6) +#define HV_X64_CONNECT_PORT (1 << 7) +#define HV_X64_ACCESS_STATS (1 << 8) +#define HV_X64_DEBUGGING (1 << 11) +#define HV_X64_CPU_POWER_MANAGEMENT (1 << 12) +#define HV_X64_CONFIGURE_PROFILER (1 << 13) + +/* +* Feature identification. EDX indicates which miscellaneous features +* are available to the partition. +*/ +/* The MWAIT instruction is available (per section MONITOR / MWAIT) */ +#define HV_X64_MWAIT_AVAILABLE (1 << 0) +/* Guest debugging support is available */ +#define HV_X64_GUEST_DEBUGGING_AVAILABLE (1 << 1) +/* Performance Monitor support is available*/ +#define HV_X64_PERF_MONITOR_AVAILABLE (1 << 2) +/* Support for physical CPU dynamic partitioning events is available*/ +#define HV_X64_CPU_DYNAMIC_PARTITIONING_AVAILABLE (1 << 3) +/* +* Support for passing hypercall input parameter block via XMM +* registers is available +*/ +#define HV_X64_HYPERCALL_PARAMS_XMM_AVAILABLE (1 << 4) +/* Support for a virtual guest idle state is available */ +#define HV_X64_GUEST_IDLE_STATE_AVAILABLE (1 << 5) + +/* +* Implementation recommendations. Indicates which behaviors the hypervisor +* recommends the OS implement for optimal performance. +*/ +/* +* Recommend using hypercall for address space switches rather +* than MOV to CR3 instruction +*/ +#define HV_X64_MWAIT_RECOMMENDED (1 << 0) +/* Recommend using hypercall for local TLB flushes rather +* than INVLPG or MOV to CR3 instructions */ +#define HV_X64_LOCAL_TLB_FLUSH_RECOMMENDED (1 << 1) +/* +* Recommend using hypercall for remote TLB flushes rather +* than inter-processor interrupts +*/ +#define HV_X64_REMOTE_TLB_FLUSH_RECOMMENDED (1 << 2) +/* +* Recommend using MSRs for accessing APIC registers +* EOI, ICR and TPR rather than their memory-mapped counterparts +*/ +#define HV_X64_APIC_ACCESS_RECOMMENDED (1 << 3) +/* Recommend using the hypervisor-provided MSR to initiate a system RESET */ +#define HV_X64_SYSTEM_RESET_RECOMMENDED (1 << 4) +/* +* Recommend using relaxed timing for this partition. If used, +* the VM should disable any watchdog timeouts that rely on the +* timely delivery of external interrupts +*/ +#define HV_X64_RELAXED_TIMING_RECOMMENDED (1 << 5) + +/* MSR used to identify the guest OS. */ +#define HV_X64_MSR_GUEST_OS_ID 0x40000000 + +/* MSR used to setup pages used to communicate with the hypervisor. */ +#define HV_X64_MSR_HYPERCALL 0x40000001 + +/* MSR used to provide vcpu index */ +#define HV_X64_MSR_VP_INDEX 0x40000002 + +/* Define the virtual APIC registers */ +#define HV_X64_MSR_EOI 0x40000070 +#define HV_X64_MSR_ICR 0x40000071 +#define HV_X64_MSR_TPR 0x40000072 +#define HV_X64_MSR_APIC_ASSIST_PAGE 0x40000073 + +/* Define synthetic interrupt controller model specific registers. */ +#define HV_X64_MSR_SCONTROL 0x40000080 +#define HV_X64_MSR_SVERSION 0x40000081 +#define HV_X64_MSR_SIEFP 0x40000082 +#define HV_X64_MSR_SIMP 0x40000083 +#define HV_X64_MSR_EOM 0x40000084 +#define HV_X64_MSR_SINT0 0x40000090 +#define HV_X64_MSR_SINT1 0x40000091 +#define HV_X64_MSR_SINT2 0x40000092 +#define HV_X64_MSR_SINT3 0x40000093 +#define HV_X64_MSR_SINT4 0x40000094 +#define HV_X64_MSR_SINT5 0x40000095 +#define HV_X64_MSR_SINT6 0x40000096 +#define HV_X64_MSR_SINT7 0x40000097 +#define HV_X64_MSR_SINT8 0x40000098 +#define HV_X64_MSR_SINT9 0x40000099 +#define HV_X64_MSR_SINT10 0x4000009A +#define HV_X64_MSR_SINT11 0x4000009B +#define HV_X64_MSR_SINT12 0x4000009C +#define HV_X64_MSR_SINT13 0x4000009D +#define HV_X64_MSR_SINT14 0x4000009E +#define HV_X64_MSR_SINT15 0x4000009F + + +#define HV_X64_MSR_HYPERCALL_ENABLE 0x00000001 +#define HV_X64_MSR_HYPERCALL_PAGE_ADDRESS_SHIFT 12 +#define HV_X64_MSR_HYPERCALL_PAGE_ADDRESS_MASK \ + (~((1ull << HV_X64_MSR_HYPERCALL_PAGE_ADDRESS_SHIFT) - 1)) + +/* Declare the various hypercall operations. */ +#define HV_X64_HV_NOTIFY_LONG_SPIN_WAIT 0x0008 + +#define HV_X64_MSR_APIC_ASSIST_PAGE_ENABLE 0x00000001 +#define HV_X64_MSR_APIC_ASSIST_PAGE_ADDRESS_SHIFT 12 +#define HV_X64_MSR_APIC_ASSIST_PAGE_ADDRESS_MASK \ + (~((1ull << HV_X64_MSR_APIC_ASSIST_PAGE_ADDRESS_SHIFT) - 1)) + +#define HV_PROCESSOR_POWER_STATE_C0 0 +#define HV_PROCESSOR_POWER_STATE_C1 1 +#define HV_PROCESSOR_POWER_STATE_C2 2 +#define HV_PROCESSOR_POWER_STATE_C3 3 + +/* hypercall status code */ +#define HV_STATUS_SUCCESS 0 +#define HV_STATUS_INVALID_HYPERCALL_CODE 2 +#define HV_STATUS_INVALID_HYPERCALL_INPUT 3 +#define HV_STATUS_INVALID_ALIGNMENT 4 + +#endif
Signature · 1 line
1.6.5.3
PATCH 36/39 KVM: Implement bare minimum of HYPER-V MSRs
In reply to Avi KivityFrom: Gleb Natapov <[email protected]>
Minimum HYPER-V implementation should have GUEST_OS_ID, HYPERCALL and VP_INDEX MSRs.
[avi: fix build on i386]
--- arch/x86/include/asm/kvm_host.h | 4 + arch/x86/include/asm/kvm_para.h | 1 + arch/x86/kvm/trace.h | 32 +++++++ arch/x86/kvm/x86.c | 193 ++++++++++++++++++++++++++++++++++++++- include/linux/kvm.h | 1 + 5 files changed, 230 insertions(+), 1 deletions(-)
arch/x86/include/asm/kvm_host.h +4 -0
@@ -413,6 +413,10 @@ struct kvm_arch {s64 kvmclock_offset;struct kvm_xen_hvm_config xen_hvm_config; + +/* fields used by HYPER-V emulation */ +u64 hv_guest_os_id; +u64 hv_hypercall; };struct kvm_vm_stat {
arch/x86/include/asm/kvm_para.h +1 -0
@@ -2,6 +2,7 @@#define _ASM_X86_KVM_PARA_H#include <linux/types.h> +#include <asm/hyperv.h> /* This CPUID returns the signature 'KVMKVMKVM' in ebx, ecx, and edx. It * should be used to determine that a VM is running under KVM.
arch/x86/kvm/trace.h +32 -0
@@ -56,6 +56,38 @@ TRACE_EVENT(kvm_hypercall, );/* +* Tracepoint for hypercall. +*/ +TRACE_EVENT (kvm_hv_hypercall, + TP_PROTO(__u16 code, bool fast, __u16 rep_cnt, __u16 rep_idx, + __u64 ingpa, __u64 outgpa), +TP_ARGS (code, fast, rep_cnt, rep_idx, ingpa, outgpa), + +TP_STRUCT__entry ( + __field( __u16, code ) + __field( bool, fast ) + __field( __u16, rep_cnt ) + __field( __u16, rep_idx ) + __field( __u64, ingpa ) +__field ( __u64, outgpa ) + ), + +TP_fast_assign ( + __entry->code = code; + __entry->fast = fast; + __entry->rep_cnt = rep_cnt; + __entry->rep_idx = rep_idx; + __entry->ingpa = ingpa; + __entry->outgpa = outgpa; + ), + +TP_printk ("code 0x%x %s cnt 0x%x idx 0x%x in 0x%llx out 0x%llx" , + __entry->code, __entry->fast ?"fast" :"slow" , + __entry->rep_cnt, __entry->rep_idx, __entry->ingpa, + __entry->outgpa) +); + +/* * Tracepoint for PIO. */ TRACE_EVENT(kvm_pio,
arch/x86/kvm/x86.c +192 -1
242 lines not on this page · raw message
include/linux/kvm.h +1 -0
@@ -497,6 +497,7 @@ struct kvm_ioeventfd {#endif #define KVM_CAP_S390_PSW 42#define KVM_CAP_PPC_SEGSTATE 43 +#define KVM_CAP_HYPERV 44#ifdef KVM_CAP_IRQ_ROUTING
Signature · 1 line
1.6.5.3
PATCH 37/39 KVM: Add HYPER-V apic access MSRs
In reply to Avi KivityFrom: Gleb Natapov <[email protected]>
Implement HYPER-V apic MSRs. Spec defines three MSRs that speed-up access to EOI/TPR/ICR apic registers for PV guests.
--- arch/x86/include/asm/kvm_host.h | 2 + arch/x86/kvm/lapic.c | 31 ++++++++++++++++++++++++++++ arch/x86/kvm/lapic.h | 8 +++++++ arch/x86/kvm/x86.c | 42 +++++++++++++++++++++++++++++++++++--- include/linux/kvm.h | 1 + 5 files changed, 80 insertions(+), 4 deletions(-)
arch/x86/include/asm/kvm_host.h +2 -0
@@ -363,6 +363,8 @@ struct kvm_vcpu_arch {/* used for guest single stepping over the given code position */ u16 singlestep_cs;unsigned long singlestep_rip; +/* fields used by HYPER-V emulation */ +u64 hv_vapic; };struct kvm_mem_alias {
arch/x86/kvm/lapic.c +31 -0
@@ -1246,3 +1246,34 @@ int kvm_x2apic_msr_read(struct kvm_vcpu *vcpu, u32 msr, u64 *data)return 0 ; } + +int kvm_hv_vapic_msr_write (struct kvm_vcpu *vcpu,u32 reg,u64 data) +{ +struct kvm_lapic *apic = vcpu->arch.apic; + +if (!irqchip_in_kernel (vcpu->kvm)) +return 1 ; + +/* if this is ICR write vector before command */ +if (reg ==APIC_ICR ) +apic_reg_write (apic,APIC_ICR2 , (u32)(data >>32 )); +return apic_reg_write (apic, reg, (u32 )data); +} + +int kvm_hv_vapic_msr_read (struct kvm_vcpu *vcpu,u32 reg,u64 *data) +{ +struct kvm_lapic *apic = vcpu->arch.apic; +u32 low, high =0 ; + +if (!irqchip_in_kernel (vcpu->kvm)) +return 1 ; + +if (apic_reg_read (apic, reg,4 , &low)) +return 1 ; +if (reg ==APIC_ICR ) +apic_reg_read (apic,APIC_ICR2 ,4 , &high); + + *data = (((u64 )high) <<32 ) | low; + +return 0 ; +}
arch/x86/kvm/lapic.h +8 -0
@@ -48,4 +48,12 @@ void kvm_lapic_sync_to_vapic(struct kvm_vcpu *vcpu);int kvm_x2apic_msr_write (struct kvm_vcpu *vcpu,u32 msr,u64 data);int kvm_x2apic_msr_read (struct kvm_vcpu *vcpu,u32 msr,u64 *data); + +int kvm_hv_vapic_msr_write (struct kvm_vcpu *vcpu,u32 msr,u64 data); +int kvm_hv_vapic_msr_read (struct kvm_vcpu *vcpu,u32 msr,u64 *data); + +static inline bool kvm_hv_vapic_assist_page_enabled (struct kvm_vcpu *vcpu) +{ +return vcpu->arch.hv_vapic &HV_X64_MSR_APIC_ASSIST_PAGE_ENABLE ; +}#endif
arch/x86/kvm/x86.c +38 -4
70 lines not on this page · raw message
include/linux/kvm.h +1 -0
@@ -498,6 +498,7 @@ struct kvm_ioeventfd {#define KVM_CAP_S390_PSW 42#define KVM_CAP_PPC_SEGSTATE 43#define KVM_CAP_HYPERV 44 +#define KVM_CAP_HYPERV_VAPIC 45#ifdef KVM_CAP_IRQ_ROUTING
Signature · 1 line
1.6.5.3
PATCH 38/39 KVM: Implement NotifyLongSpinWait HYPER-V hypercall
In reply to Avi KivityFrom: Gleb Natapov <[email protected]>
Windows issues this hypercall after guest was spinning on a spinlock for too many iterations.
--- arch/x86/kvm/x86.c | 10 +++++++++- include/linux/kvm.h | 1 + 2 files changed, 10 insertions(+), 1 deletions(-)
arch/x86/kvm/x86.c +9 -1
@@ -1564,6 +1564,7 @@ int kvm_dev_ioctl_check_extension(long ext)case KVM_CAP_VCPU_EVENTS :case KVM_CAP_HYPERV :case KVM_CAP_HYPERV_VAPIC : +case KVM_CAP_HYPERV_SPIN : r =1 ;break ;case KVM_CAP_COALESCED_MMIO :
@@ -3827,7 +3828,14 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu)trace_kvm_hv_hypercall (code, fast, rep_cnt, rep_idx, ingpa, outgpa); - res =HV_STATUS_INVALID_HYPERCALL_CODE ; +switch (code) { +case HV_X64_HV_NOTIFY_LONG_SPIN_WAIT : +kvm_vcpu_on_spin (vcpu); +break ; +default : + res =HV_STATUS_INVALID_HYPERCALL_CODE ; +break ; + } ret = res | (((u64 )rep_done &0xfff ) <<32 );if (longmode) {
include/linux/kvm.h +1 -0
@@ -499,6 +499,7 @@ struct kvm_ioeventfd {#define KVM_CAP_PPC_SEGSTATE 43#define KVM_CAP_HYPERV 44#define KVM_CAP_HYPERV_VAPIC 45 +#define KVM_CAP_HYPERV_SPIN 46#ifdef KVM_CAP_IRQ_ROUTING
Signature · 1 line
1.6.5.3
PATCH 39/39 KVM: rename is_writeble_pte() to is_writable_pte()
In reply to Avi KivityFrom: Takuya Yoshikawa <[email protected]>
There are two spellings of "writable" inarch/x86/kvm/mmu.c and paging_tmpl.h .
This patch renames is_writeble_pte() to is_writable_pte() and makes grepping easy.
New name is consistent with the definition of itself:
return pte & PT_WRITABLE_MASK;
--- arch/x86/kvm/mmu.c | 18 +++++++++--------- arch/x86/kvm/paging_tmpl.h | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-)
arch/x86/kvm/mmu.c +9 -9
@@ -250,7 +250,7 @@ static int is_large_pte(u64 pte)return pte &PT_PAGE_SIZE_MASK ; } -static int is_writeble_pte (unsigned long pte) +static int is_writable_pte (unsigned long pte) {return pte &PT_WRITABLE_MASK ; }
@@ -632,7 +632,7 @@ static void rmap_remove(struct kvm *kvm, u64 *spte) pfn =spte_to_pfn (*spte);if (*spte & shadow_accessed_mask)kvm_set_pfn_accessed (pfn); -if (is_writeble_pte (*spte)) +if (is_writable_pte (*spte))kvm_set_pfn_dirty (pfn); rmapp =gfn_to_rmap (kvm, sp->gfns[spte - sp->spt], sp->role.level);if (!*rmapp) {
@@ -708,7 +708,7 @@ static int rmap_write_protect(struct kvm *kvm, u64 gfn)BUG_ON (!spte);BUG_ON (!(*spte &PT_PRESENT_MASK ));rmap_printk ("rmap_write_protect: spte %p %llx\n" , spte, *spte); -if (is_writeble_pte (*spte)) { +if (is_writable_pte (*spte)) {__set_spte (spte, *spte & ~PT_WRITABLE_MASK ); write_protected =1 ; }
@@ -732,7 +732,7 @@ static int rmap_write_protect(struct kvm *kvm, u64 gfn)BUG_ON (!(*spte &PT_PRESENT_MASK ));BUG_ON ((*spte & (PT_PAGE_SIZE_MASK |PT_PRESENT_MASK )) != (PT_PAGE_SIZE_MASK |PT_PRESENT_MASK ));pgprintk ("rmap_write_protect(large): spte %p %llx %lld\n" , spte, *spte, gfn); -if (is_writeble_pte (*spte)) { +if (is_writable_pte (*spte)) {rmap_remove (kvm, spte); --kvm->stat.lpages;__set_spte (spte, shadow_trap_nonpresent_pte);
@@ -787,7 +787,7 @@ static int kvm_set_pte_rmapp(struct kvm *kvm, unsigned long *rmapp, new_spte &= ~PT_WRITABLE_MASK ; new_spte &= ~SPTE_HOST_WRITEABLE ; -if (is_writeble_pte (*spte)) +if (is_writable_pte (*spte))kvm_set_pfn_dirty (spte_to_pfn (*spte));__set_spte (spte, new_spte); spte =rmap_next (kvm, rmapp, spte);
@@ -1847,7 +1847,7 @@ static int set_spte(struct kvm_vcpu *vcpu, u64 *sptep,* is responsibility of mmu_get_page / kvm_sync_page. * Same reasoning can be applied to dirty page accounting. */ -if (!can_unsync &&is_writeble_pte (*sptep)) +if (!can_unsync &&is_writable_pte (*sptep)) goto set_pte;if (mmu_need_write_protect (vcpu, gfn, can_unsync)) {
@@ -1855,7 +1855,7 @@ static int set_spte(struct kvm_vcpu *vcpu, u64 *sptep, __func__, gfn); ret =1 ; pte_access &= ~ACC_WRITE_MASK ; -if (is_writeble_pte (spte)) +if (is_writable_pte (spte)) spte &= ~PT_WRITABLE_MASK ; } }
@@ -1876,7 +1876,7 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep, bool reset_host_protection) {int was_rmapped =0 ; -int was_writeble =is_writeble_pte (*sptep); +int was_writable =is_writable_pte (*sptep);int rmap_count; pgprintk("%s: spte %llx access %x write_fault %d"
@@ -1927,7 +1927,7 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep,if (rmap_count >RMAP_RECYCLE_THRESHOLD )rmap_recycle (vcpu, sptep, gfn); }else { -if (was_writeble) +if (was_writable)kvm_release_pfn_dirty (pfn);else kvm_release_pfn_clean (pfn);
arch/x86/kvm/paging_tmpl.h +1 -1
@@ -162,7 +162,7 @@ walk:if (rsvd_fault) goto access_error; -if (write_fault && !is_writeble_pte (pte)) +if (write_fault && !is_writable_pte (pte))if (user_fault ||is_write_protection (vcpu)) goto access_error;
Signature · 1 line
1.6.5.3