powerpc/64s/radix: Fix radix_kvm_prefetch_workaround paca access of not possible CPU

Message ID 20180612093808.30679-1-npiggin@gmail.com
State Accepted
Commit 758380b8155f69b4e2f77f27562f8a7a466749d6
Headers show
Series
  • powerpc/64s/radix: Fix radix_kvm_prefetch_workaround paca access of not possible CPU
Related show

Commit Message

Nicholas Piggin June 12, 2018, 9:38 a.m.
If possible CPUs are limited (e.g., by kexec), then the kvm prefetch
workaround function can access the paca pointer for a !possible CPU.

Fixes: d2e60075a3d44 ("powerpc/64: Use array of paca pointers and allocate pacas individually")
Cc: stable@kernel.org
Reported-by: Pridhiviraj Paidipeddi <ppaidipe@linux.vnet.ibm.com>
Tested-by: Pridhiviraj Paidipeddi <ppaidipe@linux.vnet.ibm.com>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>

---
[kdump still seems to have a problem upstream, but this solves one crash]

 arch/powerpc/mm/tlb-radix.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Michael Ellerman June 23, 2018, 12:56 p.m. | #1
On Tue, 2018-06-12 at 09:38:08 UTC, Nicholas Piggin wrote:
> If possible CPUs are limited (e.g., by kexec), then the kvm prefetch
> workaround function can access the paca pointer for a !possible CPU.
> 
> Fixes: d2e60075a3d44 ("powerpc/64: Use array of paca pointers and allocate pacas individually")
> Cc: stable@kernel.org
> Reported-by: Pridhiviraj Paidipeddi <ppaidipe@linux.vnet.ibm.com>
> Tested-by: Pridhiviraj Paidipeddi <ppaidipe@linux.vnet.ibm.com>
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>

Applied to powerpc fixes, thanks.

https://git.kernel.org/powerpc/c/758380b8155f69b4e2f77f27562f8a

cheers

Patch

diff --git a/arch/powerpc/mm/tlb-radix.c b/arch/powerpc/mm/tlb-radix.c
index 67a6e86d3e7e..06ea845d8033 100644
--- a/arch/powerpc/mm/tlb-radix.c
+++ b/arch/powerpc/mm/tlb-radix.c
@@ -1043,6 +1043,8 @@  extern void radix_kvm_prefetch_workaround(struct mm_struct *mm)
 		for (; sib <= cpu_last_thread_sibling(cpu) && !flush; sib++) {
 			if (sib == cpu)
 				continue;
+			if (!cpu_possible(sib))
+				continue;
 			if (paca_ptrs[sib]->kvm_hstate.kvm_vcpu)
 				flush = true;
 		}