3 files changed, 49 insertions, 13 deletions

diff --git a/virt/kvm/arm/mmu.c b/virt/kvm/arm/mmu.c
index f2d5b6cf06ae..0e1fc75f3585 100644
--- a/virt/kvm/arm/mmu.c
+++ b/virt/kvm/arm/mmu.c
@@ -30,6 +30,7 @@
 #include <asm/kvm_asm.h>
 #include <asm/kvm_emulate.h>
 #include <asm/virt.h>
+#include <asm/system_misc.h>
 
 #include "trace.h"
 
@@ -1453,6 +1454,25 @@ out:
                 kvm_set_pfn_accessed(pfn);
 }
 
+static bool is_abort_sea(unsigned long fault_status)
+{
+        switch (fault_status) {
+        case FSC_SEA:
+        case FSC_SEA_TTW0:
+        case FSC_SEA_TTW1:
+        case FSC_SEA_TTW2:
+        case FSC_SEA_TTW3:
+        case FSC_SECC:
+        case FSC_SECC_TTW0:
+        case FSC_SECC_TTW1:
+        case FSC_SECC_TTW2:
+        case FSC_SECC_TTW3:
+                return true;
+        default:
+                return false;
+        }
+}
+
 /**
  * kvm_handle_guest_abort - handles all 2nd stage aborts
  * @vcpu:       the VCPU pointer
@@ -1475,19 +1495,29 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run)
         gfn_t gfn;
         int ret, idx;
 
+        fault_status = kvm_vcpu_trap_get_fault_type(vcpu);
+
+        fault_ipa = kvm_vcpu_get_fault_ipa(vcpu);
+
+        /*
+         * The host kernel will handle the synchronous external abort. There
+         * is no need to pass the error into the guest.
+         */
+        if (is_abort_sea(fault_status)) {
+                if (!handle_guest_sea(fault_ipa, kvm_vcpu_get_hsr(vcpu)))
+                        return 1;
+        }
+
         is_iabt = kvm_vcpu_trap_is_iabt(vcpu);
         if (unlikely(!is_iabt && kvm_vcpu_dabt_isextabt(vcpu))) {
                 kvm_inject_vabt(vcpu);
                 return 1;
         }
 
-        fault_ipa = kvm_vcpu_get_fault_ipa(vcpu);
-
         trace_kvm_guest_fault(*vcpu_pc(vcpu), kvm_vcpu_get_hsr(vcpu),
                               kvm_vcpu_get_hfar(vcpu), fault_ipa);
 
         /* Check the stage-2 fault is trans. fault or write fault */
-        fault_status = kvm_vcpu_trap_get_fault_type(vcpu);
         if (fault_status != FSC_FAULT && fault_status != FSC_PERM &&
             fault_status != FSC_ACCESS) {
                 kvm_err("Unsupported FSC: EC=%#x xFSC=%#lx ESR_EL2=%#lx\n",
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index d016aadd5fbb..f2ac53ab8243 100644
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@ -184,7 +184,7 @@ int __attribute__((weak)) kvm_arch_set_irq_inatomic(
  * Called with wqh->lock held and interrupts disabled
  */
 static int
-irqfd_wakeup(wait_queue_t *wait, unsigned mode, int sync, void *key)
+irqfd_wakeup(wait_queue_entry_t *wait, unsigned mode, int sync, void *key)
 {
         struct kvm_kernel_irqfd *irqfd =
                 container_of(wait, struct kvm_kernel_irqfd, wait);
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 6e6d4edf0e92..7766c2b52797 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -187,12 +187,23 @@ static void ack_flush(void *_completed)
 {
 }
 
+static inline bool kvm_kick_many_cpus(const struct cpumask *cpus, bool wait)
+{
+        if (unlikely(!cpus))
+                cpus = cpu_online_mask;
+
+        if (cpumask_empty(cpus))
+                return false;
+
+        smp_call_function_many(cpus, ack_flush, NULL, wait);
+        return true;
+}
+
 bool kvm_make_all_cpus_request(struct kvm *kvm, unsigned int req)
 {
         int i, cpu, me;
         cpumask_var_t cpus;
-        bool called = true;
-        bool wait = req & KVM_REQUEST_WAIT;
+        bool called;
         struct kvm_vcpu *vcpu;
 
         zalloc_cpumask_var(&cpus, GFP_ATOMIC);
@@ -207,14 +218,9 @@ bool kvm_make_all_cpus_request(struct kvm *kvm, unsigned int req)
 
                 if (cpus != NULL && cpu != -1 && cpu != me &&
                     kvm_request_needs_ipi(vcpu, req))
-                        cpumask_set_cpu(cpu, cpus);
+                        __cpumask_set_cpu(cpu, cpus);
         }
-        if (unlikely(cpus == NULL))
-                smp_call_function_many(cpu_online_mask, ack_flush, NULL, wait);
-        else if (!cpumask_empty(cpus))
-                smp_call_function_many(cpus, ack_flush, NULL, wait);
-        else
-                called = false;
+        called = kvm_kick_many_cpus(cpus, !!(req & KVM_REQUEST_WAIT));
         put_cpu();
         free_cpumask_var(cpus);
         return called;