Skip to contentSkip to conversation

userfaultfd: Add test using UFFDIO_POISON

PATCH Applied Ricardo Branco 3 participants 4 messages Mar 2 – Mar 20

lore
Share & tools
lore
#0 lore raw

PATCH v8 1/1 userfaultfd: Add test using UFFDIO_POISON

---
 configure.ac                                  |   1 +
 include/lapi/userfaultfd.h                    |  13 ++
 runtest/syscalls                              |   1 +
 .../kernel/syscalls/userfaultfd/.gitignore    |   1 +
 .../kernel/syscalls/userfaultfd/Makefile      |   1 +
 .../syscalls/userfaultfd/userfaultfd06.c      | 144 ++++++++++++++++++
 6 files changed, 161 insertions(+)
 create mode 100644 testcases/kernel/syscalls/userfaultfd/userfaultfd06.c
configure.ac +1 -0
index 7fa614dcb..94bcbcc98 100644
@@ -278,6 +278,7 @@ AC_CHECK_TYPES([struct sockaddr_vm],,,[
 ])
 
 AC_CHECK_TYPES([struct uffdio_move],,,[#include <linux/userfaultfd.h>])
+AC_CHECK_TYPES([struct uffdio_poison],,,[#include <linux/userfaultfd.h>])
 AC_CHECK_TYPES([struct uffdio_writeprotect],,,[#include <linux/userfaultfd.h>])
 
 # Tools knobs
include/lapi/userfaultfd.h +13 -0
index 0c9e34c84..aab3890b7 100644
@@ -233,6 +233,19 @@ struct uffdio_writeprotect {
 };
 #endif	/* HAVE_STRUCT_UFFDIO_WRITEPROTECT */
 
+#ifndef HAVE_STRUCT_UFFDIO_POISON
+#define UFFD_FEATURE_POISON			(1<<14)
+#define _UFFDIO_POISON				(0x08)
+#define UFFDIO_POISON		_IOWR(UFFDIO, _UFFDIO_POISON, \
+				      struct uffdio_poison)
+struct uffdio_poison {
+        struct uffdio_range range;
+#define UFFDIO_POISON_MODE_DONTWAKE		((__u64)1<<0)
+        __u64 mode;
+        __s64 updated;
+};
+#endif	/* HAVE_STRUCT_UFFDIO_POISON */
+
 #define SAFE_USERFAULTFD(flags, retry) \
 	safe_userfaultfd(__FILE__, __LINE__, (flags), (retry))
 
runtest/syscalls +1 -0
index 05bb3ceb1..b76c3890f 100644
@@ -1775,6 +1775,7 @@ userfaultfd02 userfaultfd02
 userfaultfd03 userfaultfd03
 userfaultfd04 userfaultfd04
 userfaultfd05 userfaultfd05
+userfaultfd06 userfaultfd06
 
 ustat01 ustat01
 ustat02 ustat02
testcases/kernel/syscalls/userfaultfd/.gitignore +1 -0
index fb2ae243b..bc32fdf3b 100644
@@ -3,3 +3,4 @@
 /userfaultfd03
 /userfaultfd04
 /userfaultfd05
+/userfaultfd06
testcases/kernel/syscalls/userfaultfd/Makefile +1 -0
index 96650a65a..3252e47df 100644
@@ -16,3 +16,4 @@ userfaultfd02: CFLAGS += -pthread
 userfaultfd03: CFLAGS += -pthread
 userfaultfd04: CFLAGS += -pthread
 userfaultfd05: CFLAGS += -pthread
+userfaultfd06: CFLAGS += -pthread
testcases/kernel/syscalls/userfaultfd/userfaultfd06.c new file +144 -0

144 lines not on this page · raw message

Signature · 5 lines
2.53.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
Acked-by Andrea Cervesato on v8 1/1
#2 lore raw
In reply to Ricardo Branco

Hi!

testcases/kernel/syscalls/userfaultfd/userfaultfd06.c line 61

Quoted 10 lines
testcases/kernel/syscalls/userfaultfd/userfaultfd06.c new file +10 -0
+
+static void reset_pages(void)
+{
+	if (page) {
+		SAFE_MUNMAP(page, page_size);
+		page = NULL;
+	}
+}
+
+static void *handle_thread(void)

It looks good, but I noticed that all threads handlers in the userfaultfd testing suite are not using the POSIX syntax:

static void *handle_thread(void *arg LTP_ATTRIBUTE_UNUSED)

We should can change it later on.

--
Andrea Cervesato
SUSE QE Automation Engineer Linux
[email protected]

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp