moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

selftest/mremap_test: update the test to handle pagesize other than 4K

Browse Source 
Patch series "mrermap fixes", v2.

This patch (of 6):

Instead of hardcoding 4K page size fetch it using sysconf().  For the
performance measurements test still assume 2M and 1G are hugepage sizes.

Link: https://lkml.kernel.org/r/20210616045239.370802-1-aneesh.kumar@linux.ibm.com
Link: https://lkml.kernel.org/r/20210616045239.370802-2-aneesh.kumar@linux.ibm.com
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Reviewed-by: Kalesh Singh <kaleshsingh@google.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Joel Fernandes <joel@joelfernandes.org>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Kirill A. Shutemov <kirill@shutemov.name>
Cc: Hugh Dickins <hughd@google.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Aneesh Kumar K.V
2021-07-07 18:09:59 -07:00
committed by Linus Torvalds
parent dc4875f0e7
commit f27a5c93cd
1 changed files with 56 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
tools/testing/selftests/vm/mremap_test.c
View File

@@ -45,14 +45,15 @@ enum {
_4MB = 4ULL << 20, _4MB = 4ULL << 20,
_1GB = 1ULL << 30, _1GB = 1ULL << 30,
_2GB = 2ULL << 30, _2GB = 2ULL << 30,
PTE = _4KB,
PMD = _2MB, PMD = _2MB,
PUD = _1GB, PUD = _1GB,
}; };
#define PTE page_size
#define MAKE_TEST(source_align, destination_align, size, \ #define MAKE_TEST(source_align, destination_align, size, \
overlaps, should_fail, test_name) \ overlaps, should_fail, test_name) \
{ \ (struct test){ \
.name = test_name, \ .name = test_name, \
.config = { \ .config = { \
.src_alignment = source_align, \ .src_alignment = source_align, \
@@ -252,12 +253,17 @@ static int parse_args(int argc, char **argv, unsigned int *threshold_mb,
return 0; return 0;
} }
#define MAX_TEST 13
#define MAX_PERF_TEST 3
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int failures = 0; int failures = 0;
int i, run_perf_tests; int i, run_perf_tests;
unsigned int threshold_mb = VALIDATION_DEFAULT_THRESHOLD; unsigned int threshold_mb = VALIDATION_DEFAULT_THRESHOLD;
unsigned int pattern_seed; unsigned int pattern_seed;
struct test test_cases[MAX_TEST];
struct test perf_test_cases[MAX_PERF_TEST];
int page_size;
time_t t; time_t t;
pattern_seed = (unsigned int) time(&t); pattern_seed = (unsigned int) time(&t);
@@ -268,56 +274,59 @@ int main(int argc, char **argv)
ksft_print_msg("Test configs:\n\tthreshold_mb=%u\n\tpattern_seed=%u\n\n", ksft_print_msg("Test configs:\n\tthreshold_mb=%u\n\tpattern_seed=%u\n\n",
threshold_mb, pattern_seed); threshold_mb, pattern_seed);
struct test test_cases[] = { page_size = sysconf(_SC_PAGESIZE);
/* Expected mremap failures */ /* Expected mremap failures */
MAKE_TEST(_4KB, _4KB, _4KB, OVERLAPPING, EXPECT_FAILURE, test_cases[0] = MAKE_TEST(page_size, page_size, page_size,
"mremap - Source and Destination Regions Overlapping"), OVERLAPPING, EXPECT_FAILURE,
MAKE_TEST(_4KB, _1KB, _4KB, NON_OVERLAPPING, EXPECT_FAILURE, "mremap - Source and Destination Regions Overlapping");
"mremap - Destination Address Misaligned (1KB-aligned)"),
MAKE_TEST(_1KB, _4KB, _4KB, NON_OVERLAPPING, EXPECT_FAILURE, test_cases[1] = MAKE_TEST(page_size, page_size/4, page_size,
"mremap - Source Address Misaligned (1KB-aligned)"), NON_OVERLAPPING, EXPECT_FAILURE,
"mremap - Destination Address Misaligned (1KB-aligned)");
test_cases[2] = MAKE_TEST(page_size/4, page_size, page_size,
NON_OVERLAPPING, EXPECT_FAILURE,
"mremap - Source Address Misaligned (1KB-aligned)");
/* Src addr PTE aligned */ /* Src addr PTE aligned */
MAKE_TEST(PTE, PTE, _8KB, NON_OVERLAPPING, EXPECT_SUCCESS, test_cases[3] = MAKE_TEST(PTE, PTE, PTE * 2,
"8KB mremap - Source PTE-aligned, Destination PTE-aligned"), NON_OVERLAPPING, EXPECT_SUCCESS,
"8KB mremap - Source PTE-aligned, Destination PTE-aligned");
/* Src addr 1MB aligned */ /* Src addr 1MB aligned */
MAKE_TEST(_1MB, PTE, _2MB, NON_OVERLAPPING, EXPECT_SUCCESS, test_cases[4] = MAKE_TEST(_1MB, PTE, _2MB, NON_OVERLAPPING, EXPECT_SUCCESS,
"2MB mremap - Source 1MB-aligned, Destination PTE-aligned"), "2MB mremap - Source 1MB-aligned, Destination PTE-aligned");
MAKE_TEST(_1MB, _1MB, _2MB, NON_OVERLAPPING, EXPECT_SUCCESS, test_cases[5] = MAKE_TEST(_1MB, _1MB, _2MB, NON_OVERLAPPING, EXPECT_SUCCESS,
"2MB mremap - Source 1MB-aligned, Destination 1MB-aligned"), "2MB mremap - Source 1MB-aligned, Destination 1MB-aligned");
/* Src addr PMD aligned */ /* Src addr PMD aligned */
MAKE_TEST(PMD, PTE, _4MB, NON_OVERLAPPING, EXPECT_SUCCESS, test_cases[6] = MAKE_TEST(PMD, PTE, _4MB, NON_OVERLAPPING, EXPECT_SUCCESS,
"4MB mremap - Source PMD-aligned, Destination PTE-aligned"), "4MB mremap - Source PMD-aligned, Destination PTE-aligned");
MAKE_TEST(PMD, _1MB, _4MB, NON_OVERLAPPING, EXPECT_SUCCESS, test_cases[7] = MAKE_TEST(PMD, _1MB, _4MB, NON_OVERLAPPING, EXPECT_SUCCESS,
"4MB mremap - Source PMD-aligned, Destination 1MB-aligned"), "4MB mremap - Source PMD-aligned, Destination 1MB-aligned");
MAKE_TEST(PMD, PMD, _4MB, NON_OVERLAPPING, EXPECT_SUCCESS, test_cases[8] = MAKE_TEST(PMD, PMD, _4MB, NON_OVERLAPPING, EXPECT_SUCCESS,
"4MB mremap - Source PMD-aligned, Destination PMD-aligned"), "4MB mremap - Source PMD-aligned, Destination PMD-aligned");
/* Src addr PUD aligned */ /* Src addr PUD aligned */
MAKE_TEST(PUD, PTE, _2GB, NON_OVERLAPPING, EXPECT_SUCCESS, test_cases[9] = MAKE_TEST(PUD, PTE, _2GB, NON_OVERLAPPING, EXPECT_SUCCESS,
"2GB mremap - Source PUD-aligned, Destination PTE-aligned"), "2GB mremap - Source PUD-aligned, Destination PTE-aligned");
MAKE_TEST(PUD, _1MB, _2GB, NON_OVERLAPPING, EXPECT_SUCCESS, test_cases[10] = MAKE_TEST(PUD, _1MB, _2GB, NON_OVERLAPPING, EXPECT_SUCCESS,
"2GB mremap - Source PUD-aligned, Destination 1MB-aligned"), "2GB mremap - Source PUD-aligned, Destination 1MB-aligned");
MAKE_TEST(PUD, PMD, _2GB, NON_OVERLAPPING, EXPECT_SUCCESS, test_cases[11] = MAKE_TEST(PUD, PMD, _2GB, NON_OVERLAPPING, EXPECT_SUCCESS,
"2GB mremap - Source PUD-aligned, Destination PMD-aligned"), "2GB mremap - Source PUD-aligned, Destination PMD-aligned");
MAKE_TEST(PUD, PUD, _2GB, NON_OVERLAPPING, EXPECT_SUCCESS, test_cases[12] = MAKE_TEST(PUD, PUD, _2GB, NON_OVERLAPPING, EXPECT_SUCCESS,
"2GB mremap - Source PUD-aligned, Destination PUD-aligned"), "2GB mremap - Source PUD-aligned, Destination PUD-aligned");
};
struct test perf_test_cases[] = { perf_test_cases[0] = MAKE_TEST(page_size, page_size, _1GB, NON_OVERLAPPING, EXPECT_SUCCESS,
"1GB mremap - Source PTE-aligned, Destination PTE-aligned");
/* /*
* mremap 1GB region - Page table level aligned time * mremap 1GB region - Page table level aligned time
* comparison. * comparison.
*/ */
MAKE_TEST(PTE, PTE, _1GB, NON_OVERLAPPING, EXPECT_SUCCESS, perf_test_cases[1] = MAKE_TEST(PMD, PMD, _1GB, NON_OVERLAPPING, EXPECT_SUCCESS,
"1GB mremap - Source PTE-aligned, Destination PTE-aligned"), "1GB mremap - Source PMD-aligned, Destination PMD-aligned");
MAKE_TEST(PMD, PMD, _1GB, NON_OVERLAPPING, EXPECT_SUCCESS, perf_test_cases[2] = MAKE_TEST(PUD, PUD, _1GB, NON_OVERLAPPING, EXPECT_SUCCESS,
"1GB mremap - Source PMD-aligned, Destination PMD-aligned"), "1GB mremap - Source PUD-aligned, Destination PUD-aligned");
MAKE_TEST(PUD, PUD, _1GB, NON_OVERLAPPING, EXPECT_SUCCESS,
"1GB mremap - Source PUD-aligned, Destination PUD-aligned"),
};
run_perf_tests = (threshold_mb == VALIDATION_NO_THRESHOLD) || run_perf_tests = (threshold_mb == VALIDATION_NO_THRESHOLD) ||
(threshold_mb * _1MB >= _1GB); (threshold_mb * _1MB >= _1GB);