| Message ID | 20151215165342.15bb4526@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
Hi Andrew, On Tue, 15 Dec 2015 16:53:42 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > diff --git a/arch/powerpc/include/asm/book3s/64/hash.h b/arch/powerpc/include/asm/book3s/64/hash.h > index 8b929e531758..4e69d9a273ed 100644 > --- a/arch/powerpc/include/asm/book3s/64/hash.h > +++ b/arch/powerpc/include/asm/book3s/64/hash.h > @@ -48,9 +43,8 @@ > /* > * set of bits not changed in pmd_modify. > */ > -#define _HPAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | \ > - _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_SPLITTING | \ > - _PAGE_THP_HUGE | _PAGE_PTE) > +#define _HPAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | _PAGE_DIRTY | ^ I missed a backslash here which I fixed up in my tree. > + _PAGE_ACCESSED | _PAGE_THP_HUGE | _PAGE_PTE)
Stephen Rothwell <sfr@canb.auug.org.au> writes: > Hi Andrew, > > Today's linux-next merge of the akpm-current tree got conflicts in: > > arch/powerpc/include/asm/nohash/64/pgtable.h > arch/powerpc/mm/pgtable_64.c > > between various commits from the powerpc tree and commits: > > e56ebae0dd4c ("powerpc, thp: remove infrastructure for handling splitting PMDs") For reference the web url for the patch http://article.gmane.org/gmane.linux.kernel.mm/139654 > > from the akpm-current tree. > > I used the powerpc tree version of the first and the akpm-current tree > version of the second and then I applied the following merge fix patch: > > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Tue, 15 Dec 2015 16:50:42 +1100 > Subject: [PATCH] merge fix for "powerpc, thp: remove infrastructure for > handling splitting PMDs" > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Looks good. Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> > --- > arch/powerpc/include/asm/book3s/64/hash-64k.h | 12 ------------ > arch/powerpc/include/asm/book3s/64/hash.h | 10 ++-------- > arch/powerpc/include/asm/book3s/64/pgtable.h | 4 ---- > 3 files changed, 2 insertions(+), 24 deletions(-) > > diff --git a/arch/powerpc/include/asm/book3s/64/hash-64k.h b/arch/powerpc/include/asm/book3s/64/hash-64k.h > index 9f9942998587..f2072a4ca9e3 100644 > --- a/arch/powerpc/include/asm/book3s/64/hash-64k.h > +++ b/arch/powerpc/include/asm/book3s/64/hash-64k.h > @@ -256,13 +256,6 @@ static inline int pmd_trans_huge(pmd_t pmd) > (_PAGE_PTE | _PAGE_THP_HUGE)); > } > > -static inline int pmd_trans_splitting(pmd_t pmd) > -{ > - if (pmd_trans_huge(pmd)) > - return pmd_val(pmd) & _PAGE_SPLITTING; > - return 0; > -} > - > static inline int pmd_large(pmd_t pmd) > { > return !!(pmd_val(pmd) & _PAGE_PTE); > @@ -273,11 +266,6 @@ static inline pmd_t pmd_mknotpresent(pmd_t pmd) > return __pmd(pmd_val(pmd) & ~_PAGE_PRESENT); > } > > -static inline pmd_t pmd_mksplitting(pmd_t pmd) > -{ > - return __pmd(pmd_val(pmd) | _PAGE_SPLITTING); > -} > - > #define __HAVE_ARCH_PMD_SAME > static inline int pmd_same(pmd_t pmd_a, pmd_t pmd_b) > { > diff --git a/arch/powerpc/include/asm/book3s/64/hash.h b/arch/powerpc/include/asm/book3s/64/hash.h > index 8b929e531758..4e69d9a273ed 100644 > --- a/arch/powerpc/include/asm/book3s/64/hash.h > +++ b/arch/powerpc/include/asm/book3s/64/hash.h > @@ -35,11 +35,6 @@ > #define _PAGE_SPECIAL 0x10000 /* software: special page */ > > /* > - * THP pages can't be special. So use the _PAGE_SPECIAL > - */ > -#define _PAGE_SPLITTING _PAGE_SPECIAL > - > -/* > * We need to differentiate between explicit huge page and THP huge > * page, since THP huge page also need to track real subpage details > */ > @@ -48,9 +43,8 @@ > /* > * set of bits not changed in pmd_modify. > */ > -#define _HPAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | \ > - _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_SPLITTING | \ > - _PAGE_THP_HUGE | _PAGE_PTE) > +#define _HPAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | _PAGE_DIRTY | > + _PAGE_ACCESSED | _PAGE_THP_HUGE | _PAGE_PTE) > > #ifdef CONFIG_PPC_64K_PAGES > #include <asm/book3s/64/hash-64k.h> > diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h > index a2d4e0e37067..6306d6565ee0 100644 > --- a/arch/powerpc/include/asm/book3s/64/pgtable.h > +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h > @@ -232,10 +232,6 @@ extern int pmdp_clear_flush_young(struct vm_area_struct *vma, > extern pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm, > unsigned long addr, pmd_t *pmdp); > > -#define __HAVE_ARCH_PMDP_SPLITTING_FLUSH > -extern void pmdp_splitting_flush(struct vm_area_struct *vma, > - unsigned long address, pmd_t *pmdp); > - > extern pmd_t pmdp_collapse_flush(struct vm_area_struct *vma, > unsigned long address, pmd_t *pmdp); > #define pmdp_collapse_flush pmdp_collapse_flush > -- > 2.6.2 > > -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au
diff --git a/arch/powerpc/include/asm/book3s/64/hash-64k.h b/arch/powerpc/include/asm/book3s/64/hash-64k.h index 9f9942998587..f2072a4ca9e3 100644 --- a/arch/powerpc/include/asm/book3s/64/hash-64k.h +++ b/arch/powerpc/include/asm/book3s/64/hash-64k.h @@ -256,13 +256,6 @@ static inline int pmd_trans_huge(pmd_t pmd) (_PAGE_PTE | _PAGE_THP_HUGE)); } -static inline int pmd_trans_splitting(pmd_t pmd) -{ - if (pmd_trans_huge(pmd)) - return pmd_val(pmd) & _PAGE_SPLITTING; - return 0; -} - static inline int pmd_large(pmd_t pmd) { return !!(pmd_val(pmd) & _PAGE_PTE); @@ -273,11 +266,6 @@ static inline pmd_t pmd_mknotpresent(pmd_t pmd) return __pmd(pmd_val(pmd) & ~_PAGE_PRESENT); } -static inline pmd_t pmd_mksplitting(pmd_t pmd) -{ - return __pmd(pmd_val(pmd) | _PAGE_SPLITTING); -} - #define __HAVE_ARCH_PMD_SAME static inline int pmd_same(pmd_t pmd_a, pmd_t pmd_b) { diff --git a/arch/powerpc/include/asm/book3s/64/hash.h b/arch/powerpc/include/asm/book3s/64/hash.h index 8b929e531758..4e69d9a273ed 100644 --- a/arch/powerpc/include/asm/book3s/64/hash.h +++ b/arch/powerpc/include/asm/book3s/64/hash.h @@ -35,11 +35,6 @@ #define _PAGE_SPECIAL 0x10000 /* software: special page */ /* - * THP pages can't be special. So use the _PAGE_SPECIAL - */ -#define _PAGE_SPLITTING _PAGE_SPECIAL - -/* * We need to differentiate between explicit huge page and THP huge * page, since THP huge page also need to track real subpage details */ @@ -48,9 +43,8 @@ /* * set of bits not changed in pmd_modify. */ -#define _HPAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | \ - _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_SPLITTING | \ - _PAGE_THP_HUGE | _PAGE_PTE) +#define _HPAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | _PAGE_DIRTY | + _PAGE_ACCESSED | _PAGE_THP_HUGE | _PAGE_PTE) #ifdef CONFIG_PPC_64K_PAGES #include <asm/book3s/64/hash-64k.h> diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h index a2d4e0e37067..6306d6565ee0 100644 --- a/arch/powerpc/include/asm/book3s/64/pgtable.h +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h @@ -232,10 +232,6 @@ extern int pmdp_clear_flush_young(struct vm_area_struct *vma, extern pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm, unsigned long addr, pmd_t *pmdp); -#define __HAVE_ARCH_PMDP_SPLITTING_FLUSH -extern void pmdp_splitting_flush(struct vm_area_struct *vma, - unsigned long address, pmd_t *pmdp); - extern pmd_t pmdp_collapse_flush(struct vm_area_struct *vma, unsigned long address, pmd_t *pmdp); #define pmdp_collapse_flush pmdp_collapse_flush
Hi Andrew, Today's linux-next merge of the akpm-current tree got conflicts in: arch/powerpc/include/asm/nohash/64/pgtable.h arch/powerpc/mm/pgtable_64.c between various commits from the powerpc tree and commits: e56ebae0dd4c ("powerpc, thp: remove infrastructure for handling splitting PMDs") from the akpm-current tree. I used the powerpc tree version of the first and the akpm-current tree version of the second and then I applied the following merge fix patch: From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Tue, 15 Dec 2015 16:50:42 +1100 Subject: [PATCH] merge fix for "powerpc, thp: remove infrastructure for handling splitting PMDs" Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- arch/powerpc/include/asm/book3s/64/hash-64k.h | 12 ------------ arch/powerpc/include/asm/book3s/64/hash.h | 10 ++-------- arch/powerpc/include/asm/book3s/64/pgtable.h | 4 ---- 3 files changed, 2 insertions(+), 24 deletions(-)