From patchwork Thu Nov 28 07:40:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13887737 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 6A690D690E3 for ; Thu, 28 Nov 2024 07:41:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 96AEF6B0089; Thu, 28 Nov 2024 02:41:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 91B786B0092; Thu, 28 Nov 2024 02:41:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6F9D16B0098; Thu, 28 Nov 2024 02:41:05 -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 20E3A6B0092 for ; Thu, 28 Nov 2024 02:41:05 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id D487EAE489 for ; Thu, 28 Nov 2024 07:41:04 +0000 (UTC) X-FDA: 82834707270.09.E0DEA14 Received: from out30-99.freemail.mail.aliyun.com (out30-99.freemail.mail.aliyun.com [115.124.30.99]) by imf08.hostedemail.com (Postfix) with ESMTP id 20A2B160006 for ; Thu, 28 Nov 2024 07:40:57 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=NPCB91RI; spf=pass (imf08.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.99 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=1732779656; 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=iizzfiOOXmZS6eNQ3u5p12da/SLq6MpmcF9cZtSAll0=; b=O6RWq9Wm+VRRRbVeKR5h/JGG8VSVx/6jt1uE26z8tYFvzBzyp3ua+YawBGcA+J705RItKy 6I1kvg9SuKZrklI/szC2Lv7Bo3dYIZEC6Hrp4SnuicgFlECGSEdf7dHpUhxocUxqjPTLil 7Qino82hbybjLzTQAdd5yN2z2D2mAIY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1732779656; a=rsa-sha256; cv=none; b=PT3oSGosDqz3gLfxHN52S6QfW6/62NBNV4nxFPNs0P/hDDThbYx1JTdLdKn3AfPW0yrEX/ mb9ssD+L8mvYGRClRAd0i2LomqfcjDlXzhjlGzDi2xWEJughoe9ncciMD+JQYC4LCMqX2C FxU/LOVj/eMz5X432xcuJX+J4TKWJ38= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=NPCB91RI; spf=pass (imf08.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.99 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1732779658; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=iizzfiOOXmZS6eNQ3u5p12da/SLq6MpmcF9cZtSAll0=; b=NPCB91RILtWDRolRp3Qh02fMEBEIpbBnuC9OIOC3V2h27fuYA7NJpidVS04q4J8bZBNldFLXoPNY64AeZDqu084mtfZsl5VIYgQqTfhesA2tYQVN3CshcV+gzHaAMv0KbixopXEQNBp0fMPy4+mKOjEs5FvYiYoVGM5Y2kRJjmA= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WKOx1q3_1732779656 cluster:ay36) by smtp.aliyun-inc.com; Thu, 28 Nov 2024 15:40:57 +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 v3 3/6] mm: shmem: add large folio support for tmpfs Date: Thu, 28 Nov 2024 15:40:41 +0800 Message-Id: <035bf55fbdebeff65f5cb2cdb9907b7d632c3228.1732779148.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 20A2B160006 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: yhecyfd6axnbsyt9mqgwa1jqifg6chc4 X-HE-Tag: 1732779657-146476 X-HE-Meta: U2FsdGVkX19nHJVTdxHpdR5Gc+uBM68ZWw0PnKN17cGwW7n+EcCYlMGCVpEaiKp+WLylqqSpk3oyq0jQyz/Rl5RjG3MDfp+/bEDsGxh/k/W/HwNDvfu+EXX7fbTWybCKAPFpOVO88bH1ue9mwscj6XNKWfeYKYf4XkNrptzF+KnWLJjGTLWPb5jOIwXfclzA0uvDip5ySior2zDHBKOwgr2W76mxlMZkZFx5bOBimhTHm4vWXWhvK7iQyTEDprj4LQofg/mRiAl0u7B4kRX5QsipjcdUCfFyPQSybboETdviizeKNpkI0x6RhjkZ7S/0h7H2sNMYBJkgrbO++jK30Bz2ttQNqMG2ATWkSX7GrBGazz7CBfYcvrVSNEiTq2YwmBROxGCoc61XhSMAffI8ZRuwU+qaoglFZ/5botIpyWThb+b//LJcla2OwhVCRg3Rl2MngnsNH9h/qcZgyB1fpPzv/qnDL+FCmJ8thpE+2ZkZ46MROWk49O3zx5SmH1vKDap55P5lUnzT4EElboOZdBz5hEtZSzj2XpbYienRjp+O2NBUEmeqlbLIC2uKSVGfpSkwBV/x8Hq323JNpvztseVR1TnrpKQ3AHFP2f2uOViuoI6BefPdWn/2T786JzuO+vc3NG9Ge7yowOsXQ7C/cD4wI4X9Zfp3D/mqy+fH2i2/cO1JyTXP2pi6Y/mRSIws+4Gii6SakrAaAg7iccZ6y+ygNZKTpHHGBOGRbh950p4WKXBgZXusLQZZ/yKt1jNHmhM4CYFPAGC4kizwkaNgt0au/Zewexd1Y/jW9AR/zTY++0onc3qaKhaEOQ40o3EOTqJWg2FYp+3KgP4Mm8p7fg04mIYIspUqMWpCMz/m+7saQ0ti5ossw77UBdM4/eRjDh/ieL0VYBGaPsY5Tgfz1dP5jlBDpQs1k3mmPRV+DSi3T0TdZiFq8EF6kS1MvRkhZgoN3HW+jwmMnwBqakE ZKf2FWas DNxo9rbct++Y0kjniW4Gi4JA9A4646SotpjNgE+d5D2xIkzJbtdEqYIovIsTMta/I9Qqy7+P0bdvW+wH2LXQHcgxJZ+eOMz5E1S/JXI1+D1JfgadPztrSaV0R681dvgDLuMaEJCrls/UtsUELkhC0aJxY3FlX7R6gkCn+ziV43hoXab9UoUkIaJ4NzenFwgsVGrAxO7fJ0+rh4qsKsqtzhVsf0n9a3mOOh5ofRpsQStp96f8AU65oyBHq20ZKwF2CvcfY 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 large 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 large 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 PMD-sized large folios allocation, we can extend the 'huge=' option to allow any sized large folios. The semantics of the 'huge=' mount option are: huge=never: no any sized large folios huge=always: any sized large folios huge=within_size: like 'always' but respect the i_size huge=advise: like 'always' if requested with 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 | 99 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 81 insertions(+), 18 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 7595c3db4c1c..54eaa724c153 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -554,34 +554,100 @@ 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 int maybe_pmd_order = HPAGE_PMD_ORDER > MAX_PAGECACHE_ORDER ? + 0 : BIT(HPAGE_PMD_ORDER); + unsigned long within_size_orders; + unsigned int order; + pgoff_t aligned_index; loff_t i_size; - if (HPAGE_PMD_ORDER > MAX_PAGECACHE_ORDER) - return 0; if (!S_ISREG(inode->i_mode)) return 0; if (shmem_huge == SHMEM_HUGE_DENY) return 0; if (shmem_huge_force || shmem_huge == SHMEM_HUGE_FORCE) - return BIT(HPAGE_PMD_ORDER); + return maybe_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); + if (vma) + return maybe_pmd_order; + + return shmem_mapping_size_orders(inode->i_mapping, index, write_end); 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 BIT(HPAGE_PMD_ORDER); + if (vma) + within_size_orders = maybe_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) - return BIT(HPAGE_PMD_ORDER); + return maybe_pmd_order; fallthrough; default: return 0; @@ -781,6 +847,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; @@ -1176,7 +1243,7 @@ static int shmem_getattr(struct mnt_idmap *idmap, STATX_ATTR_NODUMP); generic_fillattr(idmap, request_mask, inode, stat); - 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) { @@ -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