From patchwork Wed Mar 15 05:14:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13175309 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 07532C76195 for ; Wed, 15 Mar 2023 05:15:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 978498E0006; Wed, 15 Mar 2023 01:14:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 836E28E0005; Wed, 15 Mar 2023 01:14:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 688A98E0006; Wed, 15 Mar 2023 01:14:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 4880D8E0005 for ; Wed, 15 Mar 2023 01:14:53 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 1B4C8C106F for ; Wed, 15 Mar 2023 05:14:53 +0000 (UTC) X-FDA: 80569968066.23.BD55864 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf24.hostedemail.com (Postfix) with ESMTP id 5163D18000B for ; Wed, 15 Mar 2023 05:14:51 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=NTzMM1J4; spf=none (imf24.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=1678857291; a=rsa-sha256; cv=none; b=I9ax66bPy5Kk4164tnI4/P8UTwoFH4eXMH/qlMBed8nic/KN/WGXpnwk0j/mfSzpuMtMQu 2qKyo5CvLhszMOqglOOVbulPzb2KNN9EJC9wjCKH92/ZOVwW7nvImwha+o1FHD7O7Qab/w G+V8g9GZXwhcSJ/iHCqcIoWZ1f30VyQ= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=NTzMM1J4; spf=none (imf24.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=1678857291; 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=WGsuNHgtl7K1C/He2s/0y/Zy8SWDFoeWCMIkXDsJXwc=; b=Ztatsb+4md1PckRvSbY92+fG7Id9VFrb93O1hxt2D3AnGkaQKA7htScHRz5+g4BB1zxm72 EzV0h8QHBjGGs+idjKrI0COhD0i8xmd6LAdLzGcte1HgwWyQrm8nKbahb/3uPKRzy93UFC Zo0NIz/YYV3BrJLz+f8BZI7cdFRApr8= 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=WGsuNHgtl7K1C/He2s/0y/Zy8SWDFoeWCMIkXDsJXwc=; b=NTzMM1J4/IOtu3QL2QKZxx9SKf FvKHZglkg/V+OAw7jgJhs6IUh8sugb4N02CL92wx+DlNtMbZam+4QFkhz1JXS9AXyos0D/MP5S0x+ CmClNweLA/k7ogci4CxD2XEyNx9LEMpNvjMiq6U2qBz+xGRCblWEZePIbFNxjONv86bEBYsZtlH9O izF3K8+37JP3Y3fCMyQspB1ZbnCOtAi1KmMyVxSaugIgdyV+sfv3Ss/PxBK41WncGTxAqrbdWk+2V we2BJPqaAKgpN4MRk0uhZbee0ESqhOXmAO1md8iW2FED3dYnzG12wd/ydj6l64pbxfxvlX4bbiIky 82Sw2grw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pcJTK-00DYAr-Eo; Wed, 15 Mar 2023 05:14:46 +0000 From: "Matthew Wilcox (Oracle)" To: linux-arch@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 01/36] mm: Convert page_table_check_pte_set() to page_table_check_ptes_set() Date: Wed, 15 Mar 2023 05:14:09 +0000 Message-Id: <20230315051444.3229621-2-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230315051444.3229621-1-willy@infradead.org> References: <20230315051444.3229621-1-willy@infradead.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 5163D18000B X-Rspamd-Server: rspam01 X-Stat-Signature: 3ctb8oi8yfwctr87r95u4tpx7hxwmsyz X-HE-Tag: 1678857291-849074 X-HE-Meta: U2FsdGVkX19kvpKZ1yLbEaFs/pZsG+ex93OgtvBDa61cC8w3+90jvO1x+m43Wp7Hx4ND5s1NZM4huMawGZUN/Ib4vCsDpKTWKZqZiK4SgBIl5ppsRQuRl6sRxD86etddqfJj51+aY2LR5KCcHMYcm9NY9T9UsPoglvG66gKOMQWz+40gXZs9BLfOYBcPt24dygBFjG01O4vv7JgHOhHRnDfkzRRpi8Ig1jWzTqxK0J3a9dnfqUtoAslIFvobGy6KKElcKXhV1QYD+wGDQw1cYW/exy3T6nr+WYWCqBSU5SKPycx0GVNvR8ShFGWw3ktBPfhFNu2bm1TW6rCcX05f2piElAduZwXxEowOoBsqJk5SKZ7UdCfAcB/sWRmVCRFDOxNOQB62hut8Bo15/Q8Hydm2edLrt9N6EVNduMJCJwzKrLLpsRqPnzwT3GYKNEOGWMIA4T0nU9qTegbQyTBiunQhjvochcOIWp6zVCmskQsm+q1ZhHxdlUqQxKJuigGUql1YxnwdmpwNBx7NF4hL1RJBYZF6bOIShAVCI0hs/EEWyylaNKIDhDzIQC5lgC80Viw5hZUQgMNP0NhZvtfSZbsCKCQ3mZlhrKN2Ik/jWPV4WrMRqR+mLy9r6KMi08ne140ezhRVk5rwoGsFLX/94hdC1yQRVQX+nxiZsO3ttTatdMO+sIjHQPvXr4/MgXJ/SGAxdq6hsXj+k2NBgwsTaYYuN408DqfFrB5vGozM48ql9uZhpvOjh92nh02KF+a8QaJv/BmUr3Cv2JEBx2m9B24G/fDI83ahTJfEbEpKNxfdVax4TWVkFzi8b3vEwUK1ysvsf7HaDzzHtGLFlapw8jdW/JJUynP4jaCTgPSO4TUE3JvqgV6UdB4lIsMISliAC1UxL8C5fGdoQQ6wLUPzr4CiXhPL8MABzuhkLCPJdl+QYAl44ssjY+pTRDxAefS4mjnymXMEa45lTB9TkfR j1eaUImN RZ3RdPGZY8OWbKMqXbQnvdXpeKNCyE3pNWbhniaH64kwSFPC9Mjel1RM+Rta5Ka/viGcpRECe4ytG1Bl1damxddS/1zr0KWMdsTUfwktEfmsBesBokTcboUCQl8QysIZQEc6fatb+WyBYGbb+mSTtGfNX0feFVMmSky6T6eBVnewtnEBnhKbH+hoahXuf/jBj/3/tjpLKpN59LPVl4FNglxJ1Aj80NG3v1Yci5PtTs70beq1MFa1BR8kcYw== 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) Reviewed-by: Mike Rapoport (IBM) Acked-by: Pasha Tatashin Reviewed-by: Anshuman Khandual --- 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 0bd18de9fd97..9428748f4691 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 15ae4d6ba476..1031025730d0 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)