mm-shmem-inline-shmem_is_huge-for-disabled-transparent-hugepages.patch removed from -mm tree
The quilt patch titled
Subject: mm/shmem: inline shmem_is_huge() for disabled transparent hugepages
has been removed from the -mm tree. Its filename was
mm-shmem-inline-shmem_is_huge-for-disabled-transparent-hugepages.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Sumanth Korikkar <[email protected]>
Subject: mm/shmem: inline shmem_is_huge() for disabled transparent hugepages
Date: Tue, 9 Apr 2024 17:54:07 +0200
In order to minimize code size (CONFIG_CC_OPTIMIZE_FOR_SIZE=y), compiler might choose to make a regular function call (out-of-line) for shmem_is_huge() instead of inlining it. When transparent hugepages are disabled (CONFIG_TRANSPARENT_HUGEPAGE=n), it can cause compilation error.
mm/shmem.c: In function `shmem_getattr':./include/linux/huge_mm.h:383:27: note: in expansion of macro `BUILD_BUG'
383 | #define HPAGE_PMD_SIZE ({ BUILD_BUG(); 0; })
| ^~~~~~~~~
mm/shmem.c:1148:33: note: in expansion of macro `HPAGE_PMD_SIZE'
1148 | stat->blksize = HPAGE_PMD_SIZE;
To prevent the possible error, always inline shmem_is_huge() when transparent hugepages are disabled.
---
include/linux/shmem_fs.h | 9 +++++++++ mm/shmem.c | 6 ------ 2 files changed, 9 insertions(+), 6 deletions(-)
include/linux/shmem_fs.h renamed from include/linux/shmem_fs.h~mm-shmem-inline-shmem_is_huge-for-disabled-transparent-hugepages +9 -0
@@ -110,8 +110,17 @@ extern struct page *shmem_read_mapping_pextern void shmem_truncate_range (struct inode *inode,loff_t start,loff_t end);int shmem_unuse (unsigned int type); +#ifdef CONFIG_TRANSPARENT_HUGEPAGE extern bool shmem_is_huge (struct inode *inode,pgoff_t index,bool shmem_huge_force,struct mm_struct *mm,unsigned long vm_flags); +#else +static __always_inline bool shmem_is_huge(struct inode *inode, pgoff_t index, bool shmem_huge_force, +struct mm_struct *mm,unsigned long vm_flags) +{ +return false; +} +#endif +#ifdef CONFIG_SHMEM extern unsigned long shmem_swap_usage (struct vm_area_struct *vma);#else
mm/shmem.c renamed from mm/shmem.c~mm-shmem-inline-shmem_is_huge-for-disabled-transparent-hugepages +0 -6
@@ -748,12 +748,6 @@ static long shmem_unused_huge_count(stru#define shmem_huge SHMEM_HUGE_DENY -bool shmem_is_huge (struct inode *inode,pgoff_t index,bool shmem_huge_force, -struct mm_struct *mm,unsigned long vm_flags) -{ -return false; -} -static unsigned long shmem_unused_huge_shrink (struct shmem_sb_info *sbinfo,struct shrink_control *sc,unsigned long nr_to_split) {
_
Patches currently in -mm which might be from [email protected] are