Hugetlb:Migrating the libhugetlbfs tests
v3 cover Hugetlb:Migrating the libhugetlbfs tests
Hi,
This patch series is in continuation to first part [1] This series include 5 more tests taken from libhugetlbfs.
ref:
1. https://lore.kernel.org/all/[email protected]/
v1 -> v2
1. Fixed comments
v2 -> v3
1. Changed from setjmp/longjmp logic to check/return logic in hugemmap10.c
2. Added a new patch to create support for custom flags in tst_creat_unlinked api.
3. Added patch to add safe macros for posix_fadvise call.
4. Updated coding asthetics.
5. Added description along with the line of failure in hugemmap10.c
Tarun Sahu (7):
Hugetlb: Add new argument flags in tst_creat_unlinked
Hugetlb: Migrating libhugetlbfs counters
Hugetlb: Migrating libhugetlbfs directio
Hugetlb: Safe macro for posix_fadvise call
Hugetlb: Migrating libhugetlbfs fadvise_reserve
Hugetlb: Migrating libhugetlbfs fallocate_align
Hugetlb: Migrating libhugetlbfs fallocate_basic
include/tst_safe_macros.h | 17 + include/tst_test.h | 2 +- lib/tst_test.c | 22 +- runtest/hugetlb | 6 + testcases/kernel/mem/.gitignore | 5 + .../kernel/mem/hugetlb/hugefallocate/Makefile | 10 + .../hugetlb/hugefallocate/hugefallocate01.c | 169 +++++++ .../hugetlb/hugefallocate/hugefallocate02.c | 90 ++++ .../kernel/mem/hugetlb/hugemmap/hugemmap07.c | 2 +- .../kernel/mem/hugetlb/hugemmap/hugemmap08.c | 2 +- .../kernel/mem/hugetlb/hugemmap/hugemmap09.c | 2 +- .../kernel/mem/hugetlb/hugemmap/hugemmap10.c | 462 ++++++++++++++++++ .../kernel/mem/hugetlb/hugemmap/hugemmap11.c | 87 ++++ .../kernel/mem/hugetlb/hugemmap/hugemmap12.c | 84 ++++ 14 files changed, 951 insertions(+), 9 deletions(-) create mode 100644 testcases/kernel/mem/hugetlb/hugefallocate/Makefile create mode 100644 testcases/kernel/mem/hugetlb/hugefallocate/hugefallocate01.c create mode 100644 testcases/kernel/mem/hugetlb/hugefallocate/hugefallocate02.c create mode 100644 testcases/kernel/mem/hugetlb/hugemmap/hugemmap10.c create mode 100644 testcases/kernel/mem/hugetlb/hugemmap/hugemmap11.c create mode 100644 testcases/kernel/mem/hugetlb/hugemmap/hugemmap12.c
Signature · 5 lines
2.31.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 1/7 Hugetlb: Add new argument flags in tst_creat_unlinked
Some test requires custom flags along with O_CREAT|O_EXCL|O_RDWR. This patch creates support to pass custom flags in tst_creat_unlinked.
--- include/tst_test.h | 2 +- lib/tst_test.c | 22 ++++++++++++++----- .../kernel/mem/hugetlb/hugemmap/hugemmap07.c | 2 +- .../kernel/mem/hugetlb/hugemmap/hugemmap08.c | 2 +- .../kernel/mem/hugetlb/hugemmap/hugemmap09.c | 2 +- 5 files changed, 21 insertions(+), 9 deletions(-)
include/tst_test.h +1 -1
@@ -365,7 +365,7 @@ void tst_set_max_runtime(int max_runtime);* Create and open a random file inside the given dir path. * It unlinks the file after opening and return file descriptor. */ -int tst_creat_unlinked (const char *path); +int tst_creat_unlinked (const char *path,int flags);/* * Returns path to the test temporary directory in a newly allocated buffer.
lib/tst_test.c +17 -5
@@ -1027,18 +1027,30 @@ static void prepare_and_mount_hugetlb_fs(void) mntpoint_mounted =1 ; } -int tst_creat_unlinked (const char *path) +int tst_creat_unlinked (const char *path,int flags) {char template[PATH_MAX ]; +int len, c, range;int fd; +int start[3 ] = {'0' ,'a' ,'A' };snprintf (template,PATH_MAX ,"%s/ltp_%.3sXXXXXX" , path, tid); + len =strlen (template) -1 ; + +retry: +srand (time (NULL )); +while (template[len] =='X' ) { + c =rand () %3 ; + range = start[c] =='0' ?10 :26 ; + c = start[c] + (rand () % range); + template[len--] = (char )c; + } +if (access (template,F_OK ) ==0 ) + goto retry; - fd =mkstemp (template); -if (fd <0 ) -tst_brk (TBROK |TERRNO ,"mkstemp(%s) failed" , template); - + flags |=O_CREAT |O_EXCL |O_RDWR ; + fd =SAFE_OPEN (template, flags);SAFE_UNLINK (template);return fd; }
testcases/kernel/mem/hugetlb/hugemmap/hugemmap07.c +1 -1
@@ -113,7 +113,7 @@ cleanup:static void setup (void ) { hpage_size =SAFE_READ_MEMINFO (MEMINFO_HPAGE_SIZE )*1024 ; - huge_fd =tst_creat_unlinked (MNTPOINT ); + huge_fd =tst_creat_unlinked (MNTPOINT ,0 ); }static void cleanup (void )
testcases/kernel/mem/hugetlb/hugemmap/hugemmap08.c +1 -1
@@ -118,7 +118,7 @@ static void run_test(unsigned int test_type)static void setup (void ) { hpage_size =SAFE_READ_MEMINFO (MEMINFO_HPAGE_SIZE )*1024 ; - huge_fd =tst_creat_unlinked (MNTPOINT ); + huge_fd =tst_creat_unlinked (MNTPOINT ,0 ); }static void cleanup (void )
testcases/kernel/mem/hugetlb/hugemmap/hugemmap09.c +1 -1
@@ -60,7 +60,7 @@ static void run_test(void)static void setup (void ) { hpage_size =SAFE_READ_MEMINFO (MEMINFO_HPAGE_SIZE )*1024 ; - huge_fd =tst_creat_unlinked (MNTPOINT ); + huge_fd =tst_creat_unlinked (MNTPOINT ,0 ); }static void cleanup (void )
Signature · 5 lines
2.31.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v3 1/7] Hugetlb: Add new argument flags in tst_creat_unlinked
Quoted 46 lines · Tarun Sahu
Some test requires custom flags along with O_CREAT|O_EXCL|O_RDWR. This patch creates support to pass custom flags in
tst_creat_unlinked.Signed-off-by Tarun Sahu <[email protected]>--- include/tst_test.h | 2 +- lib/tst_test.c | 22 ++++++++++++++----- .../kernel/mem/hugetlb/hugemmap/hugemmap07.c | 2 +- .../kernel/mem/hugetlb/hugemmap/hugemmap08.c | 2 +- .../kernel/mem/hugetlb/hugemmap/hugemmap09.c | 2 +- 5 files changed, 21 insertions(+), 9 deletions(-)include/tst_test.h +1
-1@@ -365,7 +365,7 @@ void tst_set_max_runtime(int max_runtime);* Create and open a random file inside the given dir path. * It unlinks the file after opening and return file descriptor. */ -int tst_creat_unlinked (const char *path); +int tst_creat_unlinked (const char *path,int flags);/* * Returns path to the test temporary directory in a newly allocated buffer. lib/tst_test.c +6
-1@@ -1027,18 +1027,30 @@ static void prepare_and_mount_hugetlb_fs(void) mntpoint_mounted =1 ; } -int tst_creat_unlinked (const char *path) +int tst_creat_unlinked (const char *path,int flags) {char template[PATH_MAX ]; +int len, c, range;int fd; +int start[3 ] = {'0' ,'a' ,'A' };snprintf (template,PATH_MAX ,"%s/ltp_%.3sXXXXXX" , path, tid); + len =strlen (template) -1 ; + +retry:
lib/tst_test.c static void prepare_and_mount_hugetlb_fs(void) · line 1051
Quoted 10 lines
lib/tst_test.c +9
-0+srand (time (NULL )); +while (template[len] =='X' ) { + c =rand () %3 ; + range = start[c] =='0' ?10 :26 ; + c = start[c] + (rand () % range); + template[len--] = (char )c; + } +if (access (template,F_OK ) ==0 ) + goto retry;
There is mistake, with retry. template will not have any XXXXXX. I will update it next version.
Quoted 54 lines
lib/tst_test.c +2
-4- fd =mkstemp (template); -if (fd <0 ) -tst_brk (TBROK |TERRNO ,"mkstemp(%s) failed" , template); - + flags |=O_CREAT |O_EXCL |O_RDWR ; + fd =SAFE_OPEN (template, flags);SAFE_UNLINK (template);return fd; }testcases/kernel/mem/hugetlb/hugemmap/hugemmap07.c +1
-1@@ -113,7 +113,7 @@ cleanup:static void setup (void ) { hpage_size =SAFE_READ_MEMINFO (MEMINFO_HPAGE_SIZE )*1024 ; - huge_fd =tst_creat_unlinked (MNTPOINT ); + huge_fd =tst_creat_unlinked (MNTPOINT ,0 ); }static void cleanup (void )testcases/kernel/mem/hugetlb/hugemmap/hugemmap08.c +1
-1@@ -118,7 +118,7 @@ static void run_test(unsigned int test_type)static void setup (void ) { hpage_size =SAFE_READ_MEMINFO (MEMINFO_HPAGE_SIZE )*1024 ; - huge_fd =tst_creat_unlinked (MNTPOINT ); + huge_fd =tst_creat_unlinked (MNTPOINT ,0 ); }static void cleanup (void )testcases/kernel/mem/hugetlb/hugemmap/hugemmap09.c +1
-1@@ -60,7 +60,7 @@ static void run_test(void)static void setup (void ) { hpage_size =SAFE_READ_MEMINFO (MEMINFO_HPAGE_SIZE )*1024 ; - huge_fd =tst_creat_unlinked (MNTPOINT ); + huge_fd =tst_creat_unlinked (MNTPOINT ,0 ); }static void cleanup (void )Signature · 5 lines
2.31.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 2/7 Hugetlb: Migrating libhugetlbfs counters
In reply to Tarun SahuMigrating the libhugetlbfs/testcases/counters.c test
Test Description: This Test perform mmap and unmap and write operation on hugetlb file based mapping. Mapping can be shared or private. and it checks for Hugetlb counter (Total, Free, Reserve, Surplus) in /proc/meminfo and compare them with expected (calculated) value. if all checks are successful, the test passes.
--- runtest/hugetlb | 1 + testcases/kernel/mem/.gitignore | 1 + .../kernel/mem/hugetlb/hugemmap/hugemmap10.c | 462 ++++++++++++++++++ 3 files changed, 464 insertions(+) create mode 100644 testcases/kernel/mem/hugetlb/hugemmap/hugemmap10.c
runtest/hugetlb +1 -0
@@ -6,6 +6,7 @@ hugemmap06 hugemmap06 hugemmap07 hugemmap07 hugemmap08 hugemmap08 hugemmap09 hugemmap09 +hugemmap10 hugemmap10 hugemmap05_1 hugemmap05 -m hugemmap05_2 hugemmap05 -s hugemmap05_3 hugemmap05 -s -m
testcases/kernel/mem/.gitignore +1 -0
@@ -7,6 +7,7 @@ /hugetlb/hugemmap/hugemmap07 /hugetlb/hugemmap/hugemmap08 /hugetlb/hugemmap/hugemmap09 +/hugetlb/hugemmap/hugemmap10 /hugetlb/hugeshmat/hugeshmat01 /hugetlb/hugeshmat/hugeshmat02 /hugetlb/hugeshmat/hugeshmat03
testcases/kernel/mem/hugetlb/hugemmap/hugemmap10.c new file +462 -0
462 lines not on this page · raw message
Signature · 5 lines
2.31.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 3/7 Hugetlb: Migrating libhugetlbfs directio
In reply to Tarun SahuMigrating the libhugetlbfs/testcases/direct.c test
Test Description: This Test perform Direct Write/Read from/To hugetlbfs file which is mapped to process address space. The test is checking if it succeeds and data written or read is not corrupted.
--- runtest/hugetlb | 1 + testcases/kernel/mem/.gitignore | 1 + .../kernel/mem/hugetlb/hugemmap/hugemmap11.c | 87 +++++++++++++++++++ 3 files changed, 89 insertions(+) create mode 100644 testcases/kernel/mem/hugetlb/hugemmap/hugemmap11.c
runtest/hugetlb +1 -0
@@ -7,6 +7,7 @@ hugemmap07 hugemmap07 hugemmap08 hugemmap08 hugemmap09 hugemmap09 hugemmap10 hugemmap10 +hugemmap11 hugemmap11 hugemmap05_1 hugemmap05 -m hugemmap05_2 hugemmap05 -s hugemmap05_3 hugemmap05 -s -m
testcases/kernel/mem/.gitignore +1 -0
@@ -8,6 +8,7 @@ /hugetlb/hugemmap/hugemmap08 /hugetlb/hugemmap/hugemmap09 /hugetlb/hugemmap/hugemmap10 +/hugetlb/hugemmap/hugemmap11 /hugetlb/hugeshmat/hugeshmat01 /hugetlb/hugeshmat/hugeshmat02 /hugetlb/hugeshmat/hugeshmat03
testcases/kernel/mem/hugetlb/hugemmap/hugemmap11.c new file +87 -0
87 lines not on this page · raw message
Signature · 5 lines
2.31.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 4/7 Hugetlb: Safe macro for posix_fadvise call
In reply to Tarun SahuThis patch adds SAFE_POSIX_FADVISE for posix_fadvise call.
--- include/tst_safe_macros.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
include/tst_safe_macros.h +17 -0
@@ -298,6 +298,23 @@ static inline int safe_ftruncate(const char *file, const int lineno,#define SAFE_FTRUNCATE (fd, length) \ safe_ftruncate(__FILE__, __LINE__, (fd), (length)) +static inline int safe_posix_fadvise (const char *file,const int lineno, +int fd,off_t offset,off_t len,int advice) +{ +int rval; + + rval =posix_fadvise (fd, offset, len, advice); + +if (rval) +tst_brk_ (file, lineno,TBROK |TERRNO , +"posix_fadvise(%d,%ld,%ld,%d) failed" , + fd, (long )offset, (long )len, advice); + +return rval; +} +#define SAFE_POSIX_FADVISE (fd, offset, len, advice) \ + safe_posix_fadvise(__FILE__, __LINE__, (fd), (offset), (len), (advice)) +static inline int safe_truncate (const char *file,const int lineno,const char *path,off_t length) {
Signature · 5 lines
2.31.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 5/7 Hugetlb: Migrating libhugetlbfs fadvise_reserve
In reply to Tarun SahuMigrating the libhugetlbfs/testcases/fadvise_reserve.c test
Test Description: fadvise() on some kernels can cause the reservation counter to get corrupted. The problem is that the patches are allocated for the reservation but not faulted in at the time of allocation. The counters do not get updated and effectively "leak". This test identifies whether the kernel is vulnerable to the problem or not. It's fixed in kernel by 'commit f2deae9d4e70 ("Remove implementation of readpage from the hugetlbfs_aops")'
--- runtest/hugetlb | 1 + testcases/kernel/mem/.gitignore | 1 + .../kernel/mem/hugetlb/hugemmap/hugemmap12.c | 84 +++++++++++++++++++ 3 files changed, 86 insertions(+) create mode 100644 testcases/kernel/mem/hugetlb/hugemmap/hugemmap12.c
runtest/hugetlb +1 -0
@@ -8,6 +8,7 @@ hugemmap08 hugemmap08 hugemmap09 hugemmap09 hugemmap10 hugemmap10 hugemmap11 hugemmap11 +hugemmap12 hugemmap12 hugemmap05_1 hugemmap05 -m hugemmap05_2 hugemmap05 -s hugemmap05_3 hugemmap05 -s -m
testcases/kernel/mem/.gitignore +1 -0
@@ -9,6 +9,7 @@ /hugetlb/hugemmap/hugemmap09 /hugetlb/hugemmap/hugemmap10 /hugetlb/hugemmap/hugemmap11 +/hugetlb/hugemmap/hugemmap12 /hugetlb/hugeshmat/hugeshmat01 /hugetlb/hugeshmat/hugeshmat02 /hugetlb/hugeshmat/hugeshmat03
testcases/kernel/mem/hugetlb/hugemmap/hugemmap12.c new file +84 -0
84 lines not on this page · raw message
Signature · 5 lines
2.31.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 6/7 Hugetlb: Migrating libhugetlbfs fallocate_align
In reply to Tarun SahuMigrating the libhugetlbfs/testcases/fallocate_align.c test
Test Description: It tests alignment of fallocate arguments. fallocate will take non-huge page aligned offsets and addresses. However, operations are only performed on huge pages. This is different that than fallocate behavior in "normal" filesystems.
--- runtest/hugetlb | 2 + testcases/kernel/mem/.gitignore | 1 + .../kernel/mem/hugetlb/hugefallocate/Makefile | 10 ++ .../hugetlb/hugefallocate/hugefallocate01.c | 169 ++++++++++++++++++ 4 files changed, 182 insertions(+) create mode 100644 testcases/kernel/mem/hugetlb/hugefallocate/Makefile create mode 100644 testcases/kernel/mem/hugetlb/hugefallocate/hugefallocate01.c
runtest/hugetlb +2 -0
@@ -1,3 +1,5 @@ +hugefallocate01 hugefallocate01 + hugemmap01 hugemmap01 hugemmap02 hugemmap02 hugemmap04 hugemmap04
testcases/kernel/mem/.gitignore +1 -0
@@ -1,4 +1,5 @@ /cpuset/cpuset01 +/hugetlb/hugefallocate/hugefallocate01 /hugetlb/hugemmap/hugemmap01 /hugetlb/hugemmap/hugemmap02 /hugetlb/hugemmap/hugemmap04
testcases/kernel/mem/hugetlb/hugefallocate/Makefile new file +10 -0
@@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2009, Cisco Systems Inc. +# Ngie Cooper, July 2009 + +top_srcdir ?= ../../../../.. + +include $(top_srcdir)/include/mk/testcases.mk +include $(abs_srcdir)/../Makefile.inc +include $(top_srcdir)/include/mk/generic_leaf_target.mk +
testcases/kernel/mem/hugetlb/hugefallocate/hugefallocate01.c new file +169 -0
169 lines not on this page · raw message
Signature · 5 lines
2.31.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 7/7 Hugetlb: Migrating libhugetlbfs fallocate_basic
In reply to Tarun SahuMigrating the libhugetlbfs/testcases/fallocate_basic.c test
Test Description: It tests basic fallocate functionality in hugetlbfs. Preallocate huge pages to a file in hugetlbfs, and then remove the pages via hole punch.
--- runtest/hugetlb | 1 + testcases/kernel/mem/.gitignore | 1 + .../hugetlb/hugefallocate/hugefallocate02.c | 90 +++++++++++++++++++ 3 files changed, 92 insertions(+) create mode 100644 testcases/kernel/mem/hugetlb/hugefallocate/hugefallocate02.c
runtest/hugetlb +1 -0
@@ -1,4 +1,5 @@ hugefallocate01 hugefallocate01 +hugefallocate02 hugefallocate02 hugemmap01 hugemmap01 hugemmap02 hugemmap02
testcases/kernel/mem/.gitignore +1 -0
@@ -1,5 +1,6 @@ /cpuset/cpuset01 /hugetlb/hugefallocate/hugefallocate01 +/hugetlb/hugefallocate/hugefallocate02 /hugetlb/hugemmap/hugemmap01 /hugetlb/hugemmap/hugemmap02 /hugetlb/hugemmap/hugemmap04
testcases/kernel/mem/hugetlb/hugefallocate/hugefallocate02.c new file +90 -0
90 lines not on this page · raw message
Signature · 5 lines
2.31.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp