From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) (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 1B5873BCD2A for ; Thu, 30 Jul 2026 19:19:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.198 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785439164; cv=none; b=hoKNiAmw4QIplaWaDLB1H5I4ZtCaYy9Ea5PMYF6bYnu+SZKcx/RIVt4y2qnlN9gvrc8rqULWT/XqEl/BvkeCR5HsSOdhPQN2GuIeg/9Rsz+jf6i5hvwDeDa/dJ/bfBLOm3l5Kw2wql0dWbuDGsvCMoc/Vw9rDYmq+rfSI/JDegg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785439164; c=relaxed/simple; bh=buhxEbHik6ByTyTxDU6sIkQHBJtr+nITQHtHhFuy1fI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ctVoECJ/3en7T9T8upw6OMEkYpiVExcarE2C7b5362bWpc549AtfHcMyAxe2kfxOYXcuOp/UvkW8+1GLBH8+Zp+gxCarLzKucupYw3VQIrtLnZK/cvG9l2VJN8zQZ08LhWth9rm740OfYZ/wFiMLH0cOWCaA0wYnZGCSobkT124= 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=JEyf90zb; arc=none smtp.client-ip=209.85.210.198 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="JEyf90zb" Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-84e04598adeso164472b3a.2 for ; Thu, 30 Jul 2026 12:19:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785439160; x=1786043960; darn=lists.linux.dev; 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=5x/8gSGAOdG58RjeR3zh9VAfNqCLNOUs74brKRK1OOI=; b=JEyf90zbirobokoXjsk7aSSFZkEPAdGgosg3aqo9MoaMIYyaSUFcNHX1e04u0XYbYu xC/Pd2Ms7t+zJyrOiIPn9t8ZDKKDzqnIrqBG3Eu2a6OHTKdYqxyUlrIhDA0nHEEzFJcB HiWpU5/EcRftMOicEAWtPrBJw5h+zjSwmLQhkua6+YYUGOwUzR/n4ZWLm2gnR+yAZ9Bq ecemEagW7lmjZfUIJmc9WI8u77tvcDSm//tKCgRv4a9AOCS0AdMBpaFu8xMZ9j/0+cCk Y8wD0enYQn1ADc5mQHNpgsKvjpiTNGNVCb6HTaJwGtO8QtXxBdjTh3aGRMxBJSYvCY3s w7ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785439160; x=1786043960; 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=5x/8gSGAOdG58RjeR3zh9VAfNqCLNOUs74brKRK1OOI=; b=WF84YWy5KKb8HTpsNp9ym8j9t/r6x5KyVN5rGGCO5lqwR04AstKH4P7AwXkAxu2k+X CLohz+cYwD3mMHzQWAnGVDFgzM616A3DSvjvrAdbRWBXj25Wf572+qcyALjrecQYpft/ WggNQEJVOaNACz4u5EuNeu1q8vGhGy9UPLvkDIxuikxyNDNJU2zh/2cdb3CAER7ymyUP ZKlU99fOofwq1iqHhvQHpUTSnYMNGLiSOZ4FSC9knq5Q3Bs8MlTOH/XYAH+co5Umi5FU bdCFhHmOsrwQ/JPd8FHEKPqcjRoqWQRf4G61v1hdQA6j7pdnawScDBh2QIBKoumek7Zl KCZA== X-Forwarded-Encrypted: i=1; AHgh+RqDoyDrNd6h4Qz1PFbFXwIX8jL1DwNRws+WE/94InLBBETl3hfhxnqn/F0KvrbDHyPWV3lJIsU=@lists.linux.dev X-Gm-Message-State: AOJu0YwWUEGG49E1VjCdgH7TIGPsB22ZXcpWlgfgWwj0pWpGTwn6GwRB xBD1HWD1HqKJkSpxYS/YT0DwUUb9W+5nK+S/xwawUNcJij5QsxxaPjbH2TbsCsjWyJIgF6aCFYv lmhdF+g== X-Received: from pflr18.prod.google.com ([2002:aa7:9892:0:b0:84e:3a87:b559]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:aa7:88c9:0:b0:84e:4598:7da3 with SMTP id d2e1a72fcca58-84ebc44263fmr3505224b3a.74.1785439159723; Thu, 30 Jul 2026 12:19:19 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 30 Jul 2026 12:19:06 -0700 In-Reply-To: <20260730191908.2084803-1-seanjc@google.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260730191908.2084803-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.508.g3f0d502094-goog Message-ID: <20260730191908.2084803-8-seanjc@google.com> Subject: [PATCH 7/9] 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 abfd89372f19..002b5a4e59eb 100644 --- a/tools/testing/selftests/kvm/include/kvm_syscalls.h +++ b/tools/testing/selftests/kvm/include/kvm_syscalls.h @@ -103,6 +103,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_cancel_join_pthread(pthread_t thread, void **r) +{ + kvm_pthread_cancel(thread); + kvm_pthread_join(thread, r); +} + +static inline void kvm_cancel_join_pthread(pthread_t thread) +{ + __kvm_cancel_join_pthread(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_cancel_join_pthread_async(pthread_t thread) +{ + void *r; + + __kvm_cancel_join_pthread(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..fe38cc4cba05 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_cancel_join_pthread_async(threads[0]); + kvm_cancel_join_pthread_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..84f22f39c8f2 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_cancel_join_pthread_async(threads[0]); + kvm_cancel_join_pthread_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..7a0bd9f7ba6c 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_cancel_join_pthread(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..9d76c2ed784b 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_cancel_join_pthread(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..78e7aae8fab8 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_cancel_join_pthread_async(threads[0]); + kvm_cancel_join_pthread_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..a226a2fd61d9 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_cancel_join_pthread(thread); goto done; case TEST_GUEST_SAW_IRQ: -- 2.55.0.508.g3f0d502094-goog