|
@@ -81,7 +81,7 @@ static int huge_fd;
|
|
static char *huge_fd_off0;
|
|
static char *huge_fd_off0;
|
|
#endif
|
|
#endif
|
|
static unsigned long long *count_verify;
|
|
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 *area_src, *area_dst;
|
|
static char *zeropage;
|
|
static char *zeropage;
|
|
pthread_attr_t attr;
|
|
pthread_attr_t attr;
|
|
@@ -512,23 +512,9 @@ static int stress(unsigned long *userfaults)
|
|
return 0;
|
|
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;
|
|
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);
|
|
uffd = syscall(__NR_userfaultfd, O_CLOEXEC | O_NONBLOCK);
|
|
if (uffd < 0) {
|
|
if (uffd < 0) {
|
|
@@ -549,6 +535,29 @@ static int userfaultfd_stress(void)
|
|
return 1;
|
|
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));
|
|
count_verify = malloc(nr_pages * sizeof(unsigned long long));
|
|
if (!count_verify) {
|
|
if (!count_verify) {
|
|
perror("count_verify");
|
|
perror("count_verify");
|