diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2023-07-01 07:19:09 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-07-01 07:19:09 -0400 |
| commit | bb05b0ef627f1d43122cdd2f172f5fb789f77a99 (patch) | |
| tree | 9e0c25878680846d1e57e3b8ee89494516562feb /tools/testing/selftests/kvm/lib/userfaultfd_util.c | |
| parent | 751d77fefaf46af17b5d9ce41d21e0e93cdd7d6e (diff) | |
| parent | 5ed19528db8ddcf0113d721f67a381be3e30c65a (diff) | |
| download | linux-next-bb05b0ef627f1d43122cdd2f172f5fb789f77a99.tar.gz linux-next-bb05b0ef627f1d43122cdd2f172f5fb789f77a99.zip | |
Merge tag 'kvm-x86-selftests-6.5' of https://github.com/kvm-x86/linux into HEAD
KVM selftests changes for 6.5:
- Add a test for splitting and reconstituting hugepages during and after
dirty logging
- Add support for CPU pinning in demand paging test
- Generate dependency files so that partial rebuilds work as expected
- Misc cleanups and fixes
Diffstat (limited to 'tools/testing/selftests/kvm/lib/userfaultfd_util.c')
| -rw-r--r-- | tools/testing/selftests/kvm/lib/userfaultfd_util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/testing/selftests/kvm/lib/userfaultfd_util.c b/tools/testing/selftests/kvm/lib/userfaultfd_util.c index 92cef20902f1..271f63891581 100644 --- a/tools/testing/selftests/kvm/lib/userfaultfd_util.c +++ b/tools/testing/selftests/kvm/lib/userfaultfd_util.c @@ -70,7 +70,7 @@ static void *uffd_handler_thread_fn(void *arg) r = read(pollfd[1].fd, &tmp_chr, 1); TEST_ASSERT(r == 1, "Error reading pipefd in UFFD thread\n"); - return NULL; + break; } if (!(pollfd[0].revents & POLLIN)) @@ -103,7 +103,7 @@ static void *uffd_handler_thread_fn(void *arg) ts_diff = timespec_elapsed(start); PER_VCPU_DEBUG("userfaulted %ld pages over %ld.%.9lds. (%f/sec)\n", pages, ts_diff.tv_sec, ts_diff.tv_nsec, - pages / ((double)ts_diff.tv_sec + (double)ts_diff.tv_nsec / 100000000.0)); + pages / ((double)ts_diff.tv_sec + (double)ts_diff.tv_nsec / NSEC_PER_SEC)); return NULL; } |