Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6228b8f2 authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

userfaultfd: non-cooperative: selftest: introduce userfaultfd_open 

userfaultfd_open will be needed by the non cooperative selftest.

Link: http://lkml.kernel.org/r/20161216144821.5183-39-aarcange@redhat.com


Signed-off-by: default avatarMike Rapoport <rppt@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Cc: Hillf Danton <hillf.zj@alibaba-inc.com>
Cc: Michael Rapoport <RAPOPORT@il.ibm.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 47dd9245

tools/testing/selftests/vm/userfaultfd.c

+25 −16
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static int huge_fd; 
static char *huge_fd_off0;

#endif

static unsigned long long *count_verify;

static int uffd, finished, *pipefd;

static int uffd, uffd_flags, finished, *pipefd;

static char *area_src, *area_dst;

static char *zeropage;

pthread_attr_t attr;
@@ -512,23 +512,9 @@ static int stress(unsigned long *userfaults) 
	return 0;

}



static int userfaultfd_stress(void)

static int userfaultfd_open(void)

{

	void *area;

	char *tmp_area;

	unsigned long nr;

	struct uffdio_register uffdio_register;

	struct uffdio_api uffdio_api;

	unsigned long cpu;

	int uffd_flags, err;

	unsigned long userfaults[nr_cpus];



	allocate_area((void **)&area_src);

	if (!area_src)

		return 1;

	allocate_area((void **)&area_dst);

	if (!area_dst)

		return 1;



	uffd = syscall(__NR_userfaultfd, O_CLOEXEC | O_NONBLOCK);

	if (uffd < 0) {
@@ -549,6 +535,29 @@ static int userfaultfd_stress(void) 
		return 1;

	}



	return 0;

}



static int userfaultfd_stress(void)

{

	void *area;

	char *tmp_area;

	unsigned long nr;

	struct uffdio_register uffdio_register;

	unsigned long cpu;

	int err;

	unsigned long userfaults[nr_cpus];



	allocate_area((void **)&area_src);

	if (!area_src)

		return 1;

	allocate_area((void **)&area_dst);

	if (!area_dst)

		return 1;



	if (userfaultfd_open() < 0)

		return 1;



	count_verify = malloc(nr_pages * sizeof(unsigned long long));

	if (!count_verify) {

		perror("count_verify");