[PATCH for mm-unstable 3/3] mm/shmem: Use folio_test_transhuge() for THP check
From: SeongJae Park
Date: Wed May 04 2022 - 16:08:23 EST
Commit 94cdf3e8c0bf ("mm/shmem: convert shmem_getpage_gfp to use a
folio") on 'mm-unstable' replaces 'PageTransHuge()' with
'folio_test_large()' instead of 'folio_test_transhuge()'. This results
in below build error when 'CONFIG_TRANSPARENT_HUGEPAGE' is unset.
CC mm/shmem.o
In file included from .../linux/include/linux/kernel.h:25,
from .../linux/arch/x86/include/asm/percpu.h:27,
from .../linux/arch/x86/include/asm/preempt.h:6,
from .../linux/include/linux/preempt.h:78,
from .../linux/include/linux/spinlock.h:55,
from .../linux/include/linux/wait.h:9,
from .../linux/include/linux/wait_bit.h:8,
from .../linux/include/linux/fs.h:6,
from .../linux/mm/shmem.c:24:
.../linux/mm/shmem.c: In function ‘shmem_getpage_gfp.isra.0’:
.../linux/include/linux/compiler_types.h:352:38: error: call to ‘__compiletime_assert_252’ declared with attribute error: BUILD_BUG failed
352 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
| ^
.../linux/include/linux/math.h:15:46: note: in definition of macro ‘__round_mask’
15 | #define __round_mask(x, y) ((__typeof__(x))((y)-1))
| ^
.../linux/mm/shmem.c:1900:12: note: in expansion of macro ‘round_down’
1900 | hindex = round_down(index, HPAGE_PMD_NR);
| ^~~~~~~~~~
.../linux/include/linux/compiler_types.h:340:2: note: in expansion of macro ‘__compiletime_assert’
340 | __compiletime_assert(condition, msg, prefix, suffix)
| ^~~~~~~~~~~~~~~~~~~~
.../linux/include/linux/compiler_types.h:352:2: note: in expansion of macro ‘_compiletime_assert’
352 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
| ^~~~~~~~~~~~~~~~~~~
.../linux/include/linux/build_bug.h:39:37: note: in expansion of macro ‘compiletime_assert’
39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
| ^~~~~~~~~~~~~~~~~~
.../linux/include/linux/build_bug.h:59:21: note: in expansion of macro ‘BUILD_BUG_ON_MSG’
59 | #define BUILD_BUG() BUILD_BUG_ON_MSG(1, "BUILD_BUG failed")
| ^~~~~~~~~~~~~~~~
.../linux/include/linux/huge_mm.h:307:28: note: in expansion of macro ‘BUILD_BUG’
307 | #define HPAGE_PMD_SHIFT ({ BUILD_BUG(); 0; })
| ^~~~~~~~~
.../linux/include/linux/huge_mm.h:105:26: note: in expansion of macro ‘HPAGE_PMD_SHIFT’
105 | #define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT)
| ^~~~~~~~~~~~~~~
.../linux/include/linux/huge_mm.h:106:26: note: in expansion of macro ‘HPAGE_PMD_ORDER’
106 | #define HPAGE_PMD_NR (1<<HPAGE_PMD_ORDER)
| ^~~~~~~~~~~~~~~
.../linux/mm/shmem.c:1900:30: note: in expansion of macro ‘HPAGE_PMD_NR’
1900 | hindex = round_down(index, HPAGE_PMD_NR);
| ^~~~~~~~~~~~
In file included from <command-line>:
.../linux/include/linux/compiler_types.h:352:38: error: call to ‘__compiletime_assert_253’ declared with attribute error: BUILD_BUG failed
352 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
| ^
.../linux/include/linux/compiler_types.h:333:4: note: in definition of macro ‘__compiletime_assert’
333 | prefix ## suffix(); \
| ^~~~~~
.../linux/include/linux/compiler_types.h:352:2: note: in expansion of macro ‘_compiletime_assert’
352 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
| ^~~~~~~~~~~~~~~~~~~
.../linux/include/linux/build_bug.h:39:37: note: in expansion of macro ‘compiletime_assert’
39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
| ^~~~~~~~~~~~~~~~~~
.../linux/include/linux/build_bug.h:59:21: note: in expansion of macro ‘BUILD_BUG_ON_MSG’
59 | #define BUILD_BUG() BUILD_BUG_ON_MSG(1, "BUILD_BUG failed")
| ^~~~~~~~~~~~~~~~
.../linux/include/linux/huge_mm.h:307:28: note: in expansion of macro ‘BUILD_BUG’
307 | #define HPAGE_PMD_SHIFT ({ BUILD_BUG(); 0; })
| ^~~~~~~~~
.../linux/include/linux/huge_mm.h:105:26: note: in expansion of macro ‘HPAGE_PMD_SHIFT’
105 | #define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT)
| ^~~~~~~~~~~~~~~
.../linux/include/linux/huge_mm.h:106:26: note: in expansion of macro ‘HPAGE_PMD_ORDER’
106 | #define HPAGE_PMD_NR (1<<HPAGE_PMD_ORDER)
| ^~~~~~~~~~~~~~~
.../linux/mm/shmem.c:1923:13: note: in expansion of macro ‘HPAGE_PMD_NR’
1923 | hindex + HPAGE_PMD_NR - 1) {
| ^~~~~~~~~~~~
Fixes: 94cdf3e8c0bf ("mm/shmem: convert shmem_getpage_gfp to use a folio")
Signed-off-by: SeongJae Park <sj@xxxxxxxxxx>
---
mm/shmem.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mm/shmem.c b/mm/shmem.c
index 3dc34a5a7923..c51d3532c962 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1888,7 +1888,7 @@ static int shmem_getpage_gfp(struct inode *inode, pgoff_t index,
goto unlock;
}
- if (folio_test_large(folio))
+ if (folio_test_transhuge(folio))
hindex = round_down(index, HPAGE_PMD_NR);
else
hindex = index;
@@ -1910,7 +1910,7 @@ static int shmem_getpage_gfp(struct inode *inode, pgoff_t index,
spin_unlock_irq(&info->lock);
alloced = true;
- if (folio_test_large(folio) &&
+ if (folio_test_transhuge(folio) &&
DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE) <
hindex + HPAGE_PMD_NR - 1) {
/*
@@ -1973,7 +1973,7 @@ static int shmem_getpage_gfp(struct inode *inode, pgoff_t index,
unacct:
shmem_inode_unacct_blocks(inode, folio_nr_pages(folio));
- if (folio_test_large(folio)) {
+ if (folio_test_transhuge(folio)) {
folio_unlock(folio);
folio_put(folio);
goto alloc_nohuge;
--
2.25.1