diff options
| author | Peter Xu <peterx@redhat.com> | 2023-04-27 16:11:12 -0400 |
|---|---|---|
| committer | Sean Christopherson <seanjc@google.com> | 2023-05-31 14:05:15 -0700 |
| commit | 21912a653d7dc9b79f3b7e9884179d7b7d593448 (patch) | |
| tree | 02fa8033a06f2cf272983c34ee1b8b43ea8aa4b4 /tools/testing | |
| parent | ba125de35da5184c5325bef5c4c89f6928ce8875 (diff) | |
| download | linux-stable-21912a653d7dc9b79f3b7e9884179d7b7d593448.tar.gz linux-stable-21912a653d7dc9b79f3b7e9884179d7b7d593448.tar.bz2 linux-stable-21912a653d7dc9b79f3b7e9884179d7b7d593448.zip | |
KVM: selftests: Allow dumping per-vcpu info for uffd threads
There's one PER_VCPU_DEBUG in per-vcpu uffd threads but it's never hit.
Trigger that when quit in normal ways (kick pollfd[1]), meanwhile fix the
number of nanosec calculation.
Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: James Houghton <jthoughton@google.com>
Link: https://lore.kernel.org/r/20230427201112.2164776-3-peterx@redhat.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
Diffstat (limited to 'tools/testing')
| -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; } |