linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Brian Geffon <bgeffon@google.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Axel Rasmussen <axelrasmussen@google.com>,
	Lokesh Gidra <lokeshgidra@google.com>,
	 Mike Rapoport <rppt@linux.vnet.ibm.com>,
	Peter Xu <peterx@redhat.com>,  Hugh Dickins <hughd@google.com>,
	"Michael S . Tsirkin" <mst@redhat.com>,
	Brian Geffon <bgeffon@google.com>,
	 linux-kernel@vger.kernel.org, linux-mm@kvack.org,
	 Andy Lutomirski <luto@amacapital.net>,
	Vlastimil Babka <vbabka@suse.cz>,
	 Andrea Arcangeli <aarcange@redhat.com>,
	Sonny Rao <sonnyrao@google.com>,
	 Minchan Kim <minchan@kernel.org>,
	"Kirill A . Shutemov" <kirill@shutemov.name>,
	 Dmitry Safonov <dima@arista.com>,
	Michael Kerrisk <mtk.manpages@gmail.com>,
	 Alejandro Colomar <alx.manpages@gmail.com>
Subject: [PATCH v4 3/3] selftests: Add a MREMAP_DONTUNMAP selftest for shmem
Date: Tue, 23 Mar 2021 09:26:10 -0700	[thread overview]
Message-ID: <20210323162611.2398613-3-bgeffon@google.com> (raw)
In-Reply-To: <20210323162611.2398613-1-bgeffon@google.com>

This test extends the current mremap tests to validate that
the MREMAP_DONTUNMAP operation can be performed on shmem mappings.

Signed-off-by: Brian Geffon <bgeffon@google.com>
---
 tools/testing/selftests/vm/mremap_dontunmap.c | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/tools/testing/selftests/vm/mremap_dontunmap.c b/tools/testing/selftests/vm/mremap_dontunmap.c
index 3a7b5ef0b0c6..f01dc4a85b0b 100644
--- a/tools/testing/selftests/vm/mremap_dontunmap.c
+++ b/tools/testing/selftests/vm/mremap_dontunmap.c
@@ -127,6 +127,57 @@ static void mremap_dontunmap_simple()
 	       "unable to unmap source mapping");
 }
 
+// This test validates that MREMAP_DONTUNMAP on a shared mapping works as expected.
+static void mremap_dontunmap_simple_shmem()
+{
+	unsigned long num_pages = 5;
+
+	int mem_fd = memfd_create("memfd", MFD_CLOEXEC);
+	BUG_ON(mem_fd < 0, "memfd_create");
+
+	BUG_ON(ftruncate(mem_fd, num_pages * page_size) < 0,
+			"ftruncate");
+
+	void *source_mapping =
+	    mmap(NULL, num_pages * page_size, PROT_READ | PROT_WRITE,
+		 MAP_FILE | MAP_SHARED, mem_fd, 0);
+	BUG_ON(source_mapping == MAP_FAILED, "mmap");
+
+	BUG_ON(close(mem_fd) < 0, "close");
+
+	memset(source_mapping, 'a', num_pages * page_size);
+
+	// Try to just move the whole mapping anywhere (not fixed).
+	void *dest_mapping =
+	    mremap(source_mapping, num_pages * page_size, num_pages * page_size,
+		   MREMAP_DONTUNMAP | MREMAP_MAYMOVE, NULL);
+	if (dest_mapping == MAP_FAILED && errno == EINVAL) {
+		// Old kernel which doesn't support MREMAP_DONTUNMAP on shmem.
+		BUG_ON(munmap(source_mapping, num_pages * page_size) == -1,
+			"unable to unmap source mapping");
+		return;
+	}
+
+	BUG_ON(dest_mapping == MAP_FAILED, "mremap");
+
+	// Validate that the pages have been moved, we know they were moved if
+	// the dest_mapping contains a's.
+	BUG_ON(check_region_contains_byte
+	       (dest_mapping, num_pages * page_size, 'a') != 0,
+	       "pages did not migrate");
+
+	// Because the region is backed by shmem, we will actually see the same
+	// memory at the source location still.
+	BUG_ON(check_region_contains_byte
+	       (source_mapping, num_pages * page_size, 'a') != 0,
+	       "source should have no ptes");
+
+	BUG_ON(munmap(dest_mapping, num_pages * page_size) == -1,
+	       "unable to unmap destination mapping");
+	BUG_ON(munmap(source_mapping, num_pages * page_size) == -1,
+	       "unable to unmap source mapping");
+}
+
 // This test validates MREMAP_DONTUNMAP will move page tables to a specific
 // destination using MREMAP_FIXED, also while validating that the source
 // remains intact.
@@ -300,6 +351,7 @@ int main(void)
 	BUG_ON(page_buffer == MAP_FAILED, "unable to mmap a page.");
 
 	mremap_dontunmap_simple();
+	mremap_dontunmap_simple_shmem();
 	mremap_dontunmap_simple_fixed();
 	mremap_dontunmap_partial_mapping();
 	mremap_dontunmap_partial_mapping_overwrite();
-- 
2.31.0.rc2.261.g7f71774620-goog



  parent reply	other threads:[~2021-03-23 16:26 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-03 17:52 [PATCH] mm: Allow shmem mappings with MREMAP_DONTUNMAP Brian Geffon
2021-03-03 18:13 ` Brian Geffon
2021-03-03 19:04   ` Lokesh Gidra
2021-03-14  4:19 ` Hugh Dickins
2021-03-16 19:18   ` Brian Geffon
2021-03-16 19:31     ` Dmitry Safonov
2021-03-16 20:17   ` Peter Xu
2021-03-19  1:58     ` Hugh Dickins
2021-03-17 19:13 ` [PATCH v2 1/2] mm: Allow non-VM_DONTEXPAND and VM_PFNMAP " Brian Geffon
2021-03-17 19:13   ` [PATCH v2 2/2] Revert "mremap: don't allow MREMAP_DONTUNMAP on special_mappings and aio" Brian Geffon
2021-03-17 20:40   ` [PATCH v2 1/2] mm: Allow non-VM_DONTEXPAND and VM_PFNMAP mappings with MREMAP_DONTUNMAP Peter Xu
2021-03-17 20:44     ` Brian Geffon
2021-03-17 21:18       ` Peter Xu
2021-03-17 21:25         ` Brian Geffon
2021-03-17 21:41 ` [PATCH v3 " Brian Geffon
2021-03-17 21:41   ` [PATCH v3 2/2] Revert "mremap: don't allow MREMAP_DONTUNMAP on special_mappings and aio" Brian Geffon
2021-03-19  1:28     ` Hugh Dickins
2021-03-17 22:03   ` [PATCH v3 1/2] mm: Allow non-VM_DONTEXPAND and VM_PFNMAP mappings with MREMAP_DONTUNMAP Andrew Morton
2021-03-19  1:20   ` Hugh Dickins
2021-03-23 16:26 ` [PATCH v4 1/3] mm: Extend MREMAP_DONTUNMAP to non-anonymous mappings Brian Geffon
2021-03-23 16:26   ` [PATCH v4 2/3] Revert "mremap: don't allow MREMAP_DONTUNMAP on special_mappings and aio" Brian Geffon
2021-03-23 18:16     ` Hugh Dickins
2021-03-23 18:26       ` Brian Geffon
2021-03-23 16:26   ` Brian Geffon [this message]
2021-03-23 16:26   ` [PATCH] mremap.2: MREMAP_DONTUNMAP to reflect to supported mappings Brian Geffon
2021-03-23 18:25 ` [PATCH v5 1/3] mm: Extend MREMAP_DONTUNMAP to non-anonymous mappings Brian Geffon
2021-03-23 18:25   ` [PATCH v5 2/3] Revert "mremap: don't allow MREMAP_DONTUNMAP on special_mappings and aio" Brian Geffon
2021-03-23 19:05     ` Dmitry Safonov
2021-03-23 18:25   ` [PATCH v5 3/3] selftests: Add a MREMAP_DONTUNMAP selftest for shmem Brian Geffon
2021-03-23 18:25   ` [PATCH] mremap.2: MREMAP_DONTUNMAP to reflect to supported mappings Brian Geffon
2021-03-25 21:34     ` Alejandro Colomar (man-pages)
2021-03-26 18:08       ` Brian Geffon
2022-05-10 20:50         ` Brian Geffon
2021-03-23 19:04   ` [PATCH v5 1/3] mm: Extend MREMAP_DONTUNMAP to non-anonymous mappings Dmitry Safonov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210323162611.2398613-3-bgeffon@google.com \
    --to=bgeffon@google.com \
    --cc=aarcange@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=alx.manpages@gmail.com \
    --cc=axelrasmussen@google.com \
    --cc=dima@arista.com \
    --cc=hughd@google.com \
    --cc=kirill@shutemov.name \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=lokeshgidra@google.com \
    --cc=luto@amacapital.net \
    --cc=minchan@kernel.org \
    --cc=mst@redhat.com \
    --cc=mtk.manpages@gmail.com \
    --cc=peterx@redhat.com \
    --cc=rppt@linux.vnet.ibm.com \
    --cc=sonnyrao@google.com \
    --cc=vbabka@suse.cz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox