github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-24 06:24:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

KVM: selftests: Add helper APIs to cancel+join pthreads

Browse Source 
Deduplicate test code that does cancel()+join() on pthreads by adding a
collection of syscall wrappers.  The tests that asynchronously cancel
pthreads, i.e. use PTHREAD_CANCEL_ASYNCHRONOUS, are particularly ugly,
especially since it's not immediately obvious why those tests assert on
the thread being CANCELED, whereas others do not.

No functional change intended.

Link: https://patch.msgid.link/20260731195612.2697986-11-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
This commit is contained in:
Sean Christopherson 2026-07-31 12:56:10 -07:00
parent bc9143135b
commit 939b20e5f3
7 changed files with 33 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/testing/selftests/kvm/include/kvm_syscalls.h
View File

@ -104,6 +104,30 @@ __KVM_SYSCALL_DEFINE(pthread_create, 4, pthread_t *, thread,
__KVM_SYSCALL_DEFINE(pthread_join, 2, pthread_t, thread, void **, thread_return);
__KVM_SYSCALL_DEFINE(pthread_cancel, 1, pthread_t, thread);
static inline void __kvm_pthread_cancel_join(pthread_t thread, void **r)
{
kvm_pthread_cancel(thread);
kvm_pthread_join(thread, r);
}
static inline void kvm_pthread_cancel_join(pthread_t thread)
{
__kvm_pthread_cancel_join(thread, NULL);
}
/*
* Cancel+Join a pthread that was configured with PTHREAD_CANCEL_ASYNCHRONOUS
* and is expected to exit only in response to cancellation.
*/
static inline void kvm_pthread_cancel_join_async(pthread_t thread)
{
void *r;
__kvm_pthread_cancel_join(thread, &r);
TEST_ASSERT(r == PTHREAD_CANCELED,
"expected retval=%p, got %p", PTHREAD_CANCELED, r);
}
#define kvm_free_fd(fd) \
do { \
kvm_close(fd); \

15
tools/testing/selftests/kvm/x86/hyperv_ipi.c
View File

@ -222,17 +222,6 @@ static void *vcpu_thread(void *arg)
return NULL;
}
static void cancel_join_vcpu_thread(pthread_t thread, struct kvm_vcpu *vcpu)
{
void *retval;
kvm_pthread_cancel(thread);
kvm_pthread_join(thread, &retval);
TEST_ASSERT(retval == PTHREAD_CANCELED,
"expected retval=%p, got %p", PTHREAD_CANCELED,
retval);
}
int main(int argc, char *argv[])
{
struct kvm_vm *vm;
@ -293,8 +282,8 @@ int main(int argc, char *argv[])
}
done:
cancel_join_vcpu_thread(threads[0], vcpu[1]);
cancel_join_vcpu_thread(threads[1], vcpu[2]);
kvm_pthread_cancel_join_async(threads[0]);
kvm_pthread_cancel_join_async(threads[1]);
kvm_vm_free(vm);
return 0;

15
tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c
View File

@ -548,17 +548,6 @@ static void *vcpu_thread(void *arg)
return NULL;
}
static void cancel_join_vcpu_thread(pthread_t thread, struct kvm_vcpu *vcpu)
{
void *retval;
kvm_pthread_cancel(thread);
kvm_pthread_join(thread, &retval);
TEST_ASSERT(retval == PTHREAD_CANCELED,
"expected retval=%p, got %p", PTHREAD_CANCELED,
retval);
}
int main(int argc, char *argv[])
{
struct kvm_vm *vm;
@ -652,8 +641,8 @@ int main(int argc, char *argv[])
}
done:
cancel_join_vcpu_thread(threads[0], vcpu[1]);
cancel_join_vcpu_thread(threads[1], vcpu[2]);
kvm_pthread_cancel_join_async(threads[0]);
kvm_pthread_cancel_join_async(threads[1]);
kvm_vm_free(vm);
return 0;

3
tools/testing/selftests/kvm/x86/recalc_apic_map_test.c
View File

@ -65,8 +65,7 @@ int main(void)
vcpu_set_msr(vcpuN, MSR_IA32_APICBASE, LAPIC_DISABLED);
}
kvm_pthread_cancel(thread);
kvm_pthread_join(thread, NULL);
kvm_pthread_cancel_join(thread);
kvm_vm_free(vm);

3
tools/testing/selftests/kvm/x86/sync_regs_test.c
View File

@ -199,8 +199,7 @@ static void race_sync_regs(struct kvm_vcpu *vcpu, void *racer)
}
}
kvm_pthread_cancel(thread);
kvm_pthread_join(thread, NULL);
kvm_pthread_cancel_join(thread);
kvm_x86_state_cleanup(state);
}

15
tools/testing/selftests/kvm/x86/xapic_ipi_test.c
View File

@ -228,17 +228,6 @@ static void *vcpu_thread(void *arg)
return NULL;
}
static void cancel_join_vcpu_thread(pthread_t thread, struct kvm_vcpu *vcpu)
{
void *retval;
kvm_pthread_cancel(thread);
kvm_pthread_join(thread, &retval);
TEST_ASSERT(retval == PTHREAD_CANCELED,
"expected retval=%p, got %p", PTHREAD_CANCELED,
retval);
}
void do_migrations(struct test_data_page *data, int run_secs, int delay_usecs,
u64 *pipis_rcvd)
{
@ -450,8 +439,8 @@ int main(int argc, char *argv[])
/*
* Cancel threads and wait for them to stop.
*/
cancel_join_vcpu_thread(threads[0], params[0].vcpu);
cancel_join_vcpu_thread(threads[1], params[1].vcpu);
kvm_pthread_cancel_join_async(threads[0]);
kvm_pthread_cancel_join_async(threads[1]);
/*
* If the host support Idle HLT, i.e. KVM *might* be using Idle HLT,

3
tools/testing/selftests/kvm/x86/xen_shinfo_test.c
View File

@ -947,8 +947,7 @@ int main(int argc, char *argv[])
TEST_ASSERT(!evtchn_irq_expected,
"Expected event channel IRQ but it didn't happen");
kvm_pthread_cancel(thread);
kvm_pthread_join(thread, 0);
kvm_pthread_cancel_join(thread);
goto done;
case TEST_GUEST_SAW_IRQ: