Skip to content

Commit 8ed873d

Browse files
joelagnelakpm00
authored andcommitted
selftests: mm: add a test for mutually aligned moves > PMD size
This patch adds a test case to check if a PMD-alignment optimization successfully happens. I add support to make sure there is some room before the source mapping, otherwise the optimization to trigger PMD-aligned move will be disabled as the kernel will detect that a mapping before the source exists and such optimization becomes impossible. Link: https://lkml.kernel.org/r/20230903151328.2981432-5-joel@joelfernandes.org Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org> Reviewed-by: Lorenzo Stoakes <lstoakes@gmail.com> Cc: Kalesh Singh <kaleshsingh@google.com> Cc: "Kirill A. Shutemov" <kirill@shutemov.name> Cc: Liam R. Howlett <Liam.Howlett@oracle.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Lokesh Gidra <lokeshgidra@google.com> Cc: Michal Hocko <mhocko@suse.com> Cc: Paul E. McKenney <paulmck@kernel.org> Cc: Shuah Khan <shuah@kernel.org> Cc: Suren Baghdasaryan <surenb@google.com> Cc: Vlastimil Babka <vbabka@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 99eb26d commit 8ed873d

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

tools/testing/selftests/mm/mremap_test.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ enum {
4444
_1MB = 1ULL << 20,
4545
_2MB = 2ULL << 20,
4646
_4MB = 4ULL << 20,
47+
_5MB = 5ULL << 20,
4748
_1GB = 1ULL << 30,
4849
_2GB = 2ULL << 30,
4950
PMD = _2MB,
@@ -235,6 +236,11 @@ static void *get_source_mapping(struct config c)
235236
unsigned long long mmap_min_addr;
236237

237238
mmap_min_addr = get_mmap_min_addr();
239+
/*
240+
* For some tests, we need to not have any mappings below the
241+
* source mapping. Add some headroom to mmap_min_addr for this.
242+
*/
243+
mmap_min_addr += 10 * _4MB;
238244

239245
retry:
240246
addr += c.src_alignment;
@@ -434,7 +440,7 @@ static int parse_args(int argc, char **argv, unsigned int *threshold_mb,
434440
return 0;
435441
}
436442

437-
#define MAX_TEST 13
443+
#define MAX_TEST 14
438444
#define MAX_PERF_TEST 3
439445
int main(int argc, char **argv)
440446
{
@@ -500,6 +506,10 @@ int main(int argc, char **argv)
500506
test_cases[12] = MAKE_TEST(PUD, PUD, _2GB, NON_OVERLAPPING, EXPECT_SUCCESS,
501507
"2GB mremap - Source PUD-aligned, Destination PUD-aligned");
502508

509+
/* Src and Dest addr 1MB aligned. 5MB mremap. */
510+
test_cases[13] = MAKE_TEST(_1MB, _1MB, _5MB, NON_OVERLAPPING, EXPECT_SUCCESS,
511+
"5MB mremap - Source 1MB-aligned, Destination 1MB-aligned");
512+
503513
perf_test_cases[0] = MAKE_TEST(page_size, page_size, _1GB, NON_OVERLAPPING, EXPECT_SUCCESS,
504514
"1GB mremap - Source PTE-aligned, Destination PTE-aligned");
505515
/*

0 commit comments

Comments
 (0)