Re: [PATCH] Revert "MIPS: make userspace mapping young by default".

[黄沛]

Is there any log about the panic?

  Original Message  
From: 周琰杰 (Zhou Yanjie)
Sent: 2021年4月16日星期五 16:48
To: tsbogend@xxxxxxxxxxxxxxxx
Cc: linux-mips@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; akpm@xxxxxxxxxxxxxxxxxxxx; paul.burton@xxxxxxxx; paul@xxxxxxxxxxxxxxx; siyanteng@xxxxxxxxxxx; huangpei@xxxxxxxxxxx; ira.weiny@xxxxxxxxx; yangtiezhu@xxxxxxxxxxx; zhouyanjie@xxxxxxxxxxxxxx; jun.jiang@xxxxxxxxxxx; dongsheng.qiu@xxxxxxxxxxx; aric.pzqi@xxxxxxxxxxx; rick.tyliu@xxxxxxxxxxx; sernia.zhou@xxxxxxxxxxx
Subject: [PATCH] Revert "MIPS: make userspace mapping young by default".

This reverts commit f685a533a7fab35c5d069dcd663f59c8e4171a75.

It cause kernel panic on Ingenic X1830, so let's revert it.

Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@xxxxxxxxxxxxxx>
---
arch/mips/mm/cache.c | 31 ++++++++++++++-----------------
1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c
index 7719d63..9cfd432 100644
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
@@ -21,7 +21,6 @@
#include <asm/cpu.h>
#include <asm/cpu-features.h>
#include <asm/setup.h>
-#include <asm/pgtable.h>

/* Cache operations. */
void (*flush_cache_all)(void);
@@ -157,31 +156,29 @@ unsigned long _page_cachable_default;
EXPORT_SYMBOL(_page_cachable_default);

#define PM(p)	__pgprot(_page_cachable_default | (p))
-#define PVA(p)	PM(_PAGE_VALID | _PAGE_ACCESSED | (p))

static inline void setup_protection_map(void)
{
protection_map[0] = PM(_PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_NO_READ);
-	protection_map[1] = PVA(_PAGE_PRESENT | _PAGE_NO_EXEC);
-	protection_map[2] = PVA(_PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_NO_READ);
-	protection_map[3] = PVA(_PAGE_PRESENT | _PAGE_NO_EXEC);
-	protection_map[4] = PVA(_PAGE_PRESENT);
-	protection_map[5] = PVA(_PAGE_PRESENT);
-	protection_map[6] = PVA(_PAGE_PRESENT);
-	protection_map[7] = PVA(_PAGE_PRESENT);
+	protection_map[1] = PM(_PAGE_PRESENT | _PAGE_NO_EXEC);
+	protection_map[2] = PM(_PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_NO_READ);
+	protection_map[3] = PM(_PAGE_PRESENT | _PAGE_NO_EXEC);
+	protection_map[4] = PM(_PAGE_PRESENT);
+	protection_map[5] = PM(_PAGE_PRESENT);
+	protection_map[6] = PM(_PAGE_PRESENT);
+	protection_map[7] = PM(_PAGE_PRESENT);

protection_map[8] = PM(_PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_NO_READ);
-	protection_map[9] = PVA(_PAGE_PRESENT | _PAGE_NO_EXEC);
-	protection_map[10] = PVA(_PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_WRITE |
+	protection_map[9] = PM(_PAGE_PRESENT | _PAGE_NO_EXEC);
+	protection_map[10] = PM(_PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_WRITE |
_PAGE_NO_READ);
-	protection_map[11] = PVA(_PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_WRITE);
-	protection_map[12] = PVA(_PAGE_PRESENT);
-	protection_map[13] = PVA(_PAGE_PRESENT);
-	protection_map[14] = PVA(_PAGE_PRESENT);
-	protection_map[15] = PVA(_PAGE_PRESENT);
+	protection_map[11] = PM(_PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_WRITE);
+	protection_map[12] = PM(_PAGE_PRESENT);
+	protection_map[13] = PM(_PAGE_PRESENT);
+	protection_map[14] = PM(_PAGE_PRESENT | _PAGE_WRITE);
+	protection_map[15] = PM(_PAGE_PRESENT | _PAGE_WRITE);
}

-#undef _PVA
#undef PM

void cpu_cache_init(void)
-- 
2.7.4