* [PATCH] RISC-V: redefine PTRS_PER_PGD/PTRS_PER_PMD/PTRS_PER_PTE
@ 2019-04-24 8:11 damon
2019-04-24 8:13 ` Anup Patel
2019-06-28 18:52 ` Paul Walmsley
0 siblings, 2 replies; 8+ messages in thread
From: damon @ 2019-04-24 8:11 UTC (permalink / raw)
To: palmer
Cc: aou, anup.patel, liush.damon, rppt, sorear2, linux-riscv, linux-kernel
Use the number of addresses to define the relevant macros.
Signed-off-by: damon <liush.damon@gmail.com>
---
arch/riscv/include/asm/pgtable-32.h | 1 +
arch/riscv/include/asm/pgtable-64.h | 3 ++-
arch/riscv/include/asm/pgtable.h | 8 ++++++--
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/arch/riscv/include/asm/pgtable-32.h b/arch/riscv/include/asm/pgtable-32.h
index d61974b7..c9c8ca8 100644
--- a/arch/riscv/include/asm/pgtable-32.h
+++ b/arch/riscv/include/asm/pgtable-32.h
@@ -17,6 +17,7 @@
#include <asm-generic/pgtable-nopmd.h>
#include <linux/const.h>
+#define MAX_USER_VA_BITS 32
/* Size of region mapped by a page global directory */
#define PGDIR_SHIFT 22
#define PGDIR_SIZE (_AC(1, UL) << PGDIR_SHIFT)
diff --git a/arch/riscv/include/asm/pgtable-64.h b/arch/riscv/include/asm/pgtable-64.h
index 7aa0ea9..a56d4d0 100644
--- a/arch/riscv/include/asm/pgtable-64.h
+++ b/arch/riscv/include/asm/pgtable-64.h
@@ -16,6 +16,7 @@
#include <linux/const.h>
+#define MAX_USER_VA_BITS 39
#define PGDIR_SHIFT 30
/* Size of region mapped by a page global directory */
#define PGDIR_SIZE (_AC(1, UL) << PGDIR_SHIFT)
@@ -34,7 +35,7 @@
#define pmd_val(x) ((x).pmd)
#define __pmd(x) ((pmd_t) { (x) })
-#define PTRS_PER_PMD (PAGE_SIZE / sizeof(pmd_t))
+#define PTRS_PER_PMD (1 << (PGDIR_SHIFT - PMD_SHIFT))
static inline int pud_present(pud_t pud)
{
diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
index 1141364..9148043 100644
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
@@ -33,9 +33,13 @@
#endif /* CONFIG_64BIT */
/* Number of entries in the page global directory */
-#define PTRS_PER_PGD (PAGE_SIZE / sizeof(pgd_t))
+#define PTRS_PER_PGD (1 << (MAX_USER_VA_BITS - PGDIR_SHIFT))
/* Number of entries in the page table */
-#define PTRS_PER_PTE (PAGE_SIZE / sizeof(pte_t))
+#ifdef __PAGETABLE_PMD_FOLDED
+#define PTRS_PER_PTE (1 << (PGDIR_SHIFT - PAGE_SHIFT))
+#else
+#define PTRS_PER_PTE (1 << (PMD_SHIFT - PAGE_SHIFT))
+#endif
/* Number of PGD entries that a user-mode program can use */
#define USER_PTRS_PER_PGD (TASK_SIZE / PGDIR_SIZE)
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] RISC-V: redefine PTRS_PER_PGD/PTRS_PER_PMD/PTRS_PER_PTE
2019-04-24 8:11 [PATCH] RISC-V: redefine PTRS_PER_PGD/PTRS_PER_PMD/PTRS_PER_PTE damon
@ 2019-04-24 8:13 ` Anup Patel
2019-06-28 18:52 ` Paul Walmsley
1 sibling, 0 replies; 8+ messages in thread
From: Anup Patel @ 2019-04-24 8:13 UTC (permalink / raw)
To: damon
Cc: Palmer Dabbelt, Albert Ou, Anup Patel, Mike Rapoport, sorear2,
linux-riscv, linux-kernel@vger.kernel.org List
On Wed, Apr 24, 2019 at 1:42 PM damon <liush.damon@gmail.com> wrote:
>
> Use the number of addresses to define the relevant macros.
>
> Signed-off-by: damon <liush.damon@gmail.com>
> ---
> arch/riscv/include/asm/pgtable-32.h | 1 +
> arch/riscv/include/asm/pgtable-64.h | 3 ++-
> arch/riscv/include/asm/pgtable.h | 8 ++++++--
> 3 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/arch/riscv/include/asm/pgtable-32.h b/arch/riscv/include/asm/pgtable-32.h
> index d61974b7..c9c8ca8 100644
> --- a/arch/riscv/include/asm/pgtable-32.h
> +++ b/arch/riscv/include/asm/pgtable-32.h
> @@ -17,6 +17,7 @@
> #include <asm-generic/pgtable-nopmd.h>
> #include <linux/const.h>
>
> +#define MAX_USER_VA_BITS 32
> /* Size of region mapped by a page global directory */
> #define PGDIR_SHIFT 22
> #define PGDIR_SIZE (_AC(1, UL) << PGDIR_SHIFT)
> diff --git a/arch/riscv/include/asm/pgtable-64.h b/arch/riscv/include/asm/pgtable-64.h
> index 7aa0ea9..a56d4d0 100644
> --- a/arch/riscv/include/asm/pgtable-64.h
> +++ b/arch/riscv/include/asm/pgtable-64.h
> @@ -16,6 +16,7 @@
>
> #include <linux/const.h>
>
> +#define MAX_USER_VA_BITS 39
> #define PGDIR_SHIFT 30
> /* Size of region mapped by a page global directory */
> #define PGDIR_SIZE (_AC(1, UL) << PGDIR_SHIFT)
> @@ -34,7 +35,7 @@
> #define pmd_val(x) ((x).pmd)
> #define __pmd(x) ((pmd_t) { (x) })
>
> -#define PTRS_PER_PMD (PAGE_SIZE / sizeof(pmd_t))
> +#define PTRS_PER_PMD (1 << (PGDIR_SHIFT - PMD_SHIFT))
>
> static inline int pud_present(pud_t pud)
> {
> diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
> index 1141364..9148043 100644
> --- a/arch/riscv/include/asm/pgtable.h
> +++ b/arch/riscv/include/asm/pgtable.h
> @@ -33,9 +33,13 @@
> #endif /* CONFIG_64BIT */
>
> /* Number of entries in the page global directory */
> -#define PTRS_PER_PGD (PAGE_SIZE / sizeof(pgd_t))
> +#define PTRS_PER_PGD (1 << (MAX_USER_VA_BITS - PGDIR_SHIFT))
> /* Number of entries in the page table */
> -#define PTRS_PER_PTE (PAGE_SIZE / sizeof(pte_t))
> +#ifdef __PAGETABLE_PMD_FOLDED
> +#define PTRS_PER_PTE (1 << (PGDIR_SHIFT - PAGE_SHIFT))
> +#else
> +#define PTRS_PER_PTE (1 << (PMD_SHIFT - PAGE_SHIFT))
> +#endif
>
> /* Number of PGD entries that a user-mode program can use */
> #define USER_PTRS_PER_PGD (TASK_SIZE / PGDIR_SIZE)
> --
> 1.9.1
>
LGTM.
Reviewed-by: Anup Patel <anup@brainfault.org>
Regards,
Anup
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] RISC-V: redefine PTRS_PER_PGD/PTRS_PER_PMD/PTRS_PER_PTE
2019-04-24 8:11 [PATCH] RISC-V: redefine PTRS_PER_PGD/PTRS_PER_PMD/PTRS_PER_PTE damon
2019-04-24 8:13 ` Anup Patel
@ 2019-06-28 18:52 ` Paul Walmsley
2019-07-24 12:36 ` sh liu
1 sibling, 1 reply; 8+ messages in thread
From: Paul Walmsley @ 2019-06-28 18:52 UTC (permalink / raw)
To: damon; +Cc: palmer, sorear2, aou, anup.patel, linux-kernel, rppt, linux-riscv
On Wed, 24 Apr 2019, damon wrote:
> Use the number of addresses to define the relevant macros.
>
> Signed-off-by: damon <liush.damon@gmail.com>
This patch looks reasonable to me. But what's missing from the
description is the motivation. Is this a prerequisite for another patch
that you're planning to post? Or because you think this is clearer than
the original? Or something else? etc.
- Paul
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] RISC-V: redefine PTRS_PER_PGD/PTRS_PER_PMD/PTRS_PER_PTE
2019-06-28 18:52 ` Paul Walmsley
@ 2019-07-24 12:36 ` sh liu
0 siblings, 0 replies; 8+ messages in thread
From: sh liu @ 2019-07-24 12:36 UTC (permalink / raw)
To: Paul Walmsley
Cc: palmer, sorear2, aou, anup.patel, linux-kernel, rppt, linux-riscv
I think the previous description is unclear, and it is difficult for
readers to understand the meaning of these macros, because I never
understand. So I submitted this patch with reference to the definition
of arm. I think this way can make the reader easier to understand, and
I also think that this definition is more reasonable.
2019-06-29 2:52 GMT+08:00, Paul Walmsley <paul.walmsley@sifive.com>:
> On Wed, 24 Apr 2019, damon wrote:
>
>> Use the number of addresses to define the relevant macros.
>>
>> Signed-off-by: damon <liush.damon@gmail.com>
>
> This patch looks reasonable to me. But what's missing from the
> description is the motivation. Is this a prerequisite for another patch
> that you're planning to post? Or because you think this is clearer than
> the original? Or something else? etc.
>
>
> - Paul
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] RISC-V: redefine PTRS_PER_PGD/PTRS_PER_PMD/PTRS_PER_PTE
2019-04-24 7:51 damon
@ 2019-04-24 7:59 ` Anup Patel
0 siblings, 0 replies; 8+ messages in thread
From: Anup Patel @ 2019-04-24 7:59 UTC (permalink / raw)
To: damon
Cc: Palmer Dabbelt, Albert Ou, Anup Patel, Mike Rapoport, sorear2,
linux-riscv, linux-kernel@vger.kernel.org List
On Wed, Apr 24, 2019 at 1:21 PM damon <liush.damon@gmail.com> wrote:
>
> Use the number of addresses to define the relevant macros.
>
> Signed-off-by: damon <liush.damon@gmail.com>
> ---
> arch/riscv/include/asm/pgtable-32.h | 2 ++
> arch/riscv/include/asm/pgtable-64.h | 3 ++-
> arch/riscv/include/asm/pgtable.h | 8 ++++++--
> 3 files changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/arch/riscv/include/asm/pgtable-32.h b/arch/riscv/include/asm/pgtable-32.h
> index d61974b7..433886b 100644
> --- a/arch/riscv/include/asm/pgtable-32.h
> +++ b/arch/riscv/include/asm/pgtable-32.h
> @@ -17,6 +17,8 @@
> #include <asm-generic/pgtable-nopmd.h>
> #include <linux/const.h>
>
> +#define __PAGETABLE_PMD_FOLDED 1
The __PAGETABLE_PMD_FOLDED is already defined in
asm-generic/pgtable-nopmd.h so we don't need to define it here.
> +#define MAX_USER_VA_BITS 32
> /* Size of region mapped by a page global directory */
> #define PGDIR_SHIFT 22
> #define PGDIR_SIZE (_AC(1, UL) << PGDIR_SHIFT)
> diff --git a/arch/riscv/include/asm/pgtable-64.h b/arch/riscv/include/asm/pgtable-64.h
> index 7aa0ea9..a56d4d0 100644
> --- a/arch/riscv/include/asm/pgtable-64.h
> +++ b/arch/riscv/include/asm/pgtable-64.h
> @@ -16,6 +16,7 @@
>
> #include <linux/const.h>
>
> +#define MAX_USER_VA_BITS 39
> #define PGDIR_SHIFT 30
> /* Size of region mapped by a page global directory */
> #define PGDIR_SIZE (_AC(1, UL) << PGDIR_SHIFT)
> @@ -34,7 +35,7 @@
> #define pmd_val(x) ((x).pmd)
> #define __pmd(x) ((pmd_t) { (x) })
>
> -#define PTRS_PER_PMD (PAGE_SIZE / sizeof(pmd_t))
> +#define PTRS_PER_PMD (1 << (PGDIR_SHIFT - PMD_SHIFT))
>
> static inline int pud_present(pud_t pud)
> {
> diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
> index 1141364..9148043 100644
> --- a/arch/riscv/include/asm/pgtable.h
> +++ b/arch/riscv/include/asm/pgtable.h
> @@ -33,9 +33,13 @@
> #endif /* CONFIG_64BIT */
>
> /* Number of entries in the page global directory */
> -#define PTRS_PER_PGD (PAGE_SIZE / sizeof(pgd_t))
> +#define PTRS_PER_PGD (1 << (MAX_USER_VA_BITS - PGDIR_SHIFT))
> /* Number of entries in the page table */
> -#define PTRS_PER_PTE (PAGE_SIZE / sizeof(pte_t))
> +#ifdef __PAGETABLE_PMD_FOLDED
> +#define PTRS_PER_PTE (1 << (PGDIR_SHIFT - PAGE_SHIFT))
> +#else
> +#define PTRS_PER_PTE (1 << (PMD_SHIFT - PAGE_SHIFT))
> +#endif
>
> /* Number of PGD entries that a user-mode program can use */
> #define USER_PTRS_PER_PGD (TASK_SIZE / PGDIR_SIZE)
> --
> 1.9.1
>
Apart from above, looks good to me.
Reviewed-by: Anup Patel <anup@brainfault.org>
Regards,
Anup
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] RISC-V: redefine PTRS_PER_PGD/PTRS_PER_PMD/PTRS_PER_PTE
@ 2019-04-24 7:51 damon
2019-04-24 7:59 ` Anup Patel
0 siblings, 1 reply; 8+ messages in thread
From: damon @ 2019-04-24 7:51 UTC (permalink / raw)
To: palmer
Cc: aou, anup.patel, liush.damon, rppt, sorear2, linux-riscv, linux-kernel
Use the number of addresses to define the relevant macros.
Signed-off-by: damon <liush.damon@gmail.com>
---
arch/riscv/include/asm/pgtable-32.h | 2 ++
arch/riscv/include/asm/pgtable-64.h | 3 ++-
arch/riscv/include/asm/pgtable.h | 8 ++++++--
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/arch/riscv/include/asm/pgtable-32.h b/arch/riscv/include/asm/pgtable-32.h
index d61974b7..433886b 100644
--- a/arch/riscv/include/asm/pgtable-32.h
+++ b/arch/riscv/include/asm/pgtable-32.h
@@ -17,6 +17,8 @@
#include <asm-generic/pgtable-nopmd.h>
#include <linux/const.h>
+#define __PAGETABLE_PMD_FOLDED 1
+#define MAX_USER_VA_BITS 32
/* Size of region mapped by a page global directory */
#define PGDIR_SHIFT 22
#define PGDIR_SIZE (_AC(1, UL) << PGDIR_SHIFT)
diff --git a/arch/riscv/include/asm/pgtable-64.h b/arch/riscv/include/asm/pgtable-64.h
index 7aa0ea9..a56d4d0 100644
--- a/arch/riscv/include/asm/pgtable-64.h
+++ b/arch/riscv/include/asm/pgtable-64.h
@@ -16,6 +16,7 @@
#include <linux/const.h>
+#define MAX_USER_VA_BITS 39
#define PGDIR_SHIFT 30
/* Size of region mapped by a page global directory */
#define PGDIR_SIZE (_AC(1, UL) << PGDIR_SHIFT)
@@ -34,7 +35,7 @@
#define pmd_val(x) ((x).pmd)
#define __pmd(x) ((pmd_t) { (x) })
-#define PTRS_PER_PMD (PAGE_SIZE / sizeof(pmd_t))
+#define PTRS_PER_PMD (1 << (PGDIR_SHIFT - PMD_SHIFT))
static inline int pud_present(pud_t pud)
{
diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
index 1141364..9148043 100644
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
@@ -33,9 +33,13 @@
#endif /* CONFIG_64BIT */
/* Number of entries in the page global directory */
-#define PTRS_PER_PGD (PAGE_SIZE / sizeof(pgd_t))
+#define PTRS_PER_PGD (1 << (MAX_USER_VA_BITS - PGDIR_SHIFT))
/* Number of entries in the page table */
-#define PTRS_PER_PTE (PAGE_SIZE / sizeof(pte_t))
+#ifdef __PAGETABLE_PMD_FOLDED
+#define PTRS_PER_PTE (1 << (PGDIR_SHIFT - PAGE_SHIFT))
+#else
+#define PTRS_PER_PTE (1 << (PMD_SHIFT - PAGE_SHIFT))
+#endif
/* Number of PGD entries that a user-mode program can use */
#define USER_PTRS_PER_PGD (TASK_SIZE / PGDIR_SIZE)
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] RISC-V: redefine PTRS_PER_PGD/PTRS_PER_PMD/PTRS_PER_PTE
2019-04-18 0:56 damon
@ 2019-04-18 6:13 ` Anup Patel
0 siblings, 0 replies; 8+ messages in thread
From: Anup Patel @ 2019-04-18 6:13 UTC (permalink / raw)
To: damon
Cc: Palmer Dabbelt, Albert Ou, Anup Patel, Mike Rapoport, sorear2,
linux-riscv, linux-kernel@vger.kernel.org List
On Thu, Apr 18, 2019 at 6:26 AM damon <liush.damon@gmail.com> wrote:
>
> Use the number of addresses to define the relevant macros.
>
> Signed-off-by: damon <liush.damon@gmail.com>
> ---
> arch/riscv/include/asm/pgtable-32.h | 2 ++
> arch/riscv/include/asm/pgtable-64.h | 3 ++-
> arch/riscv/include/asm/pgtable.h | 4 ++--
> 3 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/arch/riscv/include/asm/pgtable-32.h b/arch/riscv/include/asm/pgtable-32.h
> index d61974b7..93607f6 100644
> --- a/arch/riscv/include/asm/pgtable-32.h
> +++ b/arch/riscv/include/asm/pgtable-32.h
> @@ -17,8 +17,10 @@
> #include <asm-generic/pgtable-nopmd.h>
> #include <linux/const.h>
>
> +#define MAX_USER_VA_BITS 32
> /* Size of region mapped by a page global directory */
> #define PGDIR_SHIFT 22
> +#define PMD_SHIFT PGDIR_SHIFT
We don't have PMD in RV32. We have only two level page table
for RV32 so defining PMD_SHIFT is misleading and in-correct.
I suggest you drop PMD_SHIFT here instead look at below
suggestion for defining PTRS_PER_PTE in asm/pgtable.h
> #define PGDIR_SIZE (_AC(1, UL) << PGDIR_SHIFT)
> #define PGDIR_MASK (~(PGDIR_SIZE - 1))
>
> diff --git a/arch/riscv/include/asm/pgtable-64.h b/arch/riscv/include/asm/pgtable-64.h
> index 7aa0ea9..a56d4d0 100644
> --- a/arch/riscv/include/asm/pgtable-64.h
> +++ b/arch/riscv/include/asm/pgtable-64.h
> @@ -16,6 +16,7 @@
>
> #include <linux/const.h>
>
> +#define MAX_USER_VA_BITS 39
> #define PGDIR_SHIFT 30
> /* Size of region mapped by a page global directory */
> #define PGDIR_SIZE (_AC(1, UL) << PGDIR_SHIFT)
> @@ -34,7 +35,7 @@
> #define pmd_val(x) ((x).pmd)
> #define __pmd(x) ((pmd_t) { (x) })
>
> -#define PTRS_PER_PMD (PAGE_SIZE / sizeof(pmd_t))
> +#define PTRS_PER_PMD (1 << (PGDIR_SHIFT - PMD_SHIFT))
>
> static inline int pud_present(pud_t pud)
> {
> diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
> index 1141364..d9cb3c8 100644
> --- a/arch/riscv/include/asm/pgtable.h
> +++ b/arch/riscv/include/asm/pgtable.h
> @@ -33,9 +33,9 @@
> #endif /* CONFIG_64BIT */
>
> /* Number of entries in the page global directory */
> -#define PTRS_PER_PGD (PAGE_SIZE / sizeof(pgd_t))
> +#define PTRS_PER_PGD (1 << (MAX_USER_VA_BITS - PGDIR_SHIFT))
> /* Number of entries in the page table */
> -#define PTRS_PER_PTE (PAGE_SIZE / sizeof(pte_t))
> +#define PTRS_PER_PTE (1 << (PMD_SHIFT - PAGE_SHIFT))
Instead of defining PTRS_PER_PTD using PMD_SHIFT for both RV32
and RV64, do the following:
#ifdef __PAGETABLE_PMD_FOLDED
#define PTRS_PER_PTE (1 << (PGDIR_SHIFT - PAGE_SHIFT))
#else
#define PTRS_PER_PTE (1 << (PMD_SHIFT - PAGE_SHIFT))
#endif
>
> /* Number of PGD entries that a user-mode program can use */
> #define USER_PTRS_PER_PGD (TASK_SIZE / PGDIR_SIZE)
> --
> 1.9.1
>
Regards,
Anup
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] RISC-V: redefine PTRS_PER_PGD/PTRS_PER_PMD/PTRS_PER_PTE
@ 2019-04-18 0:56 damon
2019-04-18 6:13 ` Anup Patel
0 siblings, 1 reply; 8+ messages in thread
From: damon @ 2019-04-18 0:56 UTC (permalink / raw)
To: palmer
Cc: aou, anup.patel, liush.damon, rppt, sorear2, linux-riscv, linux-kernel
Use the number of addresses to define the relevant macros.
Signed-off-by: damon <liush.damon@gmail.com>
---
arch/riscv/include/asm/pgtable-32.h | 2 ++
arch/riscv/include/asm/pgtable-64.h | 3 ++-
arch/riscv/include/asm/pgtable.h | 4 ++--
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/arch/riscv/include/asm/pgtable-32.h b/arch/riscv/include/asm/pgtable-32.h
index d61974b7..93607f6 100644
--- a/arch/riscv/include/asm/pgtable-32.h
+++ b/arch/riscv/include/asm/pgtable-32.h
@@ -17,8 +17,10 @@
#include <asm-generic/pgtable-nopmd.h>
#include <linux/const.h>
+#define MAX_USER_VA_BITS 32
/* Size of region mapped by a page global directory */
#define PGDIR_SHIFT 22
+#define PMD_SHIFT PGDIR_SHIFT
#define PGDIR_SIZE (_AC(1, UL) << PGDIR_SHIFT)
#define PGDIR_MASK (~(PGDIR_SIZE - 1))
diff --git a/arch/riscv/include/asm/pgtable-64.h b/arch/riscv/include/asm/pgtable-64.h
index 7aa0ea9..a56d4d0 100644
--- a/arch/riscv/include/asm/pgtable-64.h
+++ b/arch/riscv/include/asm/pgtable-64.h
@@ -16,6 +16,7 @@
#include <linux/const.h>
+#define MAX_USER_VA_BITS 39
#define PGDIR_SHIFT 30
/* Size of region mapped by a page global directory */
#define PGDIR_SIZE (_AC(1, UL) << PGDIR_SHIFT)
@@ -34,7 +35,7 @@
#define pmd_val(x) ((x).pmd)
#define __pmd(x) ((pmd_t) { (x) })
-#define PTRS_PER_PMD (PAGE_SIZE / sizeof(pmd_t))
+#define PTRS_PER_PMD (1 << (PGDIR_SHIFT - PMD_SHIFT))
static inline int pud_present(pud_t pud)
{
diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
index 1141364..d9cb3c8 100644
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
@@ -33,9 +33,9 @@
#endif /* CONFIG_64BIT */
/* Number of entries in the page global directory */
-#define PTRS_PER_PGD (PAGE_SIZE / sizeof(pgd_t))
+#define PTRS_PER_PGD (1 << (MAX_USER_VA_BITS - PGDIR_SHIFT))
/* Number of entries in the page table */
-#define PTRS_PER_PTE (PAGE_SIZE / sizeof(pte_t))
+#define PTRS_PER_PTE (1 << (PMD_SHIFT - PAGE_SHIFT))
/* Number of PGD entries that a user-mode program can use */
#define USER_PTRS_PER_PGD (TASK_SIZE / PGDIR_SIZE)
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-07-24 12:36 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-24 8:11 [PATCH] RISC-V: redefine PTRS_PER_PGD/PTRS_PER_PMD/PTRS_PER_PTE damon
2019-04-24 8:13 ` Anup Patel
2019-06-28 18:52 ` Paul Walmsley
2019-07-24 12:36 ` sh liu
-- strict thread matches above, loose matches on Subject: below --
2019-04-24 7:51 damon
2019-04-24 7:59 ` Anup Patel
2019-04-18 0:56 damon
2019-04-18 6:13 ` Anup Patel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).