userfaultfd: Minor fixes
PATCH 1/1 userfaultfd: Minor fixes
- Use POSIX semantics for thread function
- Set cleanup to call reset_pages
Signed-off-by Ricardo Branco <[email protected]>
--- .../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(-)
testcases/kernel/syscalls/userfaultfd/userfaultfd01.c +7 -3
@@ -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, };
testcases/kernel/syscalls/userfaultfd/userfaultfd02.c +6 -3
@@ -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, };
testcases/kernel/syscalls/userfaultfd/userfaultfd03.c +8 -4
@@ -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, };
testcases/kernel/syscalls/userfaultfd/userfaultfd04.c +6 -2
@@ -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, };
testcases/kernel/syscalls/userfaultfd/userfaultfd05.c +7 -3
@@ -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, };
testcases/kernel/syscalls/userfaultfd/userfaultfd06.c +1 -1
@@ -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 = {};
Signature · 5 lines
2.53.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Ricardo,
...
Quoted 30 lines
+++
b/testcases/kernel/syscalls/userfaultfd/userfaultfd01.ctestcases/kernel/syscalls/userfaultfd/userfaultfd01.c +7
-3@@ -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, };testcases/kernel/syscalls/userfaultfd/userfaultfd02.c +0
-0
testcases/kernel/syscalls/userfaultfd/userfaultfd02.c static void set_pages(void) · line 37
Quoted 8 lines
testcases/kernel/syscalls/userfaultfd/userfaultfd02.c +3
-2@@ -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 <[email protected]>
Kind regards,
Petr
Quoted 2 lines
testcases/kernel/syscalls/userfaultfd/userfaultfd02.c +1
-0+ } }
...
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp