From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 20 Oct 2020 12:14:25 +0000 (-0400)
Subject: Merge tag 'kvmarm-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmar... 
X-Git-Tag: microblaze-v5.11~24^2~50
X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=commitdiff_plain;h=1b21c8db0e3b71523ada0cf568372ebfcf0d3466

Merge tag 'kvmarm-5.10' of git://git./linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/arm64 updates for Linux 5.10

- New page table code for both hypervisor and guest stage-2
- Introduction of a new EL2-private host context
- Allow EL2 to have its own private per-CPU variables
- Support of PMU event filtering
- Complete rework of the Spectre mitigation
---

1b21c8db0e3b71523ada0cf568372ebfcf0d3466
diff --cc arch/arm64/kvm/mmu.c
index 3d26b47a1343,a816cb8e619b..19aacc7d64de
--- a/arch/arm64/kvm/mmu.c
+++ b/arch/arm64/kvm/mmu.c
@@@ -1842,14 -751,15 +751,15 @@@ static int user_mem_abort(struct kvm_vc
  	struct kvm_mmu_memory_cache *memcache = &vcpu->arch.mmu_page_cache;
  	struct vm_area_struct *vma;
  	short vma_shift;
+ 	gfn_t gfn;
  	kvm_pfn_t pfn;
- 	pgprot_t mem_type = PAGE_S2;
  	bool logging_active = memslot_is_logging(memslot);
- 	unsigned long vma_pagesize, flags = 0;
- 	struct kvm_s2_mmu *mmu = vcpu->arch.hw_mmu;
+ 	unsigned long vma_pagesize;
+ 	enum kvm_pgtable_prot prot = KVM_PGTABLE_PROT_R;
+ 	struct kvm_pgtable *pgt;
  
  	write_fault = kvm_is_write_fault(vcpu);
 -	exec_fault = kvm_vcpu_trap_is_iabt(vcpu);
 +	exec_fault = kvm_vcpu_trap_is_exec_fault(vcpu);
  	VM_BUG_ON(write_fault && exec_fault);
  
  	if (fault_status == FSC_PERM && !write_fault && !exec_fault) {