From patchwork Thu Jun 22 20:57:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13289630 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 E8662C0015E for ; Thu, 22 Jun 2023 20:59:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7BE638D0020; Thu, 22 Jun 2023 16:59:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 76F058D0001; Thu, 22 Jun 2023 16:59:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5E8148D0020; Thu, 22 Jun 2023 16:59:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 520D28D0001 for ; Thu, 22 Jun 2023 16:59:08 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 0E5EA4028F for ; Thu, 22 Jun 2023 20:59:08 +0000 (UTC) X-FDA: 80931598734.12.D55C1F9 Received: from mail-yb1-f177.google.com (mail-yb1-f177.google.com [209.85.219.177]) by imf08.hostedemail.com (Postfix) with ESMTP id 32615160011 for ; Thu, 22 Jun 2023 20:59:06 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=oQo8Ww3r; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf08.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.177 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=1687467546; 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=UurGuuLzED1CKQ5+YtAa+uldlNlkULcrhOlEPtYgkts=; b=M3B/eiKCnJPIi6JIadhUsmjdRe9kcbhFUzHQjYlhXFUPmZoGTtR9XFmzXYX8YujK6tPPEA Df+3W+iePZbWS/UfxDRAOn7kC6TMe5S3KusiujPtq40/TcDjjafxkkpR/L3PFi8I6Ncjnm 7FGhrpAKaunkRKnkMMIow1wfLd07ULM= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=oQo8Ww3r; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf08.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.177 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687467546; a=rsa-sha256; cv=none; b=M5OQmgbyJr7dp5D/RQSc8n21UeDZ9on1nJ/bXkMo+ju4TL537WVSXAWpmE4IdRZsq1BCV1 v3QWmJY7t4kh4ZfUtQMGNSRMmFXByUSV6SIPEp9LPNLZ8mrRZhFBhm8VybgGN1QxtepRiq NekczKJ8XECTJIWqdGRZj6D1MbmelZU= Received: by mail-yb1-f177.google.com with SMTP id 3f1490d57ef6-bfe6ea01ff5so2381185276.3 for ; Thu, 22 Jun 2023 13:59:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687467545; x=1690059545; 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=UurGuuLzED1CKQ5+YtAa+uldlNlkULcrhOlEPtYgkts=; b=oQo8Ww3rkcQ6O4ERZYbbm7gIN+KUZJBSX76Jt+A0yqxzuaw5csFJ7AbMPXoNar1y+V tZQraeqybmf35Qo5xoKl1awKHEBN/Nxr+iHHL+iOhynJPYAD9oID72CJXajJ9Jf7DkVt j26rlavSXJqsTv4JH9m0aLFnC9iK42GCsz7JUCHqTbiCOXGPKTX89JvhbmgJctDtXiKK TITKlfKlRxN76qLZH8F23nvkVHDCJrlE7Pe9NREUl+WlgOK0PObb86E20s865la+XsRl r0ny/7zkkdzJjzv/4f5M4RYeUYdlHDKmxWEXxa021UXcBJ73jIQME8NWHlpzSqT6M39a D91A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687467545; x=1690059545; 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=UurGuuLzED1CKQ5+YtAa+uldlNlkULcrhOlEPtYgkts=; b=Dl1t+c7s+mpxcj3d8+FrzkctJxe7p02pZZ72uQBO+bQtaIfWst/UPwfHduHP+KBCEV vVUPSRM1ElHtuwpBq7KsPezsbbKeDi1VMoxq6xK883agZFs0h26AWmcaldwpoG4RdWOY VV4r5DHeZzq4xUgpR1aZOg5o05rFeN6dnzbzkMNM4CBfb0f4HY+C5zxCKNMTbyPumbvE Y2gcUZPOBjUPY0OxST6QjV0DA766B+IDRqrAssdp1oarATM8FLf6nJEtVocWBIJn9kwA BoLjUMohtbabxrdnxbSBgVUEsy3P497vLVn1RwKGVYqX3zdkW8uUS6jfn2cHZCX0caPi u/cQ== X-Gm-Message-State: AC+VfDyZiQO8sbE2sTCoBUo2NqhJY2C6HXTE4QvhkygAWrGLqTRCna5B HFoT5NgViPUavi4zUqVDrq8= X-Google-Smtp-Source: ACHHUZ5/16pTE8w+KmQXtTEHVbvOJ9pX8CyeEgbjUI2ZBq46DEtB7j98e4dbCDGlFjYL7Uz7mrOclw== X-Received: by 2002:a25:d707:0:b0:bca:9c66:e53b with SMTP id o7-20020a25d707000000b00bca9c66e53bmr16719019ybg.14.1687467545228; Thu, 22 Jun 2023 13:59:05 -0700 (PDT) Received: from unknowna0e70b2ca394.attlocal.net ([2600:1700:2f7d:1800::36]) by smtp.googlemail.com with ESMTPSA id d18-20020a5b0c52000000b00bc501a1b062sm1684937ybr.42.2023.06.22.13.59.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 13:59:04 -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 v5 33/33] mm: Remove pgtable_{pmd, pte}_page_{ctor, dtor}() wrappers Date: Thu, 22 Jun 2023 13:57:45 -0700 Message-Id: <20230622205745.79707-34-vishal.moola@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230622205745.79707-1-vishal.moola@gmail.com> References: <20230622205745.79707-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 32615160011 X-Stat-Signature: kfmijzj36rqzb4id5znm1atti181am6m X-HE-Tag: 1687467545-392230 X-HE-Meta: U2FsdGVkX1/E6LpkY6WeeDmIJgClwhRFZYCwOnAoWA5VxsS77NaER2tCvSMEUawkSbBDtWzHmgfAKduySqUQqfwiH9fLceUuUWTGnIRlJnhmt5TwuSheB/wte5UfOpODjitPdLYEksLslqGo60+u38o8qgU2SLNe4eWXNQ/bINfW9gYdas2j+Vnd0Uz2Pkhkff65mqEHaYeWNb/XYj6GEbaI+JUgJDzTkqeqvdLuDcbYPbftZLpog6OCf2+ACULQNH80PvXW8yTNwLnmN0FyBLNbPzgKps0YzQxXqDGZ9ku8OH6kbV23QJJcH36EfgoRSd4H+beKE6tpvyLKz/DncrH8hWO+GsD7lGlHuwUyF46ZoEIVymopzmJdrpVcZM5hlaW32lCATxYgjln5lH0vtaZoTVLLl4JJC2E8Aug6PMIDkwTeUPZnPuKiwLghqtcKNDg6i/FU27Ww7Iwsgp6TNm20P8lHwBws8V29QMN1TDaUIzkX2s7PtWKBQFwJZQQCcHRQhuLss/k8Dd4rV6Nniipq+AObeUCA9tiBExFEj+a4S2g3D4QLAUWP9c0rFv79yTEg7eQfYasQc1BrkpthS/zAIht/3mk5du+l6DY06+s2/MbngDBxT85B3idtwXdaZVJ4hGVt6V4yw7GGrLqmPtAiY/9kZJ+XsShsOhK0sVHgNJp6RXxkFONceS+QBqX3ci3czdEqXZAErHCnczqu7Pktd1tcQwSKvOQqq06ZCUJj9jzOuqGXyRtXf5jXnGNIAC2CACHrpnfYUehRbKQe9grQSoXLrzRe2PQfx0g2VeyuobMfx3c53+F49A8KCXRDRbKh+te3KBOyfILH8D9croSdjI7piVjqmU/ZwX/BS229ed71ReAOIXweVW6DXBe8Jtqr2jfvo7NwTU0cp4MZPVuBk8yh16Uolxbw7PXcqlyq6gaXmuYE6KBQNRXM8/SEe/DPDzpW7WzV45u1mym XIZP6zSQ xcAQXVeDaIRL9oj8hWFcBueGel2yTEoGui2h+TAU0M8u8VGRzABewXvKd7M+3kgQqLTlxAai1yQjSt09nj8RDa48N2K8kcF4hefprHPu1KJx7Kxm6osgw59bGxfsAhZWwufY8wTevTbZuSTF9L/Y9k2KeUy/4MEiGyE6+8hYngttCNEl/aHrHcRg+H9/1l0DUDp1RJUM9o8iArNwbquClNfxtN0dCprIcf2vHFSU0gapNrXn7immtToGrR91egiSFPF/xIWxoaVfaFSNrQhLZfqIHWt84ZIkZwveUUTRaJERUuvamyeQ+Un+LZQ/vRCHTtxg6g5N/KNrGLx8JmZReuS+NWQvQ7S7yz1dhtwrxpfLIhqht5KeWrPGdEysSAsOwpuGovi//AaSustwR+2DESci9ckLLu/8z1qtdlMZQKY8sCBXKlUdoB0G4DJ6ljjOqMQ+6/7xnqJtZvmLMsHtRvxXjNeahB3WN5d1rXNichfxiknpqKzFEdM+hEvblk1A87f75sIQ4x32Uxtf3NHKNxii/lXIxt14tRfkVskS4tfS3Uag6f1vloHOXbi7X/vzFOGOWGR7EBWujG/dOe5pgB3D3eAGSxaVx1v2nFnT2Dl2SUT7KziQ/eBGTIFsle/rCIkh/8tB1j6Wiuao= 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 0e4d5f6d10e5..dc0f19f35424 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2873,11 +2873,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); @@ -2887,11 +2882,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) { @@ -2993,11 +2983,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); @@ -3007,11 +2992,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