| Message ID | 1521463256-19858-2-git-send-email-cpandya@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 2018-03-19 at 18:10 +0530, Chintan Pandya wrote: > This patch ("mm/vmalloc: Add interfaces to free unmapped > page table") adds following 2 interfaces to free the page > table in case we implement huge mapping. > > pud_free_pmd_page() and pmd_free_pte_page() > > Some architectures (like arm64) needs to do proper TLB > maintanance after updating pagetable entry even in map. > Why ? Read this, > https://patchwork.kernel.org/patch/10134581/ > > Pass 'addr' in these interfaces so that proper TLB ops > can be performed. > > Signed-off-by: Chintan Pandya <cpandya@codeaurora.org> : > diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c > index 34cda7e..20b0322 100644 > --- a/arch/x86/mm/pgtable.c > +++ b/arch/x86/mm/pgtable.c > @@ -710,7 +710,7 @@ int pmd_clear_huge(pmd_t *pmd) > * Context: The pud range has been unmaped and TLB purged. > * Return: 1 if clearing the entry succeeded. 0 otherwise. > */ > -int pud_free_pmd_page(pud_t *pud) > +int pud_free_pmd_page(pud_t *pud, unsigned long addr) Please update the function header as well. Same for pmd. + * @addr: Virtual address associated with pud. --- a/include/asm-generic/pgtable.h > +++ b/include/asm-generic/pgtable.h > @@ -983,8 +983,8 @@ static inline int p4d_clear_huge(p4d_t *p4d) > int pmd_set_huge(pmd_t *pmd, phys_addr_t addr, pgprot_t prot); > int pud_clear_huge(pud_t *pud); > int pmd_clear_huge(pmd_t *pmd); > -int pud_free_pmd_page(pud_t *pud); > -int pmd_free_pte_page(pmd_t *pmd); > +int pud_free_pmd_page(pud_t *pud, unsigned long addr); > +int pmd_free_pte_page(pmd_t *pmd, unsigned long addr); > #else /* !CONFIG_HAVE_ARCH_HUGE_VMAP */ > static inline int p4d_set_huge(p4d_t *p4d, phys_addr_t addr, pgprot_t prot) > { > @@ -1010,11 +1010,11 @@ static inline int pmd_clear_huge(pmd_t *pmd) > { > return 0; > } > -static inline int pud_free_pmd_page(pud_t *pud) > +static inline int pud_free_pmd_page(pud_t *pud, unsigned long addr) > { > return 0; > } > -static inline int pmd_free_pte_page(pud_t *pmd) > +static inline int pmd_free_pte_page(pud_t *pmd, unsigned long addr) Please base your patches on top of the mm tree or at least pick up 8cab93de994f6 in the mm tree. Andrew fixed the typo; the 'pud_t' above should have been 'pmd_t'. Thanks, -Toshi
On 3/20/2018 12:31 AM, Kani, Toshi wrote: > On Mon, 2018-03-19 at 18:10 +0530, Chintan Pandya wrote: >> This patch ("mm/vmalloc: Add interfaces to free unmapped >> page table") adds following 2 interfaces to free the page >> table in case we implement huge mapping. >> >> pud_free_pmd_page() and pmd_free_pte_page() >> >> Some architectures (like arm64) needs to do proper TLB >> maintanance after updating pagetable entry even in map. >> Why ? Read this, >> https://patchwork.kernel.org/patch/10134581/ >> >> Pass 'addr' in these interfaces so that proper TLB ops >> can be performed. >> >> Signed-off-by: Chintan Pandya <cpandya@codeaurora.org> > : >> diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c >> index 34cda7e..20b0322 100644 >> --- a/arch/x86/mm/pgtable.c >> +++ b/arch/x86/mm/pgtable.c >> @@ -710,7 +710,7 @@ int pmd_clear_huge(pmd_t *pmd) >> * Context: The pud range has been unmaped and TLB purged. >> * Return: 1 if clearing the entry succeeded. 0 otherwise. >> */ >> -int pud_free_pmd_page(pud_t *pud) >> +int pud_free_pmd_page(pud_t *pud, unsigned long addr) > > Please update the function header as well. Same for pmd. > > + * @addr: Virtual address associated with pud. Noted. > > --- a/include/asm-generic/pgtable.h >> +++ b/include/asm-generic/pgtable.h >> @@ -983,8 +983,8 @@ static inline int p4d_clear_huge(p4d_t *p4d) >> int pmd_set_huge(pmd_t *pmd, phys_addr_t addr, pgprot_t prot); >> int pud_clear_huge(pud_t *pud); >> int pmd_clear_huge(pmd_t *pmd); >> -int pud_free_pmd_page(pud_t *pud); >> -int pmd_free_pte_page(pmd_t *pmd); >> +int pud_free_pmd_page(pud_t *pud, unsigned long addr); >> +int pmd_free_pte_page(pmd_t *pmd, unsigned long addr); >> #else /* !CONFIG_HAVE_ARCH_HUGE_VMAP */ >> static inline int p4d_set_huge(p4d_t *p4d, phys_addr_t addr, pgprot_t > prot) >> { >> @@ -1010,11 +1010,11 @@ static inline int pmd_clear_huge(pmd_t *pmd) >> { >> return 0; >> } >> -static inline int pud_free_pmd_page(pud_t *pud) >> +static inline int pud_free_pmd_page(pud_t *pud, unsigned long addr) >> { >> return 0; >> } >> -static inline int pmd_free_pte_page(pud_t *pmd) >> +static inline int pmd_free_pte_page(pud_t *pmd, unsigned long addr) > > Please base your patches on top of the mm tree or at least pick up > 8cab93de994f6 in the mm tree. Andrew fixed the typo; the 'pud_t' above > should have been 'pmd_t'. Right. Noted. > > Thanks, > -Toshi > Chintan
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 2dbb2c9..da98828 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -973,12 +973,12 @@ int pmd_clear_huge(pmd_t *pmdp) return 1; } -int pud_free_pmd_page(pud_t *pud) +int pud_free_pmd_page(pud_t *pud, unsigned long addr) { return pud_none(*pud); } -int pmd_free_pte_page(pmd_t *pmd) +int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) { return pmd_none(*pmd); } diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 34cda7e..20b0322 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -710,7 +710,7 @@ int pmd_clear_huge(pmd_t *pmd) * Context: The pud range has been unmaped and TLB purged. * Return: 1 if clearing the entry succeeded. 0 otherwise. */ -int pud_free_pmd_page(pud_t *pud) +int pud_free_pmd_page(pud_t *pud, unsigned long addr) { pmd_t *pmd; int i; @@ -737,7 +737,7 @@ int pud_free_pmd_page(pud_t *pud) * Context: The pmd range has been unmaped and TLB purged. * Return: 1 if clearing the entry succeeded. 0 otherwise. */ -int pmd_free_pte_page(pmd_t *pmd) +int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) { pte_t *pte; diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index 2490800..7f00c2d 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -983,8 +983,8 @@ static inline int p4d_clear_huge(p4d_t *p4d) int pmd_set_huge(pmd_t *pmd, phys_addr_t addr, pgprot_t prot); int pud_clear_huge(pud_t *pud); int pmd_clear_huge(pmd_t *pmd); -int pud_free_pmd_page(pud_t *pud); -int pmd_free_pte_page(pmd_t *pmd); +int pud_free_pmd_page(pud_t *pud, unsigned long addr); +int pmd_free_pte_page(pmd_t *pmd, unsigned long addr); #else /* !CONFIG_HAVE_ARCH_HUGE_VMAP */ static inline int p4d_set_huge(p4d_t *p4d, phys_addr_t addr, pgprot_t prot) { @@ -1010,11 +1010,11 @@ static inline int pmd_clear_huge(pmd_t *pmd) { return 0; } -static inline int pud_free_pmd_page(pud_t *pud) +static inline int pud_free_pmd_page(pud_t *pud, unsigned long addr) { return 0; } -static inline int pmd_free_pte_page(pud_t *pmd) +static inline int pmd_free_pte_page(pud_t *pmd, unsigned long addr) { return 0; } diff --git a/lib/ioremap.c b/lib/ioremap.c index 54e5bba..517f585 100644 --- a/lib/ioremap.c +++ b/lib/ioremap.c @@ -92,7 +92,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr, if (ioremap_pmd_enabled() && ((next - addr) == PMD_SIZE) && IS_ALIGNED(phys_addr + addr, PMD_SIZE) && - pmd_free_pte_page(pmd)) { + pmd_free_pte_page(pmd, addr)) { if (pmd_set_huge(pmd, phys_addr + addr, prot)) continue; } @@ -119,7 +119,7 @@ static inline int ioremap_pud_range(p4d_t *p4d, unsigned long addr, if (ioremap_pud_enabled() && ((next - addr) == PUD_SIZE) && IS_ALIGNED(phys_addr + addr, PUD_SIZE) && - pud_free_pmd_page(pud)) { + pud_free_pmd_page(pud, addr)) { if (pud_set_huge(pud, phys_addr + addr, prot)) continue; }
This patch ("mm/vmalloc: Add interfaces to free unmapped page table") adds following 2 interfaces to free the page table in case we implement huge mapping. pud_free_pmd_page() and pmd_free_pte_page() Some architectures (like arm64) needs to do proper TLB maintanance after updating pagetable entry even in map. Why ? Read this, https://patchwork.kernel.org/patch/10134581/ Pass 'addr' in these interfaces so that proper TLB ops can be performed. Signed-off-by: Chintan Pandya <cpandya@codeaurora.org> --- arch/arm64/mm/mmu.c | 4 ++-- arch/x86/mm/pgtable.c | 4 ++-- include/asm-generic/pgtable.h | 8 ++++---- lib/ioremap.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-)