From: guoren@kernel.org
To: linux-kernel@vger.kernel.org, paul.walmsley@sifive.com,
palmer@dabbelt.com, alexghiti@rivosinc.com, charlie@rivosinc.com,
xiao.w.wang@intel.com, guoren@kernel.org, david@redhat.com,
panqinglin2020@iscas.ac.cn, rick.p.edgecombe@intel.com,
willy@infradead.org, bjorn@rivosinc.com,
conor.dooley@microchip.com, cleger@rivosinc.com,
leobras@redhat.com
Cc: linux-riscv@lists.infradead.org, Guo Ren <guoren@linux.alibaba.com>
Subject: [PATCH V2 4/4] riscv: mm: Optimize TASK_SIZE definition
Date: Thu, 21 Dec 2023 10:47:01 -0500 [thread overview]
Message-ID: <20231221154702.2267684-5-guoren@kernel.org> (raw)
In-Reply-To: <20231221154702.2267684-1-guoren@kernel.org>
From: Guo Ren <guoren@linux.alibaba.com>
Unify the TASK_SIZE definition with VA_BITS for better readability.
Add COMPAT mode user address space info in the comment.
Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
Signed-off-by: Guo Ren <guoren@kernel.org>
---
arch/riscv/include/asm/pgtable.h | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
index e415582276ec..d165ddae3b42 100644
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
@@ -866,6 +866,7 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte)
* Note that PGDIR_SIZE must evenly divide TASK_SIZE.
* Task size is:
* - 0x9fc00000 (~2.5GB) for RV32.
+ * - 0x80000000 ( 2GB) for RV64 compat mode
* - 0x4000000000 ( 256GB) for RV64 using SV39 mmu
* - 0x800000000000 ( 128TB) for RV64 using SV48 mmu
* - 0x100000000000000 ( 64PB) for RV64 using SV57 mmu
@@ -877,11 +878,11 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte)
* Similarly for SV57, bits 63–57 must be equal to bit 56.
*/
#ifdef CONFIG_64BIT
-#define TASK_SIZE_64 (PGDIR_SIZE * PTRS_PER_PGD / 2)
+#define TASK_SIZE_64 (UL(1) << (VA_BITS - 1))
#ifdef CONFIG_COMPAT
-#define TASK_SIZE_32 (_AC(0x80000000, UL))
-#define TASK_SIZE (test_thread_flag(TIF_32BIT) ? \
+#define TASK_SIZE_32 (UL(1) << (VA_BITS_SV32 - 1))
+#define TASK_SIZE (is_compat_task() ? \
TASK_SIZE_32 : TASK_SIZE_64)
#else
#define TASK_SIZE TASK_SIZE_64
--
2.40.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2023-12-21 15:47 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-21 15:46 [PATCH V2 0/4] riscv: mm: Fixup & Optimize COMPAT code guoren
2023-12-21 15:46 ` [PATCH V2 1/4] riscv: mm: Fixup compat mode boot failure guoren
2023-12-22 1:51 ` Leonardo Bras
2023-12-22 2:57 ` Guo Ren
2023-12-22 3:50 ` Charlie Jenkins
2023-12-22 4:32 ` Leonardo Bras
2023-12-22 7:33 ` Guo Ren
2023-12-22 10:58 ` Guo Ren
2023-12-21 15:46 ` [PATCH V2 2/4] riscv: mm: Fixup compat arch_get_mmap_end guoren
2023-12-22 3:34 ` Leonardo Bras
2023-12-22 4:04 ` Charlie Jenkins
2023-12-22 4:23 ` Leonardo Bras
2023-12-22 5:42 ` Charlie Jenkins
2023-12-22 8:27 ` Leonardo Bras
2023-12-22 4:36 ` Guo Ren
2023-12-22 4:26 ` Guo Ren
2023-12-22 4:43 ` Leonardo Bras
2023-12-22 4:50 ` Guo Ren
2023-12-22 5:27 ` Leonardo Bras
2023-12-22 7:20 ` Guo Ren
2023-12-22 7:49 ` Leonardo Bras
2023-12-22 8:59 ` David Laight
2023-12-22 9:33 ` Guo Ren
2023-12-21 15:47 ` [PATCH V2 3/4] riscv: mm: Remove unused TASK_SIZE_MIN guoren
2023-12-22 4:49 ` Leonardo Bras
2023-12-22 7:16 ` Guo Ren
2023-12-22 7:22 ` Leonardo Bras
2023-12-21 15:47 ` guoren [this message]
2023-12-22 5:09 ` [PATCH V2 4/4] riscv: mm: Optimize TASK_SIZE definition Leonardo Bras
2023-12-22 11:25 ` Guo Ren
2023-12-22 11:52 ` David Laight
2023-12-23 2:38 ` Guo Ren
2023-12-23 2:52 ` Guo Ren
2023-12-23 10:31 ` David Laight
2023-12-24 1:24 ` Guo Ren
2023-12-24 14:37 ` David Laight
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=20231221154702.2267684-5-guoren@kernel.org \
--to=guoren@kernel.org \
--cc=alexghiti@rivosinc.com \
--cc=bjorn@rivosinc.com \
--cc=charlie@rivosinc.com \
--cc=cleger@rivosinc.com \
--cc=conor.dooley@microchip.com \
--cc=david@redhat.com \
--cc=guoren@linux.alibaba.com \
--cc=leobras@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=panqinglin2020@iscas.ac.cn \
--cc=paul.walmsley@sifive.com \
--cc=rick.p.edgecombe@intel.com \
--cc=willy@infradead.org \
--cc=xiao.w.wang@intel.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