| Message ID | 20230612210423.18611-28-vishal.moola@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Split ptdesc from struct page | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/tree_selection | fail | Failed to apply to next/pending-fixes, riscv/for-next or riscv/master |
On 6/12/23 16:04, Vishal Moola (Oracle) wrote: > Part of the conversions to replace pgtable constructor/destructors with > ptdesc equivalents. > > Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com> > --- > arch/nios2/include/asm/pgalloc.h | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/nios2/include/asm/pgalloc.h b/arch/nios2/include/asm/pgalloc.h > index ecd1657bb2ce..ce6bb8e74271 100644 > --- a/arch/nios2/include/asm/pgalloc.h > +++ b/arch/nios2/include/asm/pgalloc.h > @@ -28,10 +28,10 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, > > extern pgd_t *pgd_alloc(struct mm_struct *mm); > > -#define __pte_free_tlb(tlb, pte, addr) \ > - do { \ > - pgtable_pte_page_dtor(pte); \ > - tlb_remove_page((tlb), (pte)); \ > +#define __pte_free_tlb(tlb, pte, addr) \ > + do { \ > + pagetable_pte_dtor(page_ptdesc(pte)); \ > + tlb_remove_page_ptdesc((tlb), (page_ptdesc(pte))); \ > } while (0) > > #endif /* _ASM_NIOS2_PGALLOC_H */ Applied! Thanks, Dinh
Hi Dinh, On Wed, Jun 14, 2023 at 12:17 AM Dinh Nguyen <dinguyen@kernel.org> wrote: > On 6/12/23 16:04, Vishal Moola (Oracle) wrote: > > Part of the conversions to replace pgtable constructor/destructors with > > ptdesc equivalents. > > > > Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com> > > --- > > arch/nios2/include/asm/pgalloc.h | 8 ++++---- > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/arch/nios2/include/asm/pgalloc.h b/arch/nios2/include/asm/pgalloc.h > > index ecd1657bb2ce..ce6bb8e74271 100644 > > --- a/arch/nios2/include/asm/pgalloc.h > > +++ b/arch/nios2/include/asm/pgalloc.h > > @@ -28,10 +28,10 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, > > > > extern pgd_t *pgd_alloc(struct mm_struct *mm); > > > > -#define __pte_free_tlb(tlb, pte, addr) \ > > - do { \ > > - pgtable_pte_page_dtor(pte); \ > > - tlb_remove_page((tlb), (pte)); \ > > +#define __pte_free_tlb(tlb, pte, addr) \ > > + do { \ > > + pagetable_pte_dtor(page_ptdesc(pte)); \ > > + tlb_remove_page_ptdesc((tlb), (page_ptdesc(pte))); \ > > } while (0) > > > > #endif /* _ASM_NIOS2_PGALLOC_H */ > > Applied! I don't think you can just apply this patch, as the new functions were only introduced in [PATCH v4 05/34] of this series. Gr{oetje,eeting}s, Geert
On Mon, Jun 12, 2023 at 02:04:16PM -0700, Vishal Moola (Oracle) wrote: > Part of the conversions to replace pgtable constructor/destructors with > ptdesc equivalents. > > Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com> Acked-by: Mike Rapoport (IBM) <rppt@kernel.org> > --- > arch/nios2/include/asm/pgalloc.h | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/nios2/include/asm/pgalloc.h b/arch/nios2/include/asm/pgalloc.h > index ecd1657bb2ce..ce6bb8e74271 100644 > --- a/arch/nios2/include/asm/pgalloc.h > +++ b/arch/nios2/include/asm/pgalloc.h > @@ -28,10 +28,10 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, > > extern pgd_t *pgd_alloc(struct mm_struct *mm); > > -#define __pte_free_tlb(tlb, pte, addr) \ > - do { \ > - pgtable_pte_page_dtor(pte); \ > - tlb_remove_page((tlb), (pte)); \ > +#define __pte_free_tlb(tlb, pte, addr) \ > + do { \ > + pagetable_pte_dtor(page_ptdesc(pte)); \ > + tlb_remove_page_ptdesc((tlb), (page_ptdesc(pte))); \ > } while (0) > > #endif /* _ASM_NIOS2_PGALLOC_H */ > -- > 2.40.1 > >
On 6/14/23 04:30, Geert Uytterhoeven wrote: > Hi Dinh, > > On Wed, Jun 14, 2023 at 12:17 AM Dinh Nguyen <dinguyen@kernel.org> wrote: >> On 6/12/23 16:04, Vishal Moola (Oracle) wrote: >>> Part of the conversions to replace pgtable constructor/destructors with >>> ptdesc equivalents. >>> >>> Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com> >>> --- >>> arch/nios2/include/asm/pgalloc.h | 8 ++++---- >>> 1 file changed, 4 insertions(+), 4 deletions(-) >>> >>> diff --git a/arch/nios2/include/asm/pgalloc.h b/arch/nios2/include/asm/pgalloc.h >>> index ecd1657bb2ce..ce6bb8e74271 100644 >>> --- a/arch/nios2/include/asm/pgalloc.h >>> +++ b/arch/nios2/include/asm/pgalloc.h >>> @@ -28,10 +28,10 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, >>> >>> extern pgd_t *pgd_alloc(struct mm_struct *mm); >>> >>> -#define __pte_free_tlb(tlb, pte, addr) \ >>> - do { \ >>> - pgtable_pte_page_dtor(pte); \ >>> - tlb_remove_page((tlb), (pte)); \ >>> +#define __pte_free_tlb(tlb, pte, addr) \ >>> + do { \ >>> + pagetable_pte_dtor(page_ptdesc(pte)); \ >>> + tlb_remove_page_ptdesc((tlb), (page_ptdesc(pte))); \ >>> } while (0) >>> >>> #endif /* _ASM_NIOS2_PGALLOC_H */ >> >> Applied! > > I don't think you can just apply this patch, as the new functions > were only introduced in [PATCH v4 05/34] of this series. > Ah, thanks for the pointer! Dinh
diff --git a/arch/nios2/include/asm/pgalloc.h b/arch/nios2/include/asm/pgalloc.h index ecd1657bb2ce..ce6bb8e74271 100644 --- a/arch/nios2/include/asm/pgalloc.h +++ b/arch/nios2/include/asm/pgalloc.h @@ -28,10 +28,10 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, extern pgd_t *pgd_alloc(struct mm_struct *mm); -#define __pte_free_tlb(tlb, pte, addr) \ - do { \ - pgtable_pte_page_dtor(pte); \ - tlb_remove_page((tlb), (pte)); \ +#define __pte_free_tlb(tlb, pte, addr) \ + do { \ + pagetable_pte_dtor(page_ptdesc(pte)); \ + tlb_remove_page_ptdesc((tlb), (page_ptdesc(pte))); \ } while (0) #endif /* _ASM_NIOS2_PGALLOC_H */
Part of the conversions to replace pgtable constructor/destructors with ptdesc equivalents. Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com> --- arch/nios2/include/asm/pgalloc.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)