linux-kernel - Re: linux-next: build failure after merge of the mm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <76quyzrawwtchqwmruopws7bidvcm5idluk36oudoeum63wc3y@dk5jfmxkfwgb>
Date: Thu, 9 Jan 2025 15:24:47 +1100
From: Alistair Popple <apopple@...dia.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Andrew Morton <akpm@...ux-foundation.org>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the mm tree

On Thu, Jan 09, 2025 at 10:06:46AM +1100, Stephen Rothwell wrote:

> Caused by commits
> 
>   c0c3319917db ("mm: remove devmap related functions and page table bits")
>   f9a01843d366 ("mm: remove pXX_devmap callers")
> 
> from the mm-unstable branch of the mm tree.
> 
> I have applied the following patch for today.

Argh. Thanks Stephen. I recall this was caught during review, but I must have
accidentally dropped the fix up change when I rebased. Will respin with this
fixed.

> From: Stephen Rothwell <sfr@...b.auug.org.au>
> Date: Thu, 9 Jan 2025 09:33:31 +1100
> Subject: [PATCH] fix up for "mm: remove devmap related functions and page
>  table bits"
> 
> and "mm: remove pXX_devmap callers"
> 
> Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
> ---
>  arch/powerpc/include/asm/book3s/64/pgtable.h | 1 -
>  arch/powerpc/mm/book3s64/hash_hugepage.c     | 2 +-
>  arch/powerpc/mm/book3s64/hugetlbpage.c       | 2 +-
>  arch/powerpc/mm/book3s64/pgtable.c           | 2 +-
>  4 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h
> index bda0649b316d..1d98d0a5984b 100644
> --- a/arch/powerpc/include/asm/book3s/64/pgtable.h
> +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h
> @@ -1361,7 +1361,6 @@ static inline bool arch_needs_pgtable_deposit(void)
>  }
>  extern void serialize_against_pte_lookup(struct mm_struct *mm);
>  
> -}
>  #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
>  
>  #define __HAVE_ARCH_PTEP_MODIFY_PROT_TRANSACTION
> diff --git a/arch/powerpc/mm/book3s64/hash_hugepage.c b/arch/powerpc/mm/book3s64/hash_hugepage.c
> index 15d6f3ea7178..cdfd4fe75edb 100644
> --- a/arch/powerpc/mm/book3s64/hash_hugepage.c
> +++ b/arch/powerpc/mm/book3s64/hash_hugepage.c
> @@ -54,7 +54,7 @@ int __hash_page_thp(unsigned long ea, unsigned long access, unsigned long vsid,
>  	/*
>  	 * Make sure this is thp or devmap entry
>  	 */
> -	if (!(old_pmd & (H_PAGE_THP_HUGE | _PAGE_DEVMAP)))
> +	if (!(old_pmd & H_PAGE_THP_HUGE))
>  		return 0;
>  
>  	rflags = htab_convert_pte_flags(new_pmd, flags);
> diff --git a/arch/powerpc/mm/book3s64/hugetlbpage.c b/arch/powerpc/mm/book3s64/hugetlbpage.c
> index 83c3361b358b..2bcbbf9d85ac 100644
> --- a/arch/powerpc/mm/book3s64/hugetlbpage.c
> +++ b/arch/powerpc/mm/book3s64/hugetlbpage.c
> @@ -74,7 +74,7 @@ int __hash_page_huge(unsigned long ea, unsigned long access, unsigned long vsid,
>  	} while(!pte_xchg(ptep, __pte(old_pte), __pte(new_pte)));
>  
>  	/* Make sure this is a hugetlb entry */
> -	if (old_pte & (H_PAGE_THP_HUGE | _PAGE_DEVMAP))
> +	if (old_pte & H_PAGE_THP_HUGE)
>  		return 0;
>  
>  	rflags = htab_convert_pte_flags(new_pte, flags);
> diff --git a/arch/powerpc/mm/book3s64/pgtable.c b/arch/powerpc/mm/book3s64/pgtable.c
> index b6aeb306ec0b..49293d0c41dd 100644
> --- a/arch/powerpc/mm/book3s64/pgtable.c
> +++ b/arch/powerpc/mm/book3s64/pgtable.c
> @@ -204,7 +204,7 @@ pmd_t pmdp_huge_get_and_clear_full(struct vm_area_struct *vma,
>  {
>  	pmd_t pmd;
>  	VM_BUG_ON(addr & ~HPAGE_PMD_MASK);
> -	VM_BUG_ON((pmd_present(*pmdp) && !pmd_trans_huge(*pmdp) &&
> +	VM_BUG_ON((pmd_present(*pmdp) && !pmd_trans_huge(*pmdp)) ||
>  		   !pmd_present(*pmdp));
>  	pmd = pmdp_huge_get_and_clear(vma->vm_mm, addr, pmdp);
>  	/*
> -- 
> 2.45.2
> 
> -- 
> Cheers,
> Stephen Rothwell