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 7A7EBC88CB5 for ; Mon, 12 Jun 2023 21:05:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1ACBC940013; Mon, 12 Jun 2023 17:05:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 15D5F8E0006; Mon, 12 Jun 2023 17:05:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EEDE6940013; Mon, 12 Jun 2023 17:05:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id D42818E0006 for ; Mon, 12 Jun 2023 17:05:58 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 83FAF1A0348 for ; Mon, 12 Jun 2023 21:05:58 +0000 (UTC) X-FDA: 80895327996.08.1F992F2 Received: from mail-yw1-f170.google.com (mail-yw1-f170.google.com [209.85.128.170]) by imf27.hostedemail.com (Postfix) with ESMTP id 7B45240010 for ; Mon, 12 Jun 2023 21:05:56 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=mPREwt4C; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf27.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.128.170 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=1686603956; 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=8ky1uDH3HAwvFTnah34UfzHSGIz5XtPXejf2e4vlCZQ=; b=fHDTqTWFxlw0wmIDMjXsreUUCA7QKeFcyfS5Tx3VjzNgw0+F8+c5IbNP3ej1R63JbenoZB GUUOszQ7NxNfG7QJm9bJ0hBLMpijIaY5oFYdg58W3X5NcM1Vb8T0e5nlqUbpIxD7ibKQUP 3n9BLSyDU7nlfimo3C0u+7rjD2o+Gy0= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=mPREwt4C; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf27.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.128.170 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686603956; a=rsa-sha256; cv=none; b=w5+R0u/F7nVYNDIucO7ZRr/hrt41zWVIEV3vCMsd2JziTBVtz/tcyfcwWHZAyxiSRQkkSt +PxRXRp6+ySSUHNxJCoNMvKOnH7ngAhiSBjWu2/F3suDo3IG1zkshbKHy8ajg6IPxUYB94 jwuWZzSuK9BcazSAdGK61NeE4PsHj9w= Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-56d4f50427cso6519997b3.3 for ; Mon, 12 Jun 2023 14:05:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686603955; x=1689195955; 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=8ky1uDH3HAwvFTnah34UfzHSGIz5XtPXejf2e4vlCZQ=; b=mPREwt4CZ7eyjP0awRF+7J59gjRJfQYSldhgYFU3GX8JHbZALGX3vT3PNPPDkSpada kYBrPZ3fT3IHCrmgBacTa14fpMsdfLY/wfMsw3mbb6xXz9ObJPsrzVS2jkFBCphqvrnl W2C3CK1LTKvQS4G7ilQBgC608IiFiwIK0aJZOApjzUoXUMUFaYyvbn2berfE8dovgnlw G/g86Ig9l0whUW2/5Qd6SZuVXZ3fDYfyaml8bSeL/n/Mla1l5cRkRmXZyiI9FghcycAP +JJqIE8dynwBhJPRmXp4HhikHugb2xp+HYDNKHli1SWflPjzo5LK7t0+7e7QbCiwECv3 X+rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686603955; x=1689195955; 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=8ky1uDH3HAwvFTnah34UfzHSGIz5XtPXejf2e4vlCZQ=; b=JLRejzVoBROl5FXcnwsxkXDHUutTqFuedkWU/KkJ9mVJ+QUuqUlnvmBVwgO0LIRy4u B6eCyjoP0I3iX0wyhNioECl6LnM3uNCasmSgI3ltWHnzEIRRhOcaKFCOurlzoO6oW/MB C7QhoXoGN281m6/jNoegNJUtXbVXN7LI0bh4LZfkbaijg5XTTF9tlhhFLdSCpRMcFZ6M yLW27GF9sZd0fPtKwDzK23ZhpY5CLeLH8E+nYi0HqIOVCnKhOPaAAFTcjhW3oEvD6DHZ VEjBpZL4mq0VDzgaSHIaOQn/LW2rP2ELUdPSt6E0IPURrFf729utgL+hopcW7Ri0WHZx SooQ== X-Gm-Message-State: AC+VfDxJwKLiiliihQXXfsZ+9PNKVOKJmxi5gsB/AkkGE3+aGXTZrYzz S4VGQv4lDscOWwZpEc3bIkrqtFlLXyLgCQ== X-Google-Smtp-Source: ACHHUZ6hpYtRh2B57fGd8bPmVf+MLwfrVY1EUXTrrFmJrCanxRRmSJ+wngffzdYGMbXJAYdrr0DA1A== X-Received: by 2002:a81:9e13:0:b0:56d:4b17:7e9c with SMTP id m19-20020a819e13000000b0056d4b177e9cmr1826324ywj.32.1686603955490; Mon, 12 Jun 2023 14:05:55 -0700 (PDT) Received: from unknowna0e70b2ca394.attlocal.net ([2600:1700:2f7d:1800::16]) by smtp.googlemail.com with ESMTPSA id s125-20020a817783000000b00569eb609458sm2757115ywc.81.2023.06.12.14.05.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 14:05:55 -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)" Subject: [PATCH v4 34/34] mm: Remove pgtable_{pmd, pte}_page_{ctor, dtor}() wrappers Date: Mon, 12 Jun 2023 14:04:23 -0700 Message-Id: <20230612210423.18611-35-vishal.moola@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230612210423.18611-1-vishal.moola@gmail.com> References: <20230612210423.18611-1-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7B45240010 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: km698drgrr8duumbcps5z1xpoifrm7e9 X-HE-Tag: 1686603956-244084 X-HE-Meta: U2FsdGVkX18BAcyxTO2PDCcTkaH0uqn2xw4c14+jIjKYkPNPEYP3EgOGC4o48xCsoEXdknBFNGz4Rd+zUuzgXQRw1qBd9LmI4X/TsozpHYLOx2zXLk1Nb0YRT7uwfsfdGU5orKAgxd1ScGnn8b0qe6mUIAP0gv4NPyCMnP5ESk6IOI/QR9oGEOiXdUSgWVBtcLmDTp/lcu53Tc26BF9t/fCRSDi/QG4F9X881LsFI9/t8hQGzorn6GvflSZPKAYrOJeuNEOFUctLtyl7Ad7+nh57puWbbdxmyfcq939933qF43imKm8sOp+QhqrL+Nu+m1OkQgT0oAmPvkwBitUdhfiyweSKGO7gKeootNn8LHCs0dsmjyoowA/K4sTrBQF3XoHROvqZxVMGUp6N9ZNoKlG8t3SP52bxB5etPAhp42r2Vfpa5zATEt/MUlhTQbq/KxBhg/yzt4HPoaoGzb7yTWpcRUQqkHQGoX7kksEUuUbtPURjntDNh5x8wt7V3rq7ZZ43sESVshbag84DynkMO8Km0EVNfCiDRldtzLM+QdhkCZnWKkY1zyKv/1FzTmjqQu6rews6HUqB4TWR1BlB/qEWtGPe5iZcmovIfXo2CWDdmniCH+o31HL+mXFbcGRSrFXDp1Ts4VL+1kXC+rBb2/7I0IrUHES+8RmqaVHj8wwjo3iSHBUG+OdYSmqDN7BMQ2+Ke8igqKyQGvpPFasim9w79QZ/M2LI/8Qu9pHHoyCPpLwsu0HHXElhSCb5W/kvAAS9+BNgNGJAUy4ZcBdBwxTICQYHPimiRfHeypz3ht2uYTVZiNmnutQZvZsVFxfyXxqviV+9Cerm7nb7yXA6RRFt6TnV5u/14R8h50OTAv4f/TwRb3U5ezNp1VXwFVTz1tWQDxk9GgiJ12Hyb+2BgA5Tua6JI6ai9SsFZhXy316O1dR50V/u53TpdSn+pO25+o8+VErsnNzGKpqKB88 COb8MVcO T5E37GVBxqvQjvBPU0pR4hhyvDP45i0q+5y0p1d90Q6YxtlMocRHTZ+o1tx9848VEl3+adkLgLogQP+AAQy3oGGJZGuzR7U0JKCgfejQZjBysl4oUN+NVehm/0B/ICEw9kXi7ahR2FAiu4GL/+wg4yb1qx2kib+gwcc/z8qaBBf6c6MQYMwsN7Xpu2f5O2qiqZfItNezbzY/mWNwP2uJ3K48+fZ7ZDxYXUb4COwaZ6jXr1Fb+cMOUT4OskSgrO7dwqV0QErmx9CCn4Al64994rfx5BwYxvEOppojRvZZEbSOgZRSym7TJVVBd+EVoqvAcXuzb3GdE6pkSMXtms4xhNDaAaydcK0r/hPLOgTjp4I3oHpbykSgeOGF3aw45ORPnLGiBPRqbo5kdEMgTsF64s73IuIGLnI3NUN4XIm8UnCek8dEkYGUsYsgm8ZqsY4az6BP8uFmVMpKv350OnrkU4a1IhW5/EF1qEArIoaKbcPc65n05LxFj4GGRB3XEOz5iZRb9ETpqv3ytvY79E3xyC/iXwCG/s0Jgx6GkJzv7zUhmzyDR8BlMLu6XZdxEIeFzqS8WFlPzlZtbsY/ifh8OXf2C1A== 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) --- 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 50ee0dfc95be..4bffec728340 100644 --- a/Documentation/mm/split_page_table_lock.rst +++ b/Documentation/mm/split_page_table_lock.rst @@ -53,7 +53,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 @@ -63,8 +63,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 @@ -72,7 +72,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 @@ -92,7 +92,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 dc211c43610b..6d83483cf186 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2897,11 +2897,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); @@ -2911,11 +2906,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)); -} - #define pte_offset_map_lock(mm, pmd, address, ptlp) \ ({ \ spinlock_t *__ptl = pte_lockptr(mm, pmd); \ @@ -3006,11 +2996,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); @@ -3020,11 +3005,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 -- 2.40.1