From patchwork Mon Aug 7 23:05:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13345315 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 42891C04FE0 for ; Mon, 7 Aug 2023 23:06:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E80E78D0001; Mon, 7 Aug 2023 19:06:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E0A38940008; Mon, 7 Aug 2023 19:06:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BE8748D0006; Mon, 7 Aug 2023 19:06:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id AA1228D0001 for ; Mon, 7 Aug 2023 19:06:25 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 8FB561C915B for ; Mon, 7 Aug 2023 23:06:25 +0000 (UTC) X-FDA: 81098844330.15.CD6C970 Received: from mail-yb1-f177.google.com (mail-yb1-f177.google.com [209.85.219.177]) by imf20.hostedemail.com (Postfix) with ESMTP id B8CE91C0018 for ; Mon, 7 Aug 2023 23:06:23 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b="ny/PO9Rz"; spf=pass (imf20.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.177 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1691449583; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=gIX4EtUZRQHbbGVDBj/rJyP4ZKSCaTL9vvlgteJwLjg=; b=d1oQW4hdTwfaDieUB+sl1i5O1HtafOVmNufFYzrze/x92hvBPHf/SzI9i7hrA9us+Uk7kW zWhmJV7IQXVv2HUSurVhCVIk6h4o+F1+Oa3iUNqPp7rDKaULnRtZaVZyWUcuUfp+F0y4oU gTo+Kqp36Q5NOYFdmBA5GWThokL3VfM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691449583; a=rsa-sha256; cv=none; b=CLSOQoW7j/jjcMygsMxd2PbKyvXBdZeD36zQVd9RTEMpVttEtSGudwlpN0q46yFoKqXC1/ auDd25Oi25pBaDQsKr10px6rLyFLLC5NKaA2Pps9UxdZ2vvvO/BhUDaWdX3+Pf6saeBfLw qJaxwuR4pzTNfLJTHmNraQkJqP1HoB4= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b="ny/PO9Rz"; spf=pass (imf20.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.177 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-yb1-f177.google.com with SMTP id 3f1490d57ef6-d4789fd9317so2925408276.1 for ; Mon, 07 Aug 2023 16:06:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691449583; x=1692054383; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gIX4EtUZRQHbbGVDBj/rJyP4ZKSCaTL9vvlgteJwLjg=; b=ny/PO9Rzwz4wKD05c8Oj8x01t9rfWUwF+DPBSi6xhAQ1t3uiUBYZ7YUUbf8WtD6fas a2dGGpvFO2SYjUkztwf/JpnNv7QhJL+Goto2OWRpxKnsAjXenC9v6P3rISzqLv6y4LVV 4Qzw+SXgVTszZ9R94kkJTKmg5SvkJhFFe8ZHJiGz98l2xVrWZH/L4O6QNYM4Ix9oN6dK IfbxHi4LcKxjr+5M4cvO0MwysEIi/pmb6eegOI2VGQmX9xJr0pTMWjXflu5Ws+wnG+9V BkJIEDxKgjBTQlry6d49f1/eWCkgGXBEpt1ui7ZKc/08IVlfaQd/C3Y9s9851HPExZOi t/gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691449583; x=1692054383; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gIX4EtUZRQHbbGVDBj/rJyP4ZKSCaTL9vvlgteJwLjg=; b=NIdtB0GUK802RzE2/KUhCukDYwbh2R6NGEicKFN5oNJjl9cWvedwystupDwZ3BESQJ K2Dk3g6W7zI5JFDV9LnudBVC3QJB/jkjsVdUYqbbmXiJqW9LBAylEH2m8Z2vcyKgAOhL GAvJnHgVe9LA3pkFlS7vkA1b7xn0JmaUTLNzc2bOBuJHOr/yZtO7rpvSlENUe++4eNHW L9iqmVnTo7LJ2lwyomHCJ2O/i+FO6D1nicyu0NVtu5DNFeWWKMX1cyZbg/yLkZjPB1wG Vkg9rPuHFLxjScDTMjcqnEglwpzsbJu+T5KI7WPTrgTiV2rms9R1FHDk7iyd2K4IalTm +S8w== X-Gm-Message-State: AOJu0Yx+qaft04fM+urYXC/k3MiRhYBEGxC6xVAvtc4bSwqzb/iaF4X8 N09ab6xMWzWPDTCQVLPH72c= X-Google-Smtp-Source: AGHT+IHSz7sLxFa/9tcB1BFEAx77xsw7IyoQHCgeHupxbvTa93/qmodby26m2eSPWXo4FijMYi73DQ== X-Received: by 2002:a25:e708:0:b0:d53:f88a:dc09 with SMTP id e8-20020a25e708000000b00d53f88adc09mr3953501ybh.2.1691449582662; Mon, 07 Aug 2023 16:06:22 -0700 (PDT) Received: from unknowna0e70b2ca394.attlocal.net ([2600:1700:2f7d:1800::16]) by smtp.googlemail.com with ESMTPSA id d190-20020a25cdc7000000b00d3596aca5bcsm2545203ybf.34.2023.08.07.16.06.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 16:06:22 -0700 (PDT) From: "Vishal Moola (Oracle)" To: Andrew Morton , Matthew Wilcox Cc: linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-openrisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org, xen-devel@lists.xenproject.org, kvm@vger.kernel.org, Hugh Dickins , "Vishal Moola (Oracle)" , Mike Rapoport Subject: [PATCH mm-unstable v9 31/31] mm: Remove pgtable_{pmd, pte}_page_{ctor, dtor}() wrappers Date: Mon, 7 Aug 2023 16:05:13 -0700 Message-Id: <20230807230513.102486-32-vishal.moola@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230807230513.102486-1-vishal.moola@gmail.com> References: <20230807230513.102486-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: B8CE91C0018 X-Rspam-User: X-Stat-Signature: nm5qigt4oqxcm7asmbsc4jgr1ibc6cyj X-Rspamd-Server: rspam03 X-HE-Tag: 1691449583-591562 X-HE-Meta: U2FsdGVkX1/WwIAypIgr5WwNI/co5gaV5W/SQml5g4vXwuqnfMLelMF9BEdLlA9iKqFfGkv1JNhBYM1546C4beYsAot7i5593sV7XeyMpRc7g6sn3yjJ9zFd5MDF0ix0/o/xTWKNMDf7weNAQ8pP6em/HcVNVA6dBtseWC6JvV+5oDO7ShB5ssIJPB2eyNmMn4cOFXcgruPZzyAN/6O6z6AO7hmLU/1vy3wf0p06kxLgMLD3YIkdNz0IZto/RFikEWwhEGmgtwGn5kp6SNi+JKB7dO4DJbTx0mLixPRAiuxTpm+mjluAttUKiY6BaQScEL+aBUmjufRetLpOUsOnlFVl7HWo7hLdUJMW4Zqn580x+BfA3Ko0AQwyFOsHKQVMMsUkpadfWfwh/HHiGB4wdvNxfkIZW9H9ajrg2/u6aIol8jP8dROWE4v3axk/yFqfFgTTlMYebQEe1OgsA5ZXsNtxfWRNELLIoWS1oSgFMwXhCYuWvkIexQAK+d0mg+BjSXXtXmzxza335F08KYszXSI0JQ36rfmGc09+BA5blpNvsDzR6SaA8Yg71PUPWXTHqNN7VdtGsyYPr/32epKKFLTKBfQ3NBbL7h0FcwRI8D+szHKP1C8A19J2a8lofj6vYhXXf3O8AIfN/7l7nIWa4l0RaoaYagLLVBpBOJw/k4G24XHMYvrEm5ZXz9csbR1qBkhopG4R3RuJBVU0hcpn6QnH3zZ7K6/dz9V+Yu96OiGKEnF+oRr7YsCl/SED+lMUorCTeLBfM3mBxwZSNs7LR/CxBPOG7JZbRyEaozA2L9/+fkZDzRE8XDq8mUZbAB5BEf+RER45/0FvZVj1QZKf9Kz4jQta3O+ZKYdzhgJnO4Li6Y8a/55XZaoHuzNs/7VaL2b/IFhjsDbyXEU7nbxrubboDLCx4BZ2ClGe5Mn/6cKkW2MnAO2Sx4mTP5ne/T2QC7UUXcR7X1YYmCAsu+U kA6WrZC3 AUYEz2IDG675rC+ysCSZrh6BjhlI77O/219Yj9JsrYpZWpc1/sDodrdaIAgAEUuybHU06OnRKnMSTMZP8/Ti3ViOi0rRYztfVmTw/Lmrecpj2UKN2HFoBAbmJlcQZngTJTO5bYwLmu84QajnosUJljWqH1eQ/8fhQOZSEoou/gAyd0gv24hvNtTSpD8j2kVpq3CQz2ExN0Nimq/YBrHtFr4mlj8PyjftIXywPq9OuoZPWJrA9rBoIdz2SUBnKBdZUDDS3dPYnXURK3vR7NwGcZaNm5vH1ZNSWfmR045FuGx1R/LxaLRi0RK7mNpqxqmtvKkTnA/RtWhKGkSPzqbhI80rY4F4mQ6aiYzJzgdjpL77UvemoPG9kk4MniwHc/Md9ICCYCPyEmq3v7TtcYezIb6GfAyyw4HU0b7zVNFioq247QmGagDGAHyZIiK7+Juj2HC7JolE5g29JdGEC/JWjXWCiJwttIX9QTJ9Slv4IA4qdCHLtkQxeUiffKGj77DbkygyP8mAp/fZoL9joPAAykPcfRcrHt880eydNSarnCjwNbMg00wNuyz1sIR4vQI753y3kyDypZCLUH7GJ8ssb1+Hi94yjCKaal8r2aHQQvY5wdWVLqrqKPLGsXadonsAXfyhcOytB5ATmhmCJR3XgjOO4AkayCN7OCtCMYjFPBimCjrV32rgTz98cPxrTtylLcW6iS/4q1Kn4C43CAxWNWoUelY2cimaOfqSq 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: These functions are no longer necessary. Remove them and cleanup Documentation referencing them. Acked-by: Mike Rapoport (IBM) Signed-off-by: Vishal Moola (Oracle) --- Documentation/mm/split_page_table_lock.rst | 12 +++++------ .../zh_CN/mm/split_page_table_lock.rst | 14 ++++++------- include/linux/mm.h | 20 ------------------- 3 files changed, 13 insertions(+), 33 deletions(-) diff --git a/Documentation/mm/split_page_table_lock.rst b/Documentation/mm/split_page_table_lock.rst index a834fad9de12..e4f6972eb6c0 100644 --- a/Documentation/mm/split_page_table_lock.rst +++ b/Documentation/mm/split_page_table_lock.rst @@ -58,7 +58,7 @@ Support of split page table lock by an architecture =================================================== There's no need in special enabling of PTE split page table lock: everything -required is done by pgtable_pte_page_ctor() and pgtable_pte_page_dtor(), which +required is done by pagetable_pte_ctor() and pagetable_pte_dtor(), which must be called on PTE table allocation / freeing. Make sure the architecture doesn't use slab allocator for page table @@ -68,8 +68,8 @@ This field shares storage with page->ptl. PMD split lock only makes sense if you have more than two page table levels. -PMD split lock enabling requires pgtable_pmd_page_ctor() call on PMD table -allocation and pgtable_pmd_page_dtor() on freeing. +PMD split lock enabling requires pagetable_pmd_ctor() call on PMD table +allocation and pagetable_pmd_dtor() on freeing. Allocation usually happens in pmd_alloc_one(), freeing in pmd_free() and pmd_free_tlb(), but make sure you cover all PMD table allocation / freeing @@ -77,7 +77,7 @@ paths: i.e X86_PAE preallocate few PMDs on pgd_alloc(). With everything in place you can set CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK. -NOTE: pgtable_pte_page_ctor() and pgtable_pmd_page_ctor() can fail -- it must +NOTE: pagetable_pte_ctor() and pagetable_pmd_ctor() can fail -- it must be handled properly. page->ptl @@ -97,7 +97,7 @@ trick: split lock with enabled DEBUG_SPINLOCK or DEBUG_LOCK_ALLOC, but costs one more cache line for indirect access; -The spinlock_t allocated in pgtable_pte_page_ctor() for PTE table and in -pgtable_pmd_page_ctor() for PMD table. +The spinlock_t allocated in pagetable_pte_ctor() for PTE table and in +pagetable_pmd_ctor() for PMD table. Please, never access page->ptl directly -- use appropriate helper. diff --git a/Documentation/translations/zh_CN/mm/split_page_table_lock.rst b/Documentation/translations/zh_CN/mm/split_page_table_lock.rst index 4fb7aa666037..a2c288670a24 100644 --- a/Documentation/translations/zh_CN/mm/split_page_table_lock.rst +++ b/Documentation/translations/zh_CN/mm/split_page_table_lock.rst @@ -56,16 +56,16 @@ Hugetlb特定的辅助函数: 架构对分页表锁的支持 ==================== -没有必要特别启用PTE分页表锁：所有需要的东西都由pgtable_pte_page_ctor() -和pgtable_pte_page_dtor()完成，它们必须在PTE表分配/释放时被调用。 +没有必要特别启用PTE分页表锁：所有需要的东西都由pagetable_pte_ctor() +和pagetable_pte_dtor()完成，它们必须在PTE表分配/释放时被调用。 确保架构不使用slab分配器来分配页表：slab使用page->slab_cache来分配其页 面。这个区域与page->ptl共享存储。 PMD分页锁只有在你有两个以上的页表级别时才有意义。 -启用PMD分页锁需要在PMD表分配时调用pgtable_pmd_page_ctor()，在释放时调 -用pgtable_pmd_page_dtor()。 +启用PMD分页锁需要在PMD表分配时调用pagetable_pmd_ctor()，在释放时调 +用pagetable_pmd_dtor()。 分配通常发生在pmd_alloc_one()中，释放发生在pmd_free()和pmd_free_tlb() 中，但要确保覆盖所有的PMD表分配/释放路径：即X86_PAE在pgd_alloc()中预先 @@ -73,7 +73,7 @@ PMD分页锁只有在你有两个以上的页表级别时才有意义。 一切就绪后，你可以设置CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK。 -注意：pgtable_pte_page_ctor()和pgtable_pmd_page_ctor()可能失败--必 +注意：pagetable_pte_ctor()和pagetable_pmd_ctor()可能失败--必 须正确处理。 page->ptl @@ -90,7 +90,7 @@ page->ptl用于访问分割页表锁，其中'page'是包含该表的页面struc 的指针并动态分配它。这允许在启用DEBUG_SPINLOCK或DEBUG_LOCK_ALLOC的 情况下使用分页锁，但由于间接访问而多花了一个缓存行。 -PTE表的spinlock_t分配在pgtable_pte_page_ctor()中，PMD表的spinlock_t -分配在pgtable_pmd_page_ctor()中。 +PTE表的spinlock_t分配在pagetable_pte_ctor()中，PMD表的spinlock_t +分配在pagetable_pmd_ctor()中。 请不要直接访问page->ptl - -使用适当的辅助函数。 diff --git a/include/linux/mm.h b/include/linux/mm.h index 6310e0c59efe..6a95dfed4957 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2932,11 +2932,6 @@ static inline bool pagetable_pte_ctor(struct ptdesc *ptdesc) return true; } -static inline bool pgtable_pte_page_ctor(struct page *page) -{ - return pagetable_pte_ctor(page_ptdesc(page)); -} - static inline void pagetable_pte_dtor(struct ptdesc *ptdesc) { struct folio *folio = ptdesc_folio(ptdesc); @@ -2946,11 +2941,6 @@ static inline void pagetable_pte_dtor(struct ptdesc *ptdesc) lruvec_stat_sub_folio(folio, NR_PAGETABLE); } -static inline void pgtable_pte_page_dtor(struct page *page) -{ - pagetable_pte_dtor(page_ptdesc(page)); -} - pte_t *__pte_offset_map(pmd_t *pmd, unsigned long addr, pmd_t *pmdvalp); static inline pte_t *pte_offset_map(pmd_t *pmd, unsigned long addr) { @@ -3057,11 +3047,6 @@ static inline bool pagetable_pmd_ctor(struct ptdesc *ptdesc) return true; } -static inline bool pgtable_pmd_page_ctor(struct page *page) -{ - return pagetable_pmd_ctor(page_ptdesc(page)); -} - static inline void pagetable_pmd_dtor(struct ptdesc *ptdesc) { struct folio *folio = ptdesc_folio(ptdesc); @@ -3071,11 +3056,6 @@ static inline void pagetable_pmd_dtor(struct ptdesc *ptdesc) lruvec_stat_sub_folio(folio, NR_PAGETABLE); } -static inline void pgtable_pmd_page_dtor(struct page *page) -{ - pagetable_pmd_dtor(page_ptdesc(page)); -} - /* * No scalability reason to split PUD locks yet, but follow the same pattern * as the PMD locks to make it easier if we decide to. The VM should not be