From nobody Sun Nov 24 04:24:37 2024 Received: from out30-110.freemail.mail.aliyun.com (out30-110.freemail.mail.aliyun.com [115.124.30.110]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 91E563BBEA for ; Fri, 8 Nov 2024 04:13:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.110 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731039211; cv=none; b=bgLiLeMkMfvHtG90ifkiNu9T/NkevyHSliVVtVlis1w1BFBJtE+reS5K9W4phZfDcEliC2zCdSK/yh/w4mRyvQw9fBOBI3HSyiWut0w0a6uJGntVtbL4XMrCMduvHElC0kYw/CzzkHzp13Jj7JSrPALVZ+F6C4DFFSyGGzsympk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731039211; c=relaxed/simple; bh=0DCuG3JDJ1q8FqeEYHOrNP3qle6nG5SinTRjy21kvLI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WiaX+iZclzUXVJxVqiNxTYbTPjwqbaxmmC7J7iQoE8VZqWHF6ezG28IuSzcS4Dl3X/tcc3Jvq2j5QwafjwMXGudM5Fd0iFcJaqPgFa5pusqpWJtdaF8vHTkVLVIXiUcgX0m8VQa3uShXAvyBtibTZa7A7lKX12NZdsj+GVg+50w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b=RQhA4ZW/; arc=none smtp.client-ip=115.124.30.110 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="RQhA4ZW/" 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: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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=3D' option to control the huge folios allocation, we can extend the 'huge=3D' option to allow any sized hu= ge folios. The semantics of the 'huge=3D' mount option are: huge=3Dnever: no any sized huge folios huge=3Dalways: any sized huge folios huge=3Dwithin_size: like 'always' but respect the i_size huge=3Dadvise: 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=3Dalways/within_size/advise is s= et. 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, =20 static int shmem_huge __read_mostly =3D SHMEM_HUGE_NEVER; =20 +/** + * shmem_mapping_size_orders - Get allowable folio orders for the given fi= le 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 rel= evant + * due to alignment considerations the mapping might have. The returned or= der + * 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, lo= ff_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 =3D write_end - (index << PAGE_SHIFT); + order =3D filemap_get_order(size); + if (!order) + return 0; + + /* If we're not aligned, allocate a smaller folio */ + if (index & ((1UL << order) - 1)) + order =3D __ffs(index); + + order =3D 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; =20 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 =3D=3D SHMEM_HUGE_FORCE) return BIT(HPAGE_PMD_ORDER); =20 + /* + * 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 =3D round_up(index + 1, HPAGE_PMD_NR); - i_size =3D max(write_end, i_size_read(inode)); - i_size =3D round_up(i_size, PAGE_SIZE); - if (i_size >> PAGE_SHIFT >=3D 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 =3D BIT(HPAGE_PMD_ORDER); + else + within_size_orders =3D shmem_mapping_size_orders(inode->i_mapping, + index, write_end); + + order =3D highest_order(within_size_orders); + while (within_size_orders) { + aligned_index =3D round_up(index + 1, 1 << order); + i_size =3D max(write_end, i_size_read(inode)); + i_size =3D round_up(i_size, PAGE_SIZE); + if (i_size >> PAGE_SHIFT >=3D aligned_index) + return within_size_orders; + + order =3D 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 sh= mem_sb_info *sbinfo, =20 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); =20 #ifdef CONFIG_TRANSPARENT_HUGEPAGE - if (shmem_huge_global_enabled(inode, 0, 0, false, 0) =3D=3D + if (shmem_huge_global_enabled(inode, 0, 0, false, NULL, 0) =3D=3D BIT(HPAGE_PMD_ORDER)) stat->blksize =3D HPAGE_PMD_SIZE; #endif @@ -1693,14 +1760,10 @@ unsigned long shmem_allowable_huge_orders(struct in= ode *inode, return 0; =20 global_orders =3D 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; - } =20 /* * Following the 'deny' semantics of the top level, force the huge --=20 2.39.3