| Message ID | 20220603101411.488970-5-anshuman.khandual@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | mm/mmap: Enable more platforms with ARCH_HAS_VM_GET_PAGE_PROT | expand |
Acked-by: Guo Ren <guoren@kernel.org> On Fri, Jun 3, 2022 at 6:15 PM Anshuman Khandual <anshuman.khandual@arm.com> wrote: > > This defines and exports a platform specific custom vm_get_page_prot() via > subscribing ARCH_HAS_VM_GET_PAGE_PROT. Subsequently all __SXXX and __PXXX > macros can be dropped which are no longer needed. > > Cc: Geert Uytterhoeven <geert@linux-m68k.org> > Cc: linux-csky@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Acked-by: Guo Ren <guoren@kernel.org> > Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> > --- > arch/csky/Kconfig | 1 + > arch/csky/include/asm/pgtable.h | 18 ------------------ > arch/csky/mm/init.c | 32 ++++++++++++++++++++++++++++++++ > 3 files changed, 33 insertions(+), 18 deletions(-) > > diff --git a/arch/csky/Kconfig b/arch/csky/Kconfig > index 21d72b078eef..588b8a9c68ed 100644 > --- a/arch/csky/Kconfig > +++ b/arch/csky/Kconfig > @@ -6,6 +6,7 @@ config CSKY > select ARCH_HAS_GCOV_PROFILE_ALL > select ARCH_HAS_SYNC_DMA_FOR_CPU > select ARCH_HAS_SYNC_DMA_FOR_DEVICE > + select ARCH_HAS_VM_GET_PAGE_PROT > select ARCH_USE_BUILTIN_BSWAP > select ARCH_USE_QUEUED_RWLOCKS > select ARCH_WANT_FRAME_POINTERS if !CPU_CK610 && $(cc-option,-mbacktrace) > diff --git a/arch/csky/include/asm/pgtable.h b/arch/csky/include/asm/pgtable.h > index bbe245117777..229a5f4ad7fc 100644 > --- a/arch/csky/include/asm/pgtable.h > +++ b/arch/csky/include/asm/pgtable.h > @@ -77,24 +77,6 @@ > #define MAX_SWAPFILES_CHECK() \ > BUILD_BUG_ON(MAX_SWAPFILES_SHIFT != 5) > > -#define __P000 PAGE_NONE > -#define __P001 PAGE_READ > -#define __P010 PAGE_READ > -#define __P011 PAGE_READ > -#define __P100 PAGE_READ > -#define __P101 PAGE_READ > -#define __P110 PAGE_READ > -#define __P111 PAGE_READ > - > -#define __S000 PAGE_NONE > -#define __S001 PAGE_READ > -#define __S010 PAGE_WRITE > -#define __S011 PAGE_WRITE > -#define __S100 PAGE_READ > -#define __S101 PAGE_READ > -#define __S110 PAGE_WRITE > -#define __S111 PAGE_WRITE > - > extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]; > #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page)) > > diff --git a/arch/csky/mm/init.c b/arch/csky/mm/init.c > index bf2004aa811a..f9babbed17d4 100644 > --- a/arch/csky/mm/init.c > +++ b/arch/csky/mm/init.c > @@ -197,3 +197,35 @@ void __init fixaddr_init(void) > vaddr = __fix_to_virt(__end_of_fixed_addresses - 1) & PMD_MASK; > fixrange_init(vaddr, vaddr + PMD_SIZE, swapper_pg_dir); > } > + > +pgprot_t vm_get_page_prot(unsigned long vm_flags) > +{ > + switch (vm_flags & (VM_READ | VM_WRITE | VM_EXEC | VM_SHARED)) { > + case VM_NONE: > + return PAGE_NONE; > + case VM_READ: > + case VM_WRITE: > + case VM_WRITE | VM_READ: > + case VM_EXEC: > + case VM_EXEC | VM_READ: > + case VM_EXEC | VM_WRITE: > + case VM_EXEC | VM_WRITE | VM_READ: > + return PAGE_READ; > + case VM_SHARED: > + return PAGE_NONE; > + case VM_SHARED | VM_READ: > + return PAGE_READ; > + case VM_SHARED | VM_WRITE: > + case VM_SHARED | VM_WRITE | VM_READ: > + return PAGE_WRITE; > + case VM_SHARED | VM_EXEC: > + case VM_SHARED | VM_EXEC | VM_READ: > + return PAGE_READ; > + case VM_SHARED | VM_EXEC | VM_WRITE: > + case VM_SHARED | VM_EXEC | VM_WRITE | VM_READ: > + return PAGE_WRITE; > + default: > + BUILD_BUG(); > + } > +} > +EXPORT_SYMBOL(vm_get_page_prot); > -- > 2.25.1 >
On 6/4/22 17:43, Guo Ren wrote: > Acked-by: Guo Ren <guoren@kernel.org> I will resend this series with suggested changes. > > On Fri, Jun 3, 2022 at 6:15 PM Anshuman Khandual > <anshuman.khandual@arm.com> wrote: >> >> This defines and exports a platform specific custom vm_get_page_prot() via >> subscribing ARCH_HAS_VM_GET_PAGE_PROT. Subsequently all __SXXX and __PXXX >> macros can be dropped which are no longer needed. >> >> Cc: Geert Uytterhoeven <geert@linux-m68k.org> >> Cc: linux-csky@vger.kernel.org >> Cc: linux-kernel@vger.kernel.org >> Acked-by: Guo Ren <guoren@kernel.org> >> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> >> --- >> arch/csky/Kconfig | 1 + >> arch/csky/include/asm/pgtable.h | 18 ------------------ >> arch/csky/mm/init.c | 32 ++++++++++++++++++++++++++++++++ >> 3 files changed, 33 insertions(+), 18 deletions(-) >> >> diff --git a/arch/csky/Kconfig b/arch/csky/Kconfig >> index 21d72b078eef..588b8a9c68ed 100644 >> --- a/arch/csky/Kconfig >> +++ b/arch/csky/Kconfig >> @@ -6,6 +6,7 @@ config CSKY >> select ARCH_HAS_GCOV_PROFILE_ALL >> select ARCH_HAS_SYNC_DMA_FOR_CPU >> select ARCH_HAS_SYNC_DMA_FOR_DEVICE >> + select ARCH_HAS_VM_GET_PAGE_PROT >> select ARCH_USE_BUILTIN_BSWAP >> select ARCH_USE_QUEUED_RWLOCKS >> select ARCH_WANT_FRAME_POINTERS if !CPU_CK610 && $(cc-option,-mbacktrace) >> diff --git a/arch/csky/include/asm/pgtable.h b/arch/csky/include/asm/pgtable.h >> index bbe245117777..229a5f4ad7fc 100644 >> --- a/arch/csky/include/asm/pgtable.h >> +++ b/arch/csky/include/asm/pgtable.h >> @@ -77,24 +77,6 @@ >> #define MAX_SWAPFILES_CHECK() \ >> BUILD_BUG_ON(MAX_SWAPFILES_SHIFT != 5) >> >> -#define __P000 PAGE_NONE >> -#define __P001 PAGE_READ >> -#define __P010 PAGE_READ >> -#define __P011 PAGE_READ >> -#define __P100 PAGE_READ >> -#define __P101 PAGE_READ >> -#define __P110 PAGE_READ >> -#define __P111 PAGE_READ >> - >> -#define __S000 PAGE_NONE >> -#define __S001 PAGE_READ >> -#define __S010 PAGE_WRITE >> -#define __S011 PAGE_WRITE >> -#define __S100 PAGE_READ >> -#define __S101 PAGE_READ >> -#define __S110 PAGE_WRITE >> -#define __S111 PAGE_WRITE >> - >> extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]; >> #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page)) >> >> diff --git a/arch/csky/mm/init.c b/arch/csky/mm/init.c >> index bf2004aa811a..f9babbed17d4 100644 >> --- a/arch/csky/mm/init.c >> +++ b/arch/csky/mm/init.c >> @@ -197,3 +197,35 @@ void __init fixaddr_init(void) >> vaddr = __fix_to_virt(__end_of_fixed_addresses - 1) & PMD_MASK; >> fixrange_init(vaddr, vaddr + PMD_SIZE, swapper_pg_dir); >> } >> + >> +pgprot_t vm_get_page_prot(unsigned long vm_flags) >> +{ >> + switch (vm_flags & (VM_READ | VM_WRITE | VM_EXEC | VM_SHARED)) { >> + case VM_NONE: >> + return PAGE_NONE; >> + case VM_READ: >> + case VM_WRITE: >> + case VM_WRITE | VM_READ: >> + case VM_EXEC: >> + case VM_EXEC | VM_READ: >> + case VM_EXEC | VM_WRITE: >> + case VM_EXEC | VM_WRITE | VM_READ: >> + return PAGE_READ; >> + case VM_SHARED: >> + return PAGE_NONE; >> + case VM_SHARED | VM_READ: >> + return PAGE_READ; >> + case VM_SHARED | VM_WRITE: >> + case VM_SHARED | VM_WRITE | VM_READ: >> + return PAGE_WRITE; >> + case VM_SHARED | VM_EXEC: >> + case VM_SHARED | VM_EXEC | VM_READ: >> + return PAGE_READ; >> + case VM_SHARED | VM_EXEC | VM_WRITE: >> + case VM_SHARED | VM_EXEC | VM_WRITE | VM_READ: >> + return PAGE_WRITE; >> + default: >> + BUILD_BUG(); >> + } >> +} >> +EXPORT_SYMBOL(vm_get_page_prot); >> -- >> 2.25.1 >> > >
diff --git a/arch/csky/Kconfig b/arch/csky/Kconfig index 21d72b078eef..588b8a9c68ed 100644 --- a/arch/csky/Kconfig +++ b/arch/csky/Kconfig @@ -6,6 +6,7 @@ config CSKY select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_SYNC_DMA_FOR_CPU select ARCH_HAS_SYNC_DMA_FOR_DEVICE + select ARCH_HAS_VM_GET_PAGE_PROT select ARCH_USE_BUILTIN_BSWAP select ARCH_USE_QUEUED_RWLOCKS select ARCH_WANT_FRAME_POINTERS if !CPU_CK610 && $(cc-option,-mbacktrace) diff --git a/arch/csky/include/asm/pgtable.h b/arch/csky/include/asm/pgtable.h index bbe245117777..229a5f4ad7fc 100644 --- a/arch/csky/include/asm/pgtable.h +++ b/arch/csky/include/asm/pgtable.h @@ -77,24 +77,6 @@ #define MAX_SWAPFILES_CHECK() \ BUILD_BUG_ON(MAX_SWAPFILES_SHIFT != 5) -#define __P000 PAGE_NONE -#define __P001 PAGE_READ -#define __P010 PAGE_READ -#define __P011 PAGE_READ -#define __P100 PAGE_READ -#define __P101 PAGE_READ -#define __P110 PAGE_READ -#define __P111 PAGE_READ - -#define __S000 PAGE_NONE -#define __S001 PAGE_READ -#define __S010 PAGE_WRITE -#define __S011 PAGE_WRITE -#define __S100 PAGE_READ -#define __S101 PAGE_READ -#define __S110 PAGE_WRITE -#define __S111 PAGE_WRITE - extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]; #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page)) diff --git a/arch/csky/mm/init.c b/arch/csky/mm/init.c index bf2004aa811a..f9babbed17d4 100644 --- a/arch/csky/mm/init.c +++ b/arch/csky/mm/init.c @@ -197,3 +197,35 @@ void __init fixaddr_init(void) vaddr = __fix_to_virt(__end_of_fixed_addresses - 1) & PMD_MASK; fixrange_init(vaddr, vaddr + PMD_SIZE, swapper_pg_dir); } + +pgprot_t vm_get_page_prot(unsigned long vm_flags) +{ + switch (vm_flags & (VM_READ | VM_WRITE | VM_EXEC | VM_SHARED)) { + case VM_NONE: + return PAGE_NONE; + case VM_READ: + case VM_WRITE: + case VM_WRITE | VM_READ: + case VM_EXEC: + case VM_EXEC | VM_READ: + case VM_EXEC | VM_WRITE: + case VM_EXEC | VM_WRITE | VM_READ: + return PAGE_READ; + case VM_SHARED: + return PAGE_NONE; + case VM_SHARED | VM_READ: + return PAGE_READ; + case VM_SHARED | VM_WRITE: + case VM_SHARED | VM_WRITE | VM_READ: + return PAGE_WRITE; + case VM_SHARED | VM_EXEC: + case VM_SHARED | VM_EXEC | VM_READ: + return PAGE_READ; + case VM_SHARED | VM_EXEC | VM_WRITE: + case VM_SHARED | VM_EXEC | VM_WRITE | VM_READ: + return PAGE_WRITE; + default: + BUILD_BUG(); + } +} +EXPORT_SYMBOL(vm_get_page_prot);