From patchwork Mon May 1 19:28:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Vishal Moola (Oracle)" X-Patchwork-Id: 13228035 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 7446FC77B7C for ; Mon, 1 May 2023 19:29:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 54335280010; Mon, 1 May 2023 15:29:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4CB7A280002; Mon, 1 May 2023 15:29:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 39403280010; Mon, 1 May 2023 15:29:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 2A3DB280002 for ; Mon, 1 May 2023 15:29:27 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id D0626AD89F for ; Mon, 1 May 2023 19:29:26 +0000 (UTC) X-FDA: 80742675132.08.673B55D Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf15.hostedemail.com (Postfix) with ESMTP id E510EA001D for ; Mon, 1 May 2023 19:29:24 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=l3gNIC84; spf=pass (imf15.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.214.181 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=1682969365; 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=tVP5uHyitpWmGyZGGmBmuGVwAuiqA5RrNeRETZrKFQk=; b=YhhOABemCeB/eCVA+Ncenv80U+/FCnWoSbGewGNzSvtge12Kn6J511Ln4zddTN/FQ8GI5y Lvvi9sfvhGdn+Qgjq/oRy3xxqS9eI47SUOn9N9McOd9Aq4QZf26otavAKkYQY/XyRH9/fC pY+ffBD/p1OWJn71q/Gq2q3gaPfeTrE= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=l3gNIC84; spf=pass (imf15.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682969365; a=rsa-sha256; cv=none; b=NyZSNWM5C5FWVgirLGoK/R/ALcqwlHsK1ISTxqkBnwKU76TptacRxi2V2rWnRh0nQeO7we FAs9N7SdaH5v8MQab/+1TWmRc+t91+981+IWmayX9MC8Xvjk0AEZBOheo1jrBM/b8UAAAY OBTH+3+Ykt8xdLmKnNMx2nHoSYzDE9U= Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1aae46e62e9so14580925ad.2 for ; Mon, 01 May 2023 12:29:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682969364; x=1685561364; 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=tVP5uHyitpWmGyZGGmBmuGVwAuiqA5RrNeRETZrKFQk=; b=l3gNIC841LsuGqQQ2UpVF+XnHjZ+kiBXZeZy4GTzDMbWbXaEiG5ArSl/ydDvotE01/ fGJ2+A5T8Q0iCPtlIlo1cxl3Uf1AxNVghNXp2wCgxamPWRN0f7NM89uS/eqg02SKiRak np/AOUUvT9Iq32lA1ArHNRu1TUuWBGP97diP1cbyLES/I8a8uq904CtHM5VcyBKmIx8g ULh11nFUApu/c5GfuUXZpzFhh6lYLhMsU4hm7q2aFdXWAxNpZKe/ScDOD1gC9EPME0aI 4wA9wQgJ9NzOXeiB1g9JMqcyyqFI/8Wvj0CTUQfo5zcTDuOrG/ytNAkFcETgxxSn2sbl hW5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682969364; x=1685561364; 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=tVP5uHyitpWmGyZGGmBmuGVwAuiqA5RrNeRETZrKFQk=; b=BQqIK+0DGiyRObyIbOX9OARuNanhOjJF/FNIv9Ws5WR8aUCX9BwTr550qpKe+2kKC7 hUbmGpQLdKS+f2IJPpUYU2kwM2rbuQXArp5sQrl05JHwqD7pyrArKcvcl0fYaFwEvjPA TiwpjZkzwDU0xknnat9pHztjTv/nqewBsegy9f7wm4yPYnRfWHUREzi2yzW1RhPqclgs qiIuiA3GMSyDKB+v5S1KiyDI/7Stwn+F+63NVj+vmJZDRxCDz2A9a4IkAe7jbJxq+E4C duN2HBaQGNZZR98D6bNpLF5EcRnDlyBY4lClKDqWwF6fwv/8mjjt1v7FV+/xAudmAk22 74pg== X-Gm-Message-State: AC+VfDzyjSNPNHDQ+TsUeve32DF2pXXTu/vDuE0zO7LMdUmac/tV3Dau 03HMyhyS0Lt7osd9qKPi99g= X-Google-Smtp-Source: ACHHUZ4QjkMy1fp/+Rin9A48k0WWuHM3fOzsdnkuixAb5bcQScYzyO713qNNM5COHanOuLDMosv4jg== X-Received: by 2002:a17:902:db07:b0:1aa:f203:781c with SMTP id m7-20020a170902db0700b001aaf203781cmr5844122plx.44.1682969363711; Mon, 01 May 2023 12:29:23 -0700 (PDT) Received: from fedora.hsd1.ca.comcast.net ([2601:644:937f:7f20::9a2c]) by smtp.googlemail.com with ESMTPSA id u8-20020a170902bf4800b0019c13d032d8sm18175622pls.253.2023.05.01.12.29.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 May 2023 12:29:23 -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, "Vishal Moola (Oracle)" Subject: [PATCH v2 34/34] mm: Remove pgtable_{pmd, pte}_page_{ctor, dtor}() wrappers Date: Mon, 1 May 2023 12:28:29 -0700 Message-Id: <20230501192829.17086-35-vishal.moola@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230501192829.17086-1-vishal.moola@gmail.com> References: <20230501192829.17086-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: E510EA001D X-Stat-Signature: rpn1bixxpufgqb9zoyemxcdb5enhuoiy X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1682969364-300507 X-HE-Meta: U2FsdGVkX18sJImESa6wun3pvvSuiLBqOlI2HumTAt0REZ7FNcvtfd6m42UjLSJCXEvGtMnOghUzMnTymkE/x3RIj0l3uiSIyoeuATx7HSxhidDEC4VMmSeu2GQd6zqPAfclUERmrAMBOOKlXeWjehScBZ5qyeXIW/6odDCYkp8ruQfMTg/M9D0dL3rzCO2fNTZAY/kAAcjPF+nklc75gQ2MkKgUjErpXiavb++C8I6VGFTJWBIusa01lC5JY0eiA6Cc4OYjgHyQit8cDhGF0DdeZ9selkDB1snaA7QpKBhu6FGAzak31xFBwbVdUntOf6steEfhpOZELbf13SC4gS536TZPT9YUbbwHtOyjnhFIFNC2SSo8qlBbkNpmD1vAEOKoTb5aTv4ACyLJIgT/21UMcVHTwWEVgAm2v2wewmbwmVhr9rbFEVmp5jzXJY3JC6fH7CAn3PBGRWNXuPubLNJqGjiTQeqbNI5nYG/LG1Aemxo+XlXCCDrLJzMNRAM5eyuPb1gReh4qZBSqMrgw5CNudL22qcwISps/jOBC2jacC7b3APAOPzwbp2q8Vr8ZkXHmhmhHd/4Y2IGV6/abBu0r/a/nO7TiPPxxO60F0Uy11t6F/heMmrZVnAT5a6k0s91TV4LzdESv4V2L/e2R1PooAFJ1oT+hS3Ae9jmK/07CBB3wlOiEnkwGUbgx26dEAxSvKtnmDQtiWyUuiNAuB1k5hU1uGS8SX6Y0L8UC7s9r+WzCAzo9P7XXYnNyg+wlveYeu4Aij2PpIokgNS+yYwFGZrwl3sltH7zM34USEREwV++/SLa8TUNMdRkdfvenyUnORJ2npa4JgB10svy+39JRhabH+I1vxy91yS+KhnWmXDM2hVs2veVB+2gJqRdaBfltUHM0IMnf7n3nNkUYBduoygh/2PnlOjUh2jnI4K0Mq1NSJtlYI5s8TkF0B5mTahuhE76kE/T3g3PhIeX zYxFMIkn pSUgx5Zqlh8EG5IEXteKaD/tdIVDMgW7qooiHyKY0CSbNHAvH1Nl45aa/pe9qB8x+hzRioplz9YH3ArbWrOCHPLuNNRWBR6ZhVeGQhYaPRjq1LV6BAnkCJuifF+wkuTtZtwr1Ohg+FtVJTw/3RpWylWf4erOeHofPTpbtkmUs/x7iQEPIEOHxr7TcqkNg+iHAk/vCEvFQ6KyhOiCd5t38GX2DEtq3ER9rNmU0sm79JnUGpcrJYSKjdHmRfs7n7/Rz0vPcFHeqdFyGgebQqHfKPd0g3cAUU1RtzLteeZ3grh+o/ToNO0e2n7DD8Bm53/F11+u/98v0rJyL8UiCQ4YTOKPDDDD8TMqckE/wd9R2wkwg3qxh0NGi4f0U/gvEN5RbeGHGKiVkfEMvByUEvI1IiIZmd3Xhe7n/BM7wbTon/CEwmXpvuZGFRG3dmE7I3fRJwlrOtuzPTcP+w1h0s5MlcpTENUc1tvlbodtwHn3vC4qDXKTYwO2IvSE1oq4ceKpEnKnr8vAeH/R7M3K67jAFWcH0e9arOxndtMXJu9GJqYqXBPZRYM/Jqlpvmz2O7Du9IYSxKGo42OI5D3miGvRNMaxmqQ== 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..b3c612183135 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 ptdesc_pte_ctor() and ptdesc_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 ptdesc_pmd_ctor() call on PMD table +allocation and ptdesc_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: ptdesc_pte_ctor() and ptdesc_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 ptdesc_pte_ctor() for PTE table and in +ptdesc_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..a3323eb9dc40 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分页表锁：所有需要的东西都由ptdesc_pte_ctor() +和ptdesc_pte_dtor()完成，它们必须在PTE表分配/释放时被调用。 确保架构不使用slab分配器来分配页表：slab使用page->slab_cache来分配其页 面。这个区域与page->ptl共享存储。 PMD分页锁只有在你有两个以上的页表级别时才有意义。 -启用PMD分页锁需要在PMD表分配时调用pgtable_pmd_page_ctor()，在释放时调 -用pgtable_pmd_page_dtor()。 +启用PMD分页锁需要在PMD表分配时调用ptdesc_pmd_ctor()，在释放时调 +用ptdesc_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()可能失败--必 +注意：ptdesc_pte_ctor()和ptdesc_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分配在ptdesc_pte_ctor()中，PMD表的spinlock_t +分配在ptdesc_pmd_ctor()中。 请不要直接访问page->ptl - -使用适当的辅助函数。 diff --git a/include/linux/mm.h b/include/linux/mm.h index dc61aeca9077..dfa3e202099a 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2858,11 +2858,6 @@ static inline bool ptdesc_pte_ctor(struct ptdesc *ptdesc) return true; } -static inline bool pgtable_pte_page_ctor(struct page *page) -{ - return ptdesc_pte_ctor(page_ptdesc(page)); -} - static inline void ptdesc_pte_dtor(struct ptdesc *ptdesc) { struct folio *folio = ptdesc_folio(ptdesc); @@ -2872,11 +2867,6 @@ static inline void ptdesc_pte_dtor(struct ptdesc *ptdesc) lruvec_stat_sub_folio(folio, NR_PAGETABLE); } -static inline void pgtable_pte_page_dtor(struct page *page) -{ - ptdesc_pte_dtor(page_ptdesc(page)); -} - #define pte_offset_map_lock(mm, pmd, address, ptlp) \ ({ \ spinlock_t *__ptl = pte_lockptr(mm, pmd); \ @@ -2967,11 +2957,6 @@ static inline bool ptdesc_pmd_ctor(struct ptdesc *ptdesc) return true; } -static inline bool pgtable_pmd_page_ctor(struct page *page) -{ - return ptdesc_pmd_ctor(page_ptdesc(page)); -} - static inline void ptdesc_pmd_dtor(struct ptdesc *ptdesc) { struct folio *folio = ptdesc_folio(ptdesc); @@ -2981,11 +2966,6 @@ static inline void ptdesc_pmd_dtor(struct ptdesc *ptdesc) lruvec_stat_sub_folio(folio, NR_PAGETABLE); } -static inline void pgtable_pmd_page_dtor(struct page *page) -{ - ptdesc_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