Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Thu, 24 Oct 2019 14:02:08 +0200
From:   Helge Deller <deller@gmx.de>
To:     Mike Rapoport <rppt@kernel.org>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org,
        James Bottomley <James.Bottomley@hansenpartnership.com>,
        John David Anglin <dave.anglin@bell.net>
Cc:     Andrew Morton <akpm@linux-foundation.org>,
        Arnd Bergmann <arnd@arndb.de>,
        "David S. Miller" <davem@davemloft.net>,
        Mike Rapoport <rppt@linux.ibm.com>
Subject: Re: [PATCH 08/12] parisc: use pgtable-nopXd instead of 4level-fixup
Message-ID: <20191024120208.GA17545@ls3530.fritz.box>
References: <1571822941-29776-1-git-send-email-rppt@kernel.org>
 <1571822941-29776-9-git-send-email-rppt@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1571822941-29776-9-git-send-email-rppt@kernel.org>
User-Agent: Mutt/1.12.1 (2019-06-15)
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

* Mike Rapoport <rppt@kernel.org>:
> From: Mike Rapoport <rppt@linux.ibm.com>
>
> parisc has two or three levels of page tables and can use appropriate
> pgtable-nopXd and folding of the upper layers.
>
> Replace usage of include/asm-generic/4level-fixup.h and explicit
> definitions of __PAGETABLE_PxD_FOLDED in parisc with
> include/asm-generic/pgtable-nopmd.h for two-level configurations and wit=
h
> include/asm-generic/pgtable-nopmd.h for three-lelve configurations and
> adjust page table manipulation macros and functions accordingly.
>
> Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
> ---
>  arch/parisc/include/asm/page.h    | 30 +++++++++++++---------
>  arch/parisc/include/asm/pgalloc.h | 41 +++++++++++-------------------
>  arch/parisc/include/asm/pgtable.h | 52 +++++++++++++++++++-------------=
-------
>  arch/parisc/include/asm/tlb.h     |  2 ++
>  arch/parisc/kernel/cache.c        | 13 ++++++----
>  arch/parisc/kernel/pci-dma.c      |  9 +++++--
>  arch/parisc/mm/fixmap.c           | 10 +++++---
>  7 files changed, 81 insertions(+), 76 deletions(-)

Mike, thanks for this clean-up!

Your patch is functional OK. I successfully tested it with a 32-bit
kernel in qemu, and with a 64-bit kernel on a physical box.
For 64-bit you missed to adapt the parisc hugetlb code, so maybe you
can add the patch below to your series?

Other than that (and the lexical corrections which other already mentioned=
):
Acked-by: Helge Deller <deller@gmx.de>

Thanks!
Helge

=2D---------------
parisc/hugetlb: use pgtable-nopXd instead of 4level-fixup

Signed-off-by: Helge Deller <deller@gmx.de>

diff --git a/arch/parisc/mm/hugetlbpage.c b/arch/parisc/mm/hugetlbpage.c
index d578809e55cf..0e1e212f1c96 100644
=2D-- a/arch/parisc/mm/hugetlbpage.c
+++ b/arch/parisc/mm/hugetlbpage.c
@@ -49,6 +49,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm,
 			unsigned long addr, unsigned long sz)
 {
 	pgd_t *pgd;
+	p4d_t *p4d;
 	pud_t *pud;
 	pmd_t *pmd;
 	pte_t *pte =3D NULL;
@@ -61,7 +62,8 @@ pte_t *huge_pte_alloc(struct mm_struct *mm,
 	addr &=3D HPAGE_MASK;

 	pgd =3D pgd_offset(mm, addr);
-	pud =3D pud_alloc(mm, pgd, addr);
+	p4d =3D p4d_offset(pgd, addr);
+	pud =3D pud_alloc(mm, p4d, addr);
 	if (pud) {
 		pmd =3D pmd_alloc(mm, pud, addr);
 		if (pmd)
@@ -74,6 +76,7 @@ pte_t *huge_pte_offset(struct mm_struct *mm,
 		       unsigned long addr, unsigned long sz)
 {
 	pgd_t *pgd;
+	p4d_t *p4d;
 	pud_t *pud;
 	pmd_t *pmd;
 	pte_t *pte =3D NULL;
@@ -82,11 +85,14 @@ pte_t *huge_pte_offset(struct mm_struct *mm,

 	pgd =3D pgd_offset(mm, addr);
 	if (!pgd_none(*pgd)) {
-		pud =3D pud_offset(pgd, addr);
-		if (!pud_none(*pud)) {
-			pmd =3D pmd_offset(pud, addr);
-			if (!pmd_none(*pmd))
-				pte =3D pte_offset_map(pmd, addr);
+		p4d =3D p4d_offset(pgd, addr);
+		if (!p4d_none(*p4d)) {
+			pud =3D pud_offset(p4d, addr);
+			if (!pud_none(*pud)) {
+				pmd =3D pmd_offset(pud, addr);
+				if (!pmd_none(*pmd))
+					pte =3D pte_offset_map(pmd, addr);
+			}
 		}
 	}
 	return pte;