From: James Hogan <james.hogan@imgtec.com> To: <linux-mips@linux-mips.org> Cc: "James Hogan" <james.hogan@imgtec.com>, "Paolo Bonzini" <pbonzini@redhat.com>, "Radim Krčmář" <rkrcmar@redhat.com>, "Ralf Baechle" <ralf@linux-mips.org>, kvm@vger.kernel.org Subject: [PATCH v2 27/30] KVM: MIPS/Emulate: Fix CACHE emulation for EVA hosts Date: Thu, 2 Feb 2017 12:04:40 +0000 [thread overview] Message-ID: <c385db5b00ed2223c500271231626c4d5be84598.1486036366.git-series.james.hogan@imgtec.com> (raw) In-Reply-To: <cover.e37f86dece46fc3ed00a075d68119cab361cda8e.1486036366.git-series.james.hogan@imgtec.com> Use protected_writeback_dcache_line() instead of flush_dcache_line(), and protected_flush_icache_line() instead of flush_icache_line(), so that CACHEE (the EVA variant) is used on EVA host kernels. Without this, guest floating point branch delay slot emulation via a trampoline on the user stack fails on EVA host kernels due to failure of the icache sync, resulting in the break instruction getting skipped and execution from the stack. Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: "Radim Krčmář" <rkrcmar@redhat.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: linux-mips@linux-mips.org Cc: kvm@vger.kernel.org --- arch/mips/kvm/emulate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/mips/kvm/emulate.c b/arch/mips/kvm/emulate.c index 3ced662e012e..9ac8e45017ce 100644 --- a/arch/mips/kvm/emulate.c +++ b/arch/mips/kvm/emulate.c @@ -1792,7 +1792,7 @@ enum emulation_result kvm_mips_emulate_cache(union mips_instruction inst, skip_fault: /* XXXKYMA: Only a subset of cache ops are supported, used by Linux */ if (op_inst == Hit_Writeback_Inv_D || op_inst == Hit_Invalidate_D) { - flush_dcache_line(va); + protected_writeback_dcache_line(va); #ifdef CONFIG_KVM_MIPS_DYN_TRANS /* @@ -1802,8 +1802,8 @@ enum emulation_result kvm_mips_emulate_cache(union mips_instruction inst, kvm_mips_trans_cache_va(inst, opc, vcpu); #endif } else if (op_inst == Hit_Invalidate_I) { - flush_dcache_line(va); - flush_icache_line(va); + protected_writeback_dcache_line(va); + protected_flush_icache_line(va); #ifdef CONFIG_KVM_MIPS_DYN_TRANS /* Replace the CACHE instruction, with a SYNCI */ -- git-series 0.8.10
WARNING: multiple messages have this Message-ID (diff)
From: James Hogan <james.hogan@imgtec.com> To: linux-mips@linux-mips.org Cc: "James Hogan" <james.hogan@imgtec.com>, "Paolo Bonzini" <pbonzini@redhat.com>, "Radim Krčmář" <rkrcmar@redhat.com>, "Ralf Baechle" <ralf@linux-mips.org>, kvm@vger.kernel.org Subject: [PATCH v2 27/30] KVM: MIPS/Emulate: Fix CACHE emulation for EVA hosts Date: Thu, 2 Feb 2017 12:04:40 +0000 [thread overview] Message-ID: <c385db5b00ed2223c500271231626c4d5be84598.1486036366.git-series.james.hogan@imgtec.com> (raw) Message-ID: <20170202120440.A4F-Mr8_rSaAGg_LSogRTI_LZ-gZrH_pAVSx6DsmDcE@z> (raw) In-Reply-To: <cover.e37f86dece46fc3ed00a075d68119cab361cda8e.1486036366.git-series.james.hogan@imgtec.com> Use protected_writeback_dcache_line() instead of flush_dcache_line(), and protected_flush_icache_line() instead of flush_icache_line(), so that CACHEE (the EVA variant) is used on EVA host kernels. Without this, guest floating point branch delay slot emulation via a trampoline on the user stack fails on EVA host kernels due to failure of the icache sync, resulting in the break instruction getting skipped and execution from the stack. Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: "Radim Krčmář" <rkrcmar@redhat.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: linux-mips@linux-mips.org Cc: kvm@vger.kernel.org --- arch/mips/kvm/emulate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/mips/kvm/emulate.c b/arch/mips/kvm/emulate.c index 3ced662e012e..9ac8e45017ce 100644 --- a/arch/mips/kvm/emulate.c +++ b/arch/mips/kvm/emulate.c @@ -1792,7 +1792,7 @@ enum emulation_result kvm_mips_emulate_cache(union mips_instruction inst, skip_fault: /* XXXKYMA: Only a subset of cache ops are supported, used by Linux */ if (op_inst == Hit_Writeback_Inv_D || op_inst == Hit_Invalidate_D) { - flush_dcache_line(va); + protected_writeback_dcache_line(va); #ifdef CONFIG_KVM_MIPS_DYN_TRANS /* @@ -1802,8 +1802,8 @@ enum emulation_result kvm_mips_emulate_cache(union mips_instruction inst, kvm_mips_trans_cache_va(inst, opc, vcpu); #endif } else if (op_inst == Hit_Invalidate_I) { - flush_dcache_line(va); - flush_icache_line(va); + protected_writeback_dcache_line(va); + protected_flush_icache_line(va); #ifdef CONFIG_KVM_MIPS_DYN_TRANS /* Replace the CACHE instruction, with a SYNCI */ -- git-series 0.8.10
next prev parent reply other threads:[~2017-02-02 12:15 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-02-02 12:04 [PATCH v2 0/30] KVM: MIPS: Implement GVA page tables James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 1/30] MIPS: Move pgd_alloc() out of header James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 2/30] MIPS: Export pgd/pmd symbols for KVM James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 3/30] MIPS: uasm: Add include guards in asm/uasm.h James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 4/30] MIPS: Export some tlbex internals for KVM to use James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 5/30] KVM: MIPS: Drop partial KVM_NMI implementation James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 6/30] KVM: MIPS/MMU: Simplify ASID restoration James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 7/30] KVM: MIPS: Convert get/set_regs -> vcpu_load/put James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 8/30] KVM: MIPS/MMU: Move preempt/ASID handling to implementation James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 9/30] KVM: MIPS: Remove duplicated ASIDs from vcpu James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 10/30] KVM: MIPS: Add vcpu_run() & vcpu_reenter() callbacks James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 11/30] KVM: MIPS/T&E: Restore host asid on return to host James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 12/30] KVM: MIPS/T&E: active_mm = init_mm in guest context James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 13/30] KVM: MIPS: Wire up vcpu uninit James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 14/30] KVM: MIPS/T&E: Allocate GVA -> HPA page tables James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 15/30] KVM: MIPS/T&E: Activate GVA page tables in guest context James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 16/30] KVM: MIPS: Support NetLogic KScratch registers James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 17/30] KVM: MIPS: Add fast path TLB refill handler James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 18/30] KVM: MIPS/TLB: Fix off-by-one in TLB invalidate James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 19/30] KVM: MIPS/TLB: Generalise host TLB invalidate to kernel ASID James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 20/30] KVM: MIPS/MMU: Invalidate GVA PTs on ASID changes James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 21/30] KVM: MIPS/MMU: Invalidate stale GVA PTEs on TLBW James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 22/30] KVM: MIPS/MMU: Convert KSeg0 faults to page tables James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 23/30] KVM: MIPS/MMU: Convert TLB mapped " James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 24/30] KVM: MIPS/MMU: Convert commpage fault handling " James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 25/30] KVM: MIPS: Drop vm_init() callback James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 26/30] KVM: MIPS: Use uaccess to read/modify guest instructions James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` James Hogan [this message] 2017-02-02 12:04 ` [PATCH v2 27/30] KVM: MIPS/Emulate: Fix CACHE emulation for EVA hosts James Hogan 2017-02-02 12:04 ` [PATCH v2 28/30] KVM: MIPS/TLB: Drop kvm_local_flush_tlb_all() James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 29/30] KVM: MIPS/Emulate: Drop redundant TLB flushes on exceptions James Hogan 2017-02-02 12:04 ` James Hogan 2017-02-02 12:04 ` [PATCH v2 30/30] KVM: MIPS/MMU: Drop kvm_get_new_mmu_context() James Hogan 2017-02-02 12:04 ` James Hogan
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=c385db5b00ed2223c500271231626c4d5be84598.1486036366.git-series.james.hogan@imgtec.com \ --to=james.hogan@imgtec.com \ --cc=kvm@vger.kernel.org \ --cc=linux-mips@linux-mips.org \ --cc=pbonzini@redhat.com \ --cc=ralf@linux-mips.org \ --cc=rkrcmar@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).