Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
Date:   Fri, 13 May 2022 17:18:38 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Catalin Marinas <catalin.marinas@arm.com>
Cc:     Andrew Morton <akpm@linux-foundation.org>,
        Will Deacon <will@kernel.org>,
        Anshuman Khandual <anshuman.khandual@arm.com>,
        Baolin Wang <baolin.wang@linux.alibaba.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the mm tree
Message-ID: <20220513171838.627ccc86@canb.auug.org.au>
In-Reply-To: <YnzqffV7STYS24Yn@arm.com>
References: <20220512193855.4f6ce32f@canb.auug.org.au>
        <YnzqffV7STYS24Yn@arm.com>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/S6tyXvo/95AbDqwnih9JeJ8";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/S6tyXvo/95AbDqwnih9JeJ8
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Catalin,

On Thu, 12 May 2022 12:07:41 +0100 Catalin Marinas <catalin.marinas@arm.com=
> wrote:
>
> Note that after the arm64 commit, get_clear_contig() no longer flushes
> the TLB. So maybe something like:
>=20
> diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c
> index 30f5b76aabe9..9a999550df8e 100644
> --- a/arch/arm64/mm/hugetlbpage.c
> +++ b/arch/arm64/mm/hugetlbpage.c
> @@ -485,12 +485,15 @@ pte_t huge_ptep_clear_flush(struct vm_area_struct *=
vma,
>  {
>  	size_t pgsize;
>  	int ncontig;
> +	pte_t orig_pte;
>=20
>  	if (!pte_cont(READ_ONCE(*ptep)))
>  		return ptep_clear_flush(vma, addr, ptep);
>=20
>  	ncontig =3D find_num_contig(vma->vm_mm, addr, ptep, &pgsize);
> -	return get_clear_contig(vma->vm_mm, addr, ptep, pgsize, ncontig);
> +	orig_pte =3D get_clear_contig(vma->vm_mm, addr, ptep, pgsize, ncontig);
> +	flush_tlb_range(vma, addr, addr + pgsize * ncontig);
> +	return orig_pte;
>  }
>=20
>  static int __init hugetlbpage_init(void)

I have modified my merge resolution patch to as in the above so it
looks like this now:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 13 May 2022 17:08:07 +1000
Subject: [PATCH] fixup for "mm: change huge_ptep_clear_flush() to return th=
e original pte"

It interacts with commit

  fb396bb459c1 ("arm64/hugetlb: Drop TLB flush from get_clear_flush()")

from the arm64 tree

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/arm64/mm/hugetlbpage.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c
index 5bdf913dedc7..10b4a19ed6a2 100644
--- a/arch/arm64/mm/hugetlbpage.c
+++ b/arch/arm64/mm/hugetlbpage.c
@@ -485,12 +485,15 @@ pte_t huge_ptep_clear_flush(struct vm_area_struct *vm=
a,
 {
 	size_t pgsize;
 	int ncontig;
+	pte_t orig_pte;
=20
 	if (!pte_cont(READ_ONCE(*ptep)))
 		return ptep_clear_flush(vma, addr, ptep);
=20
 	ncontig =3D find_num_contig(vma->vm_mm, addr, ptep, &pgsize);
-	return get_clear_flush(vma->vm_mm, addr, ptep, pgsize, ncontig);
+	orig_pte =3D get_clear_contig(vma->vm_mm, addr, ptep, pgsize, ncontig);
+	flush_tlb_range(vma, addr, addr + pgsize * ncontig);
+	return orig_pte;
 }
=20
 static int __init hugetlbpage_init(void)
--=20
2.35.1

--=20
Cheers,
Stephen Rothwell

--Sig_/S6tyXvo/95AbDqwnih9JeJ8
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmJ+Bk4ACgkQAVBC80lX
0GxnEQgAnmB5YyNJxCEZkMLv9LEMvl/mtMzQAG9P53jT6S9/ghNP4Cs5Nu5WL3is
CZPmCdZe6kH7svVzjWxZeVykPaAvDmDFcGG8wCE/aZBIRrz7gFRGZVh+ewMSxhUf
PE2/WaBVTKCZbk/MmATYrTJN4/sepWyHqS7HNtfNjCwtLrdU2a4Xiogtxy78gmJe
BOLaH9qtKuonXrbVpLwpd0ulHZSqd3jF8fY8k8S0YJF1eM+rmjbGVMMqP7OBudre
AaE+hCIX/nTXltbJkyB1FZvqLqgws36enZiQNjWcrBsivbc259HyJPIHXDWJ1BaG
NHs2eiCsXVXoEthvnnBcwtaMgq454Q==
=xeD6
-----END PGP SIGNATURE-----

--Sig_/S6tyXvo/95AbDqwnih9JeJ8--