linux-mips
[Top] [All Lists]

[PATCH 20/31] mips/kvm: Hook into TLB fault handlers.

To: linux-mips@linux-mips.org, ralf@linux-mips.org, kvm@vger.kernel.org, Sanjay Lal <sanjayl@kymasys.com>
Subject: [PATCH 20/31] mips/kvm: Hook into TLB fault handlers.
From: David Daney <ddaney.cavm@gmail.com>
Date: Fri, 7 Jun 2013 16:03:24 -0700
Cc: linux-kernel@vger.kernel.org, David Daney <david.daney@cavium.com>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=mx23w+vrmCLgT0cbXWmdHcohMpXBQwMGGsJZJhaJqqA=; b=tG7KjEZtFrc6IaG5N61Pv45002tSzUhuNG19sqLJUFxG1D+eI0smNSQ8cEU6SYJuaj yJmMNuRvmKxdtGpWVSWT7g+evPk0cPYv3HEjgC9IwXxaqKg23FihdsU/dFnwBVz93yJI iaqKnPJorEPJPOx3Ln9nFWJ9oA7He+WFaquNzZGjEGvN0oHdTmA0z0TL6mFTCHPSvkru xy3naoH8bTjM3f4nQIslV0Fuw7q+zOccK8GdOBJ2yKLrorrNMofzpMb5FgrNGTSZGPs7 6bucm7ZuCT7Fda1snDhsY9q+F0YawuMK+gPA5bA9qJ+PMuqHX3N107fa0HpOMU522pwA EFbA==
In-reply-to: <1370646215-6543-1-git-send-email-ddaney.cavm@gmail.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1370646215-6543-1-git-send-email-ddaney.cavm@gmail.com>
Sender: linux-mips-bounce@linux-mips.org
From: David Daney <david.daney@cavium.com>

If the CPU is operating in guest mode when a TLB related excpetion
occurs, give KVM a chance to do emulation.

Signed-off-by: David Daney <david.daney@cavium.com>
---
 arch/mips/mm/fault.c       | 8 ++++++++
 arch/mips/mm/tlbex-fault.S | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
index 0fead53..9391da49 100644
--- a/arch/mips/mm/fault.c
+++ b/arch/mips/mm/fault.c
@@ -26,6 +26,7 @@
 #include <asm/ptrace.h>
 #include <asm/highmem.h>               /* For VMALLOC_END */
 #include <linux/kdebug.h>
+#include <asm/kvm_mips_vz.h>
 
 /*
  * This routine handles page faults.  It determines the address,
@@ -50,6 +51,13 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs 
*regs, unsigned long writ
               field, regs->cp0_epc);
 #endif
 
+#ifdef CONFIG_KVM_MIPSVZ
+       if (test_tsk_thread_flag(current, TIF_GUESTMODE)) {
+               if (mipsvz_page_fault(regs, write, address))
+                       return;
+       }
+#endif
+
 #ifdef CONFIG_KPROBES
        /*
         * This is to notify the fault handler of the kprobes.  The
diff --git a/arch/mips/mm/tlbex-fault.S b/arch/mips/mm/tlbex-fault.S
index 318855e..df0f70b 100644
--- a/arch/mips/mm/tlbex-fault.S
+++ b/arch/mips/mm/tlbex-fault.S
@@ -14,6 +14,12 @@
        NESTED(tlb_do_page_fault_\write, PT_SIZE, sp)
        SAVE_ALL
        MFC0    a2, CP0_BADVADDR
+#ifdef CONFIG_KVM_MIPSVZ
+       mfc0    v0, CP0_BADINSTR
+       mfc0    v1, CP0_BADINSTRP
+       sw      v0, PT_BADINSTR(sp)
+       sw      v1, PT_BADINSTRP(sp)
+#endif
        KMODE
        move    a0, sp
        REG_S   a2, PT_BVADDR(sp)
-- 
1.7.11.7


<Prev in Thread] Current Thread [Next in Thread>