* [PATCH 1/2] arm64/mm: Remove CONT_RANGE_OFFSET
@ 2020-09-08 7:19 Gavin Shan
2020-09-08 7:19 ` [PATCH 2/2] arm64/mm: Use CONT_SHIFT to define CONT_PTE_SHIFT Gavin Shan
2020-09-10 5:59 ` [PATCH 1/2] arm64/mm: Remove CONT_RANGE_OFFSET Anshuman Khandual
0 siblings, 2 replies; 7+ messages in thread
From: Gavin Shan @ 2020-09-08 7:19 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-kernel, catalin.marinas, will, anshuman.khandual, shan.gavin
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>
---
arch/arm64/include/asm/pgtable-hwdef.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h
index d400a4d9aee2..8a399e666837 100644
--- a/arch/arm64/include/asm/pgtable-hwdef.h
+++ b/arch/arm64/include/asm/pgtable-hwdef.h
@@ -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.
--
2.23.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/2] arm64/mm: Use CONT_SHIFT to define CONT_PTE_SHIFT 2020-09-08 7:19 [PATCH 1/2] arm64/mm: Remove CONT_RANGE_OFFSET Gavin Shan @ 2020-09-08 7:19 ` Gavin Shan 2020-09-10 6:17 ` Anshuman Khandual 2020-09-10 5:59 ` [PATCH 1/2] arm64/mm: Remove CONT_RANGE_OFFSET Anshuman Khandual 1 sibling, 1 reply; 7+ messages in thread From: Gavin Shan @ 2020-09-08 7:19 UTC (permalink / raw) To: linux-arm-kernel Cc: linux-kernel, catalin.marinas, will, anshuman.khandual, shan.gavin The macro CONT_PTE_SHIFT actually depends on CONT_SHIFT, which has been defined in page-def.h, based on CONFIG_ARM64_CONT_SHIFT. Lets reflect the dependency. Signed-off-by: Gavin Shan <gshan@redhat.com> --- arch/arm64/include/asm/pgtable-hwdef.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h index 8a399e666837..0bd9469f4323 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 (CONT_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] 7+ messages in thread
* Re: [PATCH 2/2] arm64/mm: Use CONT_SHIFT to define CONT_PTE_SHIFT 2020-09-08 7:19 ` [PATCH 2/2] arm64/mm: Use CONT_SHIFT to define CONT_PTE_SHIFT Gavin Shan @ 2020-09-10 6:17 ` Anshuman Khandual 2020-09-10 8:31 ` Gavin Shan 0 siblings, 1 reply; 7+ messages in thread From: Anshuman Khandual @ 2020-09-10 6:17 UTC (permalink / raw) To: Gavin Shan, linux-arm-kernel Cc: linux-kernel, catalin.marinas, will, shan.gavin On 09/08/2020 12:49 PM, Gavin Shan wrote: > The macro CONT_PTE_SHIFT actually depends on CONT_SHIFT, which has > been defined in page-def.h, based on CONFIG_ARM64_CONT_SHIFT. Lets > reflect the dependency. > > Signed-off-by: Gavin Shan <gshan@redhat.com> > --- > arch/arm64/include/asm/pgtable-hwdef.h | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h > index 8a399e666837..0bd9469f4323 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 (CONT_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 Could not a similar CONT_PMD be created from a new CONFIG_ARM64_CONT_PMD config option, which would help unify CONT_PMD_SHIFT here as well ? ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] arm64/mm: Use CONT_SHIFT to define CONT_PTE_SHIFT 2020-09-10 6:17 ` Anshuman Khandual @ 2020-09-10 8:31 ` Gavin Shan 2020-09-10 9:28 ` Anshuman Khandual 0 siblings, 1 reply; 7+ messages in thread From: Gavin Shan @ 2020-09-10 8:31 UTC (permalink / raw) To: Anshuman Khandual, linux-arm-kernel Cc: linux-kernel, catalin.marinas, will, shan.gavin Hi Anshuman, On 9/10/20 4:17 PM, Anshuman Khandual wrote: > On 09/08/2020 12:49 PM, Gavin Shan wrote: >> The macro CONT_PTE_SHIFT actually depends on CONT_SHIFT, which has >> been defined in page-def.h, based on CONFIG_ARM64_CONT_SHIFT. Lets >> reflect the dependency. >> >> Signed-off-by: Gavin Shan <gshan@redhat.com> >> --- >> arch/arm64/include/asm/pgtable-hwdef.h | 4 +--- >> 1 file changed, 1 insertion(+), 3 deletions(-) >> >> diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h >> index 8a399e666837..0bd9469f4323 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 (CONT_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 > Could not a similar CONT_PMD be created from a new CONFIG_ARM64_CONT_PMD > config option, which would help unify CONT_PMD_SHIFT here as well ? > I was thinking of it, to have CONFIG_ARM64_CONT_PMD and defined the following macros in arch/arm64/include/asm/page-def.h: #define CONT_PMD_SHIFT CONFIG_ARM64_CONT_PMD_SHIFT #define CONT_PMD_SIZE (_AC(1, UL) << (CONT_PMD_SHIFT + PMD_SHIFT) #define CONT_PMD_MASK (~(CONT_PMD_SIZE - 1)) PMD_SHIFT is variable because PMD could be folded into PUD or PGD, depending on the kernel configuration. PMD_SHIFT is declared in arch/arm64/include/asm/pgtable-types.h, which isn't supposed to be included in "page-def.h". So the peroper way to handle this might be drop the continuous page macros in page-def.h and introduce the following ones into pgtable-hwdef.h. I will post v2 to do this if it sounds good to you. #define CONT_PTE_SHIFT (CONFIG_ARM64_CONT_PTE_SHIFT + PAGE_SHIFT) #define CONT_PMD_SHIFT (CONFIG_ARM64_CONT_PMD_SHIFT + PMD_SHIFT) Thanks, Gavin ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] arm64/mm: Use CONT_SHIFT to define CONT_PTE_SHIFT 2020-09-10 8:31 ` Gavin Shan @ 2020-09-10 9:28 ` Anshuman Khandual 2020-09-10 9:56 ` Gavin Shan 0 siblings, 1 reply; 7+ messages in thread From: Anshuman Khandual @ 2020-09-10 9:28 UTC (permalink / raw) To: Gavin Shan, linux-arm-kernel Cc: linux-kernel, catalin.marinas, will, shan.gavin On 09/10/2020 02:01 PM, Gavin Shan wrote: > Hi Anshuman, > > On 9/10/20 4:17 PM, Anshuman Khandual wrote: >> On 09/08/2020 12:49 PM, Gavin Shan wrote: >>> The macro CONT_PTE_SHIFT actually depends on CONT_SHIFT, which has >>> been defined in page-def.h, based on CONFIG_ARM64_CONT_SHIFT. Lets >>> reflect the dependency. >>> >>> Signed-off-by: Gavin Shan <gshan@redhat.com> >>> --- >>> arch/arm64/include/asm/pgtable-hwdef.h | 4 +--- >>> 1 file changed, 1 insertion(+), 3 deletions(-) >>> >>> diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h >>> index 8a399e666837..0bd9469f4323 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 (CONT_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 >> Could not a similar CONT_PMD be created from a new CONFIG_ARM64_CONT_PMD >> config option, which would help unify CONT_PMD_SHIFT here as well ? >> > > I was thinking of it, to have CONFIG_ARM64_CONT_PMD and defined the > following macros in arch/arm64/include/asm/page-def.h: > > #define CONT_PMD_SHIFT CONFIG_ARM64_CONT_PMD_SHIFT > #define CONT_PMD_SIZE (_AC(1, UL) << (CONT_PMD_SHIFT + PMD_SHIFT) > #define CONT_PMD_MASK (~(CONT_PMD_SIZE - 1)) > > PMD_SHIFT is variable because PMD could be folded into PUD or PGD, > depending on the kernel configuration. PMD_SHIFT is declared Even CONT_PMD_SHIFT via the new CONFIG_ARM64_CONT_PMD_SHIFT will be a variable as well depending on page size. > in arch/arm64/include/asm/pgtable-types.h, which isn't supposed > to be included in "page-def.h". Are there build failures if <pgtable-types.h> is included from <page-def.h> ? > > So the peroper way to handle this might be drop the continuous page > macros in page-def.h and introduce the following ones into pgtable-hwdef.h. > I will post v2 to do this if it sounds good to you. Sure, go ahead if that builds. But unifying both these macros seems cleaner. > > #define CONT_PTE_SHIFT (CONFIG_ARM64_CONT_PTE_SHIFT + PAGE_SHIFT) > #define CONT_PMD_SHIFT (CONFIG_ARM64_CONT_PMD_SHIFT + PMD_SHIFT) > > Thanks, > Gavin > > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] arm64/mm: Use CONT_SHIFT to define CONT_PTE_SHIFT 2020-09-10 9:28 ` Anshuman Khandual @ 2020-09-10 9:56 ` Gavin Shan 0 siblings, 0 replies; 7+ messages in thread From: Gavin Shan @ 2020-09-10 9:56 UTC (permalink / raw) To: Anshuman Khandual, linux-arm-kernel Cc: linux-kernel, catalin.marinas, will, shan.gavin Hi Anshuman, On 9/10/20 7:28 PM, Anshuman Khandual wrote: > On 09/10/2020 02:01 PM, Gavin Shan wrote: >> On 9/10/20 4:17 PM, Anshuman Khandual wrote: >>> On 09/08/2020 12:49 PM, Gavin Shan wrote: >>>> The macro CONT_PTE_SHIFT actually depends on CONT_SHIFT, which has >>>> been defined in page-def.h, based on CONFIG_ARM64_CONT_SHIFT. Lets >>>> reflect the dependency. >>>> >>>> Signed-off-by: Gavin Shan <gshan@redhat.com> >>>> --- >>>> arch/arm64/include/asm/pgtable-hwdef.h | 4 +--- >>>> 1 file changed, 1 insertion(+), 3 deletions(-) >>>> >>>> diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h >>>> index 8a399e666837..0bd9469f4323 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 (CONT_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 >>> Could not a similar CONT_PMD be created from a new CONFIG_ARM64_CONT_PMD >>> config option, which would help unify CONT_PMD_SHIFT here as well ? >>> >> >> I was thinking of it, to have CONFIG_ARM64_CONT_PMD and defined the >> following macros in arch/arm64/include/asm/page-def.h: >> >> #define CONT_PMD_SHIFT CONFIG_ARM64_CONT_PMD_SHIFT >> #define CONT_PMD_SIZE (_AC(1, UL) << (CONT_PMD_SHIFT + PMD_SHIFT) >> #define CONT_PMD_MASK (~(CONT_PMD_SIZE - 1)) >> >> PMD_SHIFT is variable because PMD could be folded into PUD or PGD, >> depending on the kernel configuration. PMD_SHIFT is declared > > Even CONT_PMD_SHIFT via the new CONFIG_ARM64_CONT_PMD_SHIFT will > be a variable as well depending on page size. > Yes, it depends on the variable PMD_SHIFT. >> in arch/arm64/include/asm/pgtable-types.h, which isn't supposed >> to be included in "page-def.h". > > Are there build failures if <pgtable-types.h> is included from <page-def.h> ? > Yes, something like this: AS arch/arm64/kernel/head.o In file included from ./arch/arm64/include/asm/pgtable-hwdef.h:8, from ./arch/arm64/include/asm/page-def.h:12, from ./arch/arm64/include/asm/page.h:11, from ./arch/arm64/include/asm/proc-fns.h:14, from ./arch/arm64/include/asm/pgtable.h:9, from ./include/linux/pgtable.h:6, from ./arch/arm64/include/asm/io.h:12, from ./include/linux/io.h:13, from drivers/bus/vexpress-config.c:9: ./arch/arm64/include/asm/memory.h:91:55: warning: "PAGE_SHIFT" is not defined, evaluates to 0 [-Wundef] #if defined(CONFIG_VMAP_STACK) && (MIN_THREAD_SHIFT < PAGE_SHIFT) ^~~~~~~~~~ ./arch/arm64/include/asm/memory.h:97:21: warning: "PAGE_SHIFT" is not defined, evaluates to 0 [-Wundef] #if THREAD_SHIFT >= PAGE_SHIFT ^~~~~~~~~~ >> >> So the peroper way to handle this might be drop the continuous page >> macros in page-def.h and introduce the following ones into pgtable-hwdef.h. >> I will post v2 to do this if it sounds good to you. > > Sure, go ahead if that builds. But unifying both these macros seems cleaner. > Thanks for your confirmation. v2 is on the way :) >> >> #define CONT_PTE_SHIFT (CONFIG_ARM64_CONT_PTE_SHIFT + PAGE_SHIFT) >> #define CONT_PMD_SHIFT (CONFIG_ARM64_CONT_PMD_SHIFT + PMD_SHIFT) >> Thanks, Gavin ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] arm64/mm: Remove CONT_RANGE_OFFSET 2020-09-08 7:19 [PATCH 1/2] arm64/mm: Remove CONT_RANGE_OFFSET Gavin Shan 2020-09-08 7:19 ` [PATCH 2/2] arm64/mm: Use CONT_SHIFT to define CONT_PTE_SHIFT Gavin Shan @ 2020-09-10 5:59 ` Anshuman Khandual 1 sibling, 0 replies; 7+ messages in thread From: Anshuman Khandual @ 2020-09-10 5:59 UTC (permalink / raw) To: Gavin Shan, linux-arm-kernel Cc: linux-kernel, catalin.marinas, will, shan.gavin On 09/08/2020 12:49 PM, 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> > --- > arch/arm64/include/asm/pgtable-hwdef.h | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h > index d400a4d9aee2..8a399e666837 100644 > --- a/arch/arm64/include/asm/pgtable-hwdef.h > +++ b/arch/arm64/include/asm/pgtable-hwdef.h > @@ -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. > Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com> ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-09-10 10:00 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-09-08 7:19 [PATCH 1/2] arm64/mm: Remove CONT_RANGE_OFFSET Gavin Shan 2020-09-08 7:19 ` [PATCH 2/2] arm64/mm: Use CONT_SHIFT to define CONT_PTE_SHIFT Gavin Shan 2020-09-10 6:17 ` Anshuman Khandual 2020-09-10 8:31 ` Gavin Shan 2020-09-10 9:28 ` Anshuman Khandual 2020-09-10 9:56 ` Gavin Shan 2020-09-10 5:59 ` [PATCH 1/2] arm64/mm: Remove CONT_RANGE_OFFSET Anshuman Khandual
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).