Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

KVM: PPC: e500mc: Revert "add load inst fixup"

The commit 1d628af7 "add load inst fixup" made an attempt to handle
failures generated by reading the guest current instruction. The fixup
code that was added works by chance hiding the real issue.

Load external pid (lwepx) instruction, used by KVM to read guest
instructions, is executed in a subsituted guest translation context
(EPLC[EGS] = 1). In consequence lwepx's TLB error and data storage
interrupts need to be handled by KVM, even though these interrupts
are generated from host context (MSR[GS] = 0) where lwepx is executed.

Currently, KVM hooks only interrupts generated from guest context
(MSR[GS] = 1), doing minimal checks on the fast path to avoid host
performance degradation. As a result, the host kernel handles lwepx
faults searching the faulting guest data address (loaded in DEAR) in
its own Logical Partition ID (LPID) 0 context. In case a host translation
is found the execution returns to the lwepx instruction instead of the
fixup, the host ending up in an infinite loop.

Revert the commit "add load inst fixup". lwepx issue will be addressed
in a subsequent patch without needing fixup code.

Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com>
Signed-off-by: Alexander Graf <agraf@suse.de>

authored by

Mihai Caraman and committed by
Alexander Graf
b5741bb3 34f754b9

+1 -25
+1 -25
arch/powerpc/kvm/bookehv_interrupts.S
··· 29 29 #include <asm/asm-compat.h> 30 30 #include <asm/asm-offsets.h> 31 31 #include <asm/bitsperlong.h> 32 - #include <asm/thread_info.h> 33 32 34 33 #ifdef CONFIG_64BIT 35 34 #include <asm/exception-64e.h> ··· 163 164 PPC_STL r30, VCPU_GPR(R30)(r4) 164 165 PPC_STL r31, VCPU_GPR(R31)(r4) 165 166 mtspr SPRN_EPLC, r8 166 - 167 - /* disable preemption, so we are sure we hit the fixup handler */ 168 - CURRENT_THREAD_INFO(r8, r1) 169 - li r7, 1 170 - stw r7, TI_PREEMPT(r8) 171 - 172 167 isync 173 - 174 - /* 175 - * In case the read goes wrong, we catch it and write an invalid value 176 - * in LAST_INST instead. 177 - */ 178 - 1: lwepx r9, 0, r5 179 - 2: 180 - .section .fixup, "ax" 181 - 3: li r9, KVM_INST_FETCH_FAILED 182 - b 2b 183 - .previous 184 - .section __ex_table,"a" 185 - PPC_LONG_ALIGN 186 - PPC_LONG 1b,3b 187 - .previous 188 - 168 + lwepx r9, 0, r5 189 169 mtspr SPRN_EPLC, r3 190 - li r7, 0 191 - stw r7, TI_PREEMPT(r8) 192 170 stw r9, VCPU_LAST_INST(r4) 193 171 .endif 194 172