* [PATCH v2 2/3] arm64/mm: Unitify CONT_PTE_SHIFT
2020-09-10 9:59 [PATCH v2 1/3] arm64/mm: Remove CONT_RANGE_OFFSET Gavin Shan
@ 2020-09-10 9:59 ` Gavin Shan
2020-09-11 7:00 ` Anshuman Khandual
2020-09-11 15:30 ` Catalin Marinas
2020-09-10 9:59 ` [PATCH v2 3/3] arm64/mm: Unitify CONT_PMD_SHIFT Gavin Shan
` (2 subsequent siblings)
3 siblings, 2 replies; 9+ messages in thread
From: Gavin Shan @ 2020-09-10 9:59 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-kernel, anshuman.khandual, catalin.marinas, will, shan.gavin
CONT_PTE_SHIFT actually depends on CONFIG_ARM64_CONT_SHIFT. It's
reasonable to reflect the dependency:
* This renames CONFIG_ARM64_CONT_SHIFT to CONFIG_ARM64_CONT_PTE_SHIFT,
so that we can introduce CONFIG_ARM64_CONT_PMD_SHIFT later.
* CONT_{SHIFT, SIZE, MASK}, defined in page-def.h are removed as they
are not used by anyone.
* CONT_PTE_SHIFT is determined by CONFIG_ARM64_CONT_PTE_SHIFT.
Signed-off-by: Gavin Shan <gshan@redhat.com>
---
arch/arm64/Kconfig | 2 +-
arch/arm64/include/asm/page-def.h | 5 -----
arch/arm64/include/asm/pgtable-hwdef.h | 4 +---
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 6d232837cbee..7ec30dd56300 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -211,7 +211,7 @@ config ARM64_PAGE_SHIFT
default 14 if ARM64_16K_PAGES
default 12
-config ARM64_CONT_SHIFT
+config ARM64_CONT_PTE_SHIFT
int
default 5 if ARM64_64K_PAGES
default 7 if ARM64_16K_PAGES
diff --git a/arch/arm64/include/asm/page-def.h b/arch/arm64/include/asm/page-def.h
index f99d48ecbeef..2403f7b4cdbf 100644
--- a/arch/arm64/include/asm/page-def.h
+++ b/arch/arm64/include/asm/page-def.h
@@ -11,13 +11,8 @@
#include <linux/const.h>
/* PAGE_SHIFT determines the page size */
-/* CONT_SHIFT determines the number of pages which can be tracked together */
#define PAGE_SHIFT CONFIG_ARM64_PAGE_SHIFT
-#define CONT_SHIFT CONFIG_ARM64_CONT_SHIFT
#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
-#define CONT_SIZE (_AC(1, UL) << (CONT_SHIFT + PAGE_SHIFT))
-#define CONT_MASK (~(CONT_SIZE-1))
-
#endif /* __ASM_PAGE_DEF_H */
diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h
index 8a399e666837..6c9c67f62551 100644
--- a/arch/arm64/include/asm/pgtable-hwdef.h
+++ b/arch/arm64/include/asm/pgtable-hwdef.h
@@ -81,14 +81,12 @@
/*
* Contiguous page definitions.
*/
+#define CONT_PTE_SHIFT (CONFIG_ARM64_CONT_PTE_SHIFT + PAGE_SHIFT)
#ifdef CONFIG_ARM64_64K_PAGES
-#define CONT_PTE_SHIFT (5 + PAGE_SHIFT)
#define CONT_PMD_SHIFT (5 + PMD_SHIFT)
#elif defined(CONFIG_ARM64_16K_PAGES)
-#define CONT_PTE_SHIFT (7 + PAGE_SHIFT)
#define CONT_PMD_SHIFT (5 + PMD_SHIFT)
#else
-#define CONT_PTE_SHIFT (4 + PAGE_SHIFT)
#define CONT_PMD_SHIFT (4 + PMD_SHIFT)
#endif
--
2.23.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2 2/3] arm64/mm: Unitify CONT_PTE_SHIFT
2020-09-10 9:59 ` [PATCH v2 2/3] arm64/mm: Unitify CONT_PTE_SHIFT Gavin Shan
@ 2020-09-11 7:00 ` Anshuman Khandual
2020-09-11 15:30 ` Catalin Marinas
1 sibling, 0 replies; 9+ messages in thread
From: Anshuman Khandual @ 2020-09-11 7:00 UTC (permalink / raw)
To: Gavin Shan, linux-arm-kernel
Cc: linux-kernel, catalin.marinas, will, shan.gavin
On 09/10/2020 03:29 PM, Gavin Shan wrote:
> CONT_PTE_SHIFT actually depends on CONFIG_ARM64_CONT_SHIFT. It's
> reasonable to reflect the dependency:
Also always better to avoid direct numerical such as 5, 7, 4. A config
option with a right name (even with constant values), gives them some
meaning.
>
> * This renames CONFIG_ARM64_CONT_SHIFT to CONFIG_ARM64_CONT_PTE_SHIFT,
> so that we can introduce CONFIG_ARM64_CONT_PMD_SHIFT later.
Agreed.
>
> * CONT_{SHIFT, SIZE, MASK}, defined in page-def.h are removed as they
> are not used by anyone.
Makes sense.
>
> * CONT_PTE_SHIFT is determined by CONFIG_ARM64_CONT_PTE_SHIFT.
>
> Signed-off-by: Gavin Shan <gshan@redhat.com>
> ---
> arch/arm64/Kconfig | 2 +-
> arch/arm64/include/asm/page-def.h | 5 -----
> arch/arm64/include/asm/pgtable-hwdef.h | 4 +---
> 3 files changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
> index 6d232837cbee..7ec30dd56300 100644
> --- a/arch/arm64/Kconfig
> +++ b/arch/arm64/Kconfig
> @@ -211,7 +211,7 @@ config ARM64_PAGE_SHIFT
> default 14 if ARM64_16K_PAGES
> default 12
>
> -config ARM64_CONT_SHIFT
> +config ARM64_CONT_PTE_SHIFT
> int
> default 5 if ARM64_64K_PAGES
> default 7 if ARM64_16K_PAGES
> diff --git a/arch/arm64/include/asm/page-def.h b/arch/arm64/include/asm/page-def.h
> index f99d48ecbeef..2403f7b4cdbf 100644
> --- a/arch/arm64/include/asm/page-def.h
> +++ b/arch/arm64/include/asm/page-def.h
> @@ -11,13 +11,8 @@
> #include <linux/const.h>
>
> /* PAGE_SHIFT determines the page size */
> -/* CONT_SHIFT determines the number of pages which can be tracked together */
This does not get added back in <pgtable-hwdef.h>, would you please
add one comment, for both CONT_PTE_SHIFT and CONT_PMD_SHIFT in their
respective patches.
> #define PAGE_SHIFT CONFIG_ARM64_PAGE_SHIFT
> -#define CONT_SHIFT CONFIG_ARM64_CONT_SHIFT
> #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
> #define PAGE_MASK (~(PAGE_SIZE-1))
>
> -#define CONT_SIZE (_AC(1, UL) << (CONT_SHIFT + PAGE_SHIFT))
> -#define CONT_MASK (~(CONT_SIZE-1))
> -
> #endif /* __ASM_PAGE_DEF_H */
> diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h
> index 8a399e666837..6c9c67f62551 100644
> --- a/arch/arm64/include/asm/pgtable-hwdef.h
> +++ b/arch/arm64/include/asm/pgtable-hwdef.h
> @@ -81,14 +81,12 @@
> /*
> * Contiguous page definitions.
> */
> +#define CONT_PTE_SHIFT (CONFIG_ARM64_CONT_PTE_SHIFT + PAGE_SHIFT)
> #ifdef CONFIG_ARM64_64K_PAGES
> -#define CONT_PTE_SHIFT (5 + PAGE_SHIFT)
> #define CONT_PMD_SHIFT (5 + PMD_SHIFT)
> #elif defined(CONFIG_ARM64_16K_PAGES)
> -#define CONT_PTE_SHIFT (7 + PAGE_SHIFT)
> #define CONT_PMD_SHIFT (5 + PMD_SHIFT)
> #else
> -#define CONT_PTE_SHIFT (4 + PAGE_SHIFT)
> #define CONT_PMD_SHIFT (4 + PMD_SHIFT)
> #endif
>
>
Looks good to me and there are no obvious regressions as well.
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2 2/3] arm64/mm: Unitify CONT_PTE_SHIFT
2020-09-10 9:59 ` [PATCH v2 2/3] arm64/mm: Unitify CONT_PTE_SHIFT Gavin Shan
2020-09-11 7:00 ` Anshuman Khandual
@ 2020-09-11 15:30 ` Catalin Marinas
1 sibling, 0 replies; 9+ messages in thread
From: Catalin Marinas @ 2020-09-11 15:30 UTC (permalink / raw)
To: Gavin Shan
Cc: linux-arm-kernel, linux-kernel, anshuman.khandual, will, shan.gavin
On Thu, Sep 10, 2020 at 07:59:35PM +1000, Gavin Shan wrote:
> CONT_PTE_SHIFT actually depends on CONFIG_ARM64_CONT_SHIFT. It's
> reasonable to reflect the dependency:
>
> * This renames CONFIG_ARM64_CONT_SHIFT to CONFIG_ARM64_CONT_PTE_SHIFT,
> so that we can introduce CONFIG_ARM64_CONT_PMD_SHIFT later.
>
> * CONT_{SHIFT, SIZE, MASK}, defined in page-def.h are removed as they
> are not used by anyone.
>
> * CONT_PTE_SHIFT is determined by CONFIG_ARM64_CONT_PTE_SHIFT.
>
> Signed-off-by: Gavin Shan <gshan@redhat.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 3/3] arm64/mm: Unitify CONT_PMD_SHIFT
2020-09-10 9:59 [PATCH v2 1/3] arm64/mm: Remove CONT_RANGE_OFFSET Gavin Shan
2020-09-10 9:59 ` [PATCH v2 2/3] arm64/mm: Unitify CONT_PTE_SHIFT Gavin Shan
@ 2020-09-10 9:59 ` Gavin Shan
2020-09-11 7:05 ` Anshuman Khandual
2020-09-11 15:30 ` Catalin Marinas
2020-09-11 15:28 ` [PATCH v2 1/3] arm64/mm: Remove CONT_RANGE_OFFSET Catalin Marinas
2020-09-11 16:33 ` Will Deacon
3 siblings, 2 replies; 9+ messages in thread
From: Gavin Shan @ 2020-09-10 9:59 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-kernel, anshuman.khandual, catalin.marinas, will, shan.gavin
Similar to how CONT_PTE_SHIFT is determined, this introduces a new
kernel option (CONFIG_CONT_PMD_SHIFT) to determine CONT_PMD_SHIFT.
Signed-off-by: Gavin Shan <gshan@redhat.com>
---
arch/arm64/Kconfig | 6 ++++++
arch/arm64/include/asm/pgtable-hwdef.h | 10 ++--------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 7ec30dd56300..d58e17fe9473 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -217,6 +217,12 @@ config ARM64_CONT_PTE_SHIFT
default 7 if ARM64_16K_PAGES
default 4
+config ARM64_CONT_PMD_SHIFT
+ int
+ default 5 if ARM64_64K_PAGES
+ default 5 if ARM64_16K_PAGES
+ default 4
+
config ARCH_MMAP_RND_BITS_MIN
default 14 if ARM64_64K_PAGES
default 16 if ARM64_16K_PAGES
diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h
index 6c9c67f62551..94b3f2ac2e9d 100644
--- a/arch/arm64/include/asm/pgtable-hwdef.h
+++ b/arch/arm64/include/asm/pgtable-hwdef.h
@@ -82,17 +82,11 @@
* Contiguous page definitions.
*/
#define CONT_PTE_SHIFT (CONFIG_ARM64_CONT_PTE_SHIFT + PAGE_SHIFT)
-#ifdef CONFIG_ARM64_64K_PAGES
-#define CONT_PMD_SHIFT (5 + PMD_SHIFT)
-#elif defined(CONFIG_ARM64_16K_PAGES)
-#define CONT_PMD_SHIFT (5 + PMD_SHIFT)
-#else
-#define CONT_PMD_SHIFT (4 + PMD_SHIFT)
-#endif
-
#define CONT_PTES (1 << (CONT_PTE_SHIFT - PAGE_SHIFT))
#define CONT_PTE_SIZE (CONT_PTES * PAGE_SIZE)
#define CONT_PTE_MASK (~(CONT_PTE_SIZE - 1))
+
+#define CONT_PMD_SHIFT (CONFIG_ARM64_CONT_PMD_SHIFT + PMD_SHIFT)
#define CONT_PMDS (1 << (CONT_PMD_SHIFT - PMD_SHIFT))
#define CONT_PMD_SIZE (CONT_PMDS * PMD_SIZE)
#define CONT_PMD_MASK (~(CONT_PMD_SIZE - 1))
--
2.23.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2 3/3] arm64/mm: Unitify CONT_PMD_SHIFT
2020-09-10 9:59 ` [PATCH v2 3/3] arm64/mm: Unitify CONT_PMD_SHIFT Gavin Shan
@ 2020-09-11 7:05 ` Anshuman Khandual
2020-09-11 15:30 ` Catalin Marinas
1 sibling, 0 replies; 9+ messages in thread
From: Anshuman Khandual @ 2020-09-11 7:05 UTC (permalink / raw)
To: Gavin Shan, linux-arm-kernel
Cc: linux-kernel, catalin.marinas, will, shan.gavin
On 09/10/2020 03:29 PM, Gavin Shan wrote:
> Similar to how CONT_PTE_SHIFT is determined, this introduces a new
> kernel option (CONFIG_CONT_PMD_SHIFT) to determine CONT_PMD_SHIFT.
>
> Signed-off-by: Gavin Shan <gshan@redhat.com>
> ---
> arch/arm64/Kconfig | 6 ++++++
> arch/arm64/include/asm/pgtable-hwdef.h | 10 ++--------
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
> index 7ec30dd56300..d58e17fe9473 100644
> --- a/arch/arm64/Kconfig
> +++ b/arch/arm64/Kconfig
> @@ -217,6 +217,12 @@ config ARM64_CONT_PTE_SHIFT
> default 7 if ARM64_16K_PAGES
> default 4
>
> +config ARM64_CONT_PMD_SHIFT
> + int
> + default 5 if ARM64_64K_PAGES
> + default 5 if ARM64_16K_PAGES
> + default 4
> +
> config ARCH_MMAP_RND_BITS_MIN
> default 14 if ARM64_64K_PAGES
> default 16 if ARM64_16K_PAGES
> diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h
> index 6c9c67f62551..94b3f2ac2e9d 100644
> --- a/arch/arm64/include/asm/pgtable-hwdef.h
> +++ b/arch/arm64/include/asm/pgtable-hwdef.h
> @@ -82,17 +82,11 @@
> * Contiguous page definitions.
> */
> #define CONT_PTE_SHIFT (CONFIG_ARM64_CONT_PTE_SHIFT + PAGE_SHIFT)
> -#ifdef CONFIG_ARM64_64K_PAGES
> -#define CONT_PMD_SHIFT (5 + PMD_SHIFT)
> -#elif defined(CONFIG_ARM64_16K_PAGES)
> -#define CONT_PMD_SHIFT (5 + PMD_SHIFT)
> -#else
> -#define CONT_PMD_SHIFT (4 + PMD_SHIFT)
> -#endif
> -
> #define CONT_PTES (1 << (CONT_PTE_SHIFT - PAGE_SHIFT))
> #define CONT_PTE_SIZE (CONT_PTES * PAGE_SIZE)
> #define CONT_PTE_MASK (~(CONT_PTE_SIZE - 1))
> +
> +#define CONT_PMD_SHIFT (CONFIG_ARM64_CONT_PMD_SHIFT + PMD_SHIFT)
> #define CONT_PMDS (1 << (CONT_PMD_SHIFT - PMD_SHIFT))
> #define CONT_PMD_SIZE (CONT_PMDS * PMD_SIZE)
> #define CONT_PMD_MASK (~(CONT_PMD_SIZE - 1))
>
This is cleaner and more uniform. Did not see any problem while
running some quick hugetlb tests across multiple page size configs
after applying all patches in this series.
Adding this new configuration ARM64_CONT_PMD_SHIFT makes sense, as
it eliminates existing constant values that are used in an ad hoc
manner, while computing contiguous page table entry properties.
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 3/3] arm64/mm: Unitify CONT_PMD_SHIFT
2020-09-10 9:59 ` [PATCH v2 3/3] arm64/mm: Unitify CONT_PMD_SHIFT Gavin Shan
2020-09-11 7:05 ` Anshuman Khandual
@ 2020-09-11 15:30 ` Catalin Marinas
1 sibling, 0 replies; 9+ messages in thread
From: Catalin Marinas @ 2020-09-11 15:30 UTC (permalink / raw)
To: Gavin Shan
Cc: linux-arm-kernel, linux-kernel, anshuman.khandual, will, shan.gavin
On Thu, Sep 10, 2020 at 07:59:36PM +1000, Gavin Shan wrote:
> Similar to how CONT_PTE_SHIFT is determined, this introduces a new
> kernel option (CONFIG_CONT_PMD_SHIFT) to determine CONT_PMD_SHIFT.
>
> Signed-off-by: Gavin Shan <gshan@redhat.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/3] arm64/mm: Remove CONT_RANGE_OFFSET
2020-09-10 9:59 [PATCH v2 1/3] arm64/mm: Remove CONT_RANGE_OFFSET Gavin Shan
2020-09-10 9:59 ` [PATCH v2 2/3] arm64/mm: Unitify CONT_PTE_SHIFT Gavin Shan
2020-09-10 9:59 ` [PATCH v2 3/3] arm64/mm: Unitify CONT_PMD_SHIFT Gavin Shan
@ 2020-09-11 15:28 ` Catalin Marinas
2020-09-11 16:33 ` Will Deacon
3 siblings, 0 replies; 9+ messages in thread
From: Catalin Marinas @ 2020-09-11 15:28 UTC (permalink / raw)
To: Gavin Shan
Cc: linux-arm-kernel, linux-kernel, anshuman.khandual, will, shan.gavin
On Thu, Sep 10, 2020 at 07:59:34PM +1000, Gavin Shan wrote:
> The macro was introduced by commit <ecf35a237a85> ("arm64: PTE/PMD
> contiguous bit definition") at the beginning. It's only used by
> commit <348a65cdcbbf> ("arm64: Mark kernel page ranges contiguous"),
> which was reverted later by commit <667c27597ca8>. This makes the
> macro unused.
>
> This removes the unused macro (CONT_RANGE_OFFSET).
>
> Signed-off-by: Gavin Shan <gshan@redhat.com>
> Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2 1/3] arm64/mm: Remove CONT_RANGE_OFFSET
2020-09-10 9:59 [PATCH v2 1/3] arm64/mm: Remove CONT_RANGE_OFFSET Gavin Shan
` (2 preceding siblings ...)
2020-09-11 15:28 ` [PATCH v2 1/3] arm64/mm: Remove CONT_RANGE_OFFSET Catalin Marinas
@ 2020-09-11 16:33 ` Will Deacon
3 siblings, 0 replies; 9+ messages in thread
From: Will Deacon @ 2020-09-11 16:33 UTC (permalink / raw)
To: linux-arm-kernel, Gavin Shan
Cc: catalin.marinas, kernel-team, Will Deacon, linux-kernel,
anshuman.khandual, shan.gavin
On Thu, 10 Sep 2020 19:59:34 +1000, Gavin Shan wrote:
> The macro was introduced by commit <ecf35a237a85> ("arm64: PTE/PMD
> contiguous bit definition") at the beginning. It's only used by
> commit <348a65cdcbbf> ("arm64: Mark kernel page ranges contiguous"),
> which was reverted later by commit <667c27597ca8>. This makes the
> macro unused.
>
> This removes the unused macro (CONT_RANGE_OFFSET).
Applied to arm64 (for-next/mm), thanks!
[1/3] arm64/mm: Remove CONT_RANGE_OFFSET
https://git.kernel.org/arm64/c/11e339d53a73
[2/3] arm64/mm: Unify CONT_PTE_SHIFT
https://git.kernel.org/arm64/c/c0d6de327f18
[3/3] arm64/mm: Unify CONT_PMD_SHIFT
https://git.kernel.org/arm64/c/e676594115f0
Cheers,
--
Will
https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev
^ permalink raw reply [flat|nested] 9+ messages in thread