From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 834A037883C for ; Fri, 31 Jul 2026 19:56:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.199 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785527793; cv=none; b=N9RkgbbJQYWtP1iBL4xc5iYqCUQ3wP66S6LctjSqOi0Af1S3924BuGKjcda8nXuPE+LnCdddu2KX41R47QFdP8sSCNWb4Df3deMYeP6waSrDjgyjkzzx93tI4voNaVTa8o+stJ43c1sYs8lETDWeBtI2AJcwuTLGi809s3K5toA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785527793; c=relaxed/simple; bh=eFedP1FKrSCUz33LyUYB/hbFk56NqWKwZqQkDaFxLJ0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Yav/3CQOORrfD7OYrFDwiDytamY9M7maTADUkBKHrLacCfu+ktFhj6YIJn6rMvlfCQ56WUvVz3RvAzP0WWdj6LvZNXcfgapGHlHh7obcgQZWd9kcDkbjVWjfI+43LoeeTeZw4MbpIEVHYKgB2uCD13GfI4B25CqLzCEV7bkNNwM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=t5ldT9n8; arc=none smtp.client-ip=209.85.214.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="t5ldT9n8" Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2cc7e86e7c5so25383475ad.3 for ; Fri, 31 Jul 2026 12:56:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785527788; x=1786132588; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:reply-to:from:to:cc:subject:date:message-id :reply-to:content-type; bh=t+9CTldHkmPcTJwS5mSWfk0XaYsDahSdFAriIqs5uQo=; b=t5ldT9n8Hip8+XrIzZcZ6P3tllYzBhAe9EWvkDWFCi4gRI9H6jbF0jVJKhFlVY7B8W T6cm1nemIa829vZ3+voMlyWVpR4zKmOWuLc8clznJ72caGP+T7iiNWleM84g0SKUldpE KERA1IkpL1hHy1HjmpOpvdO4/cLjKGjDIYIIjaaPflZTT+/TRWra7ZOpAbdUKnQWe1NM UjBQTp2NYtaCxCJVEiUnsRuIYNwrR4kGa10si/4UIuXRryw8WiY9tPXqIGBiZnk5mmWD EnEYYUoMJ0FgLVRE0DTcNKZTfJXVSfxVVQFM3E7nXIcE397S/7vBvNWP9mcZITmjQYXw hFJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785527788; x=1786132588; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:reply-to:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to:content-type; bh=t+9CTldHkmPcTJwS5mSWfk0XaYsDahSdFAriIqs5uQo=; b=hTnsc4SL0YnP88V/OWCuYLaKZmKp+x0SL1fqVEcF3G5xy1+t+ZncXcwWGSUUFUsbfK bK9bIcnGBAsEWotahfUY5h8iqtQBMiPF/LUFHzplRpuwZlQ0mejaUoIGvdoutwYl3+Bb KZ2HKHBKi/ShD2tWN8fvhg0Fz7mQVubX4C8U5FtAABuHqI/R2ZM3LI8ikW9VI3Yp+n+7 gy5M7+H7z4/01Z3iyusKbychz7YQ0IniFXQGFNUdywDrAEdYcgtMJo5gNa3QBCgXn/oE pCIvSSdIUd40jxINh+tDJ1UBdEyWb6/8isEJ4HRBhzSCUhL/6cXg6xOXItUs5rj2lasV n3Yg== X-Forwarded-Encrypted: i=1; AHgh+RqZP1aFIXdjG3NG/7+FoGbv49oF5mYr8Fdt9R4xfF+8jr/ug5W97ymAFbCAP7QNhIoGOnaFe8Twozku7qc=@vger.kernel.org X-Gm-Message-State: AOJu0YxQBfzqyBcO2YhWCYMq5sP+QRMnkCUG3kS0wYhlao9aK+Or5zId VSew6PenOMQwzrTrdGutOE2FY8qkt6kEhbexO5ZufreNlwJvkb77OzoWkL413YMcxCpGjQIfQPQ m/jhHtA== X-Received: from plbj20.prod.google.com ([2002:a17:903:4654:b0:2c6:be9a:d6c2]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:26cd:b0:2cf:82e6:a5 with SMTP id d9443c01a7336-2d0521bbfddmr11886345ad.13.1785527787901; Fri, 31 Jul 2026 12:56:27 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 31 Jul 2026 12:56:10 -0700 In-Reply-To: <20260731195612.2697986-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260731195612.2697986-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.508.g3f0d502094-goog Message-ID: <20260731195612.2697986-11-seanjc@google.com> Subject: [PATCH v3 10/12] KVM: selftests: Add helper APIs to cancel+join pthreads From: Sean Christopherson To: Paolo Bonzini , Marc Zyngier , Oliver Upton , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Sean Christopherson Cc: Joey Gouly , Steffen Eiden , Suzuki K Poulose , Zenghui Yu , David Hildenbrand , kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" 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. Signed-off-by: Sean Christopherson --- .../selftests/kvm/include/kvm_syscalls.h | 24 +++++++++++++++++++ tools/testing/selftests/kvm/x86/hyperv_ipi.c | 15 ++---------- .../selftests/kvm/x86/hyperv_tlb_flush.c | 15 ++---------- .../selftests/kvm/x86/recalc_apic_map_test.c | 3 +-- .../selftests/kvm/x86/sync_regs_test.c | 3 +-- .../selftests/kvm/x86/xapic_ipi_test.c | 15 ++---------- .../selftests/kvm/x86/xen_shinfo_test.c | 3 +-- 7 files changed, 33 insertions(+), 45 deletions(-) diff --git a/tools/testing/selftests/kvm/include/kvm_syscalls.h b/tools/testing/selftests/kvm/include/kvm_syscalls.h index d6c18e13b9c8..c0657e54aee5 100644 --- a/tools/testing/selftests/kvm/include/kvm_syscalls.h +++ b/tools/testing/selftests/kvm/include/kvm_syscalls.h @@ -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); \ diff --git a/tools/testing/selftests/kvm/x86/hyperv_ipi.c b/tools/testing/selftests/kvm/x86/hyperv_ipi.c index d2efb1043534..a2fc0bca8011 100644 --- a/tools/testing/selftests/kvm/x86/hyperv_ipi.c +++ b/tools/testing/selftests/kvm/x86/hyperv_ipi.c @@ -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; diff --git a/tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c b/tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c index e4fc9bb6f329..dc9d40830a7f 100644 --- a/tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c +++ b/tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c @@ -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; diff --git a/tools/testing/selftests/kvm/x86/recalc_apic_map_test.c b/tools/testing/selftests/kvm/x86/recalc_apic_map_test.c index e3e397f32bff..6252a96320ee 100644 --- a/tools/testing/selftests/kvm/x86/recalc_apic_map_test.c +++ b/tools/testing/selftests/kvm/x86/recalc_apic_map_test.c @@ -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); diff --git a/tools/testing/selftests/kvm/x86/sync_regs_test.c b/tools/testing/selftests/kvm/x86/sync_regs_test.c index 99a5bbeffc5d..ed0c21b427c9 100644 --- a/tools/testing/selftests/kvm/x86/sync_regs_test.c +++ b/tools/testing/selftests/kvm/x86/sync_regs_test.c @@ -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); } diff --git a/tools/testing/selftests/kvm/x86/xapic_ipi_test.c b/tools/testing/selftests/kvm/x86/xapic_ipi_test.c index 33e78b284c67..469e3ab16460 100644 --- a/tools/testing/selftests/kvm/x86/xapic_ipi_test.c +++ b/tools/testing/selftests/kvm/x86/xapic_ipi_test.c @@ -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, diff --git a/tools/testing/selftests/kvm/x86/xen_shinfo_test.c b/tools/testing/selftests/kvm/x86/xen_shinfo_test.c index 3ec5e67b21ef..aaa414c677ad 100644 --- a/tools/testing/selftests/kvm/x86/xen_shinfo_test.c +++ b/tools/testing/selftests/kvm/x86/xen_shinfo_test.c @@ -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: -- 2.55.0.508.g3f0d502094-goog