From patchwork Mon Jul 31 17:03:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13335132 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 E7AECC001DE for ; Mon, 31 Jul 2023 17:04:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8C85928007D; Mon, 31 Jul 2023 13:04:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8527328007A; Mon, 31 Jul 2023 13:04:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6A21128007D; Mon, 31 Jul 2023 13:04:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 53ABB28007A for ; Mon, 31 Jul 2023 13:04:47 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 1B395C017B for ; Mon, 31 Jul 2023 17:04:47 +0000 (UTC) X-FDA: 81072531414.08.B9AB696 Received: from mail-yb1-f180.google.com (mail-yb1-f180.google.com [209.85.219.180]) by imf17.hostedemail.com (Postfix) with ESMTP id 2EC8140009 for ; Mon, 31 Jul 2023 17:04:42 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=ioOMbbu3; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.180 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690823083; 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=ge3Da1dLlbVImV5jdD/HZRx7aISFPvIvfEGvqleo2SA=; b=c5bmQf9ztju4KUzs6MdprFRq688HYYwIDmt16XsjBNE2cNAzACta8a5EFo2qkmFZGNSQsP W3BA26EBt6SPgW8R3zdmq+LEC5GcU76uYsPZimozmfO24kgMx84qx8C22Lqbnh2fCbx6Gw 9IeLF6cgAQe7EgdtrwGl4Asi8LaYCQc= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=ioOMbbu3; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.180 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690823083; a=rsa-sha256; cv=none; b=09PcfV0+O75yViLY3ZjO0ZXrUolHsTOJv2qop5ut0N2lq0vn9T6q8VBf6x8QKp7Q5ai/S+ CTAhszJF0ak+T/7FAmsQE+0HEu0JNvJefWepUxjnl5iKkhcYbpuGBFGq+Ys/UT9D0T3EUX vRRTcW81NQAoqJbt9FTSjQO9TNE/FwY= Received: by mail-yb1-f180.google.com with SMTP id 3f1490d57ef6-d2b8437d825so2457677276.3 for ; Mon, 31 Jul 2023 10:04:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690823082; x=1691427882; 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=ge3Da1dLlbVImV5jdD/HZRx7aISFPvIvfEGvqleo2SA=; b=ioOMbbu3JES3j1Jj+JW3855XW3Ov65AQm8O9lv95JxDcPPS6IwntjHfsaaLCwjHL5b OuA4j3AMcOeG2v6VKrbkSXabyBKoN8KuyYIoDCC1YD5I/RC4KqKt3ITSQwKezbQCp/8J AR8EjEBjRuz0BKnlQIU6Pu2fINdNhuBPDReykf5gMLB8b4rp/cimT4edf9bEDyME9O7d VFOstOotn1+dDzfuistQZkRoPkOh7Uzd/ZqgsVXJ0Zgg3bR5ReggCo1obemCJNhIS+t9 Ue+OH0jfGRqmyKjIxlmOMTrVnVAvQzQZxHF6PwZledF5BBiAWirHuHl+9jo5QzXuxUnf 6Gng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690823082; x=1691427882; 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=ge3Da1dLlbVImV5jdD/HZRx7aISFPvIvfEGvqleo2SA=; b=Ra6jbzOMiHfBSxRhseMwozBTek3pasoxR2XXuMuwYTo52MUzDQGlDwtweUcd8khCs6 H5mnTfPeWyFlIWnM6so7zlDRK8GKb8WWEhLuUego2Y46yhDNqKAN8+Vl6DoIJsLuFyuJ MA3F20jyMMuINIF5gRO/9DsqzH7HoZIQikDwjUCUlvsm13vYjbQ6jNoMtmx+R72xlJry A1hlPYsitUl11K/vX6QPOEqD7isEOFU2p5INszxsvgzpmJ14kFfB/2BqbqmSSg8c7/qr rZnSrLcdwfbZfOYWTItato0ge4IwHbnPEyQ7pAinfMzvl++US7M2gwxzIc9t/kYlLIut JI9A== X-Gm-Message-State: ABy/qLZfwZw8kYaKjpEv4+GyURy/+iBSDetDRGY9TEARwLWR44pgoaPn jru+Aq76JYL6h4sbsXnyg4o= X-Google-Smtp-Source: APBJJlF0vgCAeh2GJq7nS2h9EAm5JTHFkJPU6wpVfPXTMfmv7gc4qDUX7Q6WDvp5wiH1WM3Qyv6c4g== X-Received: by 2002:a25:d68d:0:b0:d0f:ea4b:1dff with SMTP id n135-20020a25d68d000000b00d0fea4b1dffmr10302787ybg.8.1690823081905; Mon, 31 Jul 2023 10:04:41 -0700 (PDT) Received: from unknowna0e70b2ca394.attlocal.net ([2600:1700:2f7d:1800::16]) by smtp.googlemail.com with ESMTPSA id x31-20020a25ac9f000000b00c832ad2e2eesm2511833ybi.60.2023.07.31.10.04.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jul 2023 10:04:41 -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 v8 31/31] mm: Remove pgtable_{pmd, pte}_page_{ctor, dtor}() wrappers Date: Mon, 31 Jul 2023 10:03:32 -0700 Message-Id: <20230731170332.69404-32-vishal.moola@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230731170332.69404-1-vishal.moola@gmail.com> References: <20230731170332.69404-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 2EC8140009 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: g5i3pezpw7kn1651jmfishjt7nqajf5d X-HE-Tag: 1690823082-417373 X-HE-Meta: U2FsdGVkX1/4dMQjA6hA9JDRg5cZCr0GIHonNmKdaBSI6hElFG0h42yIV14mUT7nN3tR+xPEFW1wWO2cDNWS2Yzq68FXAb8V0oI5D6QNGAS5DUUQ/TZH2NCywk0ipNbH1j0vB06YoV8iaEWGsw+r4t4ZvtwPYGN4Nj6HwCbZoYNlSd8fugPiTNIECADbXT3Ma1qLRUtIMTX6r38zbuw3xxAGda8pNxaKt9xMgA8RLoOBf4hjyjDo3lEPna3rewaJNWSEw7hBWOS6CPDSq0oz+fpUA03tMs6rm2NhYQmUsw3tWx6Z51HrMRv0HqOSKYw9wBSlMHdlj7UgvrTRppTXLVAvEDsKjR5itr35yA3nKdmVSBiPEmb/zR+Vp5EovsW50xNX7bmDXu8gXd3Qm0OWz+u0G5ISAjgP+DxYKn9cZnuY2CZyhyfOe44xEBkytQ6Pw8+EvEakQYn65pI4ytU+i51OYIHu1oEHmLxXeEumGNNrdWFqrlb69KgF+fBj9NYXfgGpU0+P8t6+HaYnB4GcBPa7t/yyfLBnO4SecaRcK31tpPeRZCN03sapOIow8lItyodpxCWUqZUxJkABJk4AlXQkM5O6l5Sps4g4RPOPGEhXbt0nTtFOMuzhGp3BpwJV2LvkVuMpRb9+3UNShHiKFfdSbyerU9zuQWD9O1tvJv3j19/5n2jGQcBsxv50QZ+al8LUK8whFjyH5Wm2KjBfEyLAq8nA7RpV4ic1bn3WQoJMdXTxNJ119Oa+hvUzduJ3KG2/CIs+gTBfXcDBB+azkRGyy3SiKo3sj+X7Jh6bOmXg36MhiTR5/WVJDzKIN4aL99Zbtnd7SLqCQFjZi6jeagQL427RS007eA7xVb/t48amk+TAg184b2Mpd5Sj16aVu91Mgn0skROrxelWBxURgCRzrT4t088AGR6edOEgLAzt9uSGj1TBlYkfRMqo1u//xoCMCaE9RYoTp4Qvnpl y4HymM+J cLYHhNKcyUztpTtbgb9AaqiqTNvyPhxdROJSlMK/5w0eOTMdGynYwoiQV5AmEf9t7AUraUdXZBreVdxpIwjsigtH71mFgpaWSXvlR1yT5Wqpf1rpvDn9YaO8wvslMflJU2TjBHrSg1Ewd6wuhXeZJshJehhm1RtTSZhM4yTLQr/xWmK64Znzccf/Ju+hZVLYePEMTAmitin6EIcjQdxxz+NGmRsZwGtAk8HtZLT9j9HwgHTNIbCQ4QZH4nzbfyBnwQBhZjHFzAlCEZVW3QMWaDgm7OWyT3WM5GKIhgqJn34Ux4HsuuShutMHzi1IxRYcRDizrJKHxeyAOC4UQ4hWsbqeDmd0xu2veQd8j+iWxJrPoPtaDGMh1OeoxcRtp/Od/mo+W7FtivhMCWKnS3mkOEavq9wTDXdewL0U0d7/X3HQUKKgRVNHSrg0HZpT7vqx+LDuZWR/Vi5kFhL+mi+L61HTMuBw9iN/OAilzy4HEEiTqa3naWaCqhPSbLjJqR5ZYQ65bwonKuik3zxVAsRKGPAVsRdolwcOeLC5py08hwkPkmkd0wrXq58WgU0e+fw8pIxE2hHOnMaGCIuX63HN+ZECGoU5/HHENZLV1EAdNzVEJQotDZOOvUJsy+7hOtLthR0Z6wqlo8KxL0kY= 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. Signed-off-by: Vishal Moola (Oracle) Acked-by: Mike Rapoport (IBM) --- 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 bd3d99d81984..e4e34ecbc2ea 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2913,11 +2913,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); @@ -2927,11 +2922,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) { @@ -3038,11 +3028,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); @@ -3052,11 +3037,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