Commit dc462267 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman

powerpc/64s: handle ISA v3.1 local copy-paste context switches

The ISA v3.1 the copy-paste facility has a new memory move functionality
which allows the copy buffer to be pasted to domestic memory (RAM) as
opposed to foreign memory (accelerator).

This means the POWER9 trick of avoiding the cp_abort on context switch if
the process had not mapped foreign memory does not work on POWER10. Do the
cp_abort unconditionally there.

KVM must also cp_abort on guest exit to prevent copy buffer state leaking
between contexts.
Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Acked-by: default avatarPaul Mackerras <paulus@ozlabs.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200825075535.224536-1-npiggin@gmail.com
parent a02f6d42
...@@ -1250,15 +1250,17 @@ struct task_struct *__switch_to(struct task_struct *prev, ...@@ -1250,15 +1250,17 @@ struct task_struct *__switch_to(struct task_struct *prev,
restore_math(current->thread.regs); restore_math(current->thread.regs);
/* /*
* The copy-paste buffer can only store into foreign real * On POWER9 the copy-paste buffer can only paste into
* addresses, so unprivileged processes can not see the * foreign real addresses, so unprivileged processes can not
* data or use it in any way unless they have foreign real * see the data or use it in any way unless they have
* mappings. If the new process has the foreign real address * foreign real mappings. If the new process has the foreign
* mappings, we must issue a cp_abort to clear any state and * real address mappings, we must issue a cp_abort to clear
* prevent snooping, corruption or a covert channel. * any state and prevent snooping, corruption or a covert
* channel. ISA v3.1 supports paste into local memory.
*/ */
if (current->mm && if (current->mm &&
atomic_read(&current->mm->context.vas_windows)) (cpu_has_feature(CPU_FTR_ARCH_31) ||
atomic_read(&current->mm->context.vas_windows)))
asm volatile(PPC_CP_ABORT); asm volatile(PPC_CP_ABORT);
} }
#endif /* CONFIG_PPC_BOOK3S_64 */ #endif /* CONFIG_PPC_BOOK3S_64 */
......
...@@ -3530,6 +3530,13 @@ static int kvmhv_load_hv_regs_and_go(struct kvm_vcpu *vcpu, u64 time_limit, ...@@ -3530,6 +3530,13 @@ static int kvmhv_load_hv_regs_and_go(struct kvm_vcpu *vcpu, u64 time_limit,
*/ */
asm volatile("eieio; tlbsync; ptesync"); asm volatile("eieio; tlbsync; ptesync");
/*
* cp_abort is required if the processor supports local copy-paste
* to clear the copy buffer that was under control of the guest.
*/
if (cpu_has_feature(CPU_FTR_ARCH_31))
asm volatile(PPC_CP_ABORT);
mtspr(SPRN_LPID, vcpu->kvm->arch.host_lpid); /* restore host LPID */ mtspr(SPRN_LPID, vcpu->kvm->arch.host_lpid); /* restore host LPID */
isync(); isync();
......
...@@ -1830,6 +1830,14 @@ END_FTR_SECTION_IFSET(CPU_FTR_P9_RADIX_PREFETCH_BUG) ...@@ -1830,6 +1830,14 @@ END_FTR_SECTION_IFSET(CPU_FTR_P9_RADIX_PREFETCH_BUG)
2: 2:
#endif /* CONFIG_PPC_RADIX_MMU */ #endif /* CONFIG_PPC_RADIX_MMU */
/*
* cp_abort is required if the processor supports local copy-paste
* to clear the copy buffer that was under control of the guest.
*/
BEGIN_FTR_SECTION
PPC_CP_ABORT
END_FTR_SECTION_IFSET(CPU_FTR_ARCH_31)
/* /*
* POWER7/POWER8 guest -> host partition switch code. * POWER7/POWER8 guest -> host partition switch code.
* We don't have to lock against tlbies but we do * We don't have to lock against tlbies but we do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment