* [LTP] [PATCH] userfaultfd: Minor fixes
@ 2026-03-20 17:00 Ricardo Branco
2026-03-25 9:23 ` Petr Vorel
0 siblings, 1 reply; 2+ messages in thread
From: Ricardo Branco @ 2026-03-20 17:00 UTC (permalink / raw)
To: ltp
- Use POSIX semantics for thread function
- Set cleanup to call reset_pages
Signed-off-by: Ricardo Branco <rbranco@suse.de>
---
.../kernel/syscalls/userfaultfd/userfaultfd01.c | 10 +++++++---
.../kernel/syscalls/userfaultfd/userfaultfd02.c | 9 ++++++---
.../kernel/syscalls/userfaultfd/userfaultfd03.c | 12 ++++++++----
.../kernel/syscalls/userfaultfd/userfaultfd04.c | 8 ++++++--
.../kernel/syscalls/userfaultfd/userfaultfd05.c | 10 +++++++---
.../kernel/syscalls/userfaultfd/userfaultfd06.c | 2 +-
6 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/testcases/kernel/syscalls/userfaultfd/userfaultfd01.c b/testcases/kernel/syscalls/userfaultfd/userfaultfd01.c
index 7368d3863..b481e5a15 100644
--- a/testcases/kernel/syscalls/userfaultfd/userfaultfd01.c
+++ b/testcases/kernel/syscalls/userfaultfd/userfaultfd01.c
@@ -53,11 +53,14 @@ static void set_pages(void)
static void reset_pages(void)
{
- SAFE_MUNMAP(page, page_size);
- SAFE_MUNMAP(copy_page, page_size);
+ if (page) {
+ SAFE_MUNMAP(page, page_size);
+ SAFE_MUNMAP(copy_page, page_size);
+ page = NULL;
+ }
}
-static void *handle_thread(void)
+static void *handle_thread(void *arg LTP_ATTRIBUTE_UNUSED)
{
static struct uffd_msg msg;
struct uffdio_copy uffdio_copy = {};
@@ -129,4 +132,5 @@ static struct tst_test test = {
.setup = setup,
.test = run,
.tcnt = ARRAY_SIZE(tcases),
+ .cleanup = reset_pages,
};
diff --git a/testcases/kernel/syscalls/userfaultfd/userfaultfd02.c b/testcases/kernel/syscalls/userfaultfd/userfaultfd02.c
index 2fd5ba5d8..db9ce4da4 100644
--- a/testcases/kernel/syscalls/userfaultfd/userfaultfd02.c
+++ b/testcases/kernel/syscalls/userfaultfd/userfaultfd02.c
@@ -32,11 +32,13 @@ static void set_pages(void)
static void reset_pages(void)
{
- SAFE_MUNMAP(page, page_size);
- SAFE_MUNMAP(move_page, page_size);
+ if (page) {
+ SAFE_MUNMAP(page, page_size);
+ SAFE_MUNMAP(move_page, page_size);
+ }
}
-static void *handle_thread(void)
+static void *handle_thread(void *arg LTP_ATTRIBUTE_UNUSED)
{
static struct uffd_msg msg;
struct uffdio_move uffdio_move = {};
@@ -94,4 +96,5 @@ static void run(void)
static struct tst_test test = {
.test_all = run,
.min_kver = "6.8",
+ .cleanup = reset_pages,
};
diff --git a/testcases/kernel/syscalls/userfaultfd/userfaultfd03.c b/testcases/kernel/syscalls/userfaultfd/userfaultfd03.c
index b65f39eca..463dfba0b 100644
--- a/testcases/kernel/syscalls/userfaultfd/userfaultfd03.c
+++ b/testcases/kernel/syscalls/userfaultfd/userfaultfd03.c
@@ -57,11 +57,14 @@ static void set_pages(void)
static void reset_pages(void)
{
- SAFE_MUNMAP(page, page_size);
- SAFE_MUNMAP(copy_page, page_size);
+ if (page) {
+ SAFE_MUNMAP(page, page_size);
+ SAFE_MUNMAP(copy_page, page_size);
+ page = NULL;
+ }
}
-static void *handle_thread(void)
+static void *handle_thread(void *arg LTP_ATTRIBUTE_UNUSED)
{
static struct uffd_msg msg;
struct uffdio_copy uffdio_copy = {};
@@ -132,5 +135,6 @@ static struct tst_test test = {
.needs_kconfigs = (const char *[]) {
"CONFIG_USERFAULTFD=y",
NULL
- }
+ },
+ .cleanup = reset_pages,
};
diff --git a/testcases/kernel/syscalls/userfaultfd/userfaultfd04.c b/testcases/kernel/syscalls/userfaultfd/userfaultfd04.c
index 4eb811e45..3273d20cb 100644
--- a/testcases/kernel/syscalls/userfaultfd/userfaultfd04.c
+++ b/testcases/kernel/syscalls/userfaultfd/userfaultfd04.c
@@ -30,10 +30,13 @@ static void set_pages(void)
static void reset_pages(void)
{
- SAFE_MUNMAP(page, page_size);
+ if (page) {
+ SAFE_MUNMAP(page, page_size);
+ page = NULL;
+ }
}
-static void *handle_thread(void)
+static void *handle_thread(void *arg LTP_ATTRIBUTE_UNUSED)
{
static struct uffd_msg msg;
struct uffdio_zeropage uffdio_zeropage = {};
@@ -98,4 +101,5 @@ static void run(void)
static struct tst_test test = {
.test_all = run,
+ .cleanup = reset_pages,
};
diff --git a/testcases/kernel/syscalls/userfaultfd/userfaultfd05.c b/testcases/kernel/syscalls/userfaultfd/userfaultfd05.c
index e25a227cf..4434f9b9f 100644
--- a/testcases/kernel/syscalls/userfaultfd/userfaultfd05.c
+++ b/testcases/kernel/syscalls/userfaultfd/userfaultfd05.c
@@ -33,10 +33,13 @@ static void set_pages(void)
static void reset_pages(void)
{
- SAFE_MUNMAP(page, page_size);
+ if (page) {
+ SAFE_MUNMAP(page, page_size);
+ page = NULL;
+ }
}
-static void *handle_thread(void)
+static void *handle_thread(void *arg LTP_ATTRIBUTE_UNUSED)
{
static struct uffd_msg msg;
struct uffdio_writeprotect uffdio_writeprotect = {};
@@ -127,5 +130,6 @@ static struct tst_test test = {
.needs_kconfigs = (const char *[]) {
"CONFIG_HAVE_ARCH_USERFAULTFD_WP=y",
NULL
- }
+ },
+ .cleanup = reset_pages,
};
diff --git a/testcases/kernel/syscalls/userfaultfd/userfaultfd06.c b/testcases/kernel/syscalls/userfaultfd/userfaultfd06.c
index 5b1252c35..238556ba4 100644
--- a/testcases/kernel/syscalls/userfaultfd/userfaultfd06.c
+++ b/testcases/kernel/syscalls/userfaultfd/userfaultfd06.c
@@ -58,7 +58,7 @@ static void reset_pages(void)
}
}
-static void *handle_thread(void)
+static void *handle_thread(void *arg LTP_ATTRIBUTE_UNUSED)
{
static struct uffd_msg msg;
struct uffdio_poison uffdio_poison = {};
--
2.53.0
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [LTP] [PATCH] userfaultfd: Minor fixes
2026-03-20 17:00 [LTP] [PATCH] userfaultfd: Minor fixes Ricardo Branco
@ 2026-03-25 9:23 ` Petr Vorel
0 siblings, 0 replies; 2+ messages in thread
From: Petr Vorel @ 2026-03-25 9:23 UTC (permalink / raw)
To: Ricardo Branco; +Cc: ltp
Hi Ricardo,
...
> +++ b/testcases/kernel/syscalls/userfaultfd/userfaultfd01.c
> @@ -53,11 +53,14 @@ static void set_pages(void)
> static void reset_pages(void)
> {
> - SAFE_MUNMAP(page, page_size);
> - SAFE_MUNMAP(copy_page, page_size);
> + if (page) {
> + SAFE_MUNMAP(page, page_size);
> + SAFE_MUNMAP(copy_page, page_size);
> + page = NULL;
> + }
> }
> -static void *handle_thread(void)
> +static void *handle_thread(void *arg LTP_ATTRIBUTE_UNUSED)
> {
> static struct uffd_msg msg;
> struct uffdio_copy uffdio_copy = {};
> @@ -129,4 +132,5 @@ static struct tst_test test = {
> .setup = setup,
> .test = run,
> .tcnt = ARRAY_SIZE(tcases),
> + .cleanup = reset_pages,
> };
> diff --git a/testcases/kernel/syscalls/userfaultfd/userfaultfd02.c b/testcases/kernel/syscalls/userfaultfd/userfaultfd02.c
> index 2fd5ba5d8..db9ce4da4 100644
> --- a/testcases/kernel/syscalls/userfaultfd/userfaultfd02.c
> +++ b/testcases/kernel/syscalls/userfaultfd/userfaultfd02.c
> @@ -32,11 +32,13 @@ static void set_pages(void)
> static void reset_pages(void)
> {
> - SAFE_MUNMAP(page, page_size);
> - SAFE_MUNMAP(move_page, page_size);
> + if (page) {
> + SAFE_MUNMAP(page, page_size);
> + SAFE_MUNMAP(move_page, page_size);
Here should be also page = NULL; right?
With that (can be added before merge)
Reviewed-by: Petr Vorel <pvorel@suse.cz>
Kind regards,
Petr
> + }
> }
...
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-03-25 9:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-03-20 17:00 [LTP] [PATCH] userfaultfd: Minor fixes Ricardo Branco
2026-03-25 9:23 ` Petr Vorel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox