userfaultfd: Minor fixes
PATCH v3 1/1 userfaultfd: Minor fixes
- Use POSIX semantics for thread function
- Set cleanup to call reset_pages
--- .../kernel/syscalls/userfaultfd/userfaultfd01.c | 13 ++++++++++--- .../kernel/syscalls/userfaultfd/userfaultfd02.c | 13 ++++++++++--- .../kernel/syscalls/userfaultfd/userfaultfd03.c | 15 +++++++++++---- .../kernel/syscalls/userfaultfd/userfaultfd04.c | 8 ++++++-- .../kernel/syscalls/userfaultfd/userfaultfd05.c | 12 ++++++++---- .../kernel/syscalls/userfaultfd/userfaultfd06.c | 4 ++-- 6 files changed, 47 insertions(+), 18 deletions(-)
testcases/kernel/syscalls/userfaultfd/userfaultfd01.c +10 -3
@@ -53,11 +53,17 @@ 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); + page =NULL ; + } +if (copy_page) { +SAFE_MUNMAP (copy_page, page_size); + copy_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 +135,5 @@ static struct tst_test test = { .setup = setup, .test = run, .tcnt = ARRAY_SIZE(tcases), + .cleanup = reset_pages, };
testcases/kernel/syscalls/userfaultfd/userfaultfd02.c +10 -3
@@ -32,11 +32,17 @@ 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); + page =NULL ; + } +if (move_page) { +SAFE_MUNMAP (move_page, page_size); + move_page =NULL ; + } } -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 +100,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 +11 -4
@@ -57,11 +57,17 @@ 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); + page =NULL ; + } +if (copy_page) { +SAFE_MUNMAP (copy_page, page_size); + copy_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 +138,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 +8 -4
@@ -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 = {};
@@ -53,7 +56,7 @@ static void *handle_thread(void)SAFE_READ (1 , uffd, &msg,sizeof (msg));if (msg.event !=UFFD_EVENT_PAGEFAULT ) -tst_brk (TFAIL ,"Received unexpected UFFD_EVENT %d" , msg.event); +tst_brk (TFAIL |TERRNO ,"Received unexpected UFFD_EVENT %d" , msg.event);if (!(msg.arg.pagefault.flags &UFFD_PAGEFAULT_FLAG_WP ) || !(msg.arg.pagefault.flags &UFFD_PAGEFAULT_FLAG_WRITE )) {
@@ -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 +2 -2
@@ -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 = {};
@@ -74,7 +74,7 @@ static void *handle_thread(void)SAFE_READ (1 , uffd, &msg,sizeof (msg));if (msg.event !=UFFD_EVENT_PAGEFAULT ) -tst_brk (TFAIL ,"Received unexpected UFFD_EVENT %d" , msg.event); +tst_brk (TFAIL |TERRNO ,"Received unexpected UFFD_EVENT %d" , msg.event);tst_atomic_store (1 , &poison_fault_seen);
Signature · 5 lines
2.53.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi all,
Quoted 2 lines
- Use POSIX semantics for thread function
- Set cleanup to callreset_pages
LGTM.
As a separate effort: Cyril raised a question if (as a separate effort) should all test have some kconfig check (e.g. CONFIG_USERFAULTFD=y)
IMHO it's a question if we are ok with wide spread of needs_kconfig even if it's not necessary (i.e. here SAFE_USERFAULTFD() check. In that case the benefit would be 1) documentation of dependencies for testers in the test catalog 2) check earlier that before running test code. And of course disadvantage to really drag kconfig dependency, but we have accepted that already.
Ideally we'd decide on some policy (which may also includes .needs_drivers). @all I planned to reword my original policy patch [1] to Li's suggestion + Cyril's kconfig changes [2], but that still does not have "use kconfig to document dependencies".
Kind regards,
Petr
[1] https://patchwork.ozlabs.org/project/ltp/patch/[email protected]/
[2] https://patchwork.ozlabs.org/comment/3662031/
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi!
Quoted 9 lines
As a separate effort: Cyril raised a question if (as a separate effort) should all test have some kconfig check (e.g.
CONFIG_USERFAULTFD=y)IMHO it's a question if we are ok with wide spread of
needs_kconfigeven if it's not necessary (i.e. hereSAFE_USERFAULTFD()check. In that case the benefit would be 1) documentation of dependencies for testers in the test catalog 2) check earlier that before running test code. And of course disadvantage to really drag kconfig dependency, but we have accepted that already.
Quoted 4 lines
Ideally we'd decide on some policy (which may also includes .needs_drivers). @all I planned to reword my original policy patch [1] to Li's suggestion + Cyril's kconfig changes [2], but that still does not have "use kconfig to document dependencies".
I think that we can get rid of needs_drivers if we add more runtime checks.
We have needs_drivers in:
- kvm tests -> CONFIG_KVM + runtime check for kvm module
- zram tests -> CONFIG_ZRAM + runtime check for zram module
- squasfs tests -> CONFIG_SQUASHFS + runtime check for squashfs module
- setxattr02 -> CONFIG_BLK_DEV_RAM + runtime check for brd module
- ioctl08 -> has both filesystems and needs_drivers set to btrfs likely we do not need the needs_drivers there
- ioctl_loop tests -> CONFIG_BLK_DEV_LOOP + runtime check for loop module
- madvise11 -> CONFIG_HWPOISON_INJECT + runtime check for hwpoison_inject module
- quotactl tests -> CONFIG_QUOTA_V2 + runtime check for quota_v2 module
- uinput tests -> CONFIG_BLK_DEV_LOOP + CONFIG_TUN + CONFIG_INPUT_UINPUT
- can tests -> CONFIG_CAN_VCAN + CONFIG_CAN_RAW + CONFIG_CAN_BCM
If we agree that we want to switch from needs_drivers to needs_kconfig + runtime checks I will add mappings from congfigs to module names into tst_kconfig and convert the tests..
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 15 lines
Hi!
Quoted 9 lines
As a separate effort: Cyril raised a question if (as a separate effort) should all test have some kconfig check (e.g.
CONFIG_USERFAULTFD=y)IMHO it's a question if we are ok with wide spread of
needs_kconfigeven if it's not necessary (i.e. hereSAFE_USERFAULTFD()check. In that case the benefit would be 1) documentation of dependencies for testers in the test catalog 2) check earlier that before running test code. And of course disadvantage to really drag kconfig dependency, but we have accepted that already.Quoted 4 lines
Ideally we'd decide on some policy (which may also includes .needs_drivers). @all I planned to reword my original policy patch [1] to Li's suggestion + Cyril's kconfig changes [2], but that still does not have "use kconfig to document dependencies".
Quoted 6 lines
I think that we can get rid of
needs_driversif we add more runtime checks.We have
needs_driversin:- kvm tests ->
CONFIG_KVM+ runtime check for kvm module
Maybe some of KVM might be more specific.
Quoted 8 lines
- zram tests ->
CONFIG_ZRAM+ runtime check for zram module
- squasfs tests ->CONFIG_SQUASHFS+ runtime check for squashfs module
- setxattr02 ->CONFIG_BLK_DEV_RAM+ runtime check for brd module
- ioctl08 -> has both filesystems andneeds_driversset to btrfs likely we do not need theneeds_driversthere
-ioctl_looptests ->CONFIG_BLK_DEV_LOOP+ runtime check for loop module
- madvise11 ->CONFIG_HWPOISON_INJECT+ runtime check forhwpoison_injectmodule
- quotactl tests ->CONFIG_QUOTA_V2+ runtime check forquota_v2module
And quota_remount_test01.sh shell test.
Quoted 2 lines
- uinput tests ->
CONFIG_BLK_DEV_LOOP+CONFIG_TUN+CONFIG_INPUT_UINPUT
- can tests ->CONFIG_CAN_VCAN+CONFIG_CAN_RAW+CONFIG_CAN_BCM
FYI a bit more, just few of them, but fortunately all for have config. I'd be surprised if there was a kernel module without it.
testcases/cve/tcindex01.c dummy -> CONFIG_DUMMY
shell has more tests (fortunately already supports $TST_NEEDS_KCONFIGS):tst_net.sh (if using nets) netns_lib.sh: veth -> CONFIG_VETH binfmt_misc_lib.sh: binfmt_misc -> CONFIG_BINFMT_MISC + runtime check for binfmt_misc module
+ many more
Quoted 3 lines
If we agree that we want to switch from
needs_driverstoneeds_kconfig+ runtime checks I will add mappings from congfigs to module names intotst_kconfigand convert the tests..
+1
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi!
testcases/kernel/syscalls/userfaultfd/userfaultfd05.c static void *handle_thread(void) · line 59
Quoted 3 lines
testcases/kernel/syscalls/userfaultfd/userfaultfd05.c +1
-1if (msg.event !=UFFD_EVENT_PAGEFAULT ) -tst_brk (TFAIL ,"Received unexpected UFFD_EVENT %d" , msg.event); +tst_brk (TFAIL |TERRNO ,"Received unexpected UFFD_EVENT %d" , msg.event);
Looking closer..
TERRNO here is not needed. At this point SAFE_READ() passed and we are going to print the errno from a previous failing call (most probably from a previous -i iteration) if we receive the wrong event.
We can fix before merge if other accept this review.
Regards,
--
Andrea Cervesato
SUSE QE Automation Engineer Linux
[email protected]
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi!
testcases/kernel/syscalls/userfaultfd/userfaultfd05.c static void *handle_thread(void) · line 59
Quoted 11 lines
testcases/kernel/syscalls/userfaultfd/userfaultfd05.c +2
-2-static void *handle_thread (void ) +static void *handle_thread(void *arg LTP_ATTRIBUTE_UNUSED) {static struct uffd_msg msg;struct uffdio_writeprotect uffdio_writeprotect = {};@@ -53,7 +56,7 @@ static void *handle_thread(void)SAFE_READ (1 , uffd, &msg,sizeof (msg));if (msg.event !=UFFD_EVENT_PAGEFAULT ) -tst_brk (TFAIL ,"Received unexpected UFFD_EVENT %d" , msg.event); +tst_brk (TFAIL |TERRNO ,"Received unexpected UFFD_EVENT %d" , msg.event);
Agree with Andrea that the TERRNO here is wrong. The rest is okay.
With the TERRNO removed:
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp