From patchwork Tue Nov 12 07:45:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13871828 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 C4BCDD41D65 for ; Tue, 12 Nov 2024 07:46:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 25A3E6B00E3; Tue, 12 Nov 2024 02:46:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 207926B00E8; Tue, 12 Nov 2024 02:46:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F27126B00E7; Tue, 12 Nov 2024 02:46:03 -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 BF4546B00E8 for ; Tue, 12 Nov 2024 02:46:03 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 56E95A1937 for ; Tue, 12 Nov 2024 07:46:03 +0000 (UTC) X-FDA: 82776658650.11.A342084 Received: from out30-100.freemail.mail.aliyun.com (out30-100.freemail.mail.aliyun.com [115.124.30.100]) by imf20.hostedemail.com (Postfix) with ESMTP id AECD61C0011 for ; Tue, 12 Nov 2024 07:45:09 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=tovnE0l6; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf20.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.100 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=1731397386; 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=BLfs2hBKLS+Nhpnosu4xyvw0VZRH7d3h79ZeLMJQj1Q=; b=LD+FWkRSoTEh4MsFLO+JqgWmgUVnI350M7/QNGkGvq0S9x5EBEIgON3Cn7IUvdRuhSdd01 3DmxtphzKOiCm8pNyFitdu8UffxH2vO1Hftr+qfWhoUK7Sujt/CqtIXmbVA/8sE9eZG0sQ HCwhrnMsbrhewcMAIRr6QkwGOVkG8cI= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=tovnE0l6; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf20.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.100 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731397386; a=rsa-sha256; cv=none; b=06pADj/H3phkn2Z2rIqX2dtjy/xDduAHxe5VA5Z/NYM8U3tfkbz96cTpTaFs3sLkDYpz7r ThpFYDHqoJ1TkdxsER6aEtlhIIJ+UwS1UxMvLNkxJKuNeAm8biDbrK6UQ0v35TS+H6Dv+G vp/hlOuMb+JTYzSuKlRJC7kigcxtXjk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1731397558; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=BLfs2hBKLS+Nhpnosu4xyvw0VZRH7d3h79ZeLMJQj1Q=; b=tovnE0l6p0cGG5l1vkBzQAW6gPJrlwozDrE92Ptbk1GKynUMvg/okpHO2sncEkpRaS5BufPw29va7AQ76Ve2wmIBAalz0b+DSJbHg7pn5OBSpDB0sRnIGSKyJATXRbfjS6svf5HOPb1Gg0Rmh6rzHmefQWV4heX9g+UZ8Jos6o4= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WJG9pLm_1731397557 cluster:ay36) by smtp.aliyun-inc.com; Tue, 12 Nov 2024 15:45:58 +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 v2 3/5] mm: shmem: add large folio support for tmpfs Date: Tue, 12 Nov 2024 15:45:50 +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: AECD61C0011 X-Stat-Signature: wb6p1bxwa3qj58dpdc3wseeeqr6mrh8d X-Rspam-User: X-HE-Tag: 1731397509-269176 X-HE-Meta: U2FsdGVkX1+JdZi1BPP86troi1fF2wIBXxWLJzbLcsKM8Ny6EIUXSLs4GWlrQFCyLUJLvWhlyh5kJtpPHz97+nhCLjNkR7PBxJ06O/Q+YdEB1wcPoVvbrRUXd5ek4cw6C5lAYSADeQ93fY3BYnGrOVJz1t7qcNBmlD6z/rXugRD4MJzwFLsH+wp107jW0rv1ND6YDIUxUaYTvQ5dCP/XnZNpx144EVTIV6vbmlrxwoy0mEY8K+Fb4+MPjP2tK00MUyklFMtNIuc3yVSmS+25syQAQ79Ech7CxSJvdR+a4ux0q1rcGsjUbXIL2sRt3dKKpj3tLUhMKEyvzc7hulc01TWkgfk4SmYiw1q7g4vJQ7mfegDjP8hpcL8MBuhHB2R2hAeJsi05b3cqV9F0wNnjDbLatLF5g4YdrjGP9aGkh8lVRhhJh/fv3GCB4KYSbt4Au4qji08nRJj3owSzQEsGV9xFSyLSjQqKP5QUWprunBLc6GrBM5qW7mc+Nf+PDLHL4IwhEY1T1rRtKOb6rv67OoJKWCKIPKoengvOcZ/q2kHApQXZ8llSDC8h6VBsOeNyYYV3UibZsd/kk91IB0Jd4vu3fKOU5Zm6hvQLSgyzfssjDOgjfQITzo0vtP0GVWXwXJ9wWQpXnTBElbtcYH48tdHxCwK59r56DFpo7Y2sQ4A+zdfwO4iWNojlA6EFyL+un9jZWWuoOw6jzSiLmGNWFvd4JM7qFJtVj3iRqkIh2kL1Lyj4XmyyOWsGpSDZcbngVF6XozbC8VL4j+H3eaP++5O+lshACkOv3ALIAE/PAz0O1WTHGCIV/HakRtQ0fXoCGhkr+tyoZ1Xvk3HK5dnK258QtoFRn2xh8q4VHHprZFjjB8iCz8appf6H6e9ac33jqKR9QbjlAD8WroSn0PQ3iZ3ALfhyNaE7rk0468PSFyg581gPtqbCBlKftXPRPF8lIhb1LDe+YA0j60r8JR5 Loq6VPUe 6M30VdaeNizhrlvFRWDUBHGGUNLex8ig2UcbcuYsKyIelOuyMtll4PvVvdVFaYjLBTk1qGHKFv8kRfS7uFPqD4Y1+5QWRpMiV2W7lbp3TyPUu3O5MTxbVclv4BWXDJJGLo+vQhdGwfcdp+CTMR/ip21cQJvDCW4zm0bGcol7iCfXqaP7OxLRq3bu3QHm8J8O2KwsOmZGYbBLlNTmEX79zxitYXvIeNNp7qF+QkHeZFbG5JOWhUCiIL8J87tNIeXOmqO5c 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 86b2e417dc6f..a3203cf8860f 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. + * @write_end: end of a write, could extend inode size. + * + * This returns huge orders 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; @@ -1173,7 +1240,7 @@ 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)) + if (shmem_huge_global_enabled(inode, 0, 0, false, NULL, 0)) stat->blksize = HPAGE_PMD_SIZE; if (request_mask & STATX_BTIME) { @@ -1690,14 +1757,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