63 lines
2.4 KiB
Diff
63 lines
2.4 KiB
Diff
|
From 5719afc7a40868418405a87a2711088556e68a3b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Pingfan Liu <piliu@redhat.com>
|
||
|
|
Date: Fri, 2 Jul 2021 10:14:21 +0800
|
||
|
|
Subject: [PATCH 13/16] arm64: rename ARM64_PAGE_OFFSET_ACTUAL to
|
||
|
|
ARM64_FLIP_PAGE_OFFSET_ACTUAL
|
||
|
|
|
||
|
|
Reflect the flipped layout of kernel VA, which is introduced by
|
||
|
|
kernel commit 14c127c957c1 ("arm64: mm: Flip kernel VA space").
|
||
|
|
|
||
|
|
Signed-off-by: Pingfan Liu <piliu@redhat.com>
|
||
|
|
Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
|
||
|
|
---
|
||
|
|
arm64.c | 10 ++++++----
|
||
|
|
defs.h | 3 ++-
|
||
|
|
2 files changed, 8 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/arm64.c b/arm64.c
|
||
|
|
index 8934961b109d..9fe1a4a3bddb 100644
|
||
|
|
--- a/arm64.c
|
||
|
|
+++ b/arm64.c
|
||
|
|
@@ -217,10 +217,12 @@ arm64_init(int when)
|
||
|
|
arm64_calc_VA_BITS();
|
||
|
|
arm64_calc_KERNELPACMASK();
|
||
|
|
ms = machdep->machspec;
|
||
|
|
+
|
||
|
|
+ /* vabits_actual introduced after mm flip, so it should be flipped layout */
|
||
|
|
if (ms->VA_BITS_ACTUAL) {
|
||
|
|
- ms->page_offset = ARM64_PAGE_OFFSET_ACTUAL;
|
||
|
|
- machdep->identity_map_base = ARM64_PAGE_OFFSET_ACTUAL;
|
||
|
|
- machdep->kvbase = ARM64_PAGE_OFFSET_ACTUAL;
|
||
|
|
+ ms->page_offset = ARM64_FLIP_PAGE_OFFSET_ACTUAL;
|
||
|
|
+ machdep->identity_map_base = ARM64_FLIP_PAGE_OFFSET_ACTUAL;
|
||
|
|
+ machdep->kvbase = ARM64_FLIP_PAGE_OFFSET_ACTUAL;
|
||
|
|
ms->userspace_top = ARM64_USERSPACE_TOP_ACTUAL;
|
||
|
|
} else {
|
||
|
|
ms->page_offset = ARM64_PAGE_OFFSET;
|
||
|
|
@@ -401,7 +403,7 @@ arm64_init(int when)
|
||
|
|
fprintf(fp, "CONFIG_ARM64_VA_BITS: %ld\n", ms->CONFIG_ARM64_VA_BITS);
|
||
|
|
fprintf(fp, " VA_BITS_ACTUAL: %ld\n", ms->VA_BITS_ACTUAL);
|
||
|
|
fprintf(fp, "(calculated) VA_BITS: %ld\n", ms->VA_BITS);
|
||
|
|
- fprintf(fp, " PAGE_OFFSET: %lx\n", ARM64_PAGE_OFFSET_ACTUAL);
|
||
|
|
+ fprintf(fp, " PAGE_OFFSET: %lx\n", ARM64_FLIP_PAGE_OFFSET_ACTUAL);
|
||
|
|
fprintf(fp, " VA_START: %lx\n", ms->VA_START);
|
||
|
|
fprintf(fp, " modules: %lx - %lx\n", ms->modules_vaddr, ms->modules_end);
|
||
|
|
fprintf(fp, " vmalloc: %lx - %lx\n", ms->vmalloc_start_addr, ms->vmalloc_end);
|
||
|
|
diff --git a/defs.h b/defs.h
|
||
|
|
index 5d32954905c2..eb7ce6aea331 100644
|
||
|
|
--- a/defs.h
|
||
|
|
+++ b/defs.h
|
||
|
|
@@ -3233,7 +3233,8 @@ typedef signed int s32;
|
||
|
|
|
||
|
|
#define ARM64_PAGE_OFFSET ((0xffffffffffffffffUL) \
|
||
|
|
<< (machdep->machspec->VA_BITS - 1))
|
||
|
|
-#define ARM64_PAGE_OFFSET_ACTUAL ((0xffffffffffffffffUL) \
|
||
|
|
+/* kernels >= v5.4 the kernel VA space is flipped */
|
||
|
|
+#define ARM64_FLIP_PAGE_OFFSET_ACTUAL ((0xffffffffffffffffUL) \
|
||
|
|
- ((1UL) << machdep->machspec->VA_BITS_ACTUAL) + 1)
|
||
|
|
|
||
|
|
#define ARM64_USERSPACE_TOP ((1UL) << machdep->machspec->VA_BITS)
|
||
|
|
--
|
||
|
|
2.30.2
|
||
|
|
|