Skip to contentSkip to conversation

userfaultfd: Add test using UFFDIO_POISON

PATCH Superseded Ricardo Branco 3 participants 4 messages Feb 5 – Feb 6

v1 of 8 Superseded Latest is v8 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 userfaultfd: Add test using UFFDIO_POISON

---
 .../kernel/syscalls/userfaultfd/.gitignore    |   1 +
 .../kernel/syscalls/userfaultfd/Makefile      |   1 +
 .../syscalls/userfaultfd/userfaultfd06.c      | 138 ++++++++++++++++++
 3 files changed, 140 insertions(+)
 create mode 100644 testcases/kernel/syscalls/userfaultfd/userfaultfd06.c
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 +138 -0

138 lines not on this page · raw message

Signature · 5 lines
2.53.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#1 lore raw

Hi!

Quoted 18 lines
testcases/kernel/syscalls/userfaultfd/userfaultfd06.c new file +18 -0
+static void run(void)
+{
+	pthread_t thr;
+	struct uffdio_api uffdio_api = {};
+	struct uffdio_register uffdio_register;
+	struct sigaction sa = {};
+	volatile char dummy;
+
+	sa.sa_handler = sigbus_handler;
+	sigemptyset(&sa.sa_mask);
+	SAFE_SIGACTION(SIGBUS, &sa, NULL);
+
+	set_pages();
+
+	uffd = SAFE_USERFAULTFD(O_CLOEXEC | O_NONBLOCK, false);
+
+	uffdio_api.api = UFFD_API;
+	uffdio_api.features = UFFD_FEATURE_POISON;

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

Quoted 10 lines
testcases/kernel/syscalls/userfaultfd/userfaultfd06.c new file +10 -0
+
+	SAFE_IOCTL(uffd, UFFDIO_API, &uffdio_api);
+
+	uffdio_register.range.start = (unsigned long) page;
+	uffdio_register.range.len = page_size;
+	uffdio_register.mode = UFFDIO_REGISTER_MODE_MISSING;
+
+	SAFE_IOCTL(uffd, UFFDIO_REGISTER, &uffdio_register);
+
+	SAFE_PTHREAD_BARRIER_INIT(&barrier, NULL, 2);

Why does this test need barriers and the rest of the tests that looks nearly the same does not?

Signature · 5 lines
Cyril Hrubis
[email protected]

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#2 lore raw
Quoted 23 lines · Cyril Hrubis

Hi!

Quoted 22 lines
testcases/kernel/syscalls/userfaultfd/userfaultfd06.c new file +22 -0
+static void run(void)
+{
+	pthread_t thr;
+	struct uffdio_api uffdio_api = {};
+	struct uffdio_register uffdio_register;
+	struct sigaction sa = {};
+	volatile char dummy;
+
+	sa.sa_handler = sigbus_handler;
+	sigemptyset(&sa.sa_mask);
+	SAFE_SIGACTION(SIGBUS, &sa, NULL);
+
+	set_pages();
+
+	uffd = SAFE_USERFAULTFD(O_CLOEXEC | O_NONBLOCK, false);
+
+	uffdio_api.api = UFFD_API;
+	uffdio_api.features = UFFD_FEATURE_POISON;
+
+	SAFE_IOCTL(uffd, UFFDIO_API, &uffdio_api);
+
+	uffdio_register.range.start = (unsigned long) page;
Quoted 8 lines

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

Quoted 6 lines
testcases/kernel/syscalls/userfaultfd/userfaultfd06.c new file +6 -0
+	uffdio_register.range.len = page_size;
+	uffdio_register.mode = UFFDIO_REGISTER_MODE_MISSING;
+
+	SAFE_IOCTL(uffd, UFFDIO_REGISTER, &uffdio_register);
+
+	SAFE_PTHREAD_BARRIER_INIT(&barrier, NULL, 2);

Why does this test need barriers and the rest of the tests that looks nearly the same does not?

This one is more complex because of the signal handling & siglongjmp.

In the other tests we can just wait for the handler thread. In this test we must also coordinate with the signal handler,

The alternative would be fork + waitpid with WIFSIGNALED,

Best,
Ricardo.

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#3 lore raw
In reply to Ricardo Branco

Hi Ricardo,

...

Quoted 37 lines
testcases/kernel/syscalls/userfaultfd/userfaultfd06.c new file +37 -0
+static void sigbus_handler(int sig)
+{
+	if (sig == SIGBUS) {
+		sigbus_seen = 1;
+		siglongjmp(jmpbuf, 1);
+	}
+}
+
+static void set_pages(void)
+{
+	page_size = sysconf(_SC_PAGE_SIZE);
+	page = SAFE_MMAP(NULL, page_size, PROT_READ | PROT_WRITE,
+			MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+}
+
+static void reset_pages(void)
+{
+	SAFE_MUNMAP(page, page_size);
+}
+
+static void *handle_thread(void)
+{
+	static struct uffd_msg msg;
+	struct uffdio_poison uffdio_poison = {};
+	struct pollfd pollfd;
+	int nready;
+
+	SAFE_PTHREAD_BARRIER_WAIT(&barrier);
+
+	pollfd.fd = uffd;
+	pollfd.events = POLLIN;
+	nready = poll(&pollfd, 1, -1);
+	if (nready == -1)
+		tst_brk(TBROK | TERRNO, "Error on poll");
+
+	SAFE_READ(1, uffd, &msg, sizeof(msg));
+

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

Quoted 10 lines
testcases/kernel/syscalls/userfaultfd/userfaultfd06.c new file +10 -0
+	if (msg.event != UFFD_EVENT_PAGEFAULT)
+		tst_brk(TFAIL, "Received unexpected UFFD_EVENT %d", msg.event);
+
+	poison_fault_seen = 1;
+
+	/* Poison the page that triggered the fault */
+	uffdio_poison.range.start = msg.arg.pagefault.address & ~(page_size - 1);
+	uffdio_poison.range.len = page_size;
+
+	SAFE_IOCTL(uffd, UFFDIO_POISON, &uffdio_poison);

CI shows old toolchains fail due:
error: 'UFFDIO_POISON' undeclared

We need a fallback definition in include/lapi/userfaultfd.h.

Quoted 36 lines
testcases/kernel/syscalls/userfaultfd/userfaultfd06.c new file +36 -0
+
+	close(uffd);
+	return NULL;
+}
+
+static void run(void)
+{
+	pthread_t thr;
+	struct uffdio_api uffdio_api = {};
+	struct uffdio_register uffdio_register;
+	struct sigaction sa = {};
+	volatile char dummy;
+
+	sa.sa_handler = sigbus_handler;
+	sigemptyset(&sa.sa_mask);
+	SAFE_SIGACTION(SIGBUS, &sa, NULL);
+
+	set_pages();
+
+	uffd = SAFE_USERFAULTFD(O_CLOEXEC | O_NONBLOCK, false);
+
+	uffdio_api.api = UFFD_API;
+	uffdio_api.features = UFFD_FEATURE_POISON;
+
+	SAFE_IOCTL(uffd, UFFDIO_API, &uffdio_api);
+
+	uffdio_register.range.start = (unsigned long) page;
+	uffdio_register.range.len = page_size;
+	uffdio_register.mode = UFFDIO_REGISTER_MODE_MISSING;
+
+	SAFE_IOCTL(uffd, UFFDIO_REGISTER, &uffdio_register);
+
+	SAFE_PTHREAD_BARRIER_INIT(&barrier, NULL, 2);
+	SAFE_PTHREAD_CREATE(&thr, NULL, (void *) handle_thread, NULL);
+
+	SAFE_PTHREAD_BARRIER_WAIT(&barrier);

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

Quoted 10 lines
testcases/kernel/syscalls/userfaultfd/userfaultfd06.c new file +10 -0
+
+	/* Try to read from the page: should trigger fault, get poisoned, then SIGBUS */
+	if (sigsetjmp(jmpbuf, 1) == 0) {
+		dummy = page[0];
+		(void)dummy;
+	}
+
+	SAFE_PTHREAD_JOIN(thr, NULL);
+	SAFE_PTHREAD_BARRIER_DESTROY(&barrier);
+	reset_pages();

If any of the SAFE_* functions fail, reset_pages() is not called. We should call it also in cleanup(), guard it with variable not to be munmapped twice.

The rest LGTM.

Kind regards,
Petr

Quoted 16 lines
testcases/kernel/syscalls/userfaultfd/userfaultfd06.c new file +16 -0
+
+	if (poison_fault_seen && sigbus_seen) {
+		tst_res(TPASS, "POISON successfully triggered SIGBUS");
+	} else if (poison_fault_seen && !sigbus_seen) {
+		tst_res(TFAIL, "POISON fault seen but no SIGBUS received");
+	} else if (!poison_fault_seen && sigbus_seen) {
+		tst_res(TFAIL, "SIGBUS received but no poison fault seen");
+	} else {
+		tst_res(TFAIL, "No poison fault or SIGBUS observed");
+	}
+}
+
+static struct tst_test test = {
+	.test_all = run,
+	.min_kver = "6.6",
+};
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp