diff options
author | Nicholas Piggin <npiggin@gmail.com> | 2018-04-05 13:56:30 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-04-10 22:35:33 -0400 |
commit | 19ce7909ed11c49f7eddf59e7f49cd3062bf83d5 (patch) | |
tree | c60ca9685a81ead71396fe32f24e909b292e8d5b | |
parent | 032900e62c176d75923baf95ad880e5d6ba71171 (diff) |
KVM: PPC: Book3S HV: trace_tlbie must not be called in realmode
This crashes with a "Bad real address for load" attempting to load
from the vmalloc region in realmode (faulting address is in DAR).
Oops: Bad interrupt in KVM entry/exit code, sig: 6 [#1]
LE SMP NR_CPUS=2048 NUMA PowerNV
CPU: 53 PID: 6582 Comm: qemu-system-ppc Not tainted 4.16.0-01530-g43d1859f0994
NIP: c0000000000155ac LR: c0000000000c2430 CTR: c000000000015580
REGS: c000000fff76dd80 TRAP: 0200 Not tainted (4.16.0-01530-g43d1859f0994)
MSR: 9000000000201003 <SF,HV,ME,RI,LE> CR: 48082222 XER: 00000000
CFAR: 0000000102900ef0 DAR: d00017fffd941a28 DSISR: 00000040 SOFTE: 3
NIP [c0000000000155ac] perf_trace_tlbie+0x2c/0x1a0
LR [c0000000000c2430] do_tlbies+0x230/0x2f0
I suspect the reason is the per-cpu data is not in the linear chunk.
This could be restored if that was able to be fixed, but for now,
just remove the tracepoints.
Fixes: 0428491cba92 ("powerpc/mm: Trace tlbie(l) instructions")
Cc: stable@vger.kernel.org # v4.13+
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r-- | arch/powerpc/kvm/book3s_hv_rm_mmu.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/kvm/book3s_hv_rm_mmu.c b/arch/powerpc/kvm/book3s_hv_rm_mmu.c index e1c083fbe434..78e6a392330f 100644 --- a/arch/powerpc/kvm/book3s_hv_rm_mmu.c +++ b/arch/powerpc/kvm/book3s_hv_rm_mmu.c | |||
@@ -470,8 +470,6 @@ static void do_tlbies(struct kvm *kvm, unsigned long *rbvalues, | |||
470 | for (i = 0; i < npages; ++i) { | 470 | for (i = 0; i < npages; ++i) { |
471 | asm volatile(PPC_TLBIE_5(%0,%1,0,0,0) : : | 471 | asm volatile(PPC_TLBIE_5(%0,%1,0,0,0) : : |
472 | "r" (rbvalues[i]), "r" (kvm->arch.lpid)); | 472 | "r" (rbvalues[i]), "r" (kvm->arch.lpid)); |
473 | trace_tlbie(kvm->arch.lpid, 0, rbvalues[i], | ||
474 | kvm->arch.lpid, 0, 0, 0); | ||
475 | } | 473 | } |
476 | 474 | ||
477 | if (cpu_has_feature(CPU_FTR_P9_TLBIE_BUG)) { | 475 | if (cpu_has_feature(CPU_FTR_P9_TLBIE_BUG)) { |
@@ -492,8 +490,6 @@ static void do_tlbies(struct kvm *kvm, unsigned long *rbvalues, | |||
492 | for (i = 0; i < npages; ++i) { | 490 | for (i = 0; i < npages; ++i) { |
493 | asm volatile(PPC_TLBIEL(%0,%1,0,0,0) : : | 491 | asm volatile(PPC_TLBIEL(%0,%1,0,0,0) : : |
494 | "r" (rbvalues[i]), "r" (0)); | 492 | "r" (rbvalues[i]), "r" (0)); |
495 | trace_tlbie(kvm->arch.lpid, 1, rbvalues[i], | ||
496 | 0, 0, 0, 0); | ||
497 | } | 493 | } |
498 | asm volatile("ptesync" : : : "memory"); | 494 | asm volatile("ptesync" : : : "memory"); |
499 | } | 495 | } |