[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <AANLkTilVp0xvAJNns3TEe4SzEUpN8hMC9DdwmwW7i9yX@mail.gmail.com>
Date: Tue, 11 May 2010 13:33:14 +0300
From: "Kirill A. Shutemov" <kirill@...temov.name>
To: Russell King <linux@....linux.org.uk>
Cc: Catalin Marinas <catalin.marinas@....com>,
Siarhei Siamashka <siarhei.siamashka@...ia.com>,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
Aaro Koskinen <aaro.koskinen@...ia.com>,
Valdis.Kletnieks@...edu
Subject: [PATCH v2] [RESEND] Handle instruction cache maintenance fault
properly
Between "clean D line..." and "invalidate I line" operations in
v7_coherent_user_range(), the memory page may get swapped out.
And the fault on "invalidate I line" could not be properly handled
causing the oops.
In ARMv6 "external abort on linefetch" replaced by "instruction cache
maintenance fault". Let's handle it as translation fault. It fixes the
issue.
I'm not sure if it's reasonable to check arch version in run-time.
Let's do it in compile time for now.
Signed-off-by: Siarhei Siamashka <siarhei.siamashka@...ia.com>
Signed-off-by: Kirill A. Shutemov <kirill@...temov.name>
---
Sorry for resend. I've made mistake in maillist address.
---
arch/arm/mm/fault.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index 9d40c34..7f193ea 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -463,7 +463,12 @@ static struct fsr_info {
{ do_bad, SIGILL, BUS_ADRALN, "alignment exception" },
{ do_bad, SIGKILL, 0, "terminal exception" },
{ do_bad, SIGILL, BUS_ADRALN, "alignment exception" },
+/* Do we need runtime check ? */
+#if __LINUX_ARM_ARCH__ < 6
{ do_bad, SIGBUS, 0, "external abort on linefetch" },
+#else
+ { do_translation_fault, SIGSEGV, SEGV_MAPPER, "I-cache maintenance
fault" },
+#endif
{ do_translation_fault, SIGSEGV, SEGV_MAPERR, "section translation
fault" },
{ do_bad, SIGBUS, 0, "external abort on linefetch" },
{ do_page_fault, SIGSEGV, SEGV_MAPERR, "page translation fault" },
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists