From nobody Wed Feb 11 07:47:16 2026 Received: from out30-99.freemail.mail.aliyun.com (out30-99.freemail.mail.aliyun.com [115.124.30.99]) (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 0762C71B5B for ; Sat, 13 Jul 2024 13:24:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.99 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720877080; cv=none; b=jgDVdx0j78vgDURGtpnZDc60/r1zR5CfGBUf4AMzv63d+0MiVbGMrJHF9v47yrrfjlAxXqDvo37CT1Hd7T+VkFkRK5W+nM7GCc1G4imH7sEXwjCzkTNX4pOZmZzG2H2Y8rd2C4GaxkerDH7WyHmKVTgYRh2LUtOkIIBVakXRTfw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720877080; c=relaxed/simple; bh=rnh/gdjtI1oxPoycpAJ+xeQh9rAzDKM3Ht4nketAmOY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=c+FBiTmLN3eKrI0t9P9wpiJSG0bixWIAMd72gaeLfaLK5hZMkB4iXhtB5HjMcTX6hVdBqD6zg3c8z108nlmIkYBVh15FjDzF6A42Bi7EAbq/2FjWQuSBlIWdmjfz624eNtspPDfSl8yXKwExwG7RYWGUH9Z61M4BdBdi1PJpZpA= 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=wAilkOtJ; arc=none smtp.client-ip=115.124.30.99 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="wAilkOtJ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1720877070; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=Djj9GEjNq9Gnbpe2Z/mIcDmYI8xxQmETjEn+X/PnVoU=; b=wAilkOtJTLL7pXwDCo1LN7QFdB5662AyGkhO0hP09NlWUEtRDzvrUk5+f/4uqdjQRYFHNU+mAi1QeCoktRS48O7wdb2RxsZYMFv/6EGbjhBhDnhunWFzUJic/CvhT+vSp8mfSfcvh80gfoHo8UjXKoQdzoiAnJcerWFpnyPZ66k= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R171e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033032014031;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0WAR0qHL_1720877068; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WAR0qHL_1720877068) by smtp.aliyun-inc.com; Sat, 13 Jul 2024 21:24:29 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, 21cnbao@gmail.com, ryan.roberts@arm.com, ziy@nvidia.com, ioworker0@gmail.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] mm: shmem: simplify the suitable huge orders validation for tmpfs Date: Sat, 13 Jul 2024 21:24:20 +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" Move the suitable huge orders validation into shmem_suitable_orders() for tmpfs, which can reuse some code to simplify the logic. In addition, we don't have special handling for the error code -E2BIG when checking for conflicts with PMD sized THP in the pagecache for tmpfs, inste= ad, it will just fallback to order-0 allocations like this patch does, so this simplification will not add functional changes. Signed-off-by: Baolin Wang Acked-by: David Hildenbrand Reviewed-by: Ryan Roberts --- mm/shmem.c | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index f24dfbd387ba..db7e9808830f 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1685,19 +1685,29 @@ static unsigned long shmem_suitable_orders(struct i= node *inode, struct vm_fault struct address_space *mapping, pgoff_t index, unsigned long orders) { - struct vm_area_struct *vma =3D vmf->vma; + struct vm_area_struct *vma =3D vmf ? vmf->vma : NULL; unsigned long pages; int order; =20 - orders =3D thp_vma_suitable_orders(vma, vmf->address, orders); - if (!orders) - return 0; + if (vma) { + orders =3D thp_vma_suitable_orders(vma, vmf->address, orders); + if (!orders) + return 0; + } =20 /* Find the highest order that can add into the page cache */ order =3D highest_order(orders); while (orders) { pages =3D 1UL << order; index =3D round_down(index, pages); + /* + * Check for conflict before waiting on a huge allocation. + * Conflict might be that a huge page has just been allocated + * and added to page cache by a racing thread, or that there + * is already at least one small page in the huge extent. + * Be careful to retry when appropriate, but not forever! + * Elsewhere -EEXIST would be the right code, but not here. + */ if (!xa_find(&mapping->i_pages, &index, index + pages - 1, XA_PRESENT)) break; @@ -1735,7 +1745,6 @@ static struct folio *shmem_alloc_and_add_folio(struct= vm_fault *vmf, { struct address_space *mapping =3D inode->i_mapping; struct shmem_inode_info *info =3D SHMEM_I(inode); - struct vm_area_struct *vma =3D vmf ? vmf->vma : NULL; unsigned long suitable_orders =3D 0; struct folio *folio =3D NULL; long pages; @@ -1745,26 +1754,8 @@ static struct folio *shmem_alloc_and_add_folio(struc= t vm_fault *vmf, orders =3D 0; =20 if (orders > 0) { - if (vma && vma_is_anon_shmem(vma)) { - suitable_orders =3D shmem_suitable_orders(inode, vmf, + suitable_orders =3D shmem_suitable_orders(inode, vmf, mapping, index, orders); - } else if (orders & BIT(HPAGE_PMD_ORDER)) { - pages =3D HPAGE_PMD_NR; - suitable_orders =3D BIT(HPAGE_PMD_ORDER); - index =3D round_down(index, HPAGE_PMD_NR); - - /* - * Check for conflict before waiting on a huge allocation. - * Conflict might be that a huge page has just been allocated - * and added to page cache by a racing thread, or that there - * is already at least one small page in the huge extent. - * Be careful to retry when appropriate, but not forever! - * Elsewhere -EEXIST would be the right code, but not here. - */ - if (xa_find(&mapping->i_pages, &index, - index + HPAGE_PMD_NR - 1, XA_PRESENT)) - return ERR_PTR(-E2BIG); - } =20 order =3D highest_order(suitable_orders); while (suitable_orders) { --=20 2.39.3 From nobody Wed Feb 11 07:47:16 2026 Received: from out30-98.freemail.mail.aliyun.com (out30-98.freemail.mail.aliyun.com [115.124.30.98]) (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 2A878133406 for ; Sat, 13 Jul 2024 13:29:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.98 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720877399; cv=none; b=WhjxzcRHijgdxyYAbQj4TKg4W202OiZKiKl9CCHyFTWVXNAIqtvX/7b6k2D96N1wEiN+GyyofIJgw32Ihtmbkm//8f29rMLGVhnK8pL9CFuevOqQ8Qt35fjJVpFDVWyY17wk5OMnc9gmNRwptWEXGP3q6dlqugNXyYuRXZ0gcpM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720877399; c=relaxed/simple; bh=XHf0EOHfMZxurw0jxGXTS2u4VOUHYpcwyRa19VHm9gM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=edFai5k09Sq1vJr7TbU7MmRgG16Bl8yGX6yau8l0jaGmBvQxymfqMJjv5ccgPgA6N9SqgMmdNmNTvKnw2ObeoUoo3G50bCyOX2RwqKfu4TmjayM1nmeO0N+qDWSg0BgiORzgzS6rd2j979Q/RB3ieqFeHoKGQ9NOiYkcu+6b/Cw= 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=LSRebKk5; arc=none smtp.client-ip=115.124.30.98 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="LSRebKk5" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1720877388; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=Tf+iCn9J1tf0mbYcwxtjryzLvO9qhkxHYDxVzJSYovE=; b=LSRebKk5qxJUGDX8wYjzWlCZTsU1v5UPIVhTs4abHClir2fa1SIBIz91i6RhQ1zRyt7DvfgZbHfsWfa6Oi1vE9mY3Oi6yYNrjUavmZSUg7MBSMbrcBvXuXiaq14rK0krWp6PoSTzpGexdbvtxKsUqIwymofGM0WOM6q5jdctVPE= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R121e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033037067113;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0WAR.kD7_1720877069; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WAR.kD7_1720877069) by smtp.aliyun-inc.com; Sat, 13 Jul 2024 21:24:30 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, 21cnbao@gmail.com, ryan.roberts@arm.com, ziy@nvidia.com, ioworker0@gmail.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] mm: shmem: rename shmem_is_huge() to shmem_huge_global_enabled() Date: Sat, 13 Jul 2024 21:24:21 +0800 Message-Id: <26dfca33f394b5cfa68e4dbda60bf5f54e41c534.1720755678.git.baolin.wang@linux.alibaba.com> 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" The shmem_is_huge() is now used to check if the top-level huge page is enab= led, thus rename it to reflect its usage. Signed-off-by: Baolin Wang Acked-by: David Hildenbrand Reviewed-by: Ryan Roberts --- include/linux/shmem_fs.h | 9 +++++---- mm/huge_memory.c | 5 +++-- mm/shmem.c | 15 ++++++++------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h index 1d06b1e5408a..405ee8d3589a 100644 --- a/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h @@ -111,14 +111,15 @@ extern void shmem_truncate_range(struct inode *inode,= loff_t start, loff_t end); int shmem_unuse(unsigned int type); =20 #ifdef CONFIG_TRANSPARENT_HUGEPAGE -extern bool shmem_is_huge(struct inode *inode, pgoff_t index, bool shmem_h= uge_force, - struct mm_struct *mm, unsigned long vm_flags); +extern bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, = bool shmem_huge_force, + struct mm_struct *mm, unsigned long vm_flags); unsigned long shmem_allowable_huge_orders(struct inode *inode, struct vm_area_struct *vma, pgoff_t index, bool global_huge); #else -static __always_inline bool shmem_is_huge(struct inode *inode, pgoff_t ind= ex, bool shmem_huge_force, - struct mm_struct *mm, unsigned long vm_flags) +static __always_inline bool shmem_huge_global_enabled(struct inode *inode,= pgoff_t index, + bool shmem_huge_force, struct mm_struct *mm, + unsigned long vm_flags) { return false; } diff --git a/mm/huge_memory.c b/mm/huge_memory.c index f9696c94e211..cc9bad12be75 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -152,8 +152,9 @@ unsigned long __thp_vma_allowable_orders(struct vm_area= _struct *vma, * own flags. */ if (!in_pf && shmem_file(vma->vm_file)) { - bool global_huge =3D shmem_is_huge(file_inode(vma->vm_file), vma->vm_pgo= ff, - !enforce_sysfs, vma->vm_mm, vm_flags); + bool global_huge =3D shmem_huge_global_enabled(file_inode(vma->vm_file), + vma->vm_pgoff, !enforce_sysfs, + vma->vm_mm, vm_flags); =20 if (!vma_is_anon_shmem(vma)) return global_huge ? orders : 0; diff --git a/mm/shmem.c b/mm/shmem.c index db7e9808830f..1445dcd39b6f 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -548,9 +548,9 @@ static bool shmem_confirm_swap(struct address_space *ma= pping, =20 static int shmem_huge __read_mostly =3D SHMEM_HUGE_NEVER; =20 -static bool __shmem_is_huge(struct inode *inode, pgoff_t index, - bool shmem_huge_force, struct mm_struct *mm, - unsigned long vm_flags) +static bool __shmem_huge_global_enabled(struct inode *inode, pgoff_t index, + bool shmem_huge_force, struct mm_struct *mm, + unsigned long vm_flags) { loff_t i_size; =20 @@ -581,14 +581,15 @@ static bool __shmem_is_huge(struct inode *inode, pgof= f_t index, } } =20 -bool shmem_is_huge(struct inode *inode, pgoff_t index, +bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, bool shmem_huge_force, struct mm_struct *mm, unsigned long vm_flags) { if (HPAGE_PMD_ORDER > MAX_PAGECACHE_ORDER) return false; =20 - return __shmem_is_huge(inode, index, shmem_huge_force, mm, vm_flags); + return __shmem_huge_global_enabled(inode, index, shmem_huge_force, + mm, vm_flags); } =20 #if defined(CONFIG_SYSFS) @@ -1156,7 +1157,7 @@ static int shmem_getattr(struct mnt_idmap *idmap, STATX_ATTR_NODUMP); generic_fillattr(idmap, request_mask, inode, stat); =20 - if (shmem_is_huge(inode, 0, false, NULL, 0)) + if (shmem_huge_global_enabled(inode, 0, false, NULL, 0)) stat->blksize =3D HPAGE_PMD_SIZE; =20 if (request_mask & STATX_BTIME) { @@ -2153,7 +2154,7 @@ static int shmem_get_folio_gfp(struct inode *inode, p= goff_t index, return 0; } =20 - huge =3D shmem_is_huge(inode, index, false, fault_mm, + huge =3D shmem_huge_global_enabled(inode, index, false, fault_mm, vma ? vma->vm_flags : 0); /* Find hugepage orders that are allowed for anonymous shmem. */ if (vma && vma_is_anon_shmem(vma)) --=20 2.39.3 From nobody Wed Feb 11 07:47:16 2026 Received: from out30-119.freemail.mail.aliyun.com (out30-119.freemail.mail.aliyun.com [115.124.30.119]) (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 242BC132125 for ; Sat, 13 Jul 2024 13:24:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.119 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720877082; cv=none; b=mUQTkAkeEsOgavJ1Ds1H8uQBMszy3FcdFX8n94EBFjx5qnQHHL69LEpsWpHG+HjdRlWX6o3VpmiMDchG4oi9GjjHW4EKu6uENSPdo8H1FO4ZwO82aJpSOVqaLQ7g7Utll6KL009aiX841s9ijZ4aQsy/qhHL7L3In0YB4i+ZjHY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720877082; c=relaxed/simple; bh=vfdzlwdRwxcORt/I1L3TbJZAqTs4F2Ll56yUQaL8Lxo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XoOUOdXvXxDM56kVcELbtxqbJWkNaJbtUAq6yOKe5UI/PWFxpdr3TEVfcShx4dZ531kOpH2WNxJxjER90pamPFjwUwhJui+vtuPZU6SFvUVXW7QW8yrNvtasmPLLKWKn9+W8FHy7i2AtiYQx1qRbNB28Cfc3P0E5hLbxneX3UzI= 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=RbTK9CIg; arc=none smtp.client-ip=115.124.30.119 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="RbTK9CIg" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1720877072; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=Q6qMaXIaTDYvJfprl3aijdTJlnnyWcHY799Vnupoh5o=; b=RbTK9CIg8a98a66riFWIVYJEGtymoqhicvFe7sZwSM/EBZQNu7gKKtCXTF+AZzSyWUwI66wEfTPy+JKNcxvhdCUyTUQIpCDrtbmfEsf8QXGS77oGm3PS0EqmZML74zEwaYshsi5WbjNuAZpjMzsBtjSZR0SxmfRY+EgZRQLUnOE= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R601e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033045220184;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0WAQzACU_1720877070; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WAQzACU_1720877070) by smtp.aliyun-inc.com; Sat, 13 Jul 2024 21:24:31 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, 21cnbao@gmail.com, ryan.roberts@arm.com, ziy@nvidia.com, ioworker0@gmail.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] mm: shmem: move shmem_huge_global_enabled() into shmem_allowable_huge_orders() Date: Sat, 13 Jul 2024 21:24:22 +0800 Message-Id: <16dad33282617ecb90a3f466b35273b10be68d21.1720755678.git.baolin.wang@linux.alibaba.com> 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" Move shmem_huge_global_enabled() into the shmem_allowable_huge_orders() fun= ction, so that shmem_allowable_huge_orders() can also help to find the allowable h= uge orders for tmpfs. Moreover the shmem_huge_global_enabled() can become stati= c. No functional changes. Signed-off-by: Baolin Wang Acked-by: David Hildenbrand Reviewed-by: Ryan Roberts --- include/linux/shmem_fs.h | 12 ++---------- mm/huge_memory.c | 12 +++--------- mm/shmem.c | 41 ++++++++++++++++++++++++++-------------- 3 files changed, 32 insertions(+), 33 deletions(-) diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h index 405ee8d3589a..1564d7d3ca61 100644 --- a/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h @@ -111,21 +111,13 @@ extern void shmem_truncate_range(struct inode *inode,= loff_t start, loff_t end); int shmem_unuse(unsigned int type); =20 #ifdef CONFIG_TRANSPARENT_HUGEPAGE -extern bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, = bool shmem_huge_force, - struct mm_struct *mm, unsigned long vm_flags); unsigned long shmem_allowable_huge_orders(struct inode *inode, struct vm_area_struct *vma, pgoff_t index, - bool global_huge); + bool shmem_huge_force); #else -static __always_inline bool shmem_huge_global_enabled(struct inode *inode,= pgoff_t index, - bool shmem_huge_force, struct mm_struct *mm, - unsigned long vm_flags) -{ - return false; -} static inline unsigned long shmem_allowable_huge_orders(struct inode *inod= e, struct vm_area_struct *vma, pgoff_t index, - bool global_huge) + bool shmem_huge_force) { return 0; } diff --git a/mm/huge_memory.c b/mm/huge_memory.c index cc9bad12be75..f69980b5b5fc 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -151,16 +151,10 @@ unsigned long __thp_vma_allowable_orders(struct vm_ar= ea_struct *vma, * Must be done before hugepage flags check since shmem has its * own flags. */ - if (!in_pf && shmem_file(vma->vm_file)) { - bool global_huge =3D shmem_huge_global_enabled(file_inode(vma->vm_file), - vma->vm_pgoff, !enforce_sysfs, - vma->vm_mm, vm_flags); - - if (!vma_is_anon_shmem(vma)) - return global_huge ? orders : 0; + if (!in_pf && shmem_file(vma->vm_file)) return shmem_allowable_huge_orders(file_inode(vma->vm_file), - vma, vma->vm_pgoff, global_huge); - } + vma, vma->vm_pgoff, + !enforce_sysfs); =20 if (!vma_is_anonymous(vma)) { /* diff --git a/mm/shmem.c b/mm/shmem.c index 1445dcd39b6f..4d274f5a17d9 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -581,7 +581,7 @@ static bool __shmem_huge_global_enabled(struct inode *i= node, pgoff_t index, } } =20 -bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, +static bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, bool shmem_huge_force, struct mm_struct *mm, unsigned long vm_flags) { @@ -772,6 +772,13 @@ static unsigned long shmem_unused_huge_shrink(struct s= hmem_sb_info *sbinfo, { return 0; } + +static bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, + bool shmem_huge_force, struct mm_struct *mm, + unsigned long vm_flags) +{ + return false; +} #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ =20 /* @@ -1625,27 +1632,39 @@ static gfp_t limit_gfp_mask(gfp_t huge_gfp, gfp_t l= imit_gfp) #ifdef CONFIG_TRANSPARENT_HUGEPAGE unsigned long shmem_allowable_huge_orders(struct inode *inode, struct vm_area_struct *vma, pgoff_t index, - bool global_huge) + bool shmem_huge_force) { unsigned long mask =3D READ_ONCE(huge_shmem_orders_always); unsigned long within_size_orders =3D READ_ONCE(huge_shmem_orders_within_s= ize); - unsigned long vm_flags =3D vma->vm_flags; + unsigned long vm_flags =3D vma ? vma->vm_flags : 0; + struct mm_struct *fault_mm =3D vma ? vma->vm_mm : NULL; /* * Check all the (large) orders below HPAGE_PMD_ORDER + 1 that * are enabled for this vma. */ unsigned long orders =3D BIT(PMD_ORDER + 1) - 1; + bool global_huge; loff_t i_size; int order; =20 - if ((vm_flags & VM_NOHUGEPAGE) || - test_bit(MMF_DISABLE_THP, &vma->vm_mm->flags)) + if (vma && ((vm_flags & VM_NOHUGEPAGE) || + test_bit(MMF_DISABLE_THP, &vma->vm_mm->flags))) return 0; =20 /* If the hardware/firmware marked hugepage support disabled. */ if (transparent_hugepage_flags & (1 << TRANSPARENT_HUGEPAGE_UNSUPPORTED)) return 0; =20 + global_huge =3D shmem_huge_global_enabled(inode, index, shmem_huge_force, + fault_mm, 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; + } + /* * Following the 'deny' semantics of the top level, force the huge * option off from all mounts. @@ -2081,7 +2100,7 @@ static int shmem_get_folio_gfp(struct inode *inode, p= goff_t index, struct mm_struct *fault_mm; struct folio *folio; int error; - bool alloced, huge; + bool alloced; unsigned long orders =3D 0; =20 if (WARN_ON_ONCE(!shmem_mapping(inode->i_mapping))) @@ -2154,14 +2173,8 @@ static int shmem_get_folio_gfp(struct inode *inode, = pgoff_t index, return 0; } =20 - huge =3D shmem_huge_global_enabled(inode, index, false, fault_mm, - vma ? vma->vm_flags : 0); - /* Find hugepage orders that are allowed for anonymous shmem. */ - if (vma && vma_is_anon_shmem(vma)) - orders =3D shmem_allowable_huge_orders(inode, vma, index, huge); - else if (huge) - orders =3D BIT(HPAGE_PMD_ORDER); - + /* Find hugepage orders that are allowed for anonymous shmem and tmpfs. */ + orders =3D shmem_allowable_huge_orders(inode, vma, index, false); if (orders > 0) { gfp_t huge_gfp; =20 --=20 2.39.3