From patchwork Tue Jul 25 04:20:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13325744 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 68CD2C001DF for ; Tue, 25 Jul 2023 04:22:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F2F9B90000F; Tue, 25 Jul 2023 00:22:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EB9B2900002; Tue, 25 Jul 2023 00:22:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C945B90000F; Tue, 25 Jul 2023 00:22:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id BB0C1900002 for ; Tue, 25 Jul 2023 00:22:15 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 9A7B6160960 for ; Tue, 25 Jul 2023 04:22:15 +0000 (UTC) X-FDA: 81048837030.05.847A9C4 Received: from mail-yb1-f177.google.com (mail-yb1-f177.google.com [209.85.219.177]) by imf03.hostedemail.com (Postfix) with ESMTP id C769720005 for ; Tue, 25 Jul 2023 04:22:13 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b="pXw/al5n"; spf=pass (imf03.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=1690258933; 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=IJJ6S+lpvdYLFTcnxtQA14fd4/3ielLdkJa5CrBAMLG+1LHjtHBO6AhvtolEjADTLqS/xU ov3rb95viOP/zWqdtnrQWxZnZcxSX2vTyK5o3yTJ9rdhoxTVcE0w431vmvTT/6wjZpvCs0 jD7C8wnlUCf/a0e/hTNzaDJiR4zAgSs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690258933; a=rsa-sha256; cv=none; b=xUjVOLx6Ym8fcZ8Q6Fx10XdARDxhyDYYm54k/RWgZHp5vEAQHhJ0Y7Qe7zRXOIrBoJCh13 Vs0Skb5KbSeMzeryRtTpplxBu5Xb0vb5yQRq1G0U/pnZIFau+qC7TsanyYJTNvwYPdTffd eEuDPubFyTvoPt9BbWOpaM2DuQO0lr0= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b="pXw/al5n"; spf=pass (imf03.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-c5f98fc4237so4297296276.2 for ; Mon, 24 Jul 2023 21:22:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690258933; x=1690863733; 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=pXw/al5n2PZt63hoen8XWII6rt0WFX5sgjX7qQn8gv0HWFLKnKq3bevtOzYUASugG2 pCxGKJOC5ggVyKCT1VDrwsaEi6MlyxwOLjAg/45BvYDi6yzh+q0BBiRQroW3z59gIlxT qmaJpZ1xyAeP6+U8sI1TI5+kmnURZAb3iR8avL4fKbvg/gsoUc7EkqlV+0gnf4rSHbHI 2YWk0HYiOFW33a4FYfPo9WrS1QN1IRD+XWbKqzPIeVg52ry9QdQcyg/270EcS7s+RywF +5wAnQbinAMNk/Lv6GIEnBeoT41AhvsJSWE+pPOymAwrKRfCNfM+KV2MhemhV91wxD/d 2Dxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690258933; x=1690863733; 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=anlWzckJjDAEnth0xzkzZ9Rcsn5OJSci3Pgl6+pP7A2E4QIzqRSFTsJFNcstmCGPXt Yd+m5buuHL+XjFrbye7a1hAgASLA/XB1T2R41tAyXrMrCDCivsvTJCfeeo+e8zzQeZqy 0C6igTsARlVUCh6efikbK75eJ3tQ2kOyBoJZIb/u6VDW+zof/D0tD5rkbkih/5ruZfxQ lQBOYJoX/eX99knLFMwOJG5lre4ctFnvLtOTZ3mgR0b2rCWpFqbNL11E8Sn85eZfspKY RJQmtckRa8m3d7Ll4sxCEe835Gm+gwTrmCgOP/pYz4rfOstZd/1MtiGTvvgBoTQXHmbh 6O3A== X-Gm-Message-State: ABy/qLbT4RSYgP0g8p1E4WhXDIl15ACMO3Xj4Y2u0nJIcw+iv/CnpPr4 DkHqi7uuQS+rbRMUN7kTl98= X-Google-Smtp-Source: APBJJlGduGUsku2y340xQfxyEpNx6ubFn5qWJpFMniISafhH3MH0EHub+91fIwUA2U73/kY7XLKlHQ== X-Received: by 2002:a25:5087:0:b0:d0e:2e5c:2f80 with SMTP id e129-20020a255087000000b00d0e2e5c2f80mr4416565ybb.64.1690258932878; Mon, 24 Jul 2023 21:22:12 -0700 (PDT) Received: from unknowna0e70b2ca394.attlocal.net ([2600:1700:2f7d:1800::16]) by smtp.googlemail.com with ESMTPSA id h9-20020a25b189000000b00d0db687ef48sm1175540ybj.61.2023.07.24.21.22.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 21:22:12 -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 v7 31/31] mm: Remove pgtable_{pmd, pte}_page_{ctor, dtor}() wrappers Date: Mon, 24 Jul 2023 21:20:51 -0700 Message-Id: <20230725042051.36691-32-vishal.moola@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230725042051.36691-1-vishal.moola@gmail.com> References: <20230725042051.36691-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: C769720005 X-Rspam-User: X-Stat-Signature: 36f88y1nc7tgm4pge7yf35fimoas9jm8 X-Rspamd-Server: rspam03 X-HE-Tag: 1690258933-318224 X-HE-Meta: U2FsdGVkX1/1YDZXEK4KmScrixa8XZTAsPqjG6TFV7I/yjYRnQV09JJcRvVu9IJzs9wgjomyxWTelddA6ShhbWe8AhIY+2t7QLbIQ7YUL04mCwAmkryFt42KlR1xqP52ove+R8zAUwI0RtBCtFrXp4FLv30wVs4hCV1yyYglzM3oeoOZH+7GuByeLSdJslNECrRHmpDPq3RTNDo6b/I5AH0eG3ZInqt7AuIn9mAjz4SBYwyEpEvEJsCIxDM0XxLahfzLruEmSlET1sY0fKQqZickFVbHbeRt8STyLyLrdyrAYIbL6z4Ly13lQbiyq9b/veo9XGATlun7fSRHLHrYEEgMS4xFZzcHxy9E2ZOt9dRklV9hC2zfTFw1zVUBhQ6KYe6CiVzZHWfcsj50SMpDYizYKef0BGkO1MfjZB4z8O9R1pqy3cuenqT8X4Pjqjcl4Zct/JUkk95ijWQdCrQgQtB6O6EGcG1RTNGuOSvQv1FUBx8E3YFwRR8MDGLGt1taae3w9AQrAn8xR00GiH/zlFwjjpP7yGw3Z/8OTTXNyCFTdS0SFWMafVuuYzN4qorKlHRHq+ajvZcDXtL4KHrFB2uB7n7VFYW00AglXqGKY7ZmyLk+MKLvq2SN/uVVUo86hqYaixJRDndln/NBbMDRbvxMicJHERoluQwWBg2mB9NWkcaj/cs+6ghnC3XkiAV9xdGKEGcNlBfmL0wxn7lHSIJew9GcMHTJfjYnnMwHnJlPOUHkCY8n3Vw58BRpgO9Pu8RnzGV8PQmZB3xIlPY5rJ2dsA4Qau6oJC2kbsQwjHb8VKgYsEdZoeUvNm7Fodxp2Y6oH8ZDSdhakbOKivkwq7bjG2mDh2Yf0uXoE0OZPwGN0DxpyM3w0aePCgCYwEdfdGutTfR6lcAkcOLt5SHc1p4GYx718UeExy1jZ1rdcB6rvrko/irsNYppq87lDjDxOxK95RMsQEGvxf3Tz7A 1skUQ9Kx 2rvBrotW4p3csClXb3nN4bMn8UHQYv1Bs0utfMKy4JmEpXW0FlDM74JBUmdNJodbI0ZZQlw+dmLqQ4jyZDr6NVR5aB/E/mzOoWfw7mx8qUkzK0EeE/780DO3DZrb2yC1x8VPbeiHpUy5i1HwWhwsG+6SSbDJLplMK5FLBo1qNXkVqxewf9O7h3ClNMwjK3DykwWzbM92JtccMNF64+7WYFVzFsH72Fi1+72Pus7ySSV7o8UzCtHQU8nCVTX/7Qqyn7VpfT1znSx4cLuUJopPJkWAy5Xk/mmXuDsSZUF74fC0WtldfkzcJsQL/q1EisfPiKDblBkt9MZXrE8bDwUmGQIl0682osJcZF/7a745cjXTKdFP0jatGHF8EcGcKyAxTjwdl0VbExpCmq1lJnU9eJ9+PDwvmRGz4nJGEZZFN/D6oxzzAABxxzgQczvIuyOv0LMmgjOBEFuK2bLeMPwrANJr+YkM4TEbpykeIhvTwyaEFN9ZAow5f+Clo+WyI+XMJLRcA4h/ZjQMqO39elj4vMwk0VGkh4N6FHgg31GGB062rQJ9vKSPUOqjcBHUAHtifH2eiuMwK890Qkq6RiIDNgQAfEVKplHt7hdo2St/2u5KhZrs2Ub8179KDrSfsBujtSHA2glxN1Ln0bEg= 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