selftests: vm: use 1 MB hugepage size for s390
Subsystems (3)
PATCH 1/1 selftests: vm: use 1 MB hugepage size for s390
hugepage-vmemmap test fails for s390 because it assumes a hugepagesize of 2 MB, while we have 1 MB on s390. This results in iterating over two hugepages. If they are consecutive in memory, check_page_flags() will stumble over the additional head page. Otherwise, it will stumble over non-huge pageflags, after crossing the first 1 MB hugepage.
Fix this by using 1 MB MAP_LENGTH for s390.
--- tools/testing/selftests/vm/hugepage-vmemmap.c | 7 +++++++ 1 file changed, 7 insertions(+)
tools/testing/selftests/vm/hugepage-vmemmap.c +7 -0
@@ -11,7 +11,14 @@#include <sys/mman.h> #include <fcntl.h> +/* +* 1 MB hugepage size for s390 +*/ +#if defined(__s390x__) +#define MAP_LENGTH (1UL * 1024 * 1024) +#else #define MAP_LENGTH (2UL * 1024 * 1024) +#endif #ifndef MAP_HUGETLB #define MAP_HUGETLB 0x40000/* arch specific */
Signature · 1 line
2.34.1
Quoted 19 lines · Gerald Schaefer
hugepage-vmemmap test fails for s390 because it assumes a hugepagesize of 2 MB, while we have 1 MB on s390. This results in iterating over two hugepages. If they are consecutive in memory,
check_page_flags()will stumble over the additional head page. Otherwise, it will stumble over non-huge pageflags, after crossing the first 1 MB hugepage.Fix this by using 1 MB
MAP_LENGTHfor s390.Signed-off-by Gerald Schaefer <[email protected]>--- tools/testing/selftests/vm/hugepage-vmemmap.c | 7 +++++++ 1 file changed, 7 insertions(+)tools/testing/selftests/vm/hugepage-vmemmap.c +0
-0@@ -11,7 +11,14 @@#include <sys/mman.h>
tools/testing/selftests/vm/hugepage-vmemmap.c line 21
Quoted 10 lines
tools/testing/selftests/vm/hugepage-vmemmap.c +7
-0#include <fcntl.h> +/* +* 1 MB hugepage size for s390 +*/ +#if defined(__s390x__) +#define MAP_LENGTH (1UL * 1024 * 1024) +#else #define MAP_LENGTH (2UL * 1024 * 1024) +#endif
Why not detect it at runtime, so this works on any architecture (e.g., ppc64 with 16 MiB IIRC and arm64 with weird sizes)?
A patch that adds such detection code is currently on its way upstream:
https://lore.kernel.org/all/[email protected]/T/#u
We could factor that out into vm_utils.c
Signature · 3 lines
Thanks, David / dhildenb
Quoted 34 lines · On Tue, 25 Oct 2022 17:34:52 +0200 David Hildenbrand <[email protected]> wrote:
Quoted 19 lines · Gerald Schaefer
hugepage-vmemmap test fails for s390 because it assumes a hugepagesize of 2 MB, while we have 1 MB on s390. This results in iterating over two hugepages. If they are consecutive in memory,
check_page_flags()will stumble over the additional head page. Otherwise, it will stumble over non-huge pageflags, after crossing the first 1 MB hugepage.Fix this by using 1 MB
MAP_LENGTHfor s390.Signed-off-by Gerald Schaefer <[email protected]>--- tools/testing/selftests/vm/hugepage-vmemmap.c | 7 +++++++ 1 file changed, 7 insertions(+)tools/testing/selftests/vm/hugepage-vmemmap.c +0
-0@@ -11,7 +11,14 @@#include <sys/mman.h> tools/testing/selftests/vm/hugepage-vmemmap.c line 21
Quoted 10 lines
tools/testing/selftests/vm/hugepage-vmemmap.c +7
-0#include <fcntl.h> +/* +* 1 MB hugepage size for s390 +*/ +#if defined(__s390x__) +#define MAP_LENGTH (1UL * 1024 * 1024) +#else #define MAP_LENGTH (2UL * 1024 * 1024) +#endif Why not detect it at runtime, so this works on any architecture (e.g., ppc64 with 16 MiB IIRC and arm64 with weird sizes)?
Quoted 6 lines
A patch that adds such detection code is currently on its way upstream:
https://lore.kernel.org/all/[email protected]/T/#u
We could factor that out into
vm_utils.c
Hello David, nice, I guess that would be much better than adding new #ifdefs, and also allow to check all available hugepage sizes per arch.