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 03D83C7EE2E for ; Mon, 27 Feb 2023 17:58:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 893356B00A1; Mon, 27 Feb 2023 12:57:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7CAB96B00A6; Mon, 27 Feb 2023 12:57:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 30F866B00A4; Mon, 27 Feb 2023 12:57:53 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 15AB26B00A1 for ; Mon, 27 Feb 2023 12:57:53 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id D78DE16018E for ; Mon, 27 Feb 2023 17:57:52 +0000 (UTC) X-FDA: 80513829984.14.76F36D6 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf23.hostedemail.com (Postfix) with ESMTP id 11090140010 for ; Mon, 27 Feb 2023 17:57:50 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=FoMahLSp; spf=none (imf23.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=1677520671; 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=ohh0hBicoR9cEJC1f0QXvtIvk3E2NGoKfRsPDD6eKkI=; b=VRtfc65hrHf2HNmTcgCuBkLOKwljjrex5LhCVEvWwxtoaWnZDpGIG7oXmcXMhxabuRngGd kgGsjVqC7DFoQo6ltEjd65FawEXXysT9sWyt8WUWWFN4XTGyJBdKVzz+xNGBBxtAVj0jWK R9DlZPi0uboHHgGXwBF2iwNNFfm657o= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=FoMahLSp; spf=none (imf23.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=1677520671; a=rsa-sha256; cv=none; b=AClujegaibz7kxXuvTptst02NaTxfl00OYRWj1Nj2Xq3fl4FNYOudhVxzajXadXnoj9ICj MdOPvmuJqLZ1Pm99O55lE2SaIbAn2vrP9bIajkwgBQcqHAbrxeybnHBXH/plQbpVZ9Ct7+ EnVoIF5DupP65vWy8huKKLzDue2HMIM= 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=ohh0hBicoR9cEJC1f0QXvtIvk3E2NGoKfRsPDD6eKkI=; b=FoMahLSpZO7AlHGXXhBAHCLsCe 6SDkWmBf3/wG2qWYJoNE8bfijZhlzdWgCOzeikWmzflr9MxdkexO2ikTu7grJ2uvEvAakdTP8kluU vZ48j/BkdV3BwJD8J1CQXjqprP6HNwLyfZUpt0fugKGLuMaejD4OZ2yJ0+crM0BFeCx5NRSVJsX6C JzEsdJwnv5pcJNLtXAxrJ6L0HK/uj8BX/ybiYgkwLkaQN5MXX35MU0LGlJ/MBuzS1CzUiRWD93EFE fkFtfBIZQgWesSVuxE+FJW6QyBUQYr5U5f8TQNhln3BZdugndqr5cyiBjFOuFkbjAq6fqOloM2+yi 8m+xL4Jg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pWhkt-000IWp-2W; Mon, 27 Feb 2023 17:57:43 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, linux-arch@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org Subject: [PATCH v2 01/30] mm: Convert page_table_check_pte_set() to page_table_check_ptes_set() Date: Mon, 27 Feb 2023 17:57:12 +0000 Message-Id: <20230227175741.71216-2-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230227175741.71216-1-willy@infradead.org> References: <20230227175741.71216-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: pimt4sqoum7rtx7wskmcsk3si8ndw5sp X-Rspam-User: X-Rspamd-Queue-Id: 11090140010 X-Rspamd-Server: rspam06 X-HE-Tag: 1677520670-350042 X-HE-Meta: U2FsdGVkX1+l4WJw9EHM18GnmlMdboTfUoOhgIlmA6vzc0/eU8Su37d9iVqr+B6uTgeSUL9jQhgZSn+b/wxYpMpgv7jnpHODTf4YZN4dgGIna2zkzjgYaKRE9tZyhuQwOYH5By0ryyhf6fz786n+ZWa9fBoYQ4hW78SS1tr0kRSknASSFWgHZFjevu9AemGj6LvDMydA/hZ2bjwbWn3Wduwz7ke/xS2abLzMrv0CybSZ59fFrCQ4MHJ9k9mWXdwiW1TMZcmVrBpKjnnlZBJsj9OrgJi8JAvAxi9vNjBGdR15/edSI1vodP+xA4BXjFWSyWa5wRyShbl2n8/zBOaNu6VFX3cZFbRTPk1x1MvJdtm2nY3NbzEJPsjVrU+M+7vgjj6ozTCOF3rex2kEEGsSHMfczCbBBZAKn4b1huNoP/Uy+4s0Hdec5rHHO+R0B7ph/JMHyx/BFWoAdQNjLJn3K7VVY0MUysVZ08cdXBo53ji6dywv/zVnnQ3Cw2W994IUckPxWFpGwtEfexosQJInDInE9WWz+R+5ltwPqQkno4AZgQYxYKMLUSIzoVMhQ7dHOOfXuC4XuF90swtmiK8zHcyqA+/vXYQQV4mYK+S8BdeykvBvfTPT+HKGOm9smFXLaMXTmVrCr0yF1IiuLtPYvIEtb9KaJBEGI/FDK/bs7sfBz1Hbp6WYCpM1wvwvTQq3414QitZkU9Zx/k/ZCV4W5s086OMEQKn6CQXXYfJhha0+I174yISYGf7YRgibmpxF3f47qzZR+TH7GMnV3VkTRjb2L1vkW1jkNWSCMfvz2cUz9R71LYZ9+I6w5yjD8YOHylCSzH1UD+l7C5assK4tPmX1B7jY9lK7XZNGp8tSWxokNv1qXeC95XWgt6yCrf7hcSdEuZ5XiPFty/i0HCdjT07DdOKN4yJOCCO3NFauGnZJM2LRMPmb9S9QgJqKSTWkQ0IC35URWSwUEXdY1gS ddyfWKYR ykE+BOU7D+nIgL/MMwrYPolfBpvZ8vJt7JM3qaBbPgK6tr5Si8EuiS7xSE6ccleVsKW3COdLOI10WHhi0OROpvZSil8jMz71l1BRF/A8AhbdaP9C1ofhCM365cbLbTieKyUnahB9Es8cwvIwqiAI3vdN61Abds8Q270ow3VW/SzYW3xOiMJuWA40+QBt6T2ZG6qrIFI/wN/KtLfNteJTrOycXcE4fGgH3jmmyx5LX7lvPE566DoyNqMtzbQ== 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 ab05f892d317..b516f3b59616 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