From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6BD69C636CC for ; Sat, 11 Feb 2023 03:39:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 78BCD6B0072; Fri, 10 Feb 2023 22:39:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 73BB56B0073; Fri, 10 Feb 2023 22:39:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 603576B0074; Fri, 10 Feb 2023 22:39:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 5207F6B0072 for ; Fri, 10 Feb 2023 22:39:58 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 222D41C6CFF for ; Sat, 11 Feb 2023 03:39:58 +0000 (UTC) X-FDA: 80453607276.17.F6D443E Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf07.hostedemail.com (Postfix) with ESMTP id DFE3440003 for ; Sat, 11 Feb 2023 03:39:55 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Q2PeMcwr; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676086796; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=xzupGZYjgsRdPzxbRyZPs4MoEuy+mGaMtCibA/DBqRA=; b=XMWdotpF7TvZ6nJnb4a3N9Di6xKuS2ccBp/wMweKhpRMMWF7PD2WHT/B33St71/ebY1kxX l3TWENYJDGCgjuCvYp8bFswPAATrmipgdAfLUS3FyT18vDAAlVSrdHzso0Sbez799vsByQ BjcZvg/Qz/g6RsvD5PpQPrgtmLfmlLU= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Q2PeMcwr; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676086796; a=rsa-sha256; cv=none; b=eNNy9nZaGAEbLZ57K3eU51PSVi9skftkwbrztwDLBIpY/gJv1jivFF45WK3JfiTFapzlsO 6uMCoSlMGDf38Ke7bNDuhALHSeQFg7P5NOGUhH3JvOWUI1Bu7512L9kqtfYXadHXxjYNBL rj87b2SPK5y3as/R5kMaGDh6fEtOWfg= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=xzupGZYjgsRdPzxbRyZPs4MoEuy+mGaMtCibA/DBqRA=; b=Q2PeMcwrdTsBzt3lz5/gXUbu1i Xd/IWhDKAN1pI9im9nvwMzNCe7kqpQ6F2ZyiNG6N5yqxUe2NmOZI6kvPuflUxJOA3bPIFAY1m2Fue 8ACsj5NcHINEPvNjA9af9rtkg7dtFwmRVKIiRRMikRvo3fWx3kPyOvShxE1Bda7wTgXdSLmSNjImK 5AyQPNnMxJMMERJP5r35+IykdW/DHxWaPAxrdjuJDp5m3PMwu0c1eX9F/JoKcJlf+gVISwE2HzESO Qs3ttwQK3uqYdCJBIcp62s6qLE+H6WUK0s/9euUK3WujdGJMQq84PHTjsPHAOjY6zNbRzknvdILDq Q2CEJWZA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pQgjv-003k2g-43; Sat, 11 Feb 2023 03:39:51 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, linux-arch@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 1/7] mm: Convert page_table_check_pte_set() to page_table_check_ptes_set() Date: Sat, 11 Feb 2023 03:39:42 +0000 Message-Id: <20230211033948.891959-2-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230211033948.891959-1-willy@infradead.org> References: <20230211033948.891959-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: y7dg55uqush1kcanmxrkq9znjhkfd6h3 X-Rspamd-Queue-Id: DFE3440003 X-HE-Tag: 1676086795-766445 X-HE-Meta: U2FsdGVkX19dnUgr8yxYG2mwVBJTb7z2GfZZxkitUZwDNkmJFGfzKJwXhnyLIN32BcFlsps/rX6u1FIsurm3dKB2H/7KBrQTpIczSwfrRjcQ4KlDIqV9NHj9OJoq4HhGJtGarVCdpB+MGVypFx0TkOEpoeV8MYZe7u5wN3ITtj7eHXGz75eAyVcTdgx45QgftkJPgaAwoh9LeHkRiDeX1w5tXDqcXvFlHn1emVoww6wc3WXJivpeabNZU+16yc4Q4xFp74huacpRVu4H4MO5ovGAUtZweIj4rE/HBTmuFAjTIA9yEsl2qnVJgjyopkLeE5ra5usiIipo9VMB6Isso0IDoGiQrrnwuYUD2ooHdBtQaKrjvSOipAALEfM/Qg1RSwk3AePXU4geDBz5QoUnP8G9Ootg6IlY6592WdYA/+ZN36vAcxYdd/Ec8d8HmTGFMSSkEjNQz41HOjisNLa28w0IizrJYzZ/PKRaN1n4Nn1ZGLEPgOSHBuMn0jFeZRZ5Gcb/6eSQ6gRNfyAlIAPWmQjxUjde+oUN3Usga4NH/JdXp+Yo+q5ZsL1p6KWjbulR8Aem0zYTy1vk+YqcOre1/KDxf6sFmauwek4Vx4nPY5cEXGDbspr9Uy/I5V69lerPpMFs8aBveoY7m3KJb8W8xRi0tOmGXYmFT457rdwUgtIMCe5A/OFn+6enKvcKJGyMEhel01CqCabIRFty0R0qwEFDFc0tjo90sHYr8PFsic7u8CKj0XqDB4PUnguyNEYpohSXUJYmuOUPsEG5AH3+XU0noIIIjR2wpUyvVdAedMOmDWb9hiJIysUt90N4WB022QPi6rqen6Zp1R29lxCJZgxHjJJ6vEjjCTmLGlvBgIijVB6l7U58k2UG/xTfgZ6qeTzedK8GPInOpcOYB5aq/gkM/jiNbfBxhVOPzjQPGnOjEzQxVL1U1+LKqs6gvr+1lDp86RwUSUcuydU8VIR B/in71mo 0hzdcrfCqokQm4f2toKeBCAWYGQXn/C8q6PaVmoImR87jvt3RTMDGSxNolm5VoL11DOmIvXnIvfxtCj0SJjOeelAtfKEjuZ593zblGAiUT2ReQD5kVgt9KqKpMGGIURsEZkCFG0d9dZ+B1HX3TOKVGPbicf07ZmLjLXzqmEtY5N1whE/PXn3pdGPqJozpNqotGImzlmF3IWEYdTqBP9y1wRodnS096lCpWv7ZZ+fmvjKv9WaUDiSgif+1sw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Tell the page table check how many PTEs & PFNs we want it to check. Signed-off-by: Matthew Wilcox (Oracle) --- 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 b6ba466e2e8a..69765dc697af 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -358,7 +358,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 2d92de386837..13222fd5c4b4 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -459,7 +459,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 7425f32e5293..84be3e07b112 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1022,7 +1022,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 25d8610c0042..e6f4d40caaa2 100644 --- a/mm/page_table_check.c +++ b/mm/page_table_check.c @@ -184,20 +184,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); + for (i = 0; i < nr; i++) + __page_table_check_pte_clear(mm, addr, 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.1