From: Samuel Holland <samuel.holland@sifive.com>
To: Palmer Dabbelt <palmer@dabbelt.com>,
linux-riscv@lists.infradead.org,
Andrey Ryabinin <ryabinin.a.a@gmail.com>,
Alexander Potapenko <glider@google.com>,
Andrey Konovalov <andreyknvl@gmail.com>,
Dmitry Vyukov <dvyukov@google.com>,
Vincenzo Frascino <vincenzo.frascino@arm.com>,
kasan-dev@googlegroups.com
Cc: llvm@lists.linux.dev, linux-kernel@vger.kernel.org,
Alexandre Ghiti <alexghiti@rivosinc.com>,
Evgenii Stepanov <eugenis@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
linux-arm-kernel@lists.infradead.org,
Samuel Holland <samuel.holland@sifive.com>
Subject: [RFC PATCH 5/7] riscv: Align the sv39 linear map to 16 GiB
Date: Wed, 14 Aug 2024 01:55:33 -0700 [thread overview]
Message-ID: <20240814085618.968833-6-samuel.holland@sifive.com> (raw)
In-Reply-To: <20240814085618.968833-1-samuel.holland@sifive.com>
The KASAN implementation on RISC-V requires the shadow memory for the
vmemmap and linear map regions to be aligned to a PMD boundary (1 GiB).
For KASAN_GENERIC (KASAN_SHADOW_SCALE_SHIFT == 3), this enforces 8 GiB
alignment for the memory regions themselves. KASAN_SW_TAGS uses 16-byte
granules (KASAN_SHADOW_SCALE_SHIFT == 4), so now the memory regions must
be aligned to a 16 GiB boundary.
Signed-off-by: Samuel Holland <samuel.holland@sifive.com>
---
Documentation/arch/riscv/vm-layout.rst | 10 +++++-----
arch/riscv/include/asm/page.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/arch/riscv/vm-layout.rst b/Documentation/arch/riscv/vm-layout.rst
index 077b968dcc81..ed71b3b1b784 100644
--- a/Documentation/arch/riscv/vm-layout.rst
+++ b/Documentation/arch/riscv/vm-layout.rst
@@ -47,11 +47,11 @@ RISC-V Linux Kernel SV39
| Kernel-space virtual memory, shared between all processes:
____________________________________________________________|___________________________________________________________
| | | |
- ffffffc4fea00000 | -236 GB | ffffffc4feffffff | 6 MB | fixmap
- ffffffc4ff000000 | -236 GB | ffffffc4ffffffff | 16 MB | PCI io
- ffffffc500000000 | -236 GB | ffffffc5ffffffff | 4 GB | vmemmap
- ffffffc600000000 | -232 GB | ffffffd5ffffffff | 64 GB | vmalloc/ioremap space
- ffffffd600000000 | -168 GB | fffffff5ffffffff | 128 GB | direct mapping of all physical memory
+ ffffffc2fea00000 | -244 GB | ffffffc2feffffff | 6 MB | fixmap
+ ffffffc2ff000000 | -244 GB | ffffffc2ffffffff | 16 MB | PCI io
+ ffffffc300000000 | -244 GB | ffffffc3ffffffff | 4 GB | vmemmap
+ ffffffc400000000 | -240 GB | ffffffd3ffffffff | 64 GB | vmalloc/ioremap space
+ ffffffd400000000 | -176 GB | fffffff3ffffffff | 128 GB | direct mapping of all physical memory
| | | |
fffffff700000000 | -36 GB | fffffffeffffffff | 32 GB | kasan
__________________|____________|__________________|_________|____________________________________________________________
diff --git a/arch/riscv/include/asm/page.h b/arch/riscv/include/asm/page.h
index 7ede2111c591..09d15567b0b8 100644
--- a/arch/riscv/include/asm/page.h
+++ b/arch/riscv/include/asm/page.h
@@ -37,7 +37,7 @@
* define the PAGE_OFFSET value for SV48 and SV39.
*/
#define PAGE_OFFSET_L4 _AC(0xffffaf8000000000, UL)
-#define PAGE_OFFSET_L3 _AC(0xffffffd600000000, UL)
+#define PAGE_OFFSET_L3 _AC(0xffffffd400000000, UL)
#else
#define PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL)
#endif /* CONFIG_64BIT */
--
2.45.1
next prev parent reply other threads:[~2024-08-14 8:56 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-14 8:55 [RFC PATCH 0/7] kasan: RISC-V support for KASAN_SW_TAGS using pointer masking Samuel Holland
2024-08-14 8:55 ` [RFC PATCH 1/7] kasan: sw_tags: Use arithmetic shift for shadow computation Samuel Holland
2024-08-14 16:03 ` Andrey Konovalov
2024-10-21 20:26 ` Samuel Holland
2024-08-14 8:55 ` [RFC PATCH 2/7] kasan: sw_tags: Check kasan_flag_enabled at runtime Samuel Holland
2024-08-14 16:03 ` Andrey Konovalov
2024-08-14 8:55 ` [RFC PATCH 3/7] kasan: sw_tags: Support tag widths less than 8 bits Samuel Holland
2024-08-14 16:03 ` Andrey Konovalov
2024-08-14 8:55 ` [RFC PATCH 4/7] riscv: Do not rely on KASAN to define the memory layout Samuel Holland
2024-08-14 8:55 ` Samuel Holland [this message]
2024-08-14 8:55 ` [RFC PATCH 6/7] riscv: Implement KASAN_SW_TAGS Samuel Holland
2024-08-14 8:55 ` [RFC PATCH 7/7] kasan: sw_tags: Support runtime stack tagging control for RISC-V Samuel Holland
2024-08-14 16:04 ` Andrey Konovalov
2024-08-14 16:03 ` [RFC PATCH 0/7] kasan: RISC-V support for KASAN_SW_TAGS using pointer masking Andrey Konovalov
2024-10-22 1:13 ` Samuel Holland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240814085618.968833-6-samuel.holland@sifive.com \
--to=samuel.holland@sifive.com \
--cc=akpm@linux-foundation.org \
--cc=alexghiti@rivosinc.com \
--cc=andreyknvl@gmail.com \
--cc=dvyukov@google.com \
--cc=eugenis@google.com \
--cc=glider@google.com \
--cc=kasan-dev@googlegroups.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=llvm@lists.linux.dev \
--cc=palmer@dabbelt.com \
--cc=ryabinin.a.a@gmail.com \
--cc=vincenzo.frascino@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®