Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tools/testing/selftests: add VMA merge tests for KSM merge

Add test to assert that we have now allowed merging of VMAs when KSM
merging-by-default has been set by prctl(PR_SET_MEMORY_MERGE, ...).

We simply perform a trivial mapping of adjacent VMAs expecting a merge,
however prior to recent changes implementing this mode earlier than
before, these merges would not have succeeded.

Assert that we have fixed this!

Link: https://lkml.kernel.org/r/6dec7aabf062c6b121cfac992c9c716cefdda00c.1748537921.git.lorenzo.stoakes@oracle.com
Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Reviewed-by: Chengming Zhou <chengming.zhou@linux.dev>
Tested-by: Chengming Zhou <chengming.zhou@linux.dev>
Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christian Brauner <brauner@kernel.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Jann Horn <jannh@google.com>
Cc: Stefan Roesch <shr@devkernel.io>
Cc: Xu Xin <xu.xin16@zte.com.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Lorenzo Stoakes and committed by
Andrew Morton
4a1ff347 cf7e7a35

+78
+78
tools/testing/selftests/mm/merge.c
··· 2 2 3 3 #define _GNU_SOURCE 4 4 #include "../kselftest_harness.h" 5 + #include <linux/prctl.h> 5 6 #include <fcntl.h> 6 7 #include <stdio.h> 7 8 #include <stdlib.h> 8 9 #include <unistd.h> 9 10 #include <sys/mman.h> 11 + #include <sys/prctl.h> 10 12 #include <sys/syscall.h> 11 13 #include <sys/wait.h> 12 14 #include <linux/perf_event.h> ··· 36 34 { 37 35 ASSERT_EQ(munmap(self->carveout, 12 * self->page_size), 0); 38 36 ASSERT_EQ(close_procmap(&self->procmap), 0); 37 + /* 38 + * Clear unconditionally, as some tests set this. It is no issue if this 39 + * fails (KSM may be disabled for instance). 40 + */ 41 + prctl(PR_SET_MEMORY_MERGE, 0, 0, 0, 0); 39 42 } 40 43 41 44 TEST_F(merge, mprotect_unfaulted_left) ··· 503 496 out: 504 497 close(fd); 505 498 remove(probe_file); 499 + } 500 + 501 + TEST_F(merge, ksm_merge) 502 + { 503 + unsigned int page_size = self->page_size; 504 + char *carveout = self->carveout; 505 + struct procmap_fd *procmap = &self->procmap; 506 + char *ptr, *ptr2; 507 + int err; 508 + 509 + /* 510 + * Map two R/W immediately adjacent to one another, they should 511 + * trivially merge: 512 + * 513 + * |-----------|-----------| 514 + * | R/W | R/W | 515 + * |-----------|-----------| 516 + * ptr ptr2 517 + */ 518 + 519 + ptr = mmap(&carveout[page_size], page_size, PROT_READ | PROT_WRITE, 520 + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); 521 + ASSERT_NE(ptr, MAP_FAILED); 522 + ptr2 = mmap(&carveout[2 * page_size], page_size, 523 + PROT_READ | PROT_WRITE, 524 + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); 525 + ASSERT_NE(ptr2, MAP_FAILED); 526 + ASSERT_TRUE(find_vma_procmap(procmap, ptr)); 527 + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr); 528 + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr + 2 * page_size); 529 + 530 + /* Unmap the second half of this merged VMA. */ 531 + ASSERT_EQ(munmap(ptr2, page_size), 0); 532 + 533 + /* OK, now enable global KSM merge. We clear this on test teardown. */ 534 + err = prctl(PR_SET_MEMORY_MERGE, 1, 0, 0, 0); 535 + if (err == -1) { 536 + int errnum = errno; 537 + 538 + /* Only non-failure case... */ 539 + ASSERT_EQ(errnum, EINVAL); 540 + /* ...but indicates we should skip. */ 541 + SKIP(return, "KSM memory merging not supported, skipping."); 542 + } 543 + 544 + /* 545 + * Now map a VMA adjacent to the existing that was just made 546 + * VM_MERGEABLE, this should merge as well. 547 + */ 548 + ptr2 = mmap(&carveout[2 * page_size], page_size, 549 + PROT_READ | PROT_WRITE, 550 + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); 551 + ASSERT_NE(ptr2, MAP_FAILED); 552 + ASSERT_TRUE(find_vma_procmap(procmap, ptr)); 553 + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr); 554 + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr + 2 * page_size); 555 + 556 + /* Now this VMA altogether. */ 557 + ASSERT_EQ(munmap(ptr, 2 * page_size), 0); 558 + 559 + /* Try the same operation as before, asserting this also merges fine. */ 560 + ptr = mmap(&carveout[page_size], page_size, PROT_READ | PROT_WRITE, 561 + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); 562 + ASSERT_NE(ptr, MAP_FAILED); 563 + ptr2 = mmap(&carveout[2 * page_size], page_size, 564 + PROT_READ | PROT_WRITE, 565 + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); 566 + ASSERT_NE(ptr2, MAP_FAILED); 567 + ASSERT_TRUE(find_vma_procmap(procmap, ptr)); 568 + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr); 569 + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr + 2 * page_size); 506 570 } 507 571 508 572 TEST_HARNESS_MAIN