mm: page-flags: fix build failure due to missing parameter for HasHWPoisoned flag
Subsystems (2)
PATCH 1/1 mm: page-flags: fix build failure due to missing parameter for HasHWPoisoned flag
The below build failure when !CONFIG_MEMORY_FAILURE was reported for v5.16 merge window:
In file included from include/linux/mmzone.h:22,
from include/linux/gfp.h:6,
from include/linux/slab.h:15,
from include/linux/crypto.h:20,
from arch/x86/kernel/asm-offsets.c:9:include/linux/page-flags.h:806:29: error: macro "PAGEFLAG_FALSE" requires 2 arguments, but only 1 given
806 | PAGEFLAG_FALSE(HasHWPoisoned)
| ^include/linux/page-flags.h:411: note: macro "PAGEFLAG_FALSE" defined here
411 | #define PAGEFLAG_FALSE(uname, lname) TESTPAGEFLAG_FALSE(uname, lname) \
|include/linux/page-flags.h:807:39: error: macro "TESTSCFLAG_FALSE" requires 2 arguments, but only 1 given
807 | TESTSCFLAG_FALSE(HasHWPoisoned)
| ^include/linux/page-flags.h:414: note: macro "TESTSCFLAG_FALSE" defined here
414 | #define TESTSCFLAG_FALSE(uname, lname)
\
|
include/linux/page-flags.h:806:1: error: unknown type name 'PAGEFLAG_FALSE'
806 | PAGEFLAG_FALSE(HasHWPoisoned)
| ^~~~~~~~~~~~~~
include/linux/page-flags.h:807:25: error: expected ';' before 'static'
807 | TESTSCFLAG_FALSE(HasHWPoisoned)
| ^
| ;
......
815 | static inline bool is_page_hwpoison(struct page *page)
| ~~~~~~make[2]: *** [scripts/Makefile.build:121: arch/x86/kernel/asm-offsets.s] Error 1
The commit d389a4a81155 ("mm: Add folio flag manipulation functions") changed the definition of PAGEFLAG macros, this caused the build failure for HasHWPoisoned flag. The new flag was introduced by commit eac96c3efdb5 ("mm: filemap: check if THP has hwpoisoned subpage for PMD page fault") in v5.15-rc7. But the folio series pull request was prepared before v5.15, so this new flag was missed.
--- include/linux/page-flags.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/page-flags.h +2 -2
@@ -803,8 +803,8 @@ PAGEFLAG_FALSE(DoubleMap, double_map) PAGEFLAG(HasHWPoisoned, has_hwpoisoned, PF_SECOND) TESTSCFLAG(HasHWPoisoned, has_hwpoisoned, PF_SECOND)#else -PAGEFLAG_FALSE(HasHWPoisoned) - TESTSCFLAG_FALSE(HasHWPoisoned) +PAGEFLAG_FALSE(HasHWPoisoned, has_hwpoisoned) + TESTSCFLAG_FALSE(HasHWPoisoned, has_hwpoisoned)#endif /*
Signature · 1 line
2.26.2
Should probbaly cc Linus, and also note that Stephen noticed & fixed this problem already.
https://lore.kernel.org/lkml/[email protected]/
I didn't know about it at the time I sent the pull request because it hadn't been merged at that point.
Quoted 70 lines · Yang Shi
The below build failure when !CONFIG_MEMORY_FAILURE was reported for v5.16 merge window:
In file included frominclude/linux/mmzone.h:22,from include/linux/gfp.h:6, from include/linux/slab.h:15, from include/linux/crypto.h:20, from arch/x86/kernel/asm-offsets.c:9:
include/linux/page-flags.h:806:29: error: macro "PAGEFLAG_FALSE" requires 2 arguments, but only 1 given
806 |PAGEFLAG_FALSE(HasHWPoisoned)
| ^include/linux/page-flags.h:411: note: macro "PAGEFLAG_FALSE" defined here411 | #define PAGEFLAG_FALSE(uname, lname) TESTPAGEFLAG_FALSE(uname, lname) \ |
include/linux/page-flags.h:807:39: error: macro "TESTSCFLAG_FALSE" requires 2 arguments, but only 1 given
807 |TESTSCFLAG_FALSE(HasHWPoisoned)
| ^include/linux/page-flags.h:414: note: macro "TESTSCFLAG_FALSE" defined here
414 | #defineTESTSCFLAG_FALSE(uname, lname)\ | include/linux/page-flags.h:806:1: error: unknown type name 'PAGEFLAG_FALSE' 806 | PAGEFLAG_FALSE(HasHWPoisoned) | ^~~~~~~~~~~~~~ include/linux/page-flags.h:807:25: error: expected ';' before 'static' 807 | TESTSCFLAG_FALSE(HasHWPoisoned) | ^ | ; ...... 815 | static inline bool is_page_hwpoison(struct page *page) | ~~~~~~make[2]: *** [
scripts/Makefile.build:121:arch/x86/kernel/asm-offsets.s] Error 1The commit
d389a4a81155("mm: Add folio flag manipulation functions") changed the definition of PAGEFLAG macros, this caused the build failure for HasHWPoisoned flag. The new flag was introduced by commiteac96c3efdb5("mm: filemap: check if THP has hwpoisoned subpage for PMD page fault") in v5.15-rc7. But the folio series pull request was prepared before v5.15, so this new flag was missed.Cc Naresh Kamboju <[email protected]>Cc Matthew Wilcox <[email protected]>Cc Kirill A. Shutemov <[email protected]>Cc Naoya Horiguchi <[email protected]>Signed-off-by Yang Shi <[email protected]>--- include/linux/page-flags.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)include/linux/page-flags.h +2
-2@@ -803,8 +803,8 @@ PAGEFLAG_FALSE(DoubleMap, double_map) PAGEFLAG(HasHWPoisoned, has_hwpoisoned, PF_SECOND) TESTSCFLAG(HasHWPoisoned, has_hwpoisoned, PF_SECOND)#else -PAGEFLAG_FALSE(HasHWPoisoned) - TESTSCFLAG_FALSE(HasHWPoisoned) +PAGEFLAG_FALSE(HasHWPoisoned, has_hwpoisoned) + TESTSCFLAG_FALSE(HasHWPoisoned, has_hwpoisoned)#endif /* Signature · 1 line
2.26.2
Quoted 4 lines · Matthew Wilcox
Should probbaly cc Linus, and also note that Stephen noticed & fixed this problem already.
https://lore.kernel.org/lkml/[email protected]/
Oh, yes, I forgot that fix. Anyway picking either one is fine to me.
Quoted 3 lines
I didn't know about it at the time I sent the pull request because it hadn't been merged at that point.
It is fine. I really don't mean blame to you.
Quoted 72 lines · Yang Shi
Quoted 70 lines
The below build failure when !CONFIG_MEMORY_FAILURE was reported for v5.16 merge window:
In file included frominclude/linux/mmzone.h:22,from include/linux/gfp.h:6, from include/linux/slab.h:15, from include/linux/crypto.h:20, from arch/x86/kernel/asm-offsets.c:9:
include/linux/page-flags.h:806:29: error: macro "PAGEFLAG_FALSE" requires 2 arguments, but only 1 given
806 |PAGEFLAG_FALSE(HasHWPoisoned)
| ^include/linux/page-flags.h:411: note: macro "PAGEFLAG_FALSE" defined here411 | #define PAGEFLAG_FALSE(uname, lname) TESTPAGEFLAG_FALSE(uname, lname) \ |
include/linux/page-flags.h:807:39: error: macro "TESTSCFLAG_FALSE" requires 2 arguments, but only 1 given
807 |TESTSCFLAG_FALSE(HasHWPoisoned)
| ^include/linux/page-flags.h:414: note: macro "TESTSCFLAG_FALSE" defined here
414 | #defineTESTSCFLAG_FALSE(uname, lname)\ | include/linux/page-flags.h:806:1: error: unknown type name 'PAGEFLAG_FALSE' 806 | PAGEFLAG_FALSE(HasHWPoisoned) | ^~~~~~~~~~~~~~ include/linux/page-flags.h:807:25: error: expected ';' before 'static' 807 | TESTSCFLAG_FALSE(HasHWPoisoned) | ^ | ; ...... 815 | static inline bool is_page_hwpoison(struct page *page) | ~~~~~~make[2]: *** [
scripts/Makefile.build:121:arch/x86/kernel/asm-offsets.s] Error 1The commit
d389a4a81155("mm: Add folio flag manipulation functions") changed the definition of PAGEFLAG macros, this caused the build failure for HasHWPoisoned flag. The new flag was introduced by commiteac96c3efdb5("mm: filemap: check if THP has hwpoisoned subpage for PMD page fault") in v5.15-rc7. But the folio series pull request was prepared before v5.15, so this new flag was missed.Cc Naresh Kamboju <[email protected]>Cc Matthew Wilcox <[email protected]>Cc Kirill A. Shutemov <[email protected]>Cc Naoya Horiguchi <[email protected]>Signed-off-by Yang Shi <[email protected]>--- include/linux/page-flags.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)include/linux/page-flags.h +2
-3@@ -803,8 +803,8 @@ PAGEFLAG_FALSE(DoubleMap, double_map) PAGEFLAG(HasHWPoisoned, has_hwpoisoned, PF_SECOND) TESTSCFLAG(HasHWPoisoned, has_hwpoisoned, PF_SECOND)#else -PAGEFLAG_FALSE(HasHWPoisoned) - TESTSCFLAG_FALSE(HasHWPoisoned) +PAGEFLAG_FALSE(HasHWPoisoned, has_hwpoisoned) + TESTSCFLAG_FALSE(HasHWPoisoned, has_hwpoisoned)#endif /* -- 2.26.2
Quoted 4 lines · Matthew Wilcox
Should probbaly cc Linus, and also note that Stephen noticed & fixed this problem already.
https://lore.kernel.org/lkml/[email protected]/
Oops. And both my "small" and "large" config have MEMORY_FAILURE and TRANSPARENT_HUGEPAGE enabled, which seems to be why my build tests didn't trigger the failure case.
Will fix up.
Linus