From patchwork Fri Nov 8 04:12:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13867518 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 1B26CD5E127 for ; Fri, 8 Nov 2024 04:13:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 163636B00AE; Thu, 7 Nov 2024 23:13:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 102B48D0002; Thu, 7 Nov 2024 23:13:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EE5718D0001; Thu, 7 Nov 2024 23:13:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id D4D3C6B00AE for ; Thu, 7 Nov 2024 23:13:30 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 51001A0838 for ; Fri, 8 Nov 2024 04:13:30 +0000 (UTC) X-FDA: 82761606732.07.2996AC9 Received: from out30-124.freemail.mail.aliyun.com (out30-124.freemail.mail.aliyun.com [115.124.30.124]) by imf24.hostedemail.com (Postfix) with ESMTP id A985A180002 for ; Fri, 8 Nov 2024 04:13:22 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=BLT+bTHW; spf=pass (imf24.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.124 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731039040; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=GjeDj7oC1iiZ/gkwEo4XJZE2Kubqr3JwCuLq6Y0HOAU=; b=lvG8s9D8o0cFy28PtPxadSIFvRZKnQUoFVqL6CSUd9F/ygViPSg59/zK5ISF5hc7ZZMdAu Cec7a1pmCiRhIz5EQN/4d3FRnN6ZbkzpsetFUiYOfBKt1tjHVFMq6sWa6rmXSg7LwvG4Ki OnNwl+cOaZ7/8vR6ZDfsqNXKxw9oF7o= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=BLT+bTHW; spf=pass (imf24.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.124 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731039040; a=rsa-sha256; cv=none; b=SYVljGNAxNvY1itRC213tOjMqU4UwJif3X2c6B72QhxNHwLSPbc3y7y7erFPBj13936Sxw 5pIL8sNvLDdkAhH200vOsBUndREU/8/KvAN01qKwd6BAqDAh5c0X+GKM8sfOtjNu710Z3s AJe4k3NPG4MaRvKHs8wC37x8qA1xigw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1731039205; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=GjeDj7oC1iiZ/gkwEo4XJZE2Kubqr3JwCuLq6Y0HOAU=; b=BLT+bTHW3cS/tkPHBwAItgUH4HiKzcYqMyXkO2UGmTrI4NkzHvCenBhi0FMSRFY3kuT8WS4tORB+M+EGw6NKS3mI7t15HlziENqLRZvzzMZc23hYMpTHtrakOLXrEYRFzdOhl2GGY1lWExPYb2U5QQHsfTFW1HJ97nGYvf8bGVw= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WIxXGhc_1731039203 cluster:ay36) by smtp.aliyun-inc.com; Fri, 08 Nov 2024 12:13:23 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, wangkefeng.wang@huawei.com, 21cnbao@gmail.com, ryan.roberts@arm.com, ioworker0@gmail.com, da.gomez@samsung.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] mm: factor out the order calculation into a new helper Date: Fri, 8 Nov 2024 12:12:55 +0800 Message-Id: X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: A985A180002 X-Stat-Signature: dfi3fs59inwyrweyqyqbuwqsk1kuqqmy X-Rspam-User: X-HE-Tag: 1731039202-339928 X-HE-Meta: U2FsdGVkX19anpZukiODCTMsPabdAXPZq1qybsG3Wn/w8GssLMVbZBa5OqmvGUsxirF2auUfIJ4JLN1IAbz7Pzx1683Cd6tWchEYpdmzitaI2HJ/fbeSyPtec4pt3szbLMOSZF5zaJseNDVw8iSTFOAdh5iilZscXPvyQJGbV6HjBI3A0pY8Kbbe/8TUSYYd08L/i1f4CjURPOOsLmt9BuJURixGQw9X6PTcPcEVTtZI+SIa7Fjdm6ujIBYUaZeQgNFTmoL0DvLIcdURfDwwTX4YBR7G0R9EoBqlFkK9zYYbRGOgg7SRSdH1tCyrxdoHWnhGMASGNa3Fu32qQG9P9ZbaAI10P70CslcK72dp7pIwULih+K6FUQ+T/Nd2RL0MYAMNYpHedvIVGetjlO3Vwc2AIhhf9Un5lPjiuGjZqh8G3FD8DJYY4POW2LSMS9FjB43Mkaic2zPtJMmwevAh3SboBUl/NjAK0o2xV8219LVpHCBUZESbCaYKKAYDIIwykS7UOpaKD5tP3a1IdD2hwnbLvTEbr7WmlZyV4EnApIczsM1l4Wtaeg8v4IpgTx8j5oILaJEZuMhePXvCW6ynhZw2Uql70/S4q7kmj8Eds4roQ1/2Y3SOvKYdWr+/2pXzo/fhPtLTdDGcHweGAmskYv0GFqvPGnQGyhyTKsBNve7MzqGYaLAQRt9i6zVVjLdsEOH/zR2EI+jstDfsr3hYnN0eQm4G5voAPQ+rqovtzEFK9Q4qTlGXggYJgUt6as8xUN6zdDb2E90s9lGg1cgehOxCNUWlF5+oxUQfWnFTD75Xj6LoHah+5ePPYk67kb6EoJ6shOtL2MQxHQo605u4nbVZO3L549+8ioSvPM/tu+L4np3kaAtKJkxQJUVyuhm2y2dsdyjV8WHnujyYjiW/Vbn2tUusSkC9UDMTgYDAGdirgVCN+O8lGrylzL29fnQ1bR9uYRupUcW0J6CFkNy pOOI00q4 IEqfD65qlFYdghZLCyCLSXoq0CxriDL1jJCw1s8X326n1bglcWFI3h9aew02ubUW3XfpnSpdTzn8CxQAN1Ur1tXouR1G1mL61UsaYEG9Wt1sKzhaa0YCjrCUpPmH7+KvtHaslK/RwNqUXwlz5q4ecCjlJk5S9S4Mj5ZWQ8/6RDfDCuvchsQjrl3u0gcGMNzkV0p9UlL4vO2C1PkpGybEb7UATcpvqe8Kkf09xUw/7yJewy9R83wPdK2qXwjCp3JO1lQ9eIjnnLoBadXmW5hHloUTP/CD6AApdLutH 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: List-Subscribe: List-Unsubscribe: Factor out the order calculation into a new helper, which can be reused by shmem in the following patch. Suggested-by: Matthew Wilcox Signed-off-by: Baolin Wang Reviewed-by: Barry Song Reviewed-by: David Hildenbrand --- include/linux/pagemap.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index bcf0865a38ae..d796c8a33647 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -727,6 +727,16 @@ typedef unsigned int __bitwise fgf_t; #define FGP_WRITEBEGIN (FGP_LOCK | FGP_WRITE | FGP_CREAT | FGP_STABLE) +static inline unsigned int filemap_get_order(size_t size) +{ + unsigned int shift = ilog2(size); + + if (shift <= PAGE_SHIFT) + return 0; + + return shift - PAGE_SHIFT; +} + /** * fgf_set_order - Encode a length in the fgf_t flags. * @size: The suggested size of the folio to create. @@ -740,11 +750,11 @@ typedef unsigned int __bitwise fgf_t; */ static inline fgf_t fgf_set_order(size_t size) { - unsigned int shift = ilog2(size); + unsigned int order = filemap_get_order(size); - if (shift <= PAGE_SHIFT) + if (!order) return 0; - return (__force fgf_t)((shift - PAGE_SHIFT) << 26); + return (__force fgf_t)(order << 26); } void *filemap_get_entry(struct address_space *mapping, pgoff_t index); From patchwork Fri Nov 8 04:12:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13867520 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 67994D5E129 for ; Fri, 8 Nov 2024 04:13:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5F6B06B00B1; Thu, 7 Nov 2024 23:13:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4FACB6B00B4; Thu, 7 Nov 2024 23:13:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 34C928D0001; Thu, 7 Nov 2024 23:13:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id F3E226B00B1 for ; Thu, 7 Nov 2024 23:13:30 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id B63101A01C9 for ; Fri, 8 Nov 2024 04:13:30 +0000 (UTC) X-FDA: 82761607824.18.ABA6DCC Received: from out30-99.freemail.mail.aliyun.com (out30-99.freemail.mail.aliyun.com [115.124.30.99]) by imf06.hostedemail.com (Postfix) with ESMTP id D272D18000B for ; Fri, 8 Nov 2024 04:13:02 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b="waC//g2Z"; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf06.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.99 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731039038; a=rsa-sha256; cv=none; b=pNzCjmyyzhl1JXOfDuPbt7qG1epADdFzadhSJQYqVBVVHyF0OM7skk0KbrykieRgNtjbME fuk4f/qz4FzXaXsn/bKsouPsVhJc9pFH2M9qQLIB25QeGONEyYxIzKeyaQ+jMzrkGBpnXI xb1NDumdiXdfVXxqLXSHi5O5/gNTFzA= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b="waC//g2Z"; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf06.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.99 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731039038; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=OAXkgfSC/TSIsttX/eS9fvBNEIFaQACVaW/jTgI39Ao=; b=UMll/v3Ia/phGtXWjcIAVwmc3M+tQ+O0Mtx6gO85T8CeaosBkRQX8RxGnHNewMH36gf81e dwCni+qScgIX6ltg/CU30PrIjYmHaIjTEqr7vGVIjwNOCrLHlYBf1EkBPUOCP/x/Sfhj7g MK0fAjPpWApTkUWWCRvhPHyrvd0YKac= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1731039205; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=OAXkgfSC/TSIsttX/eS9fvBNEIFaQACVaW/jTgI39Ao=; b=waC//g2Z7LcVw7cSIEOwv9vL/4wGocXTrav2+04qF0sz9jy4YcTE6ww31ZSxJEheK2QsKE0r4d1jjuvI3TozIMBeiaubhOtO7585yR4gP/4fCvwSMrT/83NZB/YWWjWvGiL+Ke268xrYdcuiVrys1Gi+xH6RFoEYqzomlpRumkc= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WIxZtPU_1731039204 cluster:ay36) by smtp.aliyun-inc.com; Fri, 08 Nov 2024 12:13:24 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, wangkefeng.wang@huawei.com, 21cnbao@gmail.com, ryan.roberts@arm.com, ioworker0@gmail.com, da.gomez@samsung.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/4] mm: shmem: change shmem_huge_global_enabled() to return huge order bitmap Date: Fri, 8 Nov 2024 12:12:56 +0800 Message-Id: X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Stat-Signature: mnrhfurr35tq5ejzogfpfw4cuibso4g4 X-Rspamd-Queue-Id: D272D18000B X-Rspamd-Server: rspam08 X-Rspam-User: X-HE-Tag: 1731039182-345316 X-HE-Meta: U2FsdGVkX1+GMVrvkoTPTMGVbPKg/ogyo+CEdi+QKSzVq2QAqNRiHwjmhkxrGxzYtuHxOCLmhMXsB6YIQmCjaUML6pIkDiPj2aMvo74K+5r+QrOimAIhf9wNjcxeqSbc5enONu9WQl7LeqHXZwqC2puUWHqjMsWro1ZPsBsa1J/c5gcUznoiweYd1zLFSJAUnFp4+TJu9ITdsS6G4/u10YhOMsL9QUrLPjyRptYsLvhGNqLWun7y1U31H/jJmYR3QT4c31hSCDoH8PDPesaxs9MRGeLuA6GOlpAj9VrplXhPXWYzQAVCCKBAIQRDxfrcUsEr+tLpM556At6DI9twcmTgc1jWgUq8rkhzyfHeSa3v/Q63jV8U7ZcfFHtahHdWtNqEOf6bdQwJeWNSflJapWQxCTR7MPZJqku3ntyu5nSkWKdy04CkuDRcOoXae0Am1scVeftsXnQkNSUTtHs9YhCXNoICf/qXyi3KLZRClhYQJFpAze9Sptu+OTduRMkWJxgahf/35khVUFkK4DXJjHuMCsJiTX2b6jLho8XLGMpwDMoepjh54PBhrDGG1sXW7v3pjBctKPrMf8/POG5CE5Fh3RrNsEl4pvWgbw462/vpx14LA5T26WajPr+99lw75fNDfWKpwHD23E2yOBIr8fP6kcjFm0CwxksSR0ijmmIfV9uU6qShuQ7HH5AnlThFIT8jD8QJ82wXbPNRYaPdd6vu12JRyrXRlVdhNxzj0KNGJiAupInWESGVF3EAW6koU++sBRqVYp3BLRfiF96tGtREIPpdQ6h8Dx6siQ0wAaPD1YWNn7zQkPViGnpFEIeGaw1+HkjwBRMFHnJaDvO+zaeIKXcXJZ2Jhs4WfG/sMGIzcY5mIzhVUKgRI5cTmGvRQA0Q5ICfXFG9nJxoQJxfG/HpRTipgr2ioPhY6jxJYN0f8pxSv6+ULTrYPWu6Ud57h96Kz9RMJBQPEiBwFZJ TxrAwPJH Z3a2xk3MKgYdfwaLmbeCo1wK1gQY82tnPEwVOQdZdjdA/P2aOKmymLtwqqCRAJJ6mtgTkBC0+DnmFLiB9ceJJljDCaJWY1duZ69zV9S23C1YCWFuR7+HML2EOE/1v28psIytAG16rGQdY4FffG+kMOTn5ad65/gPrSTv3m3Ob/xkPd5oqk9U8WNjYti5mJ+mllqd0gBX9peW5qp9OKDGW2QKZoWrViAiKNgzneaGq0Xj7gO2NohXRG4/wSHUDUorWIzNLxpUgYzJQo0Qn4KXEaJdwVA== 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: List-Subscribe: List-Unsubscribe: Change the shmem_huge_global_enabled() to return the suitable huge order bitmap, and return 0 if huge pages are not allowed. This is a preparation for supporting various huge orders allocation of tmpfs in the following patches. No functional changes. Signed-off-by: Baolin Wang --- mm/shmem.c | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 579e58cb3262..361da46c4bd5 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -549,37 +549,37 @@ static bool shmem_confirm_swap(struct address_space *mapping, static int shmem_huge __read_mostly = SHMEM_HUGE_NEVER; -static bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, - loff_t write_end, bool shmem_huge_force, - unsigned long vm_flags) +static unsigned int shmem_huge_global_enabled(struct inode *inode, pgoff_t index, + loff_t write_end, bool shmem_huge_force, + unsigned long vm_flags) { loff_t i_size; if (HPAGE_PMD_ORDER > MAX_PAGECACHE_ORDER) - return false; + return 0; if (!S_ISREG(inode->i_mode)) - return false; + return 0; if (shmem_huge == SHMEM_HUGE_DENY) - return false; + return 0; if (shmem_huge_force || shmem_huge == SHMEM_HUGE_FORCE) - return true; + return BIT(HPAGE_PMD_ORDER); switch (SHMEM_SB(inode->i_sb)->huge) { case SHMEM_HUGE_ALWAYS: - return true; + return BIT(HPAGE_PMD_ORDER); case SHMEM_HUGE_WITHIN_SIZE: index = round_up(index + 1, HPAGE_PMD_NR); i_size = max(write_end, i_size_read(inode)); i_size = round_up(i_size, PAGE_SIZE); if (i_size >> PAGE_SHIFT >= index) - return true; + return BIT(HPAGE_PMD_ORDER); fallthrough; case SHMEM_HUGE_ADVISE: if (vm_flags & VM_HUGEPAGE) - return true; + return BIT(HPAGE_PMD_ORDER); fallthrough; default: - return false; + return 0; } } @@ -774,11 +774,11 @@ static unsigned long shmem_unused_huge_shrink(struct shmem_sb_info *sbinfo, return 0; } -static bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, - loff_t write_end, bool shmem_huge_force, - unsigned long vm_flags) +static unsigned int shmem_huge_global_enabled(struct inode *inode, pgoff_t index, + loff_t write_end, bool shmem_huge_force, + unsigned long vm_flags) { - return false; + return 0; } #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ @@ -1173,8 +1173,11 @@ static int shmem_getattr(struct mnt_idmap *idmap, generic_fillattr(idmap, request_mask, inode, stat); inode_unlock_shared(inode); - if (shmem_huge_global_enabled(inode, 0, 0, false, 0)) +#ifdef CONFIG_TRANSPARENT_HUGEPAGE + if (shmem_huge_global_enabled(inode, 0, 0, false, 0) == + BIT(HPAGE_PMD_ORDER)) stat->blksize = HPAGE_PMD_SIZE; +#endif if (request_mask & STATX_BTIME) { stat->result_mask |= STATX_BTIME; @@ -1682,21 +1685,21 @@ unsigned long shmem_allowable_huge_orders(struct inode *inode, unsigned long mask = READ_ONCE(huge_shmem_orders_always); unsigned long within_size_orders = READ_ONCE(huge_shmem_orders_within_size); unsigned long vm_flags = vma ? vma->vm_flags : 0; - bool global_huge; + unsigned int global_orders; loff_t i_size; int order; if (thp_disabled_by_hw() || (vma && vma_thp_disabled(vma, vm_flags))) return 0; - global_huge = shmem_huge_global_enabled(inode, index, write_end, - shmem_huge_force, vm_flags); + global_orders = shmem_huge_global_enabled(inode, index, write_end, + shmem_huge_force, vm_flags); if (!vma || !vma_is_anon_shmem(vma)) { /* * For tmpfs, we now only support PMD sized THP if huge page * is enabled, otherwise fallback to order 0. */ - return global_huge ? BIT(HPAGE_PMD_ORDER) : 0; + return global_orders; } /* @@ -1729,7 +1732,7 @@ unsigned long shmem_allowable_huge_orders(struct inode *inode, if (vm_flags & VM_HUGEPAGE) mask |= READ_ONCE(huge_shmem_orders_madvise); - if (global_huge) + if (global_orders > 0) mask |= READ_ONCE(huge_shmem_orders_inherit); return THP_ORDERS_ALL_FILE_DEFAULT & mask; From patchwork Fri Nov 8 04:12:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13867521 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 217C0D5E124 for ; Fri, 8 Nov 2024 04:13:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E3598D0001; Thu, 7 Nov 2024 23:13:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 793FC6B00B6; Thu, 7 Nov 2024 23:13:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 682EC8D0001; Thu, 7 Nov 2024 23:13:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 45CF46B00B4 for ; Thu, 7 Nov 2024 23:13:32 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 023CB808A0 for ; Fri, 8 Nov 2024 04:13:31 +0000 (UTC) X-FDA: 82761606816.13.E37B460 Received: from out30-97.freemail.mail.aliyun.com (out30-97.freemail.mail.aliyun.com [115.124.30.97]) by imf17.hostedemail.com (Postfix) with ESMTP id ED51540007 for ; Fri, 8 Nov 2024 04:13:01 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b="RQhA4ZW/"; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf17.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.97 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731039040; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=kKtwOTm/io/miazqQHXaa70Oq2bCu/U2TTLxQP5qiDM=; b=6Buq9nFdYkxkFkhIMVthwROW7FNrh1rpf35qU7U5kRSXphZAjX6F6Yg4iZu67KloyWLdek STv9KGXpjF24UmsEfX8t4qMEA7Aa5P5gLFf7kwhNLEqSKv12Xq2xZ433JslcqQrK9gylmG vCeGTxR4kVpLda2cNSFNl9PwIxNHf9M= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b="RQhA4ZW/"; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf17.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.97 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731039040; a=rsa-sha256; cv=none; b=pdypK5dkJ0eetCPtGozl0+UnxiDBZC/U8VtY3PFcvozp0nM+/V9MoL9YVHELJQRdAe2xwd XaT3EufvpaAUvurZesCzevYmR3Ano3lzSgSiElzy3axVPgHIbfyUVoQQzbmsOJHIjKMxqO wqtGHohFHXr01ijWm9xDFqzvOVhapBI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1731039207; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=kKtwOTm/io/miazqQHXaa70Oq2bCu/U2TTLxQP5qiDM=; b=RQhA4ZW/CqyHM20Pm0dsvDGk0WoRKfNOoFL30lfD0TMTlqZdur4/MxZqrycQn/ONM0/HvX/t94CKxjaOGodXbQlQYTOvGzIsBoWlbGu/EkU2vchNY9rPjJ2vDLjoREEJt58sZcY1mhYppwSctG0q5icNhD/JfjkkGGKy5YNUM38= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WIxRHWc_1731039205 cluster:ay36) by smtp.aliyun-inc.com; Fri, 08 Nov 2024 12:13:25 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, wangkefeng.wang@huawei.com, 21cnbao@gmail.com, ryan.roberts@arm.com, ioworker0@gmail.com, da.gomez@samsung.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] mm: shmem: add large folio support for tmpfs Date: Fri, 8 Nov 2024 12:12:57 +0800 Message-Id: X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: ED51540007 X-Stat-Signature: fsrr68qi5i9baupgzmw6pgunnskreih4 X-Rspam-User: X-HE-Tag: 1731039181-966583 X-HE-Meta: U2FsdGVkX19gVP7AMeuFBOsbXUbYIStW1VGZUgLS7Ukgbw/eEI0X/SyXGroZVE9PsfJG/R5Xt2wSmyF7zFm/V7WMymc3AWTcXgB3kwQuAQnFwnTArMp2GT1dw1L6Fem/CPsl+4lDUeRWLdq2VIWuCuY2z/hiWhz2VfyyVUwb2d0v0WYrLMcpHBn2Px8afJGAY+vY5M9YnbybL2Irx+FtSKFsB7VWtZta+O8YEppeirBCuj4oeHIYLdwd4uRXT2WnImdVphR0Zx28XV0hJ/ZTEEwSvM+T2bD58v5JE3gaNJRbW1umhnjYdpGr/jbCylABqxOqScIcIGCI/EeiIAVsDy6kDRRx1K39BeglkNnzkYnRXUFfBmeOnfIHCEQqLrDLlr0tYMVcRq/ZX2bPFp4DVumndHXtCbCLsHOnfOSjl+11mbOm7iGv70/b6BBN8gp/KTq/I0gn7vBQnvBRPrCXeaQnATbUo78gfIXv86TSoahDLwVpqt/I+iihwQ2gx1nY7MZ1e2KUAcov0S2vDN6HmYt1DryEMiim0jYGv3MabEmpccOhmywSJ4lWNan4ufEBZFtFQQbc/DB1BEZMzTj1GtKu/aCfIuAUJBHMy/LcZMoOVgnUbruWCMx4N36zEVbLU3iBFDaoI9W+NNFKVEoN0k/S83SkZD760pPZP2jt9yMp1rfrA+VRYo/uWIg3QSsT02FfHxBvEb2LolRL1CQImc8/4ql/CZNBPY0Px4+DOishDiPmDHg+W1hng4JjYaUNkVmL1QWobi07RiS9fOqAZEY7eD6qySJeC960JrGlkFr/5topFXGxrEKbUdqZlA9GmvM22y9sa62aReym8IH8QbBKTi2sR2AOJ4AiRtKiJUB1Be7l0fNdHrYAqh1KQiylIheU8b6sgANuJJnWzAIyVmcNezN+Fl+ZGnrc6MNjb/8zJA7GMe1F0V9aXTPAirkgVrbyOFp+lOctg747/NK kFajNOz0 JKV4dN8rdCJ4ZYFIVPxU5v9WTsdzHtdATOyDQx45hJutVK7J7EtdeQmsINqyc8mMFXikAswo9q8qVlbFwJGxXeC1HEMG8dkfhubEtau6yUYyNbZogMAyfTeHE8AGnKoKx8ISM5erDWNOc9HJJG8T/XkjseOZmA1P5I1ZC7iDCso1DrW89uiM8xi740/VZkLI9veEh9RoGC0ZlQBeWpI/ymclSZXjdqwDGrxSWOoW5lYuc2vpp7c/OWyW5pETaITNs9omt 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: List-Subscribe: List-Unsubscribe: Add large folio support for tmpfs write and fallocate paths matching the same high order preference mechanism used in the iomap buffered IO path as used in __filemap_get_folio(). Add shmem_mapping_size_orders() to get a hint for the orders of the folio based on the file size which takes care of the mapping requirements. Traditionally, tmpfs only supported PMD-sized huge folios. However nowadays with other file systems supporting any sized large folios, and extending anonymous to support mTHP, we should not restrict tmpfs to allocating only PMD-sized huge folios, making it more special. Instead, we should allow tmpfs can allocate any sized large folios. Considering that tmpfs already has the 'huge=' option to control the huge folios allocation, we can extend the 'huge=' option to allow any sized huge folios. The semantics of the 'huge=' mount option are: huge=never: no any sized huge folios huge=always: any sized huge folios huge=within_size: like 'always' but respect the i_size huge=advise: like 'always' if requested with fadvise()/madvise() Note: for tmpfs mmap() faults, due to the lack of a write size hint, still allocate the PMD-sized huge folios if huge=always/within_size/advise is set. Moreover, the 'deny' and 'force' testing options controlled by '/sys/kernel/mm/transparent_hugepage/shmem_enabled', still retain the same semantics. The 'deny' can disable any sized large folios for tmpfs, while the 'force' can enable PMD sized large folios for tmpfs. Co-developed-by: Daniel Gomez Signed-off-by: Daniel Gomez Signed-off-by: Baolin Wang --- mm/shmem.c | 91 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 77 insertions(+), 14 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 361da46c4bd5..98503a93a404 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -549,10 +549,50 @@ static bool shmem_confirm_swap(struct address_space *mapping, static int shmem_huge __read_mostly = SHMEM_HUGE_NEVER; +/** + * shmem_mapping_size_orders - Get allowable folio orders for the given file size. + * @mapping: Target address_space. + * @index: The page index. + * @size: The suggested size of the folio to create. + * + * This returns a high order for folios (when supported) based on the file size + * which the mapping currently allows at the given index. The index is relevant + * due to alignment considerations the mapping might have. The returned order + * may be less than the size passed. + * + * Return: The orders. + */ +static inline unsigned int +shmem_mapping_size_orders(struct address_space *mapping, pgoff_t index, loff_t write_end) +{ + unsigned int order; + size_t size; + + if (!mapping_large_folio_support(mapping) || !write_end) + return 0; + + /* Calculate the write size based on the write_end */ + size = write_end - (index << PAGE_SHIFT); + order = filemap_get_order(size); + if (!order) + return 0; + + /* If we're not aligned, allocate a smaller folio */ + if (index & ((1UL << order) - 1)) + order = __ffs(index); + + order = min_t(size_t, order, MAX_PAGECACHE_ORDER); + return order > 0 ? BIT(order + 1) - 1 : 0; +} + static unsigned int shmem_huge_global_enabled(struct inode *inode, pgoff_t index, loff_t write_end, bool shmem_huge_force, + struct vm_area_struct *vma, unsigned long vm_flags) { + unsigned long within_size_orders; + unsigned int order; + pgoff_t aligned_index; loff_t i_size; if (HPAGE_PMD_ORDER > MAX_PAGECACHE_ORDER) @@ -564,15 +604,41 @@ static unsigned int shmem_huge_global_enabled(struct inode *inode, pgoff_t index if (shmem_huge_force || shmem_huge == SHMEM_HUGE_FORCE) return BIT(HPAGE_PMD_ORDER); + /* + * The huge order allocation for anon shmem is controlled through + * the mTHP interface, so we still use PMD-sized huge order to + * check whether global control is enabled. + * + * For tmpfs mmap()'s huge order, we still use PMD-sized order to + * allocate huge pages due to lack of a write size hint. + * + * Otherwise, tmpfs will allow getting a highest order hint based on + * the size of write and fallocate paths, then will try each allowable + * huge orders. + */ switch (SHMEM_SB(inode->i_sb)->huge) { case SHMEM_HUGE_ALWAYS: - return BIT(HPAGE_PMD_ORDER); - case SHMEM_HUGE_WITHIN_SIZE: - index = round_up(index + 1, HPAGE_PMD_NR); - i_size = max(write_end, i_size_read(inode)); - i_size = round_up(i_size, PAGE_SIZE); - if (i_size >> PAGE_SHIFT >= index) + if (vma) return BIT(HPAGE_PMD_ORDER); + + return shmem_mapping_size_orders(inode->i_mapping, index, write_end); + case SHMEM_HUGE_WITHIN_SIZE: + if (vma) + within_size_orders = BIT(HPAGE_PMD_ORDER); + else + within_size_orders = shmem_mapping_size_orders(inode->i_mapping, + index, write_end); + + order = highest_order(within_size_orders); + while (within_size_orders) { + aligned_index = round_up(index + 1, 1 << order); + i_size = max(write_end, i_size_read(inode)); + i_size = round_up(i_size, PAGE_SIZE); + if (i_size >> PAGE_SHIFT >= aligned_index) + return within_size_orders; + + order = next_order(&within_size_orders, order); + } fallthrough; case SHMEM_HUGE_ADVISE: if (vm_flags & VM_HUGEPAGE) @@ -776,6 +842,7 @@ static unsigned long shmem_unused_huge_shrink(struct shmem_sb_info *sbinfo, static unsigned int shmem_huge_global_enabled(struct inode *inode, pgoff_t index, loff_t write_end, bool shmem_huge_force, + struct vm_area_struct *vma, unsigned long vm_flags) { return 0; @@ -1174,7 +1241,7 @@ static int shmem_getattr(struct mnt_idmap *idmap, inode_unlock_shared(inode); #ifdef CONFIG_TRANSPARENT_HUGEPAGE - if (shmem_huge_global_enabled(inode, 0, 0, false, 0) == + if (shmem_huge_global_enabled(inode, 0, 0, false, NULL, 0) == BIT(HPAGE_PMD_ORDER)) stat->blksize = HPAGE_PMD_SIZE; #endif @@ -1693,14 +1760,10 @@ unsigned long shmem_allowable_huge_orders(struct inode *inode, return 0; global_orders = shmem_huge_global_enabled(inode, index, write_end, - shmem_huge_force, vm_flags); - if (!vma || !vma_is_anon_shmem(vma)) { - /* - * For tmpfs, we now only support PMD sized THP if huge page - * is enabled, otherwise fallback to order 0. - */ + shmem_huge_force, vma, vm_flags); + /* Tmpfs huge pages allocation? */ + if (!vma || !vma_is_anon_shmem(vma)) return global_orders; - } /* * Following the 'deny' semantics of the top level, force the huge From patchwork Fri Nov 8 04:12:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13867522 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 92BD3D5E127 for ; Fri, 8 Nov 2024 04:13:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B8CCB6B00B4; Thu, 7 Nov 2024 23:13:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B3F296B00B6; Thu, 7 Nov 2024 23:13:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9E2A28E0001; Thu, 7 Nov 2024 23:13:32 -0500 (EST) 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 80E5D8D0002 for ; Thu, 7 Nov 2024 23:13:32 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 4395BC08A7 for ; Fri, 8 Nov 2024 04:13:32 +0000 (UTC) X-FDA: 82761608244.02.6B76531 Received: from out30-131.freemail.mail.aliyun.com (out30-131.freemail.mail.aliyun.com [115.124.30.131]) by imf24.hostedemail.com (Postfix) with ESMTP id 1952918000A for ; Fri, 8 Nov 2024 04:13:24 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b="eTTbWeE/"; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf24.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.131 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731039150; a=rsa-sha256; cv=none; b=v3jCBQPy8CsOzobHtSq2QJFK79ov9QiBUCdx2401UXmOmWa+/mf7Fa2y7YexPwQboiB0lq tHE2o/V+bR2KmjmM4PhZk6GM/uBPastdrZq6D8O7kgPtF/SxKhfzf7MRMPc+AO2KiBTjn2 FGRqNcFAJl8aGIWRBNBZ1opkpMaaYHg= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b="eTTbWeE/"; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf24.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.131 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731039150; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ZMgQiGlmb/wE6nW4qxF+A3bZ7Id2I6Bajbakd8brhAI=; b=gPNbWz7xdtT2bJHQlo7ZGDBPeoA+flbe18bKHRc9Uk94844oWKyx/Xtut7gYGylu0qzOVW nzUY5EorMW9KdpaXNJQQUAFkXXkYoAkD/9iEnS70P8TlwpIUepXJp9DARx7D43dnjQmxJb XFR8K/FJxd9wvP5yWwCZSHXGXlzXgKc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1731039207; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=ZMgQiGlmb/wE6nW4qxF+A3bZ7Id2I6Bajbakd8brhAI=; b=eTTbWeE/Og09/TA5S1rB7dBdBCU8WCHWnJgeMsyEiV4k+RFFVSwYTwyejBpJ70cJQ1Q3LOX78MhoEOeZ4wEJCB1+F8NmYFeMEE4CB+mesUshR2iyAH7XJSF2BMebPQu07KiRSMof+kK4qbbT9lqltS5yvOw6tNpZP7xsLfeJFD4= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WIxRHWz_1731039206 cluster:ay36) by smtp.aliyun-inc.com; Fri, 08 Nov 2024 12:13:26 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, wangkefeng.wang@huawei.com, 21cnbao@gmail.com, ryan.roberts@arm.com, ioworker0@gmail.com, da.gomez@samsung.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] docs: tmpfs: update the huge folios policy for tmpfs and shmem Date: Fri, 8 Nov 2024 12:12:58 +0800 Message-Id: X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 1952918000A X-Rspamd-Server: rspam11 X-Stat-Signature: ijoyq1ccy9gxcoxop7jw1haszrkgjq8a X-HE-Tag: 1731039204-873785 X-HE-Meta: U2FsdGVkX19DT4R4EyJ75pxXvFDC8ZOAXz+p7ZkKBzwLz2/629Q7TyYhgfLoi7Y7w2A9xOdtgBhuTXRBsEsnEldk+Aqav3vysaE6hYRI7TIeDUWVINE1JPM7G3W5f+eXYViT4H/tDsJN1KuaTgv7gY3UVXD/hnNx4GwDnFsQMOYI9Mugj3fz3M1jmgvwEtG7lrhIM9r09oviGggeooCLgSxExl6cAjRuYD3MCGFu2P5hOOXU8nd5robJbiYdHLnV4iWKlJ14yIAyKqp3WWlznqBhmIYB7MSi1F/sOFX5/ouzsI2LAkrJDwNBTCt8czxM56LcjEkphxROxP2LInePGN05KZCcTVBBRg3kD9pTt3DIO7wrn70LzXY+vD3DnKPK1OPIr+ACRAHy+atrOlQsOWfyX5rEpyEI2YFLqOZfrstZD5OGPWXaOdX5ZBBTLUTvpxE0zoXUjMPSmPvNTCLp2yYAJ/BZAtFeXrSAabZBHS2v1Yh5hQMGFqxogi5MJfFK1r2EKbZs3M7dp5suqua5DOW/QT3gSM92nk1K4Z8V5viHjRBuFO4HDcuOhl/sfxAvQySd+J69baTtcp2oR/twEMleBfoMrgiRr+eazcFbGKO3hVl1wRmJjzO84VylMSKvpQEvm94BkkQOM3nAHnh/U0GS96rMpno/fQdL21Y6NKnlq37GRgctaU8ukUbQLpnjOzCH6kObvFqCZNBYEcPAAaO7rguek/SSmFdKBuni44PMbCVY7nGFWeeeP8INNo+WB6UmhldTq6ePT2Qq184Ebszfo6lN7lEy/T+2BJ6IqMDNbKSqy0QWl5g17UsPaT8zEG/2MJdeh8bvkmTjLwkY1ZuarjcVXTAzJ4f2uTqpbKCYFYE2VbC4oZ4l6F/IRADoUdqQdsrGRlPKb8QFlGupWiv3hrF5nTP/1+cQHjgnwFSrD0uf0oM+wcfwyOYdNfKI1GGEhjo9ano8omRxWjW Kl8qzzYB 9yAbG9XsKI2/khQTF0/P34e4wcPGDHcjRGeP5jPNWwgR4vI3kQ8zjoNlhvwO0Fm/UtshmWogWqDnSPqNmTF6yq7MDz+DRvYu26eBr4HokGMTkQ6O6ZGrm+oTH7Xgo1Rqhe3b5B43edZ08VPrT8s2ZkoBNRpzfi6P5QyqVBRq0lWhXvNT6pn+oUGuHAgqI6x9KtsJD1DLQ/Ia5WFncHFhJoB+Txo1aD1z7T7gcVe5eoMvujdoT5KsMGSglGBFv62tDucHW 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: List-Subscribe: List-Unsubscribe: From: David Hildenbrand Update the huge folios policy for tmpfs and shmem. Signed-off-by: David Hildenbrand Signed-off-by: Baolin Wang --- Documentation/admin-guide/mm/transhuge.rst | 52 +++++++++++++++------- 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/Documentation/admin-guide/mm/transhuge.rst b/Documentation/admin-guide/mm/transhuge.rst index 5034915f4e8e..2a7705bf622d 100644 --- a/Documentation/admin-guide/mm/transhuge.rst +++ b/Documentation/admin-guide/mm/transhuge.rst @@ -352,8 +352,21 @@ default to ``never``. Hugepages in tmpfs/shmem ======================== -You can control hugepage allocation policy in tmpfs with mount option -``huge=``. It can have following values: +Traditionally, tmpfs only supported a single huge page size ("PMD"). Today, +it also supports smaller sizes just like anonymous memory, often referred +to as "multi-size THP" (mTHP). Huge pages of any size are commonly +represented in the kernel as "large folios". + +While there is fine control over the huge page sizes to use for the internal +shmem mount (see below), ordinary tmpfs mounts will make use of all available +huge page sizes without any control over the exact sizes, behaving more like +other file systems. + +tmpfs mounts +------------ + +The THP allocation policy for tmpfs mounts can be adjusted using the mount +option: ``huge=``. It can have following values: always Attempt to allocate huge pages every time we need a new page; @@ -374,13 +387,9 @@ The default policy is ``never``. ``huge=never`` will not attempt to break up huge pages at all, just stop more from being allocated. -There's also sysfs knob to control hugepage allocation policy for internal -shmem mount: /sys/kernel/mm/transparent_hugepage/shmem_enabled. The mount -is used for SysV SHM, memfds, shared anonymous mmaps (of /dev/zero or -MAP_ANONYMOUS), GPU drivers' DRM objects, Ashmem. - -In addition to policies listed above, shmem_enabled allows two further -values: +In addition to policies listed above, the sysfs knob +/sys/kernel/mm/transparent_hugepage/shmem_enabled will affect the +allocation policy of tmpfs mounts, when set to the following values: deny For use in emergencies, to force the huge option off from @@ -388,13 +397,24 @@ deny force Force the huge option on for all - very useful for testing; -Shmem can also use "multi-size THP" (mTHP) by adding a new sysfs knob to -control mTHP allocation: -'/sys/kernel/mm/transparent_hugepage/hugepages-kB/shmem_enabled', -and its value for each mTHP is essentially consistent with the global -setting. An 'inherit' option is added to ensure compatibility with these -global settings. Conversely, the options 'force' and 'deny' are dropped, -which are rather testing artifacts from the old ages. +shmem / internal tmpfs +---------------------- +The mount internal tmpfs mount is used for SysV SHM, memfds, shared anonymous +mmaps (of /dev/zero or MAP_ANONYMOUS), GPU drivers' DRM objects, Ashmem. + +To control the THP allocation policy for this internal tmpfs mount, the +sysfs knob /sys/kernel/mm/transparent_hugepage/shmem_enabled and the knobs +per THP size in +'/sys/kernel/mm/transparent_hugepage/hugepages-kB/shmem_enabled' +can be used. + +The global knob has the same semantics as the ``huge=`` mount options +for tmpfs mounts, except that the different huge page sizes can be controlled +individually, and will only use the setting of the global knob when the +per-size knob is set to 'inherit'. + +The options 'force' and 'deny' are dropped for the individual sizes, which +are rather testing artifacts from the old ages. always Attempt to allocate huge pages every time we need a new page;