All of lore.kernel.org
 help / color / mirror / Atom feed
From: Axel Rasmussen <axelrasmussen@google.com>
To: Alexander Viro <viro@zeniv.linux.org.uk>,
	Andrea Arcangeli <aarcange@redhat.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Hugh Dickins <hughd@google.com>,
	Jerome Glisse <jglisse@redhat.com>, Joe Perches <joe@perches.com>,
	Lokesh Gidra <lokeshgidra@google.com>,
	Mike Kravetz <mike.kravetz@oracle.com>,
	Mike Rapoport <rppt@linux.vnet.ibm.com>,
	Peter Xu <peterx@redhat.com>, Shaohua Li <shli@fb.com>,
	Shuah Khan <shuah@kernel.org>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	Wang Qing <wangqing@vivo.com>
Cc: linux-api@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org,
	linux-mm@kvack.org, Axel Rasmussen <axelrasmussen@google.com>,
	Brian Geffon <bgeffon@google.com>,
	"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
	Mina Almasry <almasrymina@google.com>,
	Oliver Upton <oupton@google.com>
Subject: [PATCH v5 07/10] userfaultfd/selftests: use memfd_create for shmem test type
Date: Tue, 27 Apr 2021 15:52:41 -0700	[thread overview]
Message-ID: <20210427225244.4326-8-axelrasmussen@google.com> (raw)
In-Reply-To: <20210427225244.4326-1-axelrasmussen@google.com>

This is a preparatory commit. In the future, we want to be able to setup
alias mappings for area_src and area_dst in the shmem test, like we do
in the hugetlb_shared test. With a VMA obtained via
mmap(MAP_ANONYMOUS | MAP_SHARED), it isn't clear how to do this.

So, mmap() with an fd, so we can create alias mappings. Use memfd_create
instead of actually passing in a tmpfs path like hugetlb does, since
it's more convenient / simpler to run, and works just as well.

Future commits will:

1. Setup the alias mappings.
2. Extend our tests to actually take advantage of this, to test new
   userfaultfd behavior being introduced in this series.

Also, a small fix in the area we're changing: when the hugetlb setup
fails in main(), pass in the right argv[] so we actually print out the
hugetlb file path.

Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Axel Rasmussen <axelrasmussen@google.com>
---
 tools/testing/selftests/vm/userfaultfd.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c
index 6339aeaeeff8..fc40831f818f 100644
--- a/tools/testing/selftests/vm/userfaultfd.c
+++ b/tools/testing/selftests/vm/userfaultfd.c
@@ -85,6 +85,7 @@ static bool test_uffdio_wp = false;
 static bool test_uffdio_minor = false;
 
 static bool map_shared;
+static int shm_fd;
 static int huge_fd;
 static char *huge_fd_off0;
 static unsigned long long *count_verify;
@@ -277,8 +278,11 @@ static void shmem_release_pages(char *rel_area)
 
 static void shmem_allocate_area(void **alloc_area)
 {
+	unsigned long offset =
+		alloc_area == (void **)&area_src ? 0 : nr_pages * page_size;
+
 	*alloc_area = mmap(NULL, nr_pages * page_size, PROT_READ | PROT_WRITE,
-			   MAP_ANONYMOUS | MAP_SHARED, -1, 0);
+			   MAP_SHARED, shm_fd, offset);
 	if (*alloc_area == MAP_FAILED)
 		err("mmap of memfd failed");
 }
@@ -1448,6 +1452,16 @@ int main(int argc, char **argv)
 			err("Open of %s failed", argv[4]);
 		if (ftruncate(huge_fd, 0))
 			err("ftruncate %s to size 0 failed", argv[4]);
+	} else if (test_type == TEST_SHMEM) {
+		shm_fd = memfd_create(argv[0], 0);
+		if (shm_fd < 0)
+			err("memfd_create");
+		if (ftruncate(shm_fd, nr_pages * page_size * 2))
+			err("ftruncate");
+		if (fallocate(shm_fd,
+			      FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, 0,
+			      nr_pages * page_size * 2))
+			err("fallocate");
 	}
 	printf("nr_pages: %lu, nr_pages_per_cpu: %lu\n",
 	       nr_pages, nr_pages_per_cpu);
-- 
2.31.1.498.g6c1eba8ee3d-goog


  parent reply	other threads:[~2021-04-27 22:53 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-27 22:52 [PATCH v5 00/10] userfaultfd: add minor fault handling for shmem Axel Rasmussen
2021-04-27 22:52 ` Axel Rasmussen
2021-04-27 22:52 ` [PATCH v5 01/10] userfaultfd/hugetlbfs: avoid including userfaultfd_k.h in hugetlb.h Axel Rasmussen
2021-04-27 22:52   ` Axel Rasmussen
2021-04-27 22:52 ` [PATCH v5 02/10] userfaultfd/shmem: combine shmem_{mcopy_atomic,mfill_zeropage}_pte Axel Rasmussen
2021-04-27 22:52   ` Axel Rasmussen
2021-04-27 22:52 ` [PATCH v5 03/10] userfaultfd/shmem: support minor fault registration for shmem Axel Rasmussen
2021-04-27 22:52   ` Axel Rasmussen
2021-04-28  0:02   ` Hugh Dickins
2021-04-28  0:02     ` Hugh Dickins
2021-04-27 22:52 ` [PATCH v5 04/10] userfaultfd/shmem: support UFFDIO_CONTINUE " Axel Rasmussen
2021-04-27 22:52   ` Axel Rasmussen
2021-04-28  0:03   ` Hugh Dickins
2021-04-28  0:03     ` Hugh Dickins
2021-04-28 15:10   ` Peter Xu
2021-04-27 22:52 ` [PATCH v5 05/10] userfaultfd/shmem: advertise shmem minor fault support Axel Rasmussen
2021-04-27 22:52   ` Axel Rasmussen
2021-04-28  0:04   ` Hugh Dickins
2021-04-28  0:04     ` Hugh Dickins
2021-04-28 15:11   ` Peter Xu
2021-04-27 22:52 ` [PATCH v5 06/10] userfaultfd/shmem: modify shmem_mcopy_atomic_pte to use install_pte() Axel Rasmussen
2021-04-27 22:52   ` Axel Rasmussen
2021-04-28  0:58   ` Hugh Dickins
2021-04-28  0:58     ` Hugh Dickins
2021-04-28 15:56     ` Peter Xu
2021-04-28 15:59       ` Axel Rasmussen
2021-04-28 15:59         ` Axel Rasmussen
2021-04-28 16:23         ` Peter Xu
2021-04-27 22:52 ` Axel Rasmussen [this message]
2021-04-27 22:52   ` [PATCH v5 07/10] userfaultfd/selftests: use memfd_create for shmem test type Axel Rasmussen
2021-04-27 22:52 ` [PATCH v5 08/10] userfaultfd/selftests: create alias mappings in the shmem test Axel Rasmussen
2021-04-27 22:52   ` Axel Rasmussen
2021-04-27 22:52 ` [PATCH v5 09/10] userfaultfd/selftests: reinitialize test context in each test Axel Rasmussen
2021-04-27 22:52   ` Axel Rasmussen
2021-04-28 17:23   ` Peter Xu
2021-05-18 20:57   ` Peter Xu
2021-05-18 22:28     ` Axel Rasmussen
2021-05-18 22:28       ` Axel Rasmussen
2021-04-27 22:52 ` [PATCH v5 10/10] userfaultfd/selftests: exercise minor fault handling shmem support Axel Rasmussen
2021-04-27 22:52   ` Axel Rasmussen
2021-04-28 17:26   ` Peter Xu

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=20210427225244.4326-8-axelrasmussen@google.com \
    --to=axelrasmussen@google.com \
    --cc=aarcange@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=almasrymina@google.com \
    --cc=bgeffon@google.com \
    --cc=dgilbert@redhat.com \
    --cc=hughd@google.com \
    --cc=jglisse@redhat.com \
    --cc=joe@perches.com \
    --cc=linux-api@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=lokeshgidra@google.com \
    --cc=mike.kravetz@oracle.com \
    --cc=oupton@google.com \
    --cc=peterx@redhat.com \
    --cc=rppt@linux.vnet.ibm.com \
    --cc=sfr@canb.auug.org.au \
    --cc=shli@fb.com \
    --cc=shuah@kernel.org \
    --cc=viro@zeniv.linux.org.uk \
    --cc=wangqing@vivo.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.