Skip to contentSkip to conversation

arm64/mm: Remove CONT_RANGE_OFFSET

PATCH Applied Gavin Shan 4 participants 9 messages Sep 10, 2020 – Sep 11, 2020 arm64

lore
Share & tools
lore

Gavin Shan

author
#0 lore raw

PATCH v2 1/3 arm64/mm: Remove CONT_RANGE_OFFSET

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).

---
 arch/arm64/include/asm/pgtable-hwdef.h | 2 --
 1 file changed, 2 deletions(-)
arch/arm64/include/asm/pgtable-hwdef.h +0 -2
index d400a4d9aee2..8a399e666837 100644
@@ -98,8 +98,6 @@
 #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))
-/* the numerical offset of the PTE within a range of CONT_PTES */
-#define CONT_RANGE_OFFSET(addr) (((addr)>>PAGE_SHIFT)&(CONT_PTES-1))
 
 /*
  * Hardware page table definitions.
Signature · 1 line
2.23.0
author
#1 lore raw

PATCH v2 2/3 arm64/mm: Unitify CONT_PTE_SHIFT

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.

---
 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(-)
arch/arm64/Kconfig +1 -1
index 6d232837cbee..7ec30dd56300 100644
@@ -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
arch/arm64/include/asm/page-def.h +0 -5
index f99d48ecbeef..2403f7b4cdbf 100644
@@ -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 */
arch/arm64/include/asm/pgtable-hwdef.h +1 -3
index 8a399e666837..6c9c67f62551 100644
@@ -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
 
Signature · 1 line
2.23.0
Reviewed-by on v2 2/3
#2 lore raw

Re: [PATCH v2 2/3] arm64/mm: Unitify CONT_PTE_SHIFT

Quoted 2 lines · Gavin Shan

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.

Quoted 3 lines

* This renames CONFIG_ARM64_CONT_SHIFT to CONFIG_ARM64_CONT_PTE_SHIFT, so that we can introduce CONFIG_ARM64_CONT_PMD_SHIFT later.

Agreed.

Quoted 3 lines

* CONT_{SHIFT, SIZE, MASK}, defined in page-def.h are removed as they are not used by anyone.

Makes sense.

Quoted 28 lines

* CONT_PTE_SHIFT is determined by CONFIG_ARM64_CONT_PTE_SHIFT.

---
 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(-)
arch/arm64/Kconfig +1 -1
index 6d232837cbee..7ec30dd56300 100644
@@ -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
arch/arm64/include/asm/page-def.h +0 -0
index f99d48ecbeef..2403f7b4cdbf 100644

arch/arm64/include/asm/page-def.h line 14

Quoted 4 lines
arch/arm64/include/asm/page-def.h +0 -1
@@ -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.

Quoted 20 lines
arch/arm64/include/asm/page-def.h +0 -4
 #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 */
arch/arm64/include/asm/pgtable-hwdef.h +1 -0
index 8a399e666837..6c9c67f62551 100644
@@ -81,14 +81,12 @@
 /*
  * Contiguous page definitions.
  */
+#define CONT_PTE_SHIFT		(CONFIG_ARM64_CONT_PTE_SHIFT + PAGE_SHIFT)
 #ifdef CONFIG_ARM64_64K_PAGES

arch/arm64/include/asm/pgtable-hwdef.h line 92

Quoted 10 lines
arch/arm64/include/asm/pgtable-hwdef.h +0 -3
-#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.

maintainer Acked-by on v2 2/3
#3 lore raw

Re: [PATCH v2 2/3] arm64/mm: Unitify CONT_PTE_SHIFT

In reply to Gavin Shan
Quoted 6 lines · Gavin Shan

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.

Quoted 6 lines

* 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.

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

author
#4 lore raw

PATCH v2 3/3 arm64/mm: Unitify CONT_PMD_SHIFT

In reply to Gavin Shan

Similar to how CONT_PTE_SHIFT is determined, this introduces a new kernel option (CONFIG_CONT_PMD_SHIFT) to determine CONT_PMD_SHIFT.

---
 arch/arm64/Kconfig                     |  6 ++++++
 arch/arm64/include/asm/pgtable-hwdef.h | 10 ++--------
 2 files changed, 8 insertions(+), 8 deletions(-)
arch/arm64/Kconfig +6 -0
index 7ec30dd56300..d58e17fe9473 100644
@@ -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
arch/arm64/include/asm/pgtable-hwdef.h +2 -8
index 6c9c67f62551..94b3f2ac2e9d 100644
@@ -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))
Signature · 1 line
2.23.0
Reviewed-by on v2 3/3
#5 lore raw

Re: [PATCH v2 3/3] arm64/mm: Unitify CONT_PMD_SHIFT

Quoted 41 lines · Gavin Shan

Similar to how CONT_PTE_SHIFT is determined, this introduces a new kernel option (CONFIG_CONT_PMD_SHIFT) to determine CONT_PMD_SHIFT.

---
 arch/arm64/Kconfig                     |  6 ++++++
 arch/arm64/include/asm/pgtable-hwdef.h | 10 ++--------
 2 files changed, 8 insertions(+), 8 deletions(-)
arch/arm64/Kconfig +6 -0
index 7ec30dd56300..d58e17fe9473 100644
@@ -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
arch/arm64/include/asm/pgtable-hwdef.h +0 -6
index 6c9c67f62551..94b3f2ac2e9d 100644
@@ -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)

arch/arm64/include/asm/pgtable-hwdef.h line 92

Quoted 10 lines
arch/arm64/include/asm/pgtable-hwdef.h +2 -2
-#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.

maintainer Acked-by on v2 3/3
#6 lore raw

Re: [PATCH v2 3/3] arm64/mm: Unitify CONT_PMD_SHIFT

In reply to Gavin Shan
Quoted 4 lines · Gavin Shan

Similar to how CONT_PTE_SHIFT is determined, this introduces a new kernel option (CONFIG_CONT_PMD_SHIFT) to determine CONT_PMD_SHIFT.

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

maintainer Acked-by on v2 1/3
#7 lore raw
In reply to Gavin Shan
Quoted 10 lines · Gavin Shan

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).

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

maintainer Applied
#8 lore raw
In reply to Gavin Shan
Quoted 7 lines · Gavin Shan

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,

Signature · 5 lines
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev