linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Nicholas Piggin <npiggin@gmail.com>
To: linux-mm@kvack.org, Andrew Morton <akpm@linux-foundation.org>
Cc: Nicholas Piggin <npiggin@gmail.com>,
	linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
	Jonathan Cameron <Jonathan.Cameron@Huawei.com>,
	Christoph Hellwig <hch@infradead.org>,
	Christophe Leroy <christophe.leroy@csgroup.eu>,
	Rick Edgecombe <rick.p.edgecombe@intel.com>,
	Ding Tianhong <dingtianhong@huawei.com>,
	Russell King <linux@armlinux.org.uk>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v13 01/14] ARM: mm: add missing pud_page define to 2-level page tables
Date: Wed, 17 Mar 2021 16:23:49 +1000	[thread overview]
Message-ID: <20210317062402.533919-2-npiggin@gmail.com> (raw)
In-Reply-To: <20210317062402.533919-1-npiggin@gmail.com>

ARM uses its own PMD folding scheme which is missing pud_page which
should just pass through to pmd_page. Move this from the 3-level
page table to common header.

Cc: Russell King <linux@armlinux.org.uk>
Cc: Ding Tianhong <dingtianhong@huawei.com>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
 arch/arm/include/asm/pgtable-3level.h | 2 --
 arch/arm/include/asm/pgtable.h        | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
index 2b85d175e999..d4edab51a77c 100644
--- a/arch/arm/include/asm/pgtable-3level.h
+++ b/arch/arm/include/asm/pgtable-3level.h
@@ -186,8 +186,6 @@ static inline pte_t pte_mkspecial(pte_t pte)
 
 #define pmd_write(pmd)		(pmd_isclear((pmd), L_PMD_SECT_RDONLY))
 #define pmd_dirty(pmd)		(pmd_isset((pmd), L_PMD_SECT_DIRTY))
-#define pud_page(pud)		pmd_page(__pmd(pud_val(pud)))
-#define pud_write(pud)		pmd_write(__pmd(pud_val(pud)))
 
 #define pmd_hugewillfault(pmd)	(!pmd_young(pmd) || !pmd_write(pmd))
 #define pmd_thp_or_huge(pmd)	(pmd_huge(pmd) || pmd_trans_huge(pmd))
diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
index c02f24400369..d63a5bb6bd0c 100644
--- a/arch/arm/include/asm/pgtable.h
+++ b/arch/arm/include/asm/pgtable.h
@@ -166,6 +166,9 @@ extern struct page *empty_zero_page;
 
 extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
 
+#define pud_page(pud)		pmd_page(__pmd(pud_val(pud)))
+#define pud_write(pud)		pmd_write(__pmd(pud_val(pud)))
+
 #define pmd_none(pmd)		(!pmd_val(pmd))
 
 static inline pte_t *pmd_page_vaddr(pmd_t pmd)
-- 
2.23.0


  reply	other threads:[~2021-03-17  6:25 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-17  6:23 [PATCH v13 00/14] huge vmalloc mappings Nicholas Piggin
2021-03-17  6:23 ` Nicholas Piggin [this message]
2021-03-17  6:23 ` [PATCH v13 02/14] mm/vmalloc: fix HUGE_VMAP regression by enabling huge pages in vmalloc_to_page Nicholas Piggin
2021-03-17  6:23 ` [PATCH v13 03/14] mm: apply_to_pte_range warn and fail if a large pte is encountered Nicholas Piggin
2021-03-17  6:23 ` [PATCH v13 04/14] mm/vmalloc: rename vmap_*_range vmap_pages_*_range Nicholas Piggin
2021-03-17  6:23 ` [PATCH v13 05/14] mm/ioremap: rename ioremap_*_range to vmap_*_range Nicholas Piggin
2021-03-17  6:23 ` [PATCH v13 06/14] mm: HUGE_VMAP arch support cleanup Nicholas Piggin
2021-04-28  8:32   ` Christophe Leroy
2021-04-28  8:34     ` Christophe Leroy
2021-03-17  6:23 ` [PATCH v13 07/14] powerpc: inline huge vmap supported functions Nicholas Piggin
2021-03-17  6:23 ` [PATCH v13 08/14] arm64: " Nicholas Piggin
2021-03-17  6:23 ` [PATCH v13 09/14] x86: " Nicholas Piggin
2021-03-17  6:23 ` [PATCH v13 10/14] mm/vmalloc: provide fallback arch huge vmap support functions Nicholas Piggin
2021-03-17  6:23 ` [PATCH v13 11/14] mm: Move vmap_range from mm/ioremap.c to mm/vmalloc.c Nicholas Piggin
2021-03-17  6:24 ` [PATCH v13 12/14] mm/vmalloc: add vmap_range_noflush variant Nicholas Piggin
2021-03-17  6:24 ` [PATCH v13 13/14] mm/vmalloc: Hugepage vmalloc mappings Nicholas Piggin
2021-03-17  6:24 ` [PATCH v13 14/14] powerpc/64s/radix: Enable huge " Nicholas Piggin
2021-04-15 10:23   ` Christophe Leroy
2021-04-15 18:55     ` Andrew Morton
2021-04-15 23:04       ` Stephen Rothwell
2021-04-17  2:39       ` Nicholas Piggin
2021-03-17 22:58 ` [PATCH v13 00/14] " Andrew Morton
2021-03-18  3:50   ` Nicholas Piggin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210317062402.533919-2-npiggin@gmail.com \
    --to=npiggin@gmail.com \
    --cc=Jonathan.Cameron@Huawei.com \
    --cc=akpm@linux-foundation.org \
    --cc=christophe.leroy@csgroup.eu \
    --cc=dingtianhong@huawei.com \
    --cc=hch@infradead.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux@armlinux.org.uk \
    --cc=rick.p.edgecombe@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).