From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
linux-arch@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, Mike Rapoport <rppt@kernel.org>,
Pasha Tatashin <pasha.tatashin@soleen.com>,
Anshuman Khandual <anshuman.khandual@arm.com>
Subject: [PATCH v5 02/38] mm: Convert page_table_check_pte_set() to page_table_check_ptes_set()
Date: Mon, 10 Jul 2023 21:43:03 +0100 [thread overview]
Message-ID: <20230710204339.3554919-3-willy@infradead.org> (raw)
In-Reply-To: <20230710204339.3554919-1-willy@infradead.org>
Tell the page table check how many PTEs & PFNs we want it to check.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Mike Rapoport (IBM) <rppt@kernel.org>
Acked-by: Pasha Tatashin <pasha.tatashin@soleen.com>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
arch/arm64/include/asm/pgtable.h | 2 +-
arch/riscv/include/asm/pgtable.h | 2 +-
arch/x86/include/asm/pgtable.h | 2 +-
include/linux/page_table_check.h | 14 +++++++-------
mm/page_table_check.c | 14 ++++++++------
5 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
index e8a252e62b12..a44a150e0318 100644
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
@@ -348,7 +348,7 @@ static inline void __set_pte_at(struct mm_struct *mm, unsigned long addr,
static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,
pte_t *ptep, pte_t pte)
{
- page_table_check_pte_set(mm, addr, ptep, pte);
+ page_table_check_ptes_set(mm, addr, ptep, pte, 1);
return __set_pte_at(mm, addr, ptep, pte);
}
diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
index 75970ee2bda2..2137e36595b3 100644
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
@@ -499,7 +499,7 @@ static inline void __set_pte_at(struct mm_struct *mm,
static inline void set_pte_at(struct mm_struct *mm,
unsigned long addr, pte_t *ptep, pte_t pteval)
{
- page_table_check_pte_set(mm, addr, ptep, pteval);
+ page_table_check_ptes_set(mm, addr, ptep, pteval, 1);
__set_pte_at(mm, addr, ptep, pteval);
}
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index 5700bb337987..c6242bc58a71 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -1023,7 +1023,7 @@ static inline pud_t native_local_pudp_get_and_clear(pud_t *pudp)
static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,
pte_t *ptep, pte_t pte)
{
- page_table_check_pte_set(mm, addr, ptep, pte);
+ page_table_check_ptes_set(mm, addr, ptep, pte, 1);
set_pte(ptep, pte);
}
diff --git a/include/linux/page_table_check.h b/include/linux/page_table_check.h
index 01e16c7696ec..ba269c7009e4 100644
--- a/include/linux/page_table_check.h
+++ b/include/linux/page_table_check.h
@@ -20,8 +20,8 @@ void __page_table_check_pmd_clear(struct mm_struct *mm, unsigned long addr,
pmd_t pmd);
void __page_table_check_pud_clear(struct mm_struct *mm, unsigned long addr,
pud_t pud);
-void __page_table_check_pte_set(struct mm_struct *mm, unsigned long addr,
- pte_t *ptep, pte_t pte);
+void __page_table_check_ptes_set(struct mm_struct *mm, unsigned long addr,
+ pte_t *ptep, pte_t pte, unsigned int nr);
void __page_table_check_pmd_set(struct mm_struct *mm, unsigned long addr,
pmd_t *pmdp, pmd_t pmd);
void __page_table_check_pud_set(struct mm_struct *mm, unsigned long addr,
@@ -73,14 +73,14 @@ static inline void page_table_check_pud_clear(struct mm_struct *mm,
__page_table_check_pud_clear(mm, addr, pud);
}
-static inline void page_table_check_pte_set(struct mm_struct *mm,
+static inline void page_table_check_ptes_set(struct mm_struct *mm,
unsigned long addr, pte_t *ptep,
- pte_t pte)
+ pte_t pte, unsigned int nr)
{
if (static_branch_likely(&page_table_check_disabled))
return;
- __page_table_check_pte_set(mm, addr, ptep, pte);
+ __page_table_check_ptes_set(mm, addr, ptep, pte, nr);
}
static inline void page_table_check_pmd_set(struct mm_struct *mm,
@@ -138,9 +138,9 @@ static inline void page_table_check_pud_clear(struct mm_struct *mm,
{
}
-static inline void page_table_check_pte_set(struct mm_struct *mm,
+static inline void page_table_check_ptes_set(struct mm_struct *mm,
unsigned long addr, pte_t *ptep,
- pte_t pte)
+ pte_t pte, unsigned int nr)
{
}
diff --git a/mm/page_table_check.c b/mm/page_table_check.c
index 93ec7690a0d8..662b3f5d31b4 100644
--- a/mm/page_table_check.c
+++ b/mm/page_table_check.c
@@ -190,20 +190,22 @@ void __page_table_check_pud_clear(struct mm_struct *mm, unsigned long addr,
}
EXPORT_SYMBOL(__page_table_check_pud_clear);
-void __page_table_check_pte_set(struct mm_struct *mm, unsigned long addr,
- pte_t *ptep, pte_t pte)
+void __page_table_check_ptes_set(struct mm_struct *mm, unsigned long addr,
+ pte_t *ptep, pte_t pte, unsigned int nr)
{
+ unsigned int i;
+
if (&init_mm == mm)
return;
- __page_table_check_pte_clear(mm, addr, ptep_get(ptep));
+ for (i = 0; i < nr; i++)
+ __page_table_check_pte_clear(mm, addr, ptep_get(ptep + i));
if (pte_user_accessible_page(pte)) {
- page_table_check_set(mm, addr, pte_pfn(pte),
- PAGE_SIZE >> PAGE_SHIFT,
+ page_table_check_set(mm, addr, pte_pfn(pte), nr,
pte_write(pte));
}
}
-EXPORT_SYMBOL(__page_table_check_pte_set);
+EXPORT_SYMBOL(__page_table_check_ptes_set);
void __page_table_check_pmd_set(struct mm_struct *mm, unsigned long addr,
pmd_t *pmdp, pmd_t pmd)
--
2.39.2
next prev parent reply other threads:[~2023-07-10 20:45 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-10 20:43 [PATCH v5 00/38] New page table range API Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 01/38] minmax: Add in_range() macro Matthew Wilcox (Oracle)
2023-07-10 23:13 ` Andrew Morton
2023-07-11 2:14 ` Matthew Wilcox
2023-07-11 15:49 ` Andrew Morton
2023-07-24 15:21 ` David Laight
2023-07-11 5:28 ` Christoph Hellwig
2023-07-21 10:14 ` Ryan Roberts
2023-07-10 20:43 ` Matthew Wilcox (Oracle) [this message]
2023-07-10 20:43 ` [PATCH v5 03/38] mm: Add generic flush_icache_pages() and documentation Matthew Wilcox (Oracle)
2023-07-10 22:23 ` Randy Dunlap
2023-07-10 20:43 ` [PATCH v5 04/38] mm: Add folio_flush_mapping() Matthew Wilcox (Oracle)
2023-07-10 23:17 ` Andrew Morton
2023-07-11 2:33 ` Matthew Wilcox
2023-07-11 16:01 ` Andrew Morton
2023-07-10 20:43 ` [PATCH v5 05/38] mm: Remove ARCH_IMPLEMENTS_FLUSH_DCACHE_FOLIO Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 06/38] mm: Add default definition of set_ptes() Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 07/38] alpha: Implement the new page table range API Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 08/38] arc: " Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 09/38] arm: " Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 10/38] arm64: " Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 11/38] csky: " Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 12/38] hexagon: " Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 13/38] ia64: " Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 14/38] loongarch: " Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 15/38] m68k: " Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 16/38] microblaze: " Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 17/38] mips: " Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 18/38] nios2: " Matthew Wilcox (Oracle)
2023-07-10 23:08 ` Dinh Nguyen
2023-07-10 20:43 ` [PATCH v5 19/38] openrisc: " Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 20/38] parisc: " Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 21/38] powerpc: " Matthew Wilcox (Oracle)
2023-07-11 4:41 ` Christophe Leroy
2023-07-10 20:43 ` [PATCH v5 22/38] riscv: " Matthew Wilcox (Oracle)
2023-07-12 13:58 ` Palmer Dabbelt
2023-07-10 20:43 ` [PATCH v5 23/38] s390: " Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 24/38] sh: " Matthew Wilcox (Oracle)
2023-07-11 4:00 ` John Paul Adrian Glaubitz
2023-07-11 5:19 ` Yin, Fengwei
2023-07-10 20:43 ` [PATCH v5 25/38] sparc32: " Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 26/38] sparc64: " Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 27/38] um: " Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 28/38] x86: " Matthew Wilcox (Oracle)
2023-07-11 11:51 ` Peter Zijlstra
2023-07-10 20:43 ` [PATCH v5 29/38] xtensa: " Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 30/38] mm: Remove page_mapping_file() Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 31/38] mm: Rationalise flush_icache_pages() and flush_icache_page() Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 32/38] mm: Tidy up set_ptes definition Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 33/38] mm: Use flush_icache_pages() in do_set_pmd() Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 34/38] filemap: Add filemap_map_folio_range() Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 35/38] rmap: add folio_add_file_rmap_range() Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 36/38] mm: Convert do_set_pte() to set_pte_range() Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 37/38] filemap: Batch PTE mappings Matthew Wilcox (Oracle)
2023-07-10 20:43 ` [PATCH v5 38/38] mm: Call update_mmu_cache_range() in more page fault handling paths Matthew Wilcox (Oracle)
2023-07-11 9:07 ` [PATCH v5 00/38] New page table range API Christian Borntraeger
2023-07-11 12:36 ` Matthew Wilcox
2023-07-11 15:24 ` Claudio Imbrenda
2023-07-11 16:52 ` Andrew Morton
2023-07-11 22:03 ` Matthew Wilcox
2023-07-12 5:29 ` Matthew Wilcox
2023-07-12 8:35 ` Claudio Imbrenda
2023-07-13 10:42 ` Christian Borntraeger
2023-07-13 13:42 ` Matthew Wilcox
2023-07-13 20:27 ` Christian Borntraeger
2023-07-13 21:22 ` Matthew Wilcox
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=20230710204339.3554919-3-willy@infradead.org \
--to=willy@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=anshuman.khandual@arm.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=pasha.tatashin@soleen.com \
--cc=rppt@kernel.org \
/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).