Fix build errors due to folio_test_large() misuse
Subsystems (4)
cover Fix build errors due to folio_test_large() misuse
Several commits on 'mm-unstable' replaces 'PageTransHuge()' with 'folio_test_large()' instead of 'folio_test_transhuge()'. As a result, several build errors occur when 'CONFIG_TRANSPARENT_HUGEPAGE' is unset.
This patchset fixes the issues by replacing the check to use 'folio_test_transhuge()'.
SeongJae Park (3):
mm/vmscan: Use folio_test_transhuge() for THP check mm/shmem: Use folio_test_transhuge() for THP check mm/shmem: Use folio_test_transhuge() for THP check
mm/shmem.c | 8 ++++---- mm/vmscan.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/3 mm/vmscan: Use folio_test_transhuge() for THP check
Commit 22bf1b68e572 ("vmscan: remove remaining uses of page in shrink_page_list") 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/vmscan.o
In file included from <command-line>:
In function ‘can_split_folio’,
inlined from ‘shrink_page_list’ at .../linux/mm/vmscan.c:1719:11:
.../linux/include/linux/compiler_types.h:352:38: error: call to ‘__compiletime_assert_178’ 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:351:2: note: in expansion of macro ‘BUILD_BUG’
351 | BUILD_BUG();
| ^~~~~~~~~
This commit fixes the issue by replacing the check to use 'folio_test_transhuge()'.
--- mm/vmscan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/vmscan.c +1 -1
@@ -1714,7 +1714,7 @@ static unsigned int shrink_page_list(struct list_head *page_list, goto keep_locked;if (folio_maybe_dma_pinned (folio)) goto keep_locked; -if (folio_test_large (folio)) { +if (folio_test_transhuge (folio)) {/* cannot split folio, skip it */ if (!can_split_folio (folio,NULL )) goto activate_locked;
Signature · 1 line
2.25.1
PATCH 2/3 mm/shmem: Use folio_test_transhuge() for THP check
In reply to SeongJae ParkCommit 9a44f3462edc ("mm/shmem: convert shmem_add_to_page_cache to take 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 <command-line>:
In function ‘shmem_add_to_page_cache’,
inlined from ‘shmem_getpage_gfp.isra.0’ at .../linux/mm/shmem.c:1912:10:
.../linux/include/linux/compiler_types.h:352:38: error: call to ‘__compiletime_assert_244’ 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/vm_event_item.h:147:27: note: in expansion of macro ‘BUILD_BUG’
147 | #define THP_FILE_ALLOC ({ BUILD_BUG(); 0; })
| ^~~~~~~~~
.../linux/mm/shmem.c:743:19: note: in expansion of macro ‘THP_FILE_ALLOC’
743 | count_vm_event(THP_FILE_ALLOC);
| ^~~~~~~~~~~~~~
This commit fixes the issue by replacing the check to use 'folio_test_transhuge()'.
--- mm/shmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/shmem.c +1 -1
@@ -739,7 +739,7 @@ static int shmem_add_to_page_cache(struct folio *folio,xas_store (&xas, folio);if (xas_error (&xas)) goto unlock; -if (folio_test_large (folio)) { +if (folio_test_transhuge (folio)) {count_vm_event (THP_FILE_ALLOC );__lruvec_stat_mod_folio (folio,NR_SHMEM_THPS , nr); }
Signature · 1 line
2.25.1
PATCH 3/3 mm/shmem: Use folio_test_transhuge() for THP check
In reply to SeongJae ParkCommit 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) {
| ^~~~~~~~~~~~--- mm/shmem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
mm/shmem.c +3 -3
@@ -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;
Signature · 1 line
2.25.1
Quoted 3 lines · SeongJae Park
Several commits on 'mm-unstable' replaces '
PageTransHuge()' with 'folio_test_large()' instead of 'folio_test_transhuge()'. As a result, several build errors occur when 'CONFIG_TRANSPARENT_HUGEPAGE' is unset.
I sent an entire replacement patch series mere minutes ago which I think fixes everything you mention here. Please check?
Quoted 9 lines · On Wed, 4 May 2022 21:10:22 +0100 Matthew Wilcox <[email protected]> wrote:
Quoted 3 lines · SeongJae Park
Several commits on 'mm-unstable' replaces '
PageTransHuge()' with 'folio_test_large()' instead of 'folio_test_transhuge()'. As a result, several build errors occur when 'CONFIG_TRANSPARENT_HUGEPAGE' is unset.I sent an entire replacement patch series mere minutes ago which I think fixes everything you mention here. Please check?
Thanks for the answer. Yes, seems the fix has made there :)
Thanks,
SJ