From: Michael Ellerman <mpe@ellerman.id.au>
Date: Thu, 17 Jun 2021 06:51:38 +0000 (+1000)
Subject: Merge branch 'topic/ppc-kvm' into next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3c53642324f526c0aba411bf8e6cf2ab2471192a;p=linux.git

Merge branch 'topic/ppc-kvm' into next

Merge some powerpc KVM patches from our topic branch.

In particular this brings in Nick's big series rewriting parts of the
guest entry/exit path in C.

Conflicts:
	arch/powerpc/kernel/security.c
	arch/powerpc/kvm/book3s_hv_rmhandlers.S
---

3c53642324f526c0aba411bf8e6cf2ab2471192a
diff --cc arch/powerpc/kernel/security.c
index 118f10d14af82,c17d1c9362b50..9c2f7b9099116
--- a/arch/powerpc/kernel/security.c
+++ b/arch/powerpc/kernel/security.c
@@@ -436,9 -436,11 +436,11 @@@ static void update_branch_cache_flush(v
  
  #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
  	site = &patch__call_kvm_flush_link_stack;
+ 	site2 = &patch__call_kvm_flush_link_stack_p9;
  	// This controls the branch from guest_exit_cont to kvm_flush_link_stack
  	if (link_stack_flush_type == BRANCH_CACHE_FLUSH_NONE) {
 -		patch_instruction_site(site, ppc_inst(PPC_INST_NOP));
 -		patch_instruction_site(site2, ppc_inst(PPC_INST_NOP));
 +		patch_instruction_site(site, ppc_inst(PPC_RAW_NOP()));
++		patch_instruction_site(site2, ppc_inst(PPC_RAW_NOP()));
  	} else {
  		// Could use HW flush, but that could also flush count cache
  		patch_branch_site(site, (u64)&kvm_flush_link_stack, BRANCH_SET_LINK);