From nobody Fri Oct 2 12:19:59 2026 Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) (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 F2400449B19 for ; Fri, 31 Jul 2026 17:06:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.69 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785517586; cv=none; b=qfrvT2Ux29PByJm/j+GsDOSjcc5jaLhm+VqpJaaCD3b5LrKfgfiezH8JH5BLpOcWfEukV9b9NlDq4ZRHwCdj+tlqPjRWwIsDMK/mq5cc2R3feXobofbx054kzzpDIuYCg5KRF7Hum4nH7D6l923+Ew7Z1fIbRqjjF959t+WxPIk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785517586; c=relaxed/simple; bh=jIqegcMSdQEr3CCSBl7CEcF3KSy6gnzkLIXn/FjtTSY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=NcczFZObr3nUNkjFODr1O/z0iqgjEbvlK1ZVWjDyXPH5182kN+2U5dRQ/5n7kRWAuVnTf2DAthuxvgqzDpRJE1upLH+VBjUqd42lb6hEIPoH0SJXGOyA0L9ZvpCmsc4E6oKMyDWlGFNz43TTBRImvtSAytGZzS3FnWHCTHq8u5w= 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=cXxAuc2S; arc=none smtp.client-ip=209.85.216.69 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="cXxAuc2S" Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-38e7ff7b375so1349767a91.1 for ; Fri, 31 Jul 2026 10:06:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785517584; x=1786122384; 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=I1vB8uido3pB5A8nVpiV1ZvPN5oqRESsQC5EjXRdj5A=; b=cXxAuc2S/7D69VI6vJIgQnhCdWLjdfikVF5/cx342pGq+U0SXYh/g9gf3wzoCKqrB3 Kn42vL/XlpEqqbemM27MVpJy8d8qJB/oNgnpb4+hRDqxh0opEX0Efs5IqScjdBVQ0Wtl oPziXnmvEKFy66SgVxflCoy4FYAxRCVNutaGKc9pBG0qwMkvXnM+RMQXS/mZKmeB/bcM vWa19tkdrFTWbnVDrEv7/V4SHgtIylxZDsPzILyOBJnQSo8tyY0vyKJ+yNks6xiOB3L9 ZtOtnQ6OUSX2hu/EHeK7wgNJpavk5r1uCiLjm695WMG48pLQXdvCpgd7tp1+xMfvPQGE U9/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785517584; x=1786122384; 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=I1vB8uido3pB5A8nVpiV1ZvPN5oqRESsQC5EjXRdj5A=; b=av/k7nUDCp7gTASJ9KzpEZFuTD7NXhGhvz/eYLEMfdvgbHa8dYhrmED1Kj83nvNZSW B82pH+83YYMz5ZqJpgAsSUxsQ59moat3qwQu78SKXcHu/aq4VmPEEggeDtT+rA0jyESq FamL+FDuFKxLSYh0CDxU9wKDNsLt+WfkCenbPjMGx8yW4LYGuMTQR8SnxBVRRXHdD3wr s3v9FTxkJsDItkUgz8Cqa//Q1V0v0DR1gSuY1GxKGJrMFLguuXc6ckEFyGUyjZqJqxCD Hzr/8Bc4hT0FTin38ddphZbykZF46dJBC8Sl7uGAgPPmyDSli7t8WMI42Gvu3NV6FLWZ Ow7A== X-Forwarded-Encrypted: i=1; AHgh+RqmpLSCQ31QYYKSjCOOKad3v3T96j3Tatrnpjv1nyTQ1wL+CvuTsynMO9YwnLsgzfWdm9KcgsRvrfOw6i0=@vger.kernel.org X-Gm-Message-State: AOJu0YyVi4YIgsFWI9bNEmpl+6DA/veKQWMVbYMovHdVeZoTuaDqA/gB KdzO4TC9nX66fPEYZ2HG+wPHTrfyeqF1cVerPHCHpW/35qSIeVUcVQLifeODneXsxnXsZzprNhN WpPQLLw== X-Received: from pjso10.prod.google.com ([2002:a17:90a:c08a:b0:381:171e:961c]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:280a:b0:37f:c28a:de61 with SMTP id 98e67ed59e1d1-38fbc45521dmr583105a91.17.1785517584041; Fri, 31 Jul 2026 10:06:24 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 31 Jul 2026 10:06:08 -0700 In-Reply-To: <20260731170619.2620845-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: <20260731170619.2620845-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.508.g3f0d502094-goog Message-ID: <20260731170619.2620845-2-seanjc@google.com> Subject: [PATCH v2 01/12] KVM: selftests: Add a KVM syscall wrapper for sched_setaffinity() 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add and use a KVM wrapper for sched_setaffinity() so that selftests don't need to manually assert that the syscall succeeded. No functional change intended. Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/include/kvm_syscalls.h | 1 + tools/testing/selftests/kvm/rseq_test.c | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/kvm/include/kvm_syscalls.h b/tools/tes= ting/selftests/kvm/include/kvm_syscalls.h index 5dae6143ddb0..01dca99009c2 100644 --- a/tools/testing/selftests/kvm/include/kvm_syscalls.h +++ b/tools/testing/selftests/kvm/include/kvm_syscalls.h @@ -95,6 +95,7 @@ __KVM_SYSCALL_DEFINE(fallocate, 4, int, fd, int, mode, lo= ff_t, offset, loff_t, l __KVM_SYSCALL_DEFINE(ftruncate, 2, unsigned int, fd, off_t, length); __KVM_SYSCALL_DEFINE(madvise, 3, void *, addr, size_t, length, int, advice= ); __KVM_SYSCALL_DEFINE(sched_getaffinity, 3, pid_t, pid, size_t, cpusetsize,= cpu_set_t *, mask); +__KVM_SYSCALL_DEFINE(sched_setaffinity, 3, pid_t, pid, size_t, cpusetsize,= cpu_set_t *, mask); =20 #define kvm_free_fd(fd) \ do { \ diff --git a/tools/testing/selftests/kvm/rseq_test.c b/tools/testing/selfte= sts/kvm/rseq_test.c index 557e393c223b..edcaf0fbe20c 100644 --- a/tools/testing/selftests/kvm/rseq_test.c +++ b/tools/testing/selftests/kvm/rseq_test.c @@ -75,7 +75,7 @@ static void *migration_worker(void *__rseq_tid) { pid_t rseq_tid =3D (pid_t)(unsigned long)__rseq_tid; cpu_set_t allowed_mask; - int r, i, cpu; + int i, cpu; =20 CPU_ZERO(&allowed_mask); =20 @@ -96,9 +96,7 @@ static void *migration_worker(void *__rseq_tid) * stable, i.e. while changing affinity is in-progress. */ smp_wmb(); - r =3D sched_setaffinity(rseq_tid, sizeof(allowed_mask), &allowed_mask); - TEST_ASSERT(!r, "sched_setaffinity failed, errno =3D %d (%s)", - errno, strerror(errno)); + kvm_sched_setaffinity(rseq_tid, sizeof(allowed_mask), &allowed_mask); smp_wmb(); atomic_inc(&seq_cnt); =20 --=20 2.55.0.508.g3f0d502094-goog From nobody Fri Oct 2 12:19:59 2026 Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) (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 28FF444AB60 for ; Fri, 31 Jul 2026 17:06:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785517587; cv=none; b=nj1OSjTSBbrtXLYXrajmQtIRSjeOjJl8daocDyD0gpRsqx5wst4YkFOpVdEKE6SV101tEnK02heZozJwKxjP/hCL9wRDVZ4T+65kN2rqQQ/6KVaHFg/YUG8uEM56Fm3P7q85S64PGzlQx1VfoUFyze3T+6SaXtKlZEplGZniHjo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785517587; c=relaxed/simple; bh=GTCdXxGxuqpPISX7zn1bGR9hfy0DxUEEavsRgWp0XqI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=PElys/uO+4bv6vaMrDCaXO6g6BC/eV/Z2B+Zrd+UMeXIZtgWm4cks5WQYnlRmoLqJmmojJO/KNFXj1ehjGJntJeEoo8oZQvRCPeaEMp1dzqXGFWlZqKgRjXAidxkIlHMs/fSsfFSWz8frGeqZXLTCIUoeRV2zzcxNJAAzs0q8q4= 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=Rs9Rnfg7; arc=none smtp.client-ip=209.85.210.197 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="Rs9Rnfg7" Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-8482b95574dso1662663b3a.1 for ; Fri, 31 Jul 2026 10:06:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785517585; x=1786122385; 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=6tcAvkg/zKE4Wpx2bpF+dHLf7/L283ci232zJUD1488=; b=Rs9Rnfg7RzSq+qrx8RERN7AEsRVaK4eY60eLDpSQBGI3eoCwcvK2IV3XmhgTnFZjwF l8a52dbF9sSYpdur+qYuVAS/ECoSDcE51wpSbriJDUB//AOH+GSJhUsaQnuYPrLOHNJw UrSX7KYiQYwVJxrLsunK7jYI4IlzCHgEC3q2EIe2zcwosfla87e0Jpbbj6mVqeWSDTaq Lb0JXSFU+7prz6dZqBINjV4k2T/+qTJ+6JkCmHym9yA5v+RK2sWIKoAKkGaothKrO7if 9BrzUW9mqQ6lzrJkua4vx7TW00V/f2AJZx+882MTqDKldTunSa6K7oDp9pwDni1llG6X Zewg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785517585; x=1786122385; 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=6tcAvkg/zKE4Wpx2bpF+dHLf7/L283ci232zJUD1488=; b=ZgOQty762mQ8Vdpqn0KBwvITUpMfhpdO7Ztvr5b+mSdRuXT1o40Vo3Ph7fs6FNq6k7 qpI72me1ayBCdiJWNEgvBHGgMiYq4KUrPo6PJUSTmsZl8l4QksBhMSo5evQREK247Qgz LYumdypnF4x6G4hHWyLJMRiTSQY9lqhwvMjrikf02MyNa2e5N3n1ExcvKh3aSWvtw/u4 euwn41CKFqJLXq178s7cNIcJuRYsIk9HKkNFqlJmwlD911dWGSGfgAL1uUBa7Zz+nqhV fJi0UG1QPWyBbSCRngFSHZKsz5nk3wdUolcJtJUIe3/NAXGTcKTwW/TyATr64VbG+SDO ZvZA== X-Forwarded-Encrypted: i=1; AHgh+Rrr2ZiGe6EIqFA9OpdKWsZQDCBgtLsYkre5ZrVVe3JZUgySCBuzZNu0ZYPy27fGzBH1ufexoa48yjAz0Mw=@vger.kernel.org X-Gm-Message-State: AOJu0Yw84N7VR9XrZ98i1K6+O3oAb65tRYQPQFlrszMXR9jP3AO35qlj FoS2YMVIL28UjoRiR4zV5qyn16h37dZtyPJve5LipbtZapE8DGjMY6HjBs8MXBpwiUtwRHa+k6J 12Nmr0w== X-Received: from pfnu15.prod.google.com ([2002:aa7:848f:0:b0:847:8962:8101]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:a909:b0:84e:1815:f999 with SMTP id d2e1a72fcca58-84ee4998f39mr357940b3a.64.1785517585158; Fri, 31 Jul 2026 10:06:25 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 31 Jul 2026 10:06:09 -0700 In-Reply-To: <20260731170619.2620845-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: <20260731170619.2620845-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.508.g3f0d502094-goog Message-ID: <20260731170619.2620845-3-seanjc@google.com> Subject: [PATCH v2 02/12] KVM: selftests: Set threads CPU affinity before doing work in hardware disable test 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Affine worker threads to their target pCPU set *before* doing any work in the hardware disable test. When running a preemptible kernel on a NUMA system with a large number of CPUs (100+ of CPUs), waiting to set the affinity of the grandchildren until after the grandchild is fully spun up results in total test runtimes of over a minute, presumably due to cross-node NUMA penalties and scheduler lock contention. E.g. from the perspective of the caller, when waiting to affine the tasks, pthread_create() takes ~100x longer. Signed-off-by: Sean Christopherson --- .../selftests/kvm/hardware_disable_test.c | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/tools/testing/selftests/kvm/hardware_disable_test.c b/tools/te= sting/selftests/kvm/hardware_disable_test.c index 3147f5c97e94..f088b4af3ccc 100644 --- a/tools/testing/selftests/kvm/hardware_disable_test.c +++ b/tools/testing/selftests/kvm/hardware_disable_test.c @@ -21,6 +21,7 @@ #define FORK_NUM (1ULL << 9) #define DELAY_US_MAX 2000 =20 +static cpu_set_t threads_cpu_set; sem_t *sem; =20 static void guest_code(void) @@ -35,6 +36,8 @@ static void *run_vcpu(void *arg) struct kvm_vcpu *vcpu =3D arg; struct kvm_run *run =3D vcpu->run; =20 + kvm_sched_setaffinity(0, sizeof(cpu_set_t), &threads_cpu_set); + vcpu_run(vcpu); =20 TEST_ASSERT(false, "%s: exited with reason %d: %s", @@ -47,6 +50,8 @@ static void *sleeping_thread(void *arg) { int fd; =20 + kvm_sched_setaffinity(0, sizeof(cpu_set_t), &threads_cpu_set); + while (true) { fd =3D open("/dev/null", O_RDWR); close(fd); @@ -64,14 +69,6 @@ static inline void check_create_thread(pthread_t *thread= , pthread_attr_t *attr, TEST_ASSERT(r =3D=3D 0, "%s: failed to create thread", __func__); } =20 -static inline void check_set_affinity(pthread_t thread, cpu_set_t *cpu_set) -{ - int r; - - r =3D pthread_setaffinity_np(thread, sizeof(cpu_set_t), cpu_set); - TEST_ASSERT(r =3D=3D 0, "%s: failed set affinity", __func__); -} - static inline void check_join(pthread_t thread, void **retval) { int r; @@ -84,16 +81,11 @@ static void run_test(u32 run) { struct kvm_vcpu *vcpu; struct kvm_vm *vm; - cpu_set_t cpu_set; pthread_t threads[VCPU_NUM]; pthread_t throw_away; void *b; u32 i, j; =20 - CPU_ZERO(&cpu_set); - for (i =3D 0; i < VCPU_NUM; i++) - CPU_SET(i, &cpu_set); - vm =3D vm_create(VCPU_NUM); =20 pr_debug("%s: [%d] start vcpus\n", __func__, run); @@ -101,12 +93,10 @@ static void run_test(u32 run) vcpu =3D vm_vcpu_add(vm, i, guest_code); =20 check_create_thread(&threads[i], NULL, run_vcpu, vcpu); - check_set_affinity(threads[i], &cpu_set); =20 for (j =3D 0; j < SLEEPING_THREAD_NUM; ++j) { check_create_thread(&throw_away, NULL, sleeping_thread, (void *)NULL); - check_set_affinity(throw_away, &cpu_set); } } pr_debug("%s: [%d] all threads launched\n", __func__, run); @@ -153,6 +143,9 @@ int main(int argc, char **argv) int s, r; pid_t pid; =20 + for (i =3D 0; i < VCPU_NUM; i++) + CPU_SET(i, &threads_cpu_set); + sem =3D sem_open("vm_sem", O_CREAT | O_EXCL, 0644, 0); sem_unlink("vm_sem"); =20 --=20 2.55.0.508.g3f0d502094-goog From nobody Fri Oct 2 12:19:59 2026 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 5C861449B1A for ; Fri, 31 Jul 2026 17:06:27 +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=1785517588; cv=none; b=d7DmmzIRcgP3Uaa6bTd/Q+CtfdgE53aw0+eNlxP5XDuoFpMegBy2nYCVlv6/O5R5+msw+wRV5ErmhkUPCZ+mw5XGo/Zi7ZxeWwLMXOFk2A2T0kJmka2qIphB9asIwJqoU6idyL3VxfblHBoUy3jDvbsmuxdKuO/50nIlzwgRIm0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785517588; c=relaxed/simple; bh=O/HA18lT4V9uEUyS4D559RXemgyAqdlbEZKAn/jF9Js=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=RsIJ/uAxbM+v22OK0X6i/JEegj0MYOO/HNoVFimD6EnM+25t2cmmxTvYUPUsYff7YxhksjjrF5eU1uSDsmsQnRpjwIqNppXZ4vxiZlMqO+LbOSUq5rRYK9l8Wgzf8EaJ36ooB9QwCS9HY+otL98hWXMiKm88/rBL+xJsc73b/20= 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=Kr95OI8i; 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="Kr95OI8i" Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-848544a8496so1480642b3a.0 for ; Fri, 31 Jul 2026 10:06:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785517587; x=1786122387; 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=i3VSeeQ+TY0YcGO9FGsFVyU5sUODRimnbCxeJHurnMk=; b=Kr95OI8i6I+oJAzJ/+qc4GOrxGjRir/mM8Yb7bWXfpNXmvFQ1YHSX3oYkTVY1PGScV +U1+SMmdSZ0z94gnP+e1kHpY/TSW8RUmhmThxaSo1u28VH6BfVvuyAUuoj+Kkf5E1fUz Jk9F2nSuUvaAJFyyS3qJ4f8ShaGGQyIwb2Anvtow5b/3of00/AQRIHkRpcyvD27LLxJm cnTrWCO7Urnx1oBroYJspVzNJvMU235QluAaIL9FqRroSIk5b1m49nqGPnn+eFdM8rTt 3hrhpWljxmIfBGgNNeGPRbBYlLmT7L7hiLPtYpnx+GArn3Zic2JAh7314nReBBgcBDxL ntMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785517587; x=1786122387; 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=i3VSeeQ+TY0YcGO9FGsFVyU5sUODRimnbCxeJHurnMk=; b=s8TCI4t/GVQxJ5k056QyQp8g+Z9YNesj+eJirgA5i2ghh4iT5l0sfcjJzoDW3l4+vV deIHkJ43jT7l0ujwC/t1XI2p6kk0usih//+so1bnAaLyhIc3ZYJfgvhIiAWfMOZkYgpo qayezcA9k5I3e7a/R0MB2jS2/WAJ+JmJAQw+NvD3pKPM9by1J2R/IzMtuPp+Q3stRJJv dm9jvia13l3BhRzvqHvY8uZQTPZbtlC/n11osktULuZ4/9C02Ik1sow76uQfc8yEVjNm l0OSnCujyz5U30V0ipZkqf47UmkdotiY5OTzAbnV+L0KBT20/FTA9AtPEuJeaMQNqpAF BhlQ== X-Forwarded-Encrypted: i=1; AHgh+Roq0AFxn886CbVHvXTb2ziVFJd29H0g0LyUpquCf7blDaCigz6uGH5daKS2vMXJrnyGtVi1H79nnUIo2wQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yz8FQ1UaXg+WCx+N0Y4nYMyDSBrqLMNjWroxJprUYwBLlnszKqu NTX8Vy3Jvwoowkaxa8Yb9apBRLuQxMJL4LP2vDojCIKnSka8Xf5esRKYr4XNr2o8Pu2qqD8ZUiU +90MLDQ== X-Received: from pfoc6.prod.google.com ([2002:aa7:8806:0:b0:847:9199:e06]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:ac07:b0:84e:d46f:492a with SMTP id d2e1a72fcca58-84ee496c951mr366009b3a.70.1785517586327; Fri, 31 Jul 2026 10:06:26 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 31 Jul 2026 10:06:10 -0700 In-Reply-To: <20260731170619.2620845-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: <20260731170619.2620845-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.508.g3f0d502094-goog Message-ID: <20260731170619.2620845-4-seanjc@google.com> Subject: [PATCH v2 03/12] KVM: selftests: Pre-set threads affinity in hardware disable test when possible 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When building against a libc that provides pthread_attr_setaffinity_np(), pre-set the grandchildren threads CPU affinity in the hardware disable test to further reduce the perceived latency of pthread_create(). On large NUMA systems, this reduces the average runtime from ~10s to ~3.5s. Signed-off-by: Sean Christopherson --- .../testing/selftests/kvm/hardware_disable_test.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/hardware_disable_test.c b/tools/te= sting/selftests/kvm/hardware_disable_test.c index f088b4af3ccc..d8288147b0a6 100644 --- a/tools/testing/selftests/kvm/hardware_disable_test.c +++ b/tools/testing/selftests/kvm/hardware_disable_test.c @@ -36,7 +36,9 @@ static void *run_vcpu(void *arg) struct kvm_vcpu *vcpu =3D arg; struct kvm_run *run =3D vcpu->run; =20 +#ifndef __USE_GNU kvm_sched_setaffinity(0, sizeof(cpu_set_t), &threads_cpu_set); +#endif =20 vcpu_run(vcpu); =20 @@ -50,7 +52,9 @@ static void *sleeping_thread(void *arg) { int fd; =20 +#ifndef __USE_GNU kvm_sched_setaffinity(0, sizeof(cpu_set_t), &threads_cpu_set); +#endif =20 while (true) { fd =3D open("/dev/null", O_RDWR); @@ -80,22 +84,28 @@ static inline void check_join(pthread_t thread, void **= retval) static void run_test(u32 run) { struct kvm_vcpu *vcpu; + pthread_attr_t attr; struct kvm_vm *vm; pthread_t threads[VCPU_NUM]; pthread_t throw_away; void *b; u32 i, j; =20 + pthread_attr_init(&attr); +#ifdef __USE_GNU + pthread_attr_setaffinity_np(&attr, sizeof(cpu_set_t), &threads_cpu_set); +#endif + vm =3D vm_create(VCPU_NUM); =20 pr_debug("%s: [%d] start vcpus\n", __func__, run); for (i =3D 0; i < VCPU_NUM; ++i) { vcpu =3D vm_vcpu_add(vm, i, guest_code); =20 - check_create_thread(&threads[i], NULL, run_vcpu, vcpu); + check_create_thread(&threads[i], &attr, run_vcpu, vcpu); =20 for (j =3D 0; j < SLEEPING_THREAD_NUM; ++j) { - check_create_thread(&throw_away, NULL, sleeping_thread, + check_create_thread(&throw_away, &attr, sleeping_thread, (void *)NULL); } } --=20 2.55.0.508.g3f0d502094-goog From nobody Fri Oct 2 12:19:59 2026 Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) (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 687D144E67E for ; Fri, 31 Jul 2026 17:06:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.200 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785517590; cv=none; b=YXpjzpS/nMgzxOLDLWcSJFOw9Opv2mCf3v/w9qi3lHNRWL5AAQrkyWWyuGaid2dYlCeerYpBT3eJJnBXIkUNl0xBiEupHgo+orsBOI6i6GpjlGePBmsW28dUFlEQjk7ZwlGPEen7TJ6wijEONL1du2xmlxc9q8cKTewB9MAr7fQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785517590; c=relaxed/simple; bh=HRd/veKnQQoNlLPIk/S30A+ciXDQdelNm8xjt5JmDww=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=m9aerIKo+AqopEUEDaR42h6BMs+8J7EdTUBBTXSfRcGXpu71ESyKi54L9SzGzBUMxJKTh+/UwVzeMazGB7yD+CQj+PKQLNVFXFvaq+m8pe1YqBcuGHveaFKev1vA1ai9P8hcQ7KtyUQ9WJo/ccmzUMSIunnxIv6vZOjiP/0mRw8= 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=OvRlGt9K; arc=none smtp.client-ip=209.85.215.200 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="OvRlGt9K" Received: by mail-pg1-f200.google.com with SMTP id 41be03b00d2f7-cb711c88f2eso633769a12.2 for ; Fri, 31 Jul 2026 10:06:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785517588; x=1786122388; 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=kus6EqucfaH9HPf637yAVY0TPxuMIU/5NctVRnWGiLw=; b=OvRlGt9KNWdNz6z1yGu+OYAmYnDkL1CiJHDiLRbmt5NuXhl51pw6SVrItms8JjzHoN KGIVhqrm1JI+I2BEuSqDR3fOxwXFHiFOw7kk8uqLa/tTE2bul+uG9KRveet+CIGp10Sr BxI8BLkQ+TaO3cj0rXHg7xTmVH9TYrxk3b1iE1McwTQMqC6QMHXzERU4ttLSkJStqb17 GE4wjCNKXJQMjfGQIRge4p5fwO2xE4ZYVEDEX103+jfgdCvsFsDS66jy2rUefmr0PZ4W WAz6ZO1RwW5npO2JrpZurLiewo3xHEB7ZACEcu906LmXddke/A0uLpt9MvhnEXW4qWX9 /YPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785517588; x=1786122388; 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=kus6EqucfaH9HPf637yAVY0TPxuMIU/5NctVRnWGiLw=; b=OK12s7hEEXL0Cv1Igu3q05jTxZBOl6LJCOf61k+Addq5n6R66FsWO/tw1oMcE4mIln XD4OMs01zrMnBHRAGb4C91+SQCsuIAK4bqo9AAWm2k9zFb1qpyvsoWqzDLP5+KU9KY9P WAI8QcxeEXPqU0AYdI/v7urEfMIiOtCgmNFjymiEWacPd7+WA2apgu591WMfs0UjXXgW pUw+5i01ox6Zpz6W79DofowueAmHlo9Fc7KV0mliUL9VtcKkHEx+VT2gtPKM0pVadDdG i99OGz0GI3KOnEm22UFuws6PwP4BtKi/p2cf0FOh+oExh9YduSNQe1wFhlhh41hi7F/G D+Dw== X-Forwarded-Encrypted: i=1; AHgh+RqC2FHsloPrIF2W0OSEJY/N/k78HR0UaPo0vZqO7fbGKYJ+w3GJf8QY7K7OpECvzLzly0/O/chJFwkDBI4=@vger.kernel.org X-Gm-Message-State: AOJu0YwMS6s0jUboyLQbZRabpI2Hz5rVjQX8OTi7Zspja4tPROUPbilS o4F0C4lNqV2kfj3aq+oNY8avfI1IpHEuDfsAQGKcdo7n4jzUV8BqPhSkzTGP7Xi5YGnNqBVfJsK hwBoF8w== X-Received: from pghd20.prod.google.com ([2002:a63:fd14:0:b0:c96:8e22:a215]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:116:b0:3c3:a1a4:862c with SMTP id adf61e73a8af0-3c92a94e9ffmr515706637.68.1785517587444; Fri, 31 Jul 2026 10:06:27 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 31 Jul 2026 10:06:11 -0700 In-Reply-To: <20260731170619.2620845-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: <20260731170619.2620845-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.508.g3f0d502094-goog Message-ID: <20260731170619.2620845-5-seanjc@google.com> Subject: [PATCH v2 04/12] KVM: selftests: Return the target CPU from pin_task_to_random_cpu() 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When pinning a task to a random CPU, return which CPU the task was pinned to so that the caller can do things like avoid running other tasks on the target CPU. Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/include/kvm_util.h | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing= /selftests/kvm/include/kvm_util.h index b39e713c30a4..61d72e1e7601 100644 --- a/tools/testing/selftests/kvm/include/kvm_util.h +++ b/tools/testing/selftests/kvm/include/kvm_util.h @@ -1094,7 +1094,7 @@ static inline void pin_task_to_cpu(pthread_t task, in= t cpu) TEST_ASSERT(!r, "Failed to set thread affinity to pCPU '%u'", cpu); } =20 -void pin_task_to_random_cpu(pthread_t task, cpu_set_t *possible_cpus); +int pin_task_to_random_cpu(pthread_t task, cpu_set_t *possible_cpus); =20 static inline int pin_task_to_any_cpu(pthread_t task) { diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/sel= ftests/kvm/lib/kvm_util.c index 3794575d2ca0..af2bad0553f9 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -668,7 +668,7 @@ void kvm_print_vcpu_pinning_help(void) " (default: no pinning)\n", name, name); } =20 -void pin_task_to_random_cpu(pthread_t task, cpu_set_t *possible_cpus) +int pin_task_to_random_cpu(pthread_t task, cpu_set_t *possible_cpus) { int target_idx; int nr_cpus; @@ -682,11 +682,12 @@ void pin_task_to_random_cpu(pthread_t task, cpu_set_t= *possible_cpus) for (cpu =3D 0; cpu < CPU_SETSIZE; cpu++) { if (CPU_ISSET(cpu, possible_cpus) && target_idx-- =3D=3D 0) { pin_task_to_cpu(task, cpu); - return; + return cpu; } } =20 TEST_FAIL("Failed to find random CPU in possible_cpus"); + return -1; } =20 void kvm_parse_vcpu_pinning(const char *pcpus_string, u32 vcpu_to_pcpu[], --=20 2.55.0.508.g3f0d502094-goog From nobody Fri Oct 2 12:19:59 2026 Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) (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 9AA7F450903 for ; Fri, 31 Jul 2026 17:06:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.69 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785517592; cv=none; b=qa+QZe+s/f96g4lzXyMNU+9XXxkXomGCMUPOfvdqRLGA5qo1Y8x46KgINhgL6Je8GLMXhaFRXnXHO46BtesfoQwzOua8fqUSP87nRaX9UNAiwsL+wNoUcgbz279Ckoh7ljbf3AmCgGJegUnqqkbEhVazZJzt0t9Mgdu8lNGJY1Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785517592; c=relaxed/simple; bh=/TJjnxpVpH8WmXNaVzrS2AeOgP3QdjHKxDY/CbjUI8M=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=I7VDF+h1nlMBjos9uT7OU6T9DaIJodservAGBeUh/fY+C17raYAbsdzsRbaczljHykzPkAQCbOo0BK0nSec56IrktrP3y8QzAkdblhm10yA+FRTGriqI9KtClpLcjt2aOJO9cftmr8PrljD+bfYDejB1yzSanRrOiiSWJsM/tMc= 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=sBpjwgH0; arc=none smtp.client-ip=209.85.216.69 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="sBpjwgH0" Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-38e475f83a2so1958132a91.1 for ; Fri, 31 Jul 2026 10:06:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785517589; x=1786122389; 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=Bs3K8CpV0aK6wpGyTBasGbTbkVQEzOsTzupfjJkDnT8=; b=sBpjwgH0BJQ7t5AMeGgcn+r24SRarQbNJ44LgZWRwtAMWXyiYklgl99llQh5aLpw4/ 7XKZYN9V1Pqg1f60JIjfEPPAqL5flMF5/2FEBA2h6MkYU2gqXulCJUmx28N7C1gqPF0R 1mLA4LQmfSm/YxvD2gz7dR/OfZ614j95o+KBuP6vKcsBeQIFEF9jZCcU6K1faGBOcpTT sPnZ+3jH0U5XHzhYyk/sfVwy4ZKbg5AMU/CWV7SWjG/tOkTUGHx47p5LDaMgLpr3wOy/ QAXVnzErJKqsd0715jAfqpzQqvdKn3KjpZCUtpbIEGCuxYoFi8XjeooMD9bA3q/U4tXs dvDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785517589; x=1786122389; 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=Bs3K8CpV0aK6wpGyTBasGbTbkVQEzOsTzupfjJkDnT8=; b=BngVREZ0rVN1XyhnCoJDrpVM7gtx3DyEwbtpPj0GRHp+jcvada/6gOYMVuWL4obusr cv0sRDksKTo49fowKRZW4u7GMAf+Y71tEQbYi/i7eX+rjYtnfYRBCyztSCuL/vF29JQM jtLs8DqoVSLvpkBlL3KAMAP+dRQ4/HHe29mPohuH46Dtz2Mo4gqPnNrh6q0pzte7xisj g4rtJ0555dLl5MIcYQg85Sl39ip1BbMFIvtDrQpKV1V95O7NGSoHVTThLb8N9jA64qGd ikg0lHNMW6vNsEy2pt2qudV9ak4Kl+0LSnkQA0o2gfr2NK4mlQASDGdYKtC2DkzqBtP2 oACA== X-Forwarded-Encrypted: i=1; AHgh+RruxTjsslsr81vv4S2c9IEo1fWuyTLkSu8jmyxrJxrgCioFU3fZymNrkYcLAlfLTgq+YcRxMML9aBihfuQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzAl8lyUNXwjdq3nvIPMNFC0Xops77nKPLt4/ORnqvec0yMenIc xFXrUvtl4m2KR9C3lIANrT6yhS+XborNMZeAUKCLscwfoLrGZAFPVdgKoIdimF0mQCLAzmRFJ9+ 0Prpvfw== X-Received: from pjbee14.prod.google.com ([2002:a17:90a:fc4e:b0:384:7daf:f48a]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5605:b0:37f:9ce3:ca95 with SMTP id 98e67ed59e1d1-38fbc560e9amr564372a91.30.1785517588641; Fri, 31 Jul 2026 10:06:28 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 31 Jul 2026 10:06:12 -0700 In-Reply-To: <20260731170619.2620845-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: <20260731170619.2620845-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.508.g3f0d502094-goog Message-ID: <20260731170619.2620845-6-seanjc@google.com> Subject: [PATCH v2 05/12] KVM: selftests: Extract picking of random CPU from cpu_set_t to separate API 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Extract kvm_pick_random_cpu() out of pin_task_to_random_cpu() so that tests can choose a random CPU without having to immediately pin a task to that CPU. No functional change intended. Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/include/kvm_util.h | 11 ++++++++++- tools/testing/selftests/kvm/lib/kvm_util.c | 7 ++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing= /selftests/kvm/include/kvm_util.h index 61d72e1e7601..5a7a455b5387 100644 --- a/tools/testing/selftests/kvm/include/kvm_util.h +++ b/tools/testing/selftests/kvm/include/kvm_util.h @@ -1084,6 +1084,8 @@ struct kvm_vcpu *vm_recreate_with_one_vcpu(struct kvm= _vm *vm); =20 void kvm_set_files_rlimit(u32 nr_vcpus); =20 +int kvm_pick_random_cpu(cpu_set_t *possible_cpus); + int __pin_task_to_cpu(pthread_t task, int cpu); =20 static inline void pin_task_to_cpu(pthread_t task, int cpu) @@ -1094,7 +1096,14 @@ static inline void pin_task_to_cpu(pthread_t task, i= nt cpu) TEST_ASSERT(!r, "Failed to set thread affinity to pCPU '%u'", cpu); } =20 -int pin_task_to_random_cpu(pthread_t task, cpu_set_t *possible_cpus); +static inline int pin_task_to_random_cpu(pthread_t task, cpu_set_t *possib= le_cpus) +{ + int cpu; + + cpu =3D kvm_pick_random_cpu(possible_cpus); + pin_task_to_cpu(task, cpu); + return cpu; +} =20 static inline int pin_task_to_any_cpu(pthread_t task) { diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/sel= ftests/kvm/lib/kvm_util.c index af2bad0553f9..9ddc047d5c27 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -668,7 +668,7 @@ void kvm_print_vcpu_pinning_help(void) " (default: no pinning)\n", name, name); } =20 -int pin_task_to_random_cpu(pthread_t task, cpu_set_t *possible_cpus) +int kvm_pick_random_cpu(cpu_set_t *possible_cpus) { int target_idx; int nr_cpus; @@ -680,12 +680,9 @@ int pin_task_to_random_cpu(pthread_t task, cpu_set_t *= possible_cpus) target_idx =3D kvm_random_u64(&kvm_rng) % nr_cpus; =20 for (cpu =3D 0; cpu < CPU_SETSIZE; cpu++) { - if (CPU_ISSET(cpu, possible_cpus) && target_idx-- =3D=3D 0) { - pin_task_to_cpu(task, cpu); + if (CPU_ISSET(cpu, possible_cpus) && target_idx-- =3D=3D 0) return cpu; - } } - TEST_FAIL("Failed to find random CPU in possible_cpus"); return -1; } --=20 2.55.0.508.g3f0d502094-goog From nobody Fri Oct 2 12:19:59 2026 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (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 F2D33451996 for ; Fri, 31 Jul 2026 17:06:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.200 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785517592; cv=none; b=hwN4Y9x3reLei/ROQvZ8BeHx8bd/iOrMCVHB5mETee1n5dkaVhlwm1gM0xieYm36ZVUamP88J/FmsxixAbYwd66AE6M2iK8Zns6G7epV22q7nNgAFQz1xVkxbIefmxz2a7H3t3RJNbarrn7CnuZ9+AsOHSftcXIN/1812HnvwVw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785517592; c=relaxed/simple; bh=atVzo7J4szz2vu/UetIPVOdW3jQWtD74LNLShVxaLFc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=l2IHKxJYj1ZlzFKVJrrA7yg2+37tvScRohz7MeBwEbLErL5JYfuehU1h+JslOfPz1POzdraiP8vUkbPeD5yHkoPQUQUIzoN6BTCCnnw38jxTzypdkno72P9ezCD21U4Ob70xuDgIQYzyIRkd+4ybvld2DipUqHZ+VD44AhAG2+w= 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=mVXWkOpd; arc=none smtp.client-ip=209.85.214.200 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="mVXWkOpd" Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2cfe48ca1efso17087835ad.0 for ; Fri, 31 Jul 2026 10:06:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785517590; x=1786122390; 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=9BfMO7lDi/jb9f6SoYoHXqiGNPLVG4w0N20HXOwKIiI=; b=mVXWkOpdh2URIG9DjXaAvsa8d0vLxYEfMfce4LvuEKQAURJVu/szuHTQphibaelSK+ aku5OTJeHR/SjM4Gx+ehS7ejNpdhB6BBmGD0rN7ksl684fhxQduiDXWH92AWqxOBggop +MfRjaumNUEUrsA7cGiUwUFEchyp2I8qyNRaggyMCrPsJp5XxrZ5nWpgurCuocof9O5X 2bJ91v1/M1GSVJ29JGRWkCNxRCoaFZcH7YqETeF9NClUEIL7I3k+3iM1oLdnJ9lIV7Tu 0QatfoOJtnaz4Jxjz91Uxzy2VyxIxLKw6VSvQVLkvZ22dekk36PEe4xlpRPAWOWg+5Xk MDaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785517590; x=1786122390; 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=9BfMO7lDi/jb9f6SoYoHXqiGNPLVG4w0N20HXOwKIiI=; b=Kk2DZ4dDuau3RDIBg6yqzCulwqijp900UtaK1FjfmoqhC2wUsDzFXcNFP658vRsOIN DOScu+mNVKMcTZxWA0qEzDgD/M7Kfuu600/HNZ2S+zVoP0ujCb93TkgDzF5Q5ZnU6eWj gQA1VFiXMm0APvE6o3XCAeU/VO4BoyWJ/+HP3PXFGNh4SVSgtkoPlQFR27ZetD/LWoW/ sLixVw5Ow4k31sxTOIoWsgLP+7jK66+DDR5TwWTot1yRlJvXNEHx8L8MVhtOqgWN8Epg Ip4HjRcoNE7PPBKwibooI/hFnHMVHNURbLwOpOj0sj7J0G1xS9XaIhgysg6agu+Pgl7p gY4w== X-Forwarded-Encrypted: i=1; AHgh+RpvByGTFJWMK4gSNOs5iazBUg9ns9jAUtTzcS+9RvqOtaQLE8DonbTgpuBv+xTEw1ESid+PYK0Y9Av8Wwk=@vger.kernel.org X-Gm-Message-State: AOJu0Yw63r/1A6CPyVZDBT3aMVEhMrkpJ9cscT9o4th0gbYgERf9AmDB JWzAExl1umC2bBzRyCPDzkGEQhkthn2Nk09LwFwEaxxR2419DtMp0+VpdSY9l/D5MMYQud45s/+ jS+bg3Q== X-Received: from plje10.prod.google.com ([2002:a17:902:ed8a:b0:2ca:e62e:eb94]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2d1:b0:2cc:6817:d9bc with SMTP id d9443c01a7336-2d0523e6ee5mr6994735ad.38.1785517589951; Fri, 31 Jul 2026 10:06:29 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 31 Jul 2026 10:06:13 -0700 In-Reply-To: <20260731170619.2620845-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: <20260731170619.2620845-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.508.g3f0d502094-goog Message-ID: <20260731170619.2620845-7-seanjc@google.com> Subject: [PATCH v2 06/12] KVM: selftests: Affine threads to random CPUs in hardware disable test 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Affine the worker threads to random CPUs in the hardware disable test, and honor the starting CPU set in the process. Hardcoding to CPUs 0-3 is both wrong and less interesting than running on random CPUs. Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/hardware_disable_test.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/hardware_disable_test.c b/tools/te= sting/selftests/kvm/hardware_disable_test.c index d8288147b0a6..bd23c1300370 100644 --- a/tools/testing/selftests/kvm/hardware_disable_test.c +++ b/tools/testing/selftests/kvm/hardware_disable_test.c @@ -149,12 +149,15 @@ void wait_for_child_setup(pid_t pid) =20 int main(int argc, char **argv) { + cpu_set_t allowed_cpu_set; u32 i; int s, r; pid_t pid; =20 - for (i =3D 0; i < VCPU_NUM; i++) - CPU_SET(i, &threads_cpu_set); + kvm_sched_getaffinity(0, sizeof(cpu_set_t), &allowed_cpu_set); + + for (i =3D 0; i < VCPU_NUM && CPU_COUNT(&allowed_cpu_set); i++) + CPU_SET(kvm_pick_random_cpu(&allowed_cpu_set), &threads_cpu_set); =20 sem =3D sem_open("vm_sem", O_CREAT | O_EXCL, 0644, 0); sem_unlink("vm_sem"); --=20 2.55.0.508.g3f0d502094-goog From nobody Fri Oct 2 12:19:59 2026 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 5BF70453A2E for ; Fri, 31 Jul 2026 17:06:32 +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=1785517593; cv=none; b=QFfT5kKBqkNtqulF0Ng2qW+iga5jXoI5/X2jv15cncK2DTz/tVkTJRdI/+QbEjJDMqgjHUOOy/GoiiN7o7pOIiRAn7PC/hn3GY0V0ekQ7dPzUHOG409jcWxJ2vc2ZX4DFJeeIvfNxbxyuVaiBlP5eTbhijRYmSP7hRkENCjmfK8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785517593; c=relaxed/simple; bh=JuNyQeBG82czs+HN+A+wHJX43qaOj8+9Nl8By6b2l/k=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=gGLJdvTPscsUPIBXcm0ofBDDcesEe6By8IGph8znRz3xBIjwmQdHVcyYDuFBL5CS8w4kFEbjGsq3oEVJzmJ+ArMsO/VSopiyH3KE6jUSdW2ZsmpsphSKGf5g4g/W9h9awv18Z5aOYRsMX0vmhcb96BEB+MRb1ts5C7ZYu3+BnSI= 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=S3eAty1v; 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="S3eAty1v" Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-8487eb67173so2401451b3a.2 for ; Fri, 31 Jul 2026 10:06:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785517591; x=1786122391; 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=F2wB8IP388Lc2MBAteJRNDo31xEFc0D1s8JJGVqmoX8=; b=S3eAty1v/msgBFMh878QYZornBR7pJ3n5iUrNUIheZLAuGVXQgwhA8Z6horIeChrVs x4tpVFngfhzdRJUx98G66CCOwMiTVFLWXx5eYvQUreNiYT9liXSSic9MuqQFlhZSM0Lu zoXj/YHDNswBBlDbK501WXHoTAeOhN7bs7koYKj1ubGDVXi2sENhHXsgl171ku6O7qbM 8EgSzee6deubUCuCv9GCFrWiYiKBZFZSzfQ3rzUiJ2Fgb/1Ds+a4DBCzfF2s2FBxummo yD2E/Dw2GfqZCqxy8mQHfr27FmZoCaaJOUvLbCBx93pzQHPm328FcIOft19FDuQ0tf3P 2/oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785517591; x=1786122391; 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=F2wB8IP388Lc2MBAteJRNDo31xEFc0D1s8JJGVqmoX8=; b=WQZ7+8CnC6axCKxJGOUUjC6eNEEJhSVC+lprLc2rrRQh193vr1UJCICDa65jPi3bX5 RR2b23/HQ2Vk8DZyRaZRfq9j+A8VgAK/VEnNNUn1mlbwvPMlUtyanAqRsmv4VueGV/XN /q6QlVfKph2Kiah6SL3Id24hN3KNCVB0DTfCaQyb/dIfbl3nbFEgXCvWK3QZIl88Rf1K EHRDfCczeh9pkE/g3DcJBnttKXPLs46qHGtrFBAwLPV0nEDiTE1rl7/BY5f/xTgjFExs OeJObCCMlTqWg2xtYROJGHrOyInE4YLysgerIZ3hFgZPiqWS7dODLyDJ7gZjgolJEekJ +Uug== X-Forwarded-Encrypted: i=1; AHgh+RpcsZnu0s/6hUvDuvQe24fMHPJfR8s+NvpjjspPIYhEPBUXZpkKWeGjsrMdVLRVnbfDTTFiFypyUUpqrzg=@vger.kernel.org X-Gm-Message-State: AOJu0YymfB0BcCXz6FqUnqznCCSce+vG59VkB9XEmX9JdfNE226DoVD2 x/zO4w0nqcW/0SHJFmh+nqu2qlwFFWEBi8BnCIRecdcyK1oV+ORx3PIKySZz97NfoYkv7/6aZhk xvUgHUg== X-Received: from pfbdc10.prod.google.com ([2002:a05:6a00:35ca:b0:84c:2b7d:213b]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:885:b0:847:8c4e:1d5e with SMTP id d2e1a72fcca58-84ee48f8431mr387593b3a.56.1785517591199; Fri, 31 Jul 2026 10:06:31 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 31 Jul 2026 10:06:14 -0700 In-Reply-To: <20260731170619.2620845-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: <20260731170619.2620845-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.508.g3f0d502094-goog Message-ID: <20260731170619.2620845-8-seanjc@google.com> Subject: [PATCH v2 07/12] KVM: selftests: Drop unreachable, dead code from hardware disable test 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Drop all of the code that is unreachable in the hardware disable test, as it adds a lot of noise that makes the test seem far more complicated than it actually is. Signed-off-by: Sean Christopherson --- .../selftests/kvm/hardware_disable_test.c | 41 +++++++------------ 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/tools/testing/selftests/kvm/hardware_disable_test.c b/tools/te= sting/selftests/kvm/hardware_disable_test.c index bd23c1300370..b8115b2dcae3 100644 --- a/tools/testing/selftests/kvm/hardware_disable_test.c +++ b/tools/testing/selftests/kvm/hardware_disable_test.c @@ -15,6 +15,7 @@ #include =20 #include "kvm_util.h" +#include "ucall_common.h" =20 #define VCPU_NUM 4 #define SLEEPING_THREAD_NUM (1 << 4) @@ -28,7 +29,7 @@ static void guest_code(void) { for (;;) ; /* Some busy work */ - printf("Should not be reached.\n"); + GUEST_ASSERT(0); } =20 static void *run_vcpu(void *arg) @@ -42,10 +43,8 @@ static void *run_vcpu(void *arg) =20 vcpu_run(vcpu); =20 - TEST_ASSERT(false, "%s: exited with reason %d: %s", - __func__, run->exit_reason, - exit_reason_str(run->exit_reason)); - pthread_exit(NULL); + TEST_FAIL("vCPU%d exited with reason %d: %s", + vcpu->id, run->exit_reason, exit_reason_str(run->exit_reason)); } =20 static void *sleeping_thread(void *arg) @@ -56,12 +55,11 @@ static void *sleeping_thread(void *arg) kvm_sched_setaffinity(0, sizeof(cpu_set_t), &threads_cpu_set); #endif =20 - while (true) { + while (1) { fd =3D open("/dev/null", O_RDWR); close(fd); } - TEST_ASSERT(false, "%s: exited", __func__); - pthread_exit(NULL); + TEST_FAIL("%s: exited", __func__); } =20 static inline void check_create_thread(pthread_t *thread, pthread_attr_t *= attr, @@ -73,22 +71,12 @@ static inline void check_create_thread(pthread_t *threa= d, pthread_attr_t *attr, TEST_ASSERT(r =3D=3D 0, "%s: failed to create thread", __func__); } =20 -static inline void check_join(pthread_t thread, void **retval) -{ - int r; - - r =3D pthread_join(thread, retval); - TEST_ASSERT(r =3D=3D 0, "%s: failed to join thread", __func__); -} - static void run_test(u32 run) { struct kvm_vcpu *vcpu; pthread_attr_t attr; struct kvm_vm *vm; - pthread_t threads[VCPU_NUM]; - pthread_t throw_away; - void *b; + pthread_t thread; u32 i, j; =20 pthread_attr_init(&attr); @@ -102,19 +90,18 @@ static void run_test(u32 run) for (i =3D 0; i < VCPU_NUM; ++i) { vcpu =3D vm_vcpu_add(vm, i, guest_code); =20 - check_create_thread(&threads[i], &attr, run_vcpu, vcpu); + check_create_thread(&thread, &attr, run_vcpu, vcpu); =20 - for (j =3D 0; j < SLEEPING_THREAD_NUM; ++j) { - check_create_thread(&throw_away, &attr, sleeping_thread, + for (j =3D 0; j < SLEEPING_THREAD_NUM; ++j) + check_create_thread(&thread, &attr, sleeping_thread, (void *)NULL); - } } pr_debug("%s: [%d] all threads launched\n", __func__, run); sem_post(sem); - for (i =3D 0; i < VCPU_NUM; ++i) - check_join(threads[i], &b); - /* Should not be reached */ - TEST_ASSERT(false, "%s: [%d] child escaped the ninja", __func__, run); + + /* Wait for the parent to SIGKILL this child. */ + while (1) + pause(); } =20 void wait_for_child_setup(pid_t pid) --=20 2.55.0.508.g3f0d502094-goog From nobody Fri Oct 2 12:19:59 2026 Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) (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 7EEDE455187 for ; Fri, 31 Jul 2026 17:06:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785517595; cv=none; b=M0FLU2+3qQRGJ9yamVasC3vf/VfG6WAIYBCw0zlDwwwecSB1+Q2+Xk5OtxJnKYVvoRUkyG+gH1SR+kF8F6yBFumHQ99mylObqOibKdZJyxKHywaazSQFDGJj/1OXMXs7nlydbmQ6Uf6ZfrE2pWkc6zOgWt6DMGNATdjLsQIKo+g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785517595; c=relaxed/simple; bh=005O5sYv+kMGHI/IAxuHJ7W9GOqScFIr6j9jgra9L2w=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Yhm22iZC/S3XbBdiXPjClPXF31ejzcdszwsPWQXnYyoh/ESAdatPtR5SEwPNF+lAOJ2Br7qITN+jrceUon7p3T0jOxQ3l90K0WICVGzCnYGWf9h1ADi+Wzg+YNaSUhBeA2+KkpgoZUt8S/upaWiR9zkErR9dyD7IA82eWSUrYSU= 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=COj9b3Oe; arc=none smtp.client-ip=209.85.210.197 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="COj9b3Oe" Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-848474825ffso1277831b3a.0 for ; Fri, 31 Jul 2026 10:06:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785517593; x=1786122393; 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=ctlXdT2JZ1q5UveKB40Dd/6tqw4CMEidpPSRexgEDyQ=; b=COj9b3OehxckoimmnLZhbnvNdX16zKRLfvgxdVen0cuAEN8k2WXjsHC8wD5KnhqiaI lojgiXa6bYjrohKEmcZAvziY+FeMCDAf5CYsJPVYuSI52wydQZBuAHX5orUHUEJ/aGt0 lYJ4hsHX7fwRYWONoqQBWqGgFOXGYxdVnAeydfJ7wU5/GlSdtsm73qlu99Ml1HgREaMr +69bLUDL6d2YQMykD8ZYD1OD4xtKOr1cSX9a5jktoAJmQBKQb1oRVLDHg5EFB1vqYz4O Q/6rLinAnr4Me0UX2VWXc6rL5E2mffYFz7TA7f2VQUuqm4T0VeME3pYOJjB36a5+rOFW Jkpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785517593; x=1786122393; 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=ctlXdT2JZ1q5UveKB40Dd/6tqw4CMEidpPSRexgEDyQ=; b=Y44XQ0amu/WGA/sJhmdQs18u4cJvRpCvFOUtdId6G6E4KvZsPsA3e+rFJzESIMfUGr CZpuOUDbbOTxYqA2iKJ22jK9yQoXbtuWXyms8aFXhGni8ZbnVIhRM4S376H/hUexTXT+ I3uBACUg/wTp32Sq9Jc0cRE+TVvtqtx62uo0ebiXi2r7F7syb9DKvRvc68e264T78z9S 6idVXrRqs3KtPgRKmQRcM5RE3GgpxyqV3WroFrbsI/DsHJGAqmmzkZHXqjmku2XfFUlQ tav6VkjK+twpo6SK0aDKWrBQIw62j1NTklbNYiessizeHZdk3DL6N7kZ/T9ps7jPwiio NxGw== X-Forwarded-Encrypted: i=1; AHgh+RqbnJho8A3zywYIiQdMQHhPbE03blnjUQhqpzGCSvdc5f6HDBsJ4hKA51mjCLy2yhndgkZJzmRC9r5qG9s=@vger.kernel.org X-Gm-Message-State: AOJu0YzH5WSB9DJvgpc+llKk7O8FMvawEUSuoP7IxOwJWD+5qv/wJRhR 6rpACoZZwUmwfpQAe4ftpjwFniCHhcOh1yOb8tUFkMV5bmfU6j6sJz6zhO0X6A6XafJRloFu//i rHcwfvQ== X-Received: from pgvh11.prod.google.com ([2002:a65:638b:0:b0:caf:5e6:fda0]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:1f18:b0:845:3033:6cbb with SMTP id d2e1a72fcca58-84ed72609d0mr2155625b3a.11.1785517592354; Fri, 31 Jul 2026 10:06:32 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 31 Jul 2026 10:06:15 -0700 In-Reply-To: <20260731170619.2620845-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: <20260731170619.2620845-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.508.g3f0d502094-goog Message-ID: <20260731170619.2620845-9-seanjc@google.com> Subject: [PATCH v2 08/12] KVM: selftests: Add KVM syscall wrapper for pthread_create() 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add and use a KVM wrapper for pthread_create() syscall so that selftests don't need to manually assert that the syscall succeeded. Note, most tests don't actually assert success, but they all obviously rely on the syscall to succeed. Other than explicitly failing if pthread_create() fails, no functional change intended. Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/arch_timer.c | 14 ++++---------- tools/testing/selftests/kvm/arm64/vgic_irq.c | 10 +++------- .../selftests/kvm/arm64/vgic_lpi_stress.c | 4 ++-- tools/testing/selftests/kvm/dirty_log_test.c | 2 +- .../selftests/kvm/hardware_disable_test.c | 16 +++------------- .../testing/selftests/kvm/include/kvm_syscalls.h | 5 +++++ tools/testing/selftests/kvm/irq_test.c | 2 +- tools/testing/selftests/kvm/irqfd_test.c | 2 +- .../testing/selftests/kvm/kvm_page_table_test.c | 4 ++-- tools/testing/selftests/kvm/lib/memstress.c | 2 +- .../testing/selftests/kvm/lib/userfaultfd_util.c | 4 ++-- tools/testing/selftests/kvm/memslot_perf_test.c | 2 +- tools/testing/selftests/kvm/mmu_stress_test.c | 2 +- .../selftests/kvm/pre_fault_memory_test.c | 2 +- tools/testing/selftests/kvm/rseq_test.c | 4 ++-- tools/testing/selftests/kvm/s390/memop.c | 2 +- .../selftests/kvm/set_memory_region_test.c | 2 +- tools/testing/selftests/kvm/steal_time.c | 2 +- tools/testing/selftests/kvm/x86/hyperv_ipi.c | 11 ++++------- .../testing/selftests/kvm/x86/hyperv_tlb_flush.c | 9 +++------ .../kvm/x86/private_mem_conversions_test.c | 2 +- .../kvm/x86/private_mem_kvm_exits_test.c | 5 ++--- .../selftests/kvm/x86/recalc_apic_map_test.c | 2 +- .../selftests/kvm/x86/sev_migrate_tests.c | 2 +- tools/testing/selftests/kvm/x86/sync_regs_test.c | 2 +- .../testing/selftests/kvm/x86/tsc_scaling_sync.c | 2 +- tools/testing/selftests/kvm/x86/xapic_ipi_test.c | 8 ++------ .../testing/selftests/kvm/x86/xen_shinfo_test.c | 3 +-- 28 files changed, 50 insertions(+), 77 deletions(-) diff --git a/tools/testing/selftests/kvm/arch_timer.c b/tools/testing/selft= ests/kvm/arch_timer.c index f8b02597897b..a6a66b5b7ea9 100644 --- a/tools/testing/selftests/kvm/arch_timer.c +++ b/tools/testing/selftests/kvm/arch_timer.c @@ -141,28 +141,22 @@ static void test_run(struct kvm_vm *vm) { pthread_t pt_vcpu_migration; unsigned int i; - int ret; =20 pthread_mutex_init(&vcpu_done_map_lock, NULL); vcpu_done_map =3D bitmap_zalloc(test_args.nr_vcpus); TEST_ASSERT(vcpu_done_map, "Failed to allocate vcpu done bitmap"); =20 - for (i =3D 0; i < (unsigned long)test_args.nr_vcpus; i++) { - ret =3D pthread_create(&pt_vcpu_run[i], NULL, test_vcpu_run, - (void *)(unsigned long)i); - TEST_ASSERT(!ret, "Failed to create vCPU-%d pthread", i); - } + for (i =3D 0; i < (unsigned long)test_args.nr_vcpus; i++) + kvm_pthread_create(&pt_vcpu_run[i], NULL, test_vcpu_run, + (void *)(unsigned long)i); =20 /* Spawn a thread to control the vCPU migrations */ if (test_args.migration_freq_ms) { srand(time(NULL)); =20 - ret =3D pthread_create(&pt_vcpu_migration, NULL, - test_vcpu_migration, NULL); - TEST_ASSERT(!ret, "Failed to create the migration pthread"); + kvm_pthread_create(&pt_vcpu_migration, NULL, test_vcpu_migration, NULL); } =20 - for (i =3D 0; i < test_args.nr_vcpus; i++) pthread_join(pt_vcpu_run[i], NULL); =20 diff --git a/tools/testing/selftests/kvm/arm64/vgic_irq.c b/tools/testing/s= elftests/kvm/arm64/vgic_irq.c index 5e231998617e..2d6f20d5c117 100644 --- a/tools/testing/selftests/kvm/arm64/vgic_irq.c +++ b/tools/testing/selftests/kvm/arm64/vgic_irq.c @@ -988,7 +988,7 @@ static void test_vgic_two_cpus(void *gcode) struct test_args args =3D {}; struct kvm_vm *vm; gva_t args_gva; - int gic_fd, ret; + int gic_fd; =20 vm =3D vm_create_with_vcpus(2, gcode, vcpus); =20 @@ -1004,12 +1004,8 @@ static void test_vgic_two_cpus(void *gcode) =20 gic_fd =3D vgic_v3_setup(vm, 2, 64); =20 - ret =3D pthread_create(&thr[0], NULL, test_vcpu_run, vcpus[0]); - if (ret) - TEST_FAIL("Can't create thread for vcpu 0 (%d)\n", ret); - ret =3D pthread_create(&thr[1], NULL, test_vcpu_run, vcpus[1]); - if (ret) - TEST_FAIL("Can't create thread for vcpu 1 (%d)\n", ret); + kvm_pthread_create(&thr[0], NULL, test_vcpu_run, vcpus[0]); + kvm_pthread_create(&thr[1], NULL, test_vcpu_run, vcpus[1]); =20 pthread_join(thr[0], NULL); pthread_join(thr[1], NULL); diff --git a/tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c b/tools/te= sting/selftests/kvm/arm64/vgic_lpi_stress.c index d64d434d3f06..549e0547d905 100644 --- a/tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c +++ b/tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c @@ -311,10 +311,10 @@ static void run_test(void) pthread_barrier_init(&test_setup_barrier, NULL, nr_vcpus + nr_devices + 1= ); =20 for (i =3D 0; i < nr_vcpus; i++) - pthread_create(&vcpu_threads[i], NULL, vcpu_worker_thread, vcpus[i]); + kvm_pthread_create(&vcpu_threads[i], NULL, vcpu_worker_thread, vcpus[i]); =20 for (i =3D 0; i < nr_devices; i++) - pthread_create(&lpi_threads[i], NULL, lpi_worker_thread, (void *)i); + kvm_pthread_create(&lpi_threads[i], NULL, lpi_worker_thread, (void *)i); =20 pthread_barrier_wait(&test_setup_barrier); =20 diff --git a/tools/testing/selftests/kvm/dirty_log_test.c b/tools/testing/s= elftests/kvm/dirty_log_test.c index e8419d7da1ea..ca22e5f09ac2 100644 --- a/tools/testing/selftests/kvm/dirty_log_test.c +++ b/tools/testing/selftests/kvm/dirty_log_test.c @@ -691,7 +691,7 @@ static void run_test(enum vm_guest_mode mode, void *arg) =20 TEST_ASSERT_EQ(vcpu_stop, false); =20 - pthread_create(&vcpu_thread, NULL, vcpu_worker, vcpu); + kvm_pthread_create(&vcpu_thread, NULL, vcpu_worker, vcpu); =20 for (iteration =3D 1; iteration <=3D p->iterations; iteration++) { unsigned long i, reap_i; diff --git a/tools/testing/selftests/kvm/hardware_disable_test.c b/tools/te= sting/selftests/kvm/hardware_disable_test.c index b8115b2dcae3..694d064e63f1 100644 --- a/tools/testing/selftests/kvm/hardware_disable_test.c +++ b/tools/testing/selftests/kvm/hardware_disable_test.c @@ -5,7 +5,6 @@ * return notifiers. */ #include -#include #include #include #include @@ -14,6 +13,7 @@ =20 #include =20 +#include "kvm_syscalls.h" #include "kvm_util.h" #include "ucall_common.h" =20 @@ -62,15 +62,6 @@ static void *sleeping_thread(void *arg) TEST_FAIL("%s: exited", __func__); } =20 -static inline void check_create_thread(pthread_t *thread, pthread_attr_t *= attr, - void *(*f)(void *), void *arg) -{ - int r; - - r =3D pthread_create(thread, attr, f, arg); - TEST_ASSERT(r =3D=3D 0, "%s: failed to create thread", __func__); -} - static void run_test(u32 run) { struct kvm_vcpu *vcpu; @@ -90,11 +81,10 @@ static void run_test(u32 run) for (i =3D 0; i < VCPU_NUM; ++i) { vcpu =3D vm_vcpu_add(vm, i, guest_code); =20 - check_create_thread(&thread, &attr, run_vcpu, vcpu); + kvm_pthread_create(&thread, &attr, run_vcpu, vcpu); =20 for (j =3D 0; j < SLEEPING_THREAD_NUM; ++j) - check_create_thread(&thread, &attr, sleeping_thread, - (void *)NULL); + kvm_pthread_create(&thread, &attr, sleeping_thread, (void *)NULL); } pr_debug("%s: [%d] all threads launched\n", __func__, run); sem_post(sem); diff --git a/tools/testing/selftests/kvm/include/kvm_syscalls.h b/tools/tes= ting/selftests/kvm/include/kvm_syscalls.h index 01dca99009c2..e75be8378779 100644 --- a/tools/testing/selftests/kvm/include/kvm_syscalls.h +++ b/tools/testing/selftests/kvm/include/kvm_syscalls.h @@ -12,6 +12,7 @@ #include #include =20 +#include #include #include =20 @@ -97,6 +98,10 @@ __KVM_SYSCALL_DEFINE(madvise, 3, void *, addr, size_t, l= ength, int, advice); __KVM_SYSCALL_DEFINE(sched_getaffinity, 3, pid_t, pid, size_t, cpusetsize,= cpu_set_t *, mask); __KVM_SYSCALL_DEFINE(sched_setaffinity, 3, pid_t, pid, size_t, cpusetsize,= cpu_set_t *, mask); =20 +typedef void *(*pthread_fn_t)(void *); +__KVM_SYSCALL_DEFINE(pthread_create, 4, pthread_t *, thread, + const pthread_attr_t *, attr, pthread_fn_t, fn, void *, arg); + #define kvm_free_fd(fd) \ do { \ kvm_close(fd); \ diff --git a/tools/testing/selftests/kvm/irq_test.c b/tools/testing/selftes= ts/kvm/irq_test.c index 240f6f0fdbe4..7da5f8d75e85 100644 --- a/tools/testing/selftests/kvm/irq_test.c +++ b/tools/testing/selftests/kvm/irq_test.c @@ -296,7 +296,7 @@ int main(int argc, char **argv) kvm_sched_getaffinity(0, sizeof(available_cpus), &available_cpus); =20 for (i =3D 0; i < nr_vcpus; i++) - pthread_create(&vcpu_threads[i], NULL, vcpu_thread_main, vcpus[i]); + kvm_pthread_create(&vcpu_threads[i], NULL, vcpu_thread_main, vcpus[i]); =20 for (i =3D 0; i < nr_vcpus; i++) { struct kvm_vcpu *vcpu =3D vcpus[i]; diff --git a/tools/testing/selftests/kvm/irqfd_test.c b/tools/testing/selft= ests/kvm/irqfd_test.c index 5d7590d01868..8b39144a2834 100644 --- a/tools/testing/selftests/kvm/irqfd_test.c +++ b/tools/testing/selftests/kvm/irqfd_test.c @@ -128,7 +128,7 @@ int main(int argc, char *argv[]) =20 close(__eventfd); =20 - pthread_create(&racing_thread, NULL, secondary_irqfd_juggler, vm2); + kvm_pthread_create(&racing_thread, NULL, secondary_irqfd_juggler, vm2); =20 for (i =3D 0; i < 10000; i++) { WRITE_ONCE(__eventfd, kvm_new_eventfd()); diff --git a/tools/testing/selftests/kvm/kvm_page_table_test.c b/tools/test= ing/selftests/kvm/kvm_page_table_test.c index a910e3abb8c7..8222bdb63e49 100644 --- a/tools/testing/selftests/kvm/kvm_page_table_test.c +++ b/tools/testing/selftests/kvm/kvm_page_table_test.c @@ -364,8 +364,8 @@ static void run_test(enum vm_guest_mode mode, void *arg) *current_stage =3D KVM_BEFORE_MAPPINGS; =20 for (i =3D 0; i < nr_vcpus; i++) - pthread_create(&vcpu_threads[i], NULL, vcpu_worker, - test_args.vcpus[i]); + kvm_pthread_create(&vcpu_threads[i], NULL, vcpu_worker, + test_args.vcpus[i]); =20 vcpus_complete_new_stage(*current_stage); pr_info("Started all vCPUs successfully\n"); diff --git a/tools/testing/selftests/kvm/lib/memstress.c b/tools/testing/se= lftests/kvm/lib/memstress.c index 3599b75d97c9..0bfa623ce9b5 100644 --- a/tools/testing/selftests/kvm/lib/memstress.c +++ b/tools/testing/selftests/kvm/lib/memstress.c @@ -294,7 +294,7 @@ void memstress_start_vcpu_threads(int nr_vcpus, vcpu->vcpu_idx =3D i; WRITE_ONCE(vcpu->running, false); =20 - pthread_create(&vcpu->thread, NULL, vcpu_thread_main, vcpu); + kvm_pthread_create(&vcpu->thread, NULL, vcpu_thread_main, vcpu); } =20 for (i =3D 0; i < nr_vcpus; i++) { diff --git a/tools/testing/selftests/kvm/lib/userfaultfd_util.c b/tools/tes= ting/selftests/kvm/lib/userfaultfd_util.c index ef8d76f71f83..4b3e3158ed87 100644 --- a/tools/testing/selftests/kvm/lib/userfaultfd_util.c +++ b/tools/testing/selftests/kvm/lib/userfaultfd_util.c @@ -167,8 +167,8 @@ struct uffd_desc *uffd_setup_demand_paging(int uffd_mod= e, useconds_t delay, uffd_desc->reader_args[i].handler =3D handler; uffd_desc->reader_args[i].pipe =3D pipes[0]; =20 - pthread_create(&uffd_desc->readers[i], NULL, uffd_handler_thread_fn, - &uffd_desc->reader_args[i]); + kvm_pthread_create(&uffd_desc->readers[i], NULL, uffd_handler_thread_fn, + &uffd_desc->reader_args[i]); =20 PER_VCPU_DEBUG("Created uffd thread %i for HVA range [%p, %p)\n", i, hva, hva + len); diff --git a/tools/testing/selftests/kvm/memslot_perf_test.c b/tools/testin= g/selftests/kvm/memslot_perf_test.c index 4d9ad6104a6e..eb49305db404 100644 --- a/tools/testing/selftests/kvm/memslot_perf_test.c +++ b/tools/testing/selftests/kvm/memslot_perf_test.c @@ -366,7 +366,7 @@ static void launch_vm(struct vm_data *data) { pr_info_v("Launching the test VM\n"); =20 - pthread_create(&data->vcpu_thread, NULL, vcpu_worker, data); + kvm_pthread_create(&data->vcpu_thread, NULL, vcpu_worker, data); =20 /* Ensure the guest thread is spun up. */ wait_for_vcpu(); diff --git a/tools/testing/selftests/kvm/mmu_stress_test.c b/tools/testing/= selftests/kvm/mmu_stress_test.c index 3d5f33a63b2b..9448498849ff 100644 --- a/tools/testing/selftests/kvm/mmu_stress_test.c +++ b/tools/testing/selftests/kvm/mmu_stress_test.c @@ -222,7 +222,7 @@ static pthread_t *spawn_workers(struct kvm_vm *vm, stru= ct kvm_vcpu **vcpus, info[i].vcpu =3D vcpus[i]; info[i].start_gpa =3D gpa; info[i].end_gpa =3D gpa + nr_bytes; - pthread_create(&threads[i], NULL, vcpu_worker, &info[i]); + kvm_pthread_create(&threads[i], NULL, vcpu_worker, &info[i]); } return threads; } diff --git a/tools/testing/selftests/kvm/pre_fault_memory_test.c b/tools/te= sting/selftests/kvm/pre_fault_memory_test.c index a0fcae3cb7a8..88287ccb9093 100644 --- a/tools/testing/selftests/kvm/pre_fault_memory_test.c +++ b/tools/testing/selftests/kvm/pre_fault_memory_test.c @@ -84,7 +84,7 @@ static void pre_fault_memory(struct kvm_vcpu *vcpu, u64 b= ase_gpa, u64 offset, * Concurrently delete (and recreate) the slot to test KVM's handling * of a racing memslot deletion with prefaulting. */ - pthread_create(&slot_worker, NULL, delete_slot_worker, &data); + kvm_pthread_create(&slot_worker, NULL, delete_slot_worker, &data); =20 while (!READ_ONCE(data.worker_ready)) cpu_relax(); diff --git a/tools/testing/selftests/kvm/rseq_test.c b/tools/testing/selfte= sts/kvm/rseq_test.c index edcaf0fbe20c..0921b8d90d4a 100644 --- a/tools/testing/selftests/kvm/rseq_test.c +++ b/tools/testing/selftests/kvm/rseq_test.c @@ -239,8 +239,8 @@ int main(int argc, char *argv[]) */ vm =3D vm_create_with_one_vcpu(&vcpu, guest_code); =20 - pthread_create(&migration_thread, NULL, migration_worker, - (void *)(unsigned long)kvm_gettid()); + kvm_pthread_create(&migration_thread, NULL, migration_worker, + (void *)(unsigned long)kvm_gettid()); =20 if (latency >=3D 0) { /* diff --git a/tools/testing/selftests/kvm/s390/memop.c b/tools/testing/selft= ests/kvm/s390/memop.c index 0244848621b3..96b32bd74009 100644 --- a/tools/testing/selftests/kvm/s390/memop.c +++ b/tools/testing/selftests/kvm/s390/memop.c @@ -678,7 +678,7 @@ static void test_cmpxchg_key_concurrent(void) HOST_SYNC(t.vcpu, STAGE_SKEYS_SET); prepare_mem12(); MOP(t.vcpu, LOGICAL, WRITE, mem1, max_block, GADDR_V(mem2)); - pthread_create(&thread, NULL, run_guest, &t.vcpu); + kvm_pthread_create(&thread, NULL, run_guest, &t.vcpu); =20 for (int i =3D 0; i < cmpxchg_iter_outer; i++) { do { diff --git a/tools/testing/selftests/kvm/set_memory_region_test.c b/tools/t= esting/selftests/kvm/set_memory_region_test.c index a152ab65c657..12f5022bb164 100644 --- a/tools/testing/selftests/kvm/set_memory_region_test.c +++ b/tools/testing/selftests/kvm/set_memory_region_test.c @@ -133,7 +133,7 @@ static struct kvm_vm *spawn_vm(struct kvm_vcpu **vcpu, = pthread_t *vcpu_thread, hva =3D addr_gpa2hva(vm, MEM_REGION_GPA); memset(hva, 0, 2 * 4096); =20 - pthread_create(vcpu_thread, NULL, vcpu_worker, *vcpu); + kvm_pthread_create(vcpu_thread, NULL, vcpu_worker, *vcpu); =20 /* Ensure the guest thread is spun up. */ wait_for_vcpu(); diff --git a/tools/testing/selftests/kvm/steal_time.c b/tools/testing/selft= ests/kvm/steal_time.c index 0b88c743ee7d..f5f708be5aa0 100644 --- a/tools/testing/selftests/kvm/steal_time.c +++ b/tools/testing/selftests/kvm/steal_time.c @@ -548,7 +548,7 @@ int main(int ac, char **av) =20 /* Steal time from the VCPU. The steal time thread has the same CPU affi= nity as the VCPUs. */ run_delay =3D get_run_delay(); - pthread_create(&thread, NULL, do_steal_time, NULL); + kvm_pthread_create(&thread, NULL, do_steal_time, NULL); pthread_getaffinity_np(thread, sizeof(cpuset), &cpuset); TEST_ASSERT(CPU_COUNT(&cpuset) =3D=3D 1 && CPU_ISSET(cpu, &cpuset), "Worker failed to inherit parent's CPU affinity"); diff --git a/tools/testing/selftests/kvm/x86/hyperv_ipi.c b/tools/testing/s= elftests/kvm/x86/hyperv_ipi.c index 771535f9aad3..3cf451f3153e 100644 --- a/tools/testing/selftests/kvm/x86/hyperv_ipi.c +++ b/tools/testing/selftests/kvm/x86/hyperv_ipi.c @@ -245,7 +245,7 @@ int main(int argc, char *argv[]) struct kvm_vcpu *vcpu[3]; gva_t hcall_page; pthread_t threads[2]; - int stage =3D 1, r; + int stage =3D 1; struct ucall uc; =20 TEST_REQUIRE(kvm_has_cap(KVM_CAP_HYPERV_SEND_IPI)); @@ -272,11 +272,8 @@ int main(int argc, char *argv[]) vcpu_args_set(vcpu[0], 2, hcall_page, addr_gva2gpa(vm, hcall_page)); vcpu_set_hv_cpuid(vcpu[0]); =20 - r =3D pthread_create(&threads[0], NULL, vcpu_thread, vcpu[1]); - TEST_ASSERT(!r, "pthread_create failed errno=3D%d", r); - - r =3D pthread_create(&threads[1], NULL, vcpu_thread, vcpu[2]); - TEST_ASSERT(!r, "pthread_create failed errno=3D%d", errno); + kvm_pthread_create(&threads[0], NULL, vcpu_thread, vcpu[1]); + kvm_pthread_create(&threads[1], NULL, vcpu_thread, vcpu[2]); =20 while (true) { vcpu_run(vcpu[0]); @@ -306,5 +303,5 @@ int main(int argc, char *argv[]) cancel_join_vcpu_thread(threads[1], vcpu[2]); kvm_vm_free(vm); =20 - return r; + return 0; } diff --git a/tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c b/tools/tes= ting/selftests/kvm/x86/hyperv_tlb_flush.c index b4be9a175379..87fac1968a47 100644 --- a/tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c +++ b/tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c @@ -575,7 +575,7 @@ int main(int argc, char *argv[]) u64 *pte; struct test_data *data; struct ucall uc; - int stage =3D 1, r, i; + int stage =3D 1, i; =20 TEST_REQUIRE(kvm_has_cap(KVM_CAP_HYPERV_TLBFLUSH)); =20 @@ -632,11 +632,8 @@ int main(int argc, char *argv[]) vcpu_set_msr(vcpu[2], HV_X64_MSR_VP_INDEX, WORKER_VCPU_ID_2); vcpu_set_hv_cpuid(vcpu[2]); =20 - r =3D pthread_create(&threads[0], NULL, vcpu_thread, vcpu[1]); - TEST_ASSERT(!r, "pthread_create() failed"); - - r =3D pthread_create(&threads[1], NULL, vcpu_thread, vcpu[2]); - TEST_ASSERT(!r, "pthread_create() failed"); + kvm_pthread_create(&threads[0], NULL, vcpu_thread, vcpu[1]); + kvm_pthread_create(&threads[1], NULL, vcpu_thread, vcpu[2]); =20 while (true) { vcpu_run(vcpu[0]); diff --git a/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c= b/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c index 1d2f5d4fd45d..e419b08f1fa6 100644 --- a/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c +++ b/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c @@ -412,7 +412,7 @@ static void test_mem_conversions(enum vm_mem_backing_sr= c_type src_type, u32 nr_v */ virt_map(vm, gpa, gpa, PER_CPU_DATA_SIZE / vm->page_size); =20 - pthread_create(&threads[i], NULL, __test_mem_conversions, vcpus[i]); + kvm_pthread_create(&threads[i], NULL, __test_mem_conversions, vcpus[i]); } =20 WRITE_ONCE(run_vcpus, true); diff --git a/tools/testing/selftests/kvm/x86/private_mem_kvm_exits_test.c b= /tools/testing/selftests/kvm/x86/private_mem_kvm_exits_test.c index 10db9fe6d906..e26524fb4b50 100644 --- a/tools/testing/selftests/kvm/x86/private_mem_kvm_exits_test.c +++ b/tools/testing/selftests/kvm/x86/private_mem_kvm_exits_test.c @@ -65,9 +65,8 @@ static void test_private_access_memslot_deleted(void) /* Request to access page privately */ vm_mem_set_private(vm, EXITS_TEST_GPA, EXITS_TEST_SIZE); =20 - pthread_create(&vm_thread, NULL, - (void *(*)(void *))run_vcpu_get_exit_reason, - (void *)vcpu); + kvm_pthread_create(&vm_thread, NULL, + (pthread_fn_t)run_vcpu_get_exit_reason, (void *)vcpu); =20 vm_mem_region_delete(vm, EXITS_TEST_SLOT); =20 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 cbc92a862ea9..13abb65620d5 100644 --- a/tools/testing/selftests/kvm/x86/recalc_apic_map_test.c +++ b/tools/testing/selftests/kvm/x86/recalc_apic_map_test.c @@ -57,7 +57,7 @@ int main(void) for (i =3D 0; i < KVM_MAX_VCPUS; i++) vcpu_set_msr(vcpus[i], MSR_IA32_APICBASE, LAPIC_X2APIC); =20 - TEST_ASSERT_EQ(pthread_create(&thread, NULL, race, vcpus[0]), 0); + kvm_pthread_create(&thread, NULL, race, vcpus[0]); =20 vcpuN =3D vcpus[KVM_MAX_VCPUS - 1]; for (t =3D time(NULL) + TIMEOUT; time(NULL) < t;) { diff --git a/tools/testing/selftests/kvm/x86/sev_migrate_tests.c b/tools/te= sting/selftests/kvm/x86/sev_migrate_tests.c index d59abb198d86..66c7ce49620a 100644 --- a/tools/testing/selftests/kvm/x86/sev_migrate_tests.c +++ b/tools/testing/selftests/kvm/x86/sev_migrate_tests.c @@ -128,7 +128,7 @@ static void test_sev_migrate_locking(void) sizeof(input[i].source_vms)); =20 for (i =3D 0; i < NR_LOCK_TESTING_THREADS; ++i) - pthread_create(&pt[i], NULL, locking_test_thread, &input[i]); + kvm_pthread_create(&pt[i], NULL, locking_test_thread, &input[i]); =20 for (i =3D 0; i < NR_LOCK_TESTING_THREADS; ++i) pthread_join(pt[i], NULL); diff --git a/tools/testing/selftests/kvm/x86/sync_regs_test.c b/tools/testi= ng/selftests/kvm/x86/sync_regs_test.c index 5b0c2359bbb4..f7228af7d594 100644 --- a/tools/testing/selftests/kvm/x86/sync_regs_test.c +++ b/tools/testing/selftests/kvm/x86/sync_regs_test.c @@ -181,7 +181,7 @@ static void race_sync_regs(struct kvm_vcpu *vcpu, void = *racer) !!(run->s.regs.sregs.cr4 & X86_CR4_PAE), !!(run->s.regs.sregs.efer & EFER_LME)); =20 - TEST_ASSERT_EQ(pthread_create(&thread, NULL, racer, (void *)run), 0); + kvm_pthread_create(&thread, NULL, racer, (void *)run); =20 for (t =3D time(NULL) + TIMEOUT; time(NULL) < t;) { /* diff --git a/tools/testing/selftests/kvm/x86/tsc_scaling_sync.c b/tools/tes= ting/selftests/kvm/x86/tsc_scaling_sync.c index 59da8d4da607..54b4b8d06d3b 100644 --- a/tools/testing/selftests/kvm/x86/tsc_scaling_sync.c +++ b/tools/testing/selftests/kvm/x86/tsc_scaling_sync.c @@ -94,7 +94,7 @@ int main(int argc, char *argv[]) pthread_t cpu_threads[NR_TEST_VCPUS]; unsigned long cpu; for (cpu =3D 0; cpu < NR_TEST_VCPUS; cpu++) - pthread_create(&cpu_threads[cpu], NULL, run_vcpu, (void *)cpu); + kvm_pthread_create(&cpu_threads[cpu], NULL, run_vcpu, (void *)cpu); =20 unsigned long failures =3D 0; for (cpu =3D 0; cpu < NR_TEST_VCPUS; cpu++) { diff --git a/tools/testing/selftests/kvm/x86/xapic_ipi_test.c b/tools/testi= ng/selftests/kvm/x86/xapic_ipi_test.c index 3a326c5e74ca..271ec09c629e 100644 --- a/tools/testing/selftests/kvm/x86/xapic_ipi_test.c +++ b/tools/testing/selftests/kvm/x86/xapic_ipi_test.c @@ -387,7 +387,6 @@ void get_cmdline_args(int argc, char *argv[], int *run_= secs, =20 int main(int argc, char *argv[]) { - int r; int wait_secs; const int max_halter_wait =3D 10; int run_secs =3D 0; @@ -428,9 +427,7 @@ int main(int argc, char *argv[]) params[1].pipis_rcvd =3D pipis_rcvd; =20 /* Start halter vCPU thread and wait for it to execute first HLT. */ - r =3D pthread_create(&threads[0], NULL, vcpu_thread, ¶ms[0]); - TEST_ASSERT(r =3D=3D 0, - "pthread_create halter failed errno=3D%d", errno); + kvm_pthread_create(&threads[0], NULL, vcpu_thread, ¶ms[0]); fprintf(stderr, "Halter vCPU thread started\n"); =20 wait_secs =3D 0; @@ -447,8 +444,7 @@ int main(int argc, char *argv[]) "Halter vCPU thread reported its APIC ID: %u after %d seconds.\n", data->halter_apic_id, wait_secs); =20 - r =3D pthread_create(&threads[1], NULL, vcpu_thread, ¶ms[1]); - TEST_ASSERT(r =3D=3D 0, "pthread_create sender failed errno=3D%d", errno); + kvm_pthread_create(&threads[1], NULL, vcpu_thread, ¶ms[1]); =20 fprintf(stderr, "IPI sender vCPU thread started. Letting vCPUs run for %d seconds.\n", diff --git a/tools/testing/selftests/kvm/x86/xen_shinfo_test.c b/tools/test= ing/selftests/kvm/x86/xen_shinfo_test.c index 5076f6a75455..20f518fe2450 100644 --- a/tools/testing/selftests/kvm/x86/xen_shinfo_test.c +++ b/tools/testing/selftests/kvm/x86/xen_shinfo_test.c @@ -894,8 +894,7 @@ int main(int argc, char *argv[]) if (verbose) printf("Testing shinfo lock corruption (KVM_XEN_HVM_EVTCHN_SEND)\n"); =20 - ret =3D pthread_create(&thread, NULL, &juggle_shinfo_state, (void *)vm= ); - TEST_ASSERT(ret =3D=3D 0, "pthread_create() failed: %s", strerror(ret)= ); + kvm_pthread_create(&thread, NULL, &juggle_shinfo_state, (void *)vm); =20 struct kvm_irq_routing_xen_evtchn uxe =3D { .port =3D 1, --=20 2.55.0.508.g3f0d502094-goog From nobody Fri Oct 2 12:19:59 2026 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (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 008B94562B0 for ; Fri, 31 Jul 2026 17:06:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.200 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785517598; cv=none; b=mxtHglh5sDaK4YeQtt9C2hQpuhkhBpgoKWq0R2kyHEGeCvnBDbfbto0wecetDCER0glb4Q3tMlbxw+OoZf/8OGwoTYv/TS5pCFXVkYaRMNqhi7gs7F58a7GPoyfJE3gF112ExCBVpn1Cevm2zsbtwVvt3VF8r0gitYdEfaf52Ng= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785517598; c=relaxed/simple; bh=L2daUKAaC9ECpQpu5ODjy4lo+CkKGGhKM8s856OlXLo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=TGZHA+fbFX3D3nvG6kMhdWziJHhobqk9zKWyeYs0bOv3oBBDzWMxGCLlMC4yQ13aMznNkyqf7ZRxs1qNTf7HDqRrJBovgIML5CyqWCwltlm6p33yO7K9kwVvz8y7umQI+liHyVs0oX4cHSfbn3CGw0J3OUkr3l//IdjInyxm8MA= 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=e3nIfIB1; arc=none smtp.client-ip=209.85.214.200 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="e3nIfIB1" Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2cc86a9ef97so20920555ad.3 for ; Fri, 31 Jul 2026 10:06:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785517594; x=1786122394; 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=WT44MxQUWgN2yFdZkSrr/Ua/CnkjLi1Rcv3VTroVkdU=; b=e3nIfIB1JyIqzMDjMmCI9koGIuZWVRWn/TjntWAnahi98gqoABYPcDHGxWOyAioBXN 4P3X+6KOo0N5FrpnHNKFbOkUOHPEJNvmpdga7GTdjnRa0TSMw2cWH8ZbwLLMXPfJiwmo HjfPU5mTyRpE73gnobWSsZAniXpC/jooYrGHUB4J0Rc8/HmowqWW/BPrqdmXE85NZZ9Z r+mNTz78/MdwWLkOVz2GncuhPIanhK33ag0z+oKSRZOP6qC41jo98Oz6NKuCM2bhh/FK uZCnYNn3VBcV9DKJydETCMN+T8xZVFfcJxpaYpu//01w3cSVyS4KOQ8taeuJwY1W6w6I 3p/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785517594; x=1786122394; 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=WT44MxQUWgN2yFdZkSrr/Ua/CnkjLi1Rcv3VTroVkdU=; b=EwYEqlpGq7+5bN+b8CGknlRboT+OuUthQTKSkFX7lEh9lxfLIZEI7P+4ciee64clyU ZOGzWRaUoR1oYGYgAOAp1Fi9axQHRg2oI+SxZpjYL9Yk5K9PaEnyt+k8sKg4YiVUZpda KlnlA8eClhhM9oUhb+o4kCDRDZPxukb6KfOQYZAsu/qwsdImqZvkblnCwhIxhfzJjfuW PZ/OlJxxataD0gsgDJItk9UtWGl4g+kN86y8F4MZhv2Vb41wxjfIlcyE6dnJ4DD16185 7wtgeUBOG7+Rx1fxVkloKdB1lEESa4g7ekdp/h8omJhkqMnfqGG40ZNazckqfBhJvWfI RsHQ== X-Forwarded-Encrypted: i=1; AHgh+RoD7kotuM1DZD6xWVZWxKiw7/dunidlrS3xi86IZA5jym6O9XS+holHurZVEktKiS5aI5XGJaiackUePpI=@vger.kernel.org X-Gm-Message-State: AOJu0Yz9o3LWFCa6ZpI5XtKqoRAs1XAh/kVZfSb1kEpvn0qmOdwznB1O /z4ux/sApgvH/0Y6wPq3i0DYfQi8mlG7gPCHoInKHW3IifBYheq7B0a/6JwZ529dnfAdxnEaA07 uFolqvw== X-Received: from plbkk4.prod.google.com ([2002:a17:903:704:b0:2cc:8a78:d849]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2407:b0:2cc:9a86:9c42 with SMTP id d9443c01a7336-2d0524ac403mr7163065ad.45.1785517594071; Fri, 31 Jul 2026 10:06:34 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 31 Jul 2026 10:06:16 -0700 In-Reply-To: <20260731170619.2620845-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: <20260731170619.2620845-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.508.g3f0d502094-goog Message-ID: <20260731170619.2620845-10-seanjc@google.com> Subject: [PATCH v2 09/12] KVM: selftests: Add KVM syscall wrappers for pthread_{cancel,join}() 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add and use KVM wrappers for pthread_{cancel,join}() so that selftests don't need to manually assert that the syscalls succeeded. Note, the vast majority tests don't actually assert success, but they all obviously rely on the syscall to succeed. Other than explicitly failing if a syscall fails, no functional change intended. Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/arch_timer.c | 4 ++-- tools/testing/selftests/kvm/arm64/vgic_irq.c | 4 ++-- tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c | 4 ++-- tools/testing/selftests/kvm/dirty_log_test.c | 2 +- tools/testing/selftests/kvm/include/kvm_syscalls.h | 2 ++ tools/testing/selftests/kvm/irq_test.c | 2 +- tools/testing/selftests/kvm/irqfd_test.c | 2 +- tools/testing/selftests/kvm/kvm_page_table_test.c | 2 +- tools/testing/selftests/kvm/lib/memstress.c | 2 +- tools/testing/selftests/kvm/lib/userfaultfd_util.c | 3 +-- tools/testing/selftests/kvm/memslot_perf_test.c | 2 +- tools/testing/selftests/kvm/mmu_stress_test.c | 2 +- tools/testing/selftests/kvm/pre_fault_memory_test.c | 2 +- tools/testing/selftests/kvm/rseq_test.c | 2 +- tools/testing/selftests/kvm/s390/memop.c | 2 +- tools/testing/selftests/kvm/set_memory_region_test.c | 4 ++-- tools/testing/selftests/kvm/steal_time.c | 2 +- tools/testing/selftests/kvm/x86/hyperv_ipi.c | 10 ++-------- tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c | 10 ++-------- .../selftests/kvm/x86/private_mem_conversions_test.c | 2 +- .../selftests/kvm/x86/private_mem_kvm_exits_test.c | 2 +- .../testing/selftests/kvm/x86/recalc_apic_map_test.c | 4 ++-- tools/testing/selftests/kvm/x86/sev_migrate_tests.c | 2 +- tools/testing/selftests/kvm/x86/sync_regs_test.c | 4 ++-- tools/testing/selftests/kvm/x86/tsc_scaling_sync.c | 2 +- tools/testing/selftests/kvm/x86/xapic_ipi_test.c | 12 ++---------- tools/testing/selftests/kvm/x86/xen_shinfo_test.c | 8 ++------ 27 files changed, 38 insertions(+), 61 deletions(-) diff --git a/tools/testing/selftests/kvm/arch_timer.c b/tools/testing/selft= ests/kvm/arch_timer.c index a6a66b5b7ea9..03160ad666f5 100644 --- a/tools/testing/selftests/kvm/arch_timer.c +++ b/tools/testing/selftests/kvm/arch_timer.c @@ -158,10 +158,10 @@ static void test_run(struct kvm_vm *vm) } =20 for (i =3D 0; i < test_args.nr_vcpus; i++) - pthread_join(pt_vcpu_run[i], NULL); + kvm_pthread_join(pt_vcpu_run[i], NULL); =20 if (test_args.migration_freq_ms) - pthread_join(pt_vcpu_migration, NULL); + kvm_pthread_join(pt_vcpu_migration, NULL); =20 bitmap_free(vcpu_done_map); } diff --git a/tools/testing/selftests/kvm/arm64/vgic_irq.c b/tools/testing/s= elftests/kvm/arm64/vgic_irq.c index 2d6f20d5c117..3cb85932ee85 100644 --- a/tools/testing/selftests/kvm/arm64/vgic_irq.c +++ b/tools/testing/selftests/kvm/arm64/vgic_irq.c @@ -1007,8 +1007,8 @@ static void test_vgic_two_cpus(void *gcode) kvm_pthread_create(&thr[0], NULL, test_vcpu_run, vcpus[0]); kvm_pthread_create(&thr[1], NULL, test_vcpu_run, vcpus[1]); =20 - pthread_join(thr[0], NULL); - pthread_join(thr[1], NULL); + kvm_pthread_join(thr[0], NULL); + kvm_pthread_join(thr[1], NULL); =20 close(gic_fd); kvm_vm_free(vm); diff --git a/tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c b/tools/te= sting/selftests/kvm/arm64/vgic_lpi_stress.c index 549e0547d905..9a69c439a0f8 100644 --- a/tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c +++ b/tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c @@ -321,13 +321,13 @@ static void run_test(void) clock_gettime(CLOCK_MONOTONIC, &start); =20 for (i =3D 0; i < nr_devices; i++) - pthread_join(lpi_threads[i], NULL); + kvm_pthread_join(lpi_threads[i], NULL); =20 delta =3D timespec_elapsed(start); write_guest_global(vm, test_data.request_vcpus_stop, true); =20 for (i =3D 0; i < nr_vcpus; i++) - pthread_join(vcpu_threads[i], NULL); + kvm_pthread_join(vcpu_threads[i], NULL); =20 report_stats(delta); } diff --git a/tools/testing/selftests/kvm/dirty_log_test.c b/tools/testing/s= elftests/kvm/dirty_log_test.c index ca22e5f09ac2..af5eb0334a74 100644 --- a/tools/testing/selftests/kvm/dirty_log_test.c +++ b/tools/testing/selftests/kvm/dirty_log_test.c @@ -805,7 +805,7 @@ static void run_test(enum vm_guest_mode mode, void *arg) WRITE_ONCE(host_quit, true); sem_post(&sem_vcpu_cont); =20 - pthread_join(vcpu_thread, NULL); + kvm_pthread_join(vcpu_thread, NULL); =20 pr_info("Total bits checked: dirty (%lu), clear (%lu)\n", host_dirty_count, host_clear_count); diff --git a/tools/testing/selftests/kvm/include/kvm_syscalls.h b/tools/tes= ting/selftests/kvm/include/kvm_syscalls.h index e75be8378779..d6c18e13b9c8 100644 --- a/tools/testing/selftests/kvm/include/kvm_syscalls.h +++ b/tools/testing/selftests/kvm/include/kvm_syscalls.h @@ -101,6 +101,8 @@ __KVM_SYSCALL_DEFINE(sched_setaffinity, 3, pid_t, pid, = size_t, cpusetsize, cpu_s typedef void *(*pthread_fn_t)(void *); __KVM_SYSCALL_DEFINE(pthread_create, 4, pthread_t *, thread, const pthread_attr_t *, attr, pthread_fn_t, fn, void *, arg); +__KVM_SYSCALL_DEFINE(pthread_join, 2, pthread_t, thread, void **, thread_r= eturn); +__KVM_SYSCALL_DEFINE(pthread_cancel, 1, pthread_t, thread); =20 #define kvm_free_fd(fd) \ do { \ diff --git a/tools/testing/selftests/kvm/irq_test.c b/tools/testing/selftes= ts/kvm/irq_test.c index 7da5f8d75e85..168c52734fef 100644 --- a/tools/testing/selftests/kvm/irq_test.c +++ b/tools/testing/selftests/kvm/irq_test.c @@ -356,7 +356,7 @@ int main(int argc, char **argv) WRITE_AND_SYNC_TO_GUEST(vm, done, true); =20 for (i =3D 0; i < nr_vcpus; i++) - pthread_join(vcpu_threads[i], NULL); + kvm_pthread_join(vcpu_threads[i], NULL); =20 return 0; } diff --git a/tools/testing/selftests/kvm/irqfd_test.c b/tools/testing/selft= ests/kvm/irqfd_test.c index 8b39144a2834..ebb2478878de 100644 --- a/tools/testing/selftests/kvm/irqfd_test.c +++ b/tools/testing/selftests/kvm/irqfd_test.c @@ -139,5 +139,5 @@ int main(int argc, char *argv[]) } =20 WRITE_ONCE(done, true); - pthread_join(racing_thread, NULL); + kvm_pthread_join(racing_thread, NULL); } diff --git a/tools/testing/selftests/kvm/kvm_page_table_test.c b/tools/test= ing/selftests/kvm/kvm_page_table_test.c index 8222bdb63e49..974813ea8953 100644 --- a/tools/testing/selftests/kvm/kvm_page_table_test.c +++ b/tools/testing/selftests/kvm/kvm_page_table_test.c @@ -413,7 +413,7 @@ static void run_test(enum vm_guest_mode mode, void *arg) } =20 for (i =3D 0; i < nr_vcpus; i++) - pthread_join(vcpu_threads[i], NULL); + kvm_pthread_join(vcpu_threads[i], NULL); =20 ret =3D sem_destroy(&test_stage_updated); TEST_ASSERT(ret =3D=3D 0, "Error in sem_destroy"); diff --git a/tools/testing/selftests/kvm/lib/memstress.c b/tools/testing/se= lftests/kvm/lib/memstress.c index 0bfa623ce9b5..2864562f57b4 100644 --- a/tools/testing/selftests/kvm/lib/memstress.c +++ b/tools/testing/selftests/kvm/lib/memstress.c @@ -312,7 +312,7 @@ void memstress_join_vcpu_threads(int nr_vcpus) WRITE_ONCE(memstress_args.stop_vcpus, true); =20 for (i =3D 0; i < nr_vcpus; i++) - pthread_join(vcpu_threads[i].thread, NULL); + kvm_pthread_join(vcpu_threads[i].thread, NULL); } =20 static void toggle_dirty_logging(struct kvm_vm *vm, int slots, bool enable) diff --git a/tools/testing/selftests/kvm/lib/userfaultfd_util.c b/tools/tes= ting/selftests/kvm/lib/userfaultfd_util.c index 4b3e3158ed87..f7ce5a6ddcc2 100644 --- a/tools/testing/selftests/kvm/lib/userfaultfd_util.c +++ b/tools/testing/selftests/kvm/lib/userfaultfd_util.c @@ -187,8 +187,7 @@ void uffd_stop_demand_paging(struct uffd_desc *uffd) "Unable to write to pipefd %i for uffd_desc %p", i, uffd); =20 for (i =3D 0; i < uffd->num_readers; ++i) - TEST_ASSERT(!pthread_join(uffd->readers[i], NULL), - "Pthread_join failed on reader %i for uffd_desc %p", i, uffd); + kvm_pthread_join(uffd->readers[i], NULL); =20 close(uffd->uffd); =20 diff --git a/tools/testing/selftests/kvm/memslot_perf_test.c b/tools/testin= g/selftests/kvm/memslot_perf_test.c index eb49305db404..e1299611be32 100644 --- a/tools/testing/selftests/kvm/memslot_perf_test.c +++ b/tools/testing/selftests/kvm/memslot_perf_test.c @@ -381,7 +381,7 @@ static void free_vm(struct vm_data *data) =20 static void wait_guest_exit(struct vm_data *data) { - pthread_join(data->vcpu_thread, NULL); + kvm_pthread_join(data->vcpu_thread, NULL); } =20 static void let_guest_run(struct sync_area *sync) diff --git a/tools/testing/selftests/kvm/mmu_stress_test.c b/tools/testing/= selftests/kvm/mmu_stress_test.c index 9448498849ff..741e343962ed 100644 --- a/tools/testing/selftests/kvm/mmu_stress_test.c +++ b/tools/testing/selftests/kvm/mmu_stress_test.c @@ -409,7 +409,7 @@ int main(int argc, char *argv[]) =20 /* Sanity check that the vCPUs actually ran. */ for (i =3D 0; i < nr_vcpus; i++) - pthread_join(threads[i], NULL); + kvm_pthread_join(threads[i], NULL); =20 /* * Deliberately exit without deleting the remaining memslots or closing diff --git a/tools/testing/selftests/kvm/pre_fault_memory_test.c b/tools/te= sting/selftests/kvm/pre_fault_memory_test.c index 88287ccb9093..c57631aab3d3 100644 --- a/tools/testing/selftests/kvm/pre_fault_memory_test.c +++ b/tools/testing/selftests/kvm/pre_fault_memory_test.c @@ -116,7 +116,7 @@ static void pre_fault_memory(struct kvm_vcpu *vcpu, u64= base_gpa, u64 offset, */ if (!slot_recreated) { WRITE_ONCE(data.recreate_slot, true); - pthread_join(slot_worker, NULL); + kvm_pthread_join(slot_worker, NULL); slot_recreated =3D true; =20 /* diff --git a/tools/testing/selftests/kvm/rseq_test.c b/tools/testing/selfte= sts/kvm/rseq_test.c index 0921b8d90d4a..b386aece68fd 100644 --- a/tools/testing/selftests/kvm/rseq_test.c +++ b/tools/testing/selftests/kvm/rseq_test.c @@ -312,7 +312,7 @@ int main(int argc, char *argv[]) " e.g. via cpuidle.off=3D1 or via -l , or run with -u to\n" " disable this sanity check.", i); =20 - pthread_join(migration_thread, NULL); + kvm_pthread_join(migration_thread, NULL); =20 kvm_vm_free(vm); =20 diff --git a/tools/testing/selftests/kvm/s390/memop.c b/tools/testing/selft= ests/kvm/s390/memop.c index 96b32bd74009..ce8db96ccf7e 100644 --- a/tools/testing/selftests/kvm/s390/memop.c +++ b/tools/testing/selftests/kvm/s390/memop.c @@ -701,7 +701,7 @@ static void test_cmpxchg_key_concurrent(void) } } =20 - pthread_join(thread, NULL); + kvm_pthread_join(thread, NULL); =20 MOP(t.vcpu, LOGICAL, READ, mem2, max_block, GADDR_V(mem2)); TEST_ASSERT(popcount_eq(*(__uint128_t *)mem1, *(__uint128_t *)mem2), diff --git a/tools/testing/selftests/kvm/set_memory_region_test.c b/tools/t= esting/selftests/kvm/set_memory_region_test.c index 12f5022bb164..dffe9654f45b 100644 --- a/tools/testing/selftests/kvm/set_memory_region_test.c +++ b/tools/testing/selftests/kvm/set_memory_region_test.c @@ -216,7 +216,7 @@ static void test_move_memory_region(bool disable_slot_z= ap_quirk) /* Defered sync from when the memslot was misaligned (above). */ wait_for_vcpu(); =20 - pthread_join(vcpu_thread, NULL); + kvm_pthread_join(vcpu_thread, NULL); =20 kvm_vm_free(vm); } @@ -302,7 +302,7 @@ static void test_delete_memory_region(bool disable_slot= _zap_quirk) */ vm_mem_region_delete(vm, 0); =20 - pthread_join(vcpu_thread, NULL); + kvm_pthread_join(vcpu_thread, NULL); =20 run =3D vcpu->run; =20 diff --git a/tools/testing/selftests/kvm/steal_time.c b/tools/testing/selft= ests/kvm/steal_time.c index f5f708be5aa0..6cb1eb4c40c9 100644 --- a/tools/testing/selftests/kvm/steal_time.c +++ b/tools/testing/selftests/kvm/steal_time.c @@ -556,7 +556,7 @@ int main(int ac, char **av) do sched_yield(); while (get_run_delay() - run_delay < MIN_RUN_DELAY_NS); - pthread_join(thread, NULL); + kvm_pthread_join(thread, NULL); run_delay =3D get_run_delay() - run_delay; TEST_ASSERT(run_delay >=3D MIN_RUN_DELAY_NS, "Expected run_delay >=3D %ld, got %ld", diff --git a/tools/testing/selftests/kvm/x86/hyperv_ipi.c b/tools/testing/s= elftests/kvm/x86/hyperv_ipi.c index 3cf451f3153e..d2efb1043534 100644 --- a/tools/testing/selftests/kvm/x86/hyperv_ipi.c +++ b/tools/testing/selftests/kvm/x86/hyperv_ipi.c @@ -225,15 +225,9 @@ static void *vcpu_thread(void *arg) static void cancel_join_vcpu_thread(pthread_t thread, struct kvm_vcpu *vcp= u) { void *retval; - int r; =20 - r =3D pthread_cancel(thread); - TEST_ASSERT(!r, "pthread_cancel on vcpu_id=3D%d failed with errno=3D%d", - vcpu->id, r); - - r =3D pthread_join(thread, &retval); - TEST_ASSERT(!r, "pthread_join on vcpu_id=3D%d failed with errno=3D%d", - vcpu->id, r); + kvm_pthread_cancel(thread); + kvm_pthread_join(thread, &retval); TEST_ASSERT(retval =3D=3D PTHREAD_CANCELED, "expected retval=3D%p, got %p", PTHREAD_CANCELED, retval); diff --git a/tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c b/tools/tes= ting/selftests/kvm/x86/hyperv_tlb_flush.c index 87fac1968a47..e4fc9bb6f329 100644 --- a/tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c +++ b/tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c @@ -551,15 +551,9 @@ static void *vcpu_thread(void *arg) static void cancel_join_vcpu_thread(pthread_t thread, struct kvm_vcpu *vcp= u) { void *retval; - int r; =20 - r =3D pthread_cancel(thread); - TEST_ASSERT(!r, "pthread_cancel on vcpu_id=3D%d failed with errno=3D%d", - vcpu->id, r); - - r =3D pthread_join(thread, &retval); - TEST_ASSERT(!r, "pthread_join on vcpu_id=3D%d failed with errno=3D%d", - vcpu->id, r); + kvm_pthread_cancel(thread); + kvm_pthread_join(thread, &retval); TEST_ASSERT(retval =3D=3D PTHREAD_CANCELED, "expected retval=3D%p, got %p", PTHREAD_CANCELED, retval); diff --git a/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c= b/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c index e419b08f1fa6..3aa0673f79f3 100644 --- a/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c +++ b/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c @@ -418,7 +418,7 @@ static void test_mem_conversions(enum vm_mem_backing_sr= c_type src_type, u32 nr_v WRITE_ONCE(run_vcpus, true); =20 for (i =3D 0; i < nr_vcpus; i++) - pthread_join(threads[i], NULL); + kvm_pthread_join(threads[i], NULL); =20 kvm_vm_free(vm); =20 diff --git a/tools/testing/selftests/kvm/x86/private_mem_kvm_exits_test.c b= /tools/testing/selftests/kvm/x86/private_mem_kvm_exits_test.c index e26524fb4b50..e6d16e9d6120 100644 --- a/tools/testing/selftests/kvm/x86/private_mem_kvm_exits_test.c +++ b/tools/testing/selftests/kvm/x86/private_mem_kvm_exits_test.c @@ -70,7 +70,7 @@ static void test_private_access_memslot_deleted(void) =20 vm_mem_region_delete(vm, EXITS_TEST_SLOT); =20 - pthread_join(vm_thread, &thread_return); + kvm_pthread_join(vm_thread, &thread_return); exit_reason =3D (u32)(u64)thread_return; =20 TEST_ASSERT_EQ(exit_reason, KVM_EXIT_MEMORY_FAULT); 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 13abb65620d5..e3e397f32bff 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,8 @@ int main(void) vcpu_set_msr(vcpuN, MSR_IA32_APICBASE, LAPIC_DISABLED); } =20 - TEST_ASSERT_EQ(pthread_cancel(thread), 0); - TEST_ASSERT_EQ(pthread_join(thread, NULL), 0); + kvm_pthread_cancel(thread); + kvm_pthread_join(thread, NULL); =20 kvm_vm_free(vm); =20 diff --git a/tools/testing/selftests/kvm/x86/sev_migrate_tests.c b/tools/te= sting/selftests/kvm/x86/sev_migrate_tests.c index 66c7ce49620a..de006e1c861c 100644 --- a/tools/testing/selftests/kvm/x86/sev_migrate_tests.c +++ b/tools/testing/selftests/kvm/x86/sev_migrate_tests.c @@ -131,7 +131,7 @@ static void test_sev_migrate_locking(void) kvm_pthread_create(&pt[i], NULL, locking_test_thread, &input[i]); =20 for (i =3D 0; i < NR_LOCK_TESTING_THREADS; ++i) - pthread_join(pt[i], NULL); + kvm_pthread_join(pt[i], NULL); for (i =3D 0; i < NR_LOCK_TESTING_THREADS; ++i) kvm_vm_free(input[i].vm); } diff --git a/tools/testing/selftests/kvm/x86/sync_regs_test.c b/tools/testi= ng/selftests/kvm/x86/sync_regs_test.c index f7228af7d594..99a5bbeffc5d 100644 --- a/tools/testing/selftests/kvm/x86/sync_regs_test.c +++ b/tools/testing/selftests/kvm/x86/sync_regs_test.c @@ -199,8 +199,8 @@ static void race_sync_regs(struct kvm_vcpu *vcpu, void = *racer) } } =20 - TEST_ASSERT_EQ(pthread_cancel(thread), 0); - TEST_ASSERT_EQ(pthread_join(thread, NULL), 0); + kvm_pthread_cancel(thread); + kvm_pthread_join(thread, NULL); =20 kvm_x86_state_cleanup(state); } diff --git a/tools/testing/selftests/kvm/x86/tsc_scaling_sync.c b/tools/tes= ting/selftests/kvm/x86/tsc_scaling_sync.c index 54b4b8d06d3b..2a3a9bd8b338 100644 --- a/tools/testing/selftests/kvm/x86/tsc_scaling_sync.c +++ b/tools/testing/selftests/kvm/x86/tsc_scaling_sync.c @@ -99,7 +99,7 @@ int main(int argc, char *argv[]) unsigned long failures =3D 0; for (cpu =3D 0; cpu < NR_TEST_VCPUS; cpu++) { void *this_cpu_failures; - pthread_join(cpu_threads[cpu], &this_cpu_failures); + kvm_pthread_join(cpu_threads[cpu], &this_cpu_failures); failures +=3D (unsigned long)this_cpu_failures; } =20 diff --git a/tools/testing/selftests/kvm/x86/xapic_ipi_test.c b/tools/testi= ng/selftests/kvm/x86/xapic_ipi_test.c index 271ec09c629e..33e78b284c67 100644 --- a/tools/testing/selftests/kvm/x86/xapic_ipi_test.c +++ b/tools/testing/selftests/kvm/x86/xapic_ipi_test.c @@ -231,17 +231,9 @@ static void *vcpu_thread(void *arg) static void cancel_join_vcpu_thread(pthread_t thread, struct kvm_vcpu *vcp= u) { void *retval; - int r; =20 - r =3D pthread_cancel(thread); - TEST_ASSERT(r =3D=3D 0, - "pthread_cancel on vcpu_id=3D%d failed with errno=3D%d", - vcpu->id, r); - - r =3D pthread_join(thread, &retval); - TEST_ASSERT(r =3D=3D 0, - "pthread_join on vcpu_id=3D%d failed with errno=3D%d", - vcpu->id, r); + kvm_pthread_cancel(thread); + kvm_pthread_join(thread, &retval); TEST_ASSERT(retval =3D=3D PTHREAD_CANCELED, "expected retval=3D%p, got %p", PTHREAD_CANCELED, retval); diff --git a/tools/testing/selftests/kvm/x86/xen_shinfo_test.c b/tools/test= ing/selftests/kvm/x86/xen_shinfo_test.c index 20f518fe2450..3ec5e67b21ef 100644 --- a/tools/testing/selftests/kvm/x86/xen_shinfo_test.c +++ b/tools/testing/selftests/kvm/x86/xen_shinfo_test.c @@ -437,7 +437,6 @@ int main(int argc, char *argv[]) struct kvm_vm *vm; pthread_t thread; bool verbose; - int ret; =20 verbose =3D argc > 1 && (!strncmp(argv[1], "-v", 3) || !strncmp(argv[1], "--verbose", 10)); @@ -948,11 +947,8 @@ int main(int argc, char *argv[]) TEST_ASSERT(!evtchn_irq_expected, "Expected event channel IRQ but it didn't happen"); =20 - ret =3D pthread_cancel(thread); - TEST_ASSERT(ret =3D=3D 0, "pthread_cancel() failed: %s", strerror(ret)= ); - - ret =3D pthread_join(thread, 0); - TEST_ASSERT(ret =3D=3D 0, "pthread_join() failed: %s", strerror(ret)); + kvm_pthread_cancel(thread); + kvm_pthread_join(thread, 0); goto done; =20 case TEST_GUEST_SAW_IRQ: --=20 2.55.0.508.g3f0d502094-goog From nobody Fri Oct 2 12:19:59 2026 Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) (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 31A2B456E1F for ; Fri, 31 Jul 2026 17:06:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.200 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785517597; cv=none; b=k9GViTnIiNfTu70a3ak//qJUACM0iVs7G6GxDuwX9/2vhq8Te7Qo9lwFK6X9S1CTsj+YW8ehppL17OOEH5kxXF+3B2Rv2eVKNGDm4kWrPI3oiBGYyDdPZrgTOYnDKeJyEcGl6ODa7sKVKAT/rXbU/mgSpny+OEL7osIxPrAyUvo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785517597; c=relaxed/simple; bh=eFedP1FKrSCUz33LyUYB/hbFk56NqWKwZqQkDaFxLJ0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=bDO7nHrrJZHgpsFPFfqYuSRM92I5jbg/NFNmq7rQYYFn5Fo6i46W0gZY5QlTZ4IIopKNb05V0F8DY+AYWoFN++ug5M+KpICxFanGOF6YuEuvXChwbjkqyT8H2pHowXZ9E7X0lAUvIxdgPCy++yeKBKHvRnmnCweibJMKE9weCsw= 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=la9G6CjZ; arc=none smtp.client-ip=209.85.215.200 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="la9G6CjZ" Received: by mail-pg1-f200.google.com with SMTP id 41be03b00d2f7-cbb92868263so1542427a12.2 for ; Fri, 31 Jul 2026 10:06:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785517595; x=1786122395; 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=la9G6CjZ10kIhQel1dm5ViW8w5W6H3vMUXc1gktJVgwAYfDyRoCdzQzlx4W4Kgjsgb vJXZ4eXZoXbOemWE4QzYOCjaH0G0VDO/hkSepg7nKuUevFqACuZ/dKryfQ49992vM86n 6Frxn6BipRIO4Yl/ir9OXcZ4yaLcgA9PCZU3PqkNCMmRHYfcka67/IDV3TR5WCe4AqWr IzUkxfy6uEdr0UmYYZnAzM5guu7f5t/fqoFkfetljZEscHzDzQ1rQF2nWi0ff484zswe MZYVPrL96zrRXD5ezPDnUzPz79BHJBr6Tl1OiSMWnUImsP0OYPMra8c4V2wwNooo4ho1 YOUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785517595; x=1786122395; 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=bvfZ5MbqEhOkKPPOuR0lF8PTupTWZHjYXg6Kj4uIgj9EVH7LAaiWZ41k+HjHkxVjYL 8INs85YPprdFHi5ItghgiC+Hx8jDbEgDyRIU42funfWdZEY9v6fi9eXQXeSHw0GdI2B0 Sn+QTNvEl4BCnoOkoXUAjmH7M6rU6F73fIMeJW6KZouaTbnFUBJzBfPHrebIJVn9Micb ji2b/4BQ9x/iUugGi0aKwtcsJVFMJKxNeVEkdtmZDIba4d7D8Ttsl4ZEILdHDQw7Gmrc BmZVjtMuEZASNkLdNASjKH+fDbaXAHt8hMtytJNWt3AK3KL6waoXT8RZNiJ14DKklU5c gWzg== X-Forwarded-Encrypted: i=1; AHgh+Rp8Pt8mpqrl9ESOL67iTNVzS0hFMt9psTO3dG3Dk3qNkuFmgatxrDN/m2CX4ZTnZ8jMc9x7rNvK83JbPA0=@vger.kernel.org X-Gm-Message-State: AOJu0Yy4U2Eta3a/H/IIvwgJgtf8nK2Kb51s54MZmcKqd6LNv87VDw3D ByWfEZK74sbWCzADVNiaNK1y/l+hCa8ggOQjDtUsKSfw+XpczHYjeu2n6DsznzBiagZrKghzaU1 ryWVTPg== X-Received: from pgbcp10.prod.google.com ([2002:a05:6a02:400a:b0:c99:7baf:125f]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:10d:b0:3c3:96dd:9ecc with SMTP id adf61e73a8af0-3c92a867734mr515731637.57.1785517595183; Fri, 31 Jul 2026 10:06:35 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 31 Jul 2026 10:06:17 -0700 In-Reply-To: <20260731170619.2620845-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: <20260731170619.2620845-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.508.g3f0d502094-goog Message-ID: <20260731170619.2620845-11-seanjc@google.com> Subject: [PATCH v2 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-Transfer-Encoding: quoted-printable 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/tes= ting/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 *, t= hread, __KVM_SYSCALL_DEFINE(pthread_join, 2, pthread_t, thread, void **, thread_r= eturn); __KVM_SYSCALL_DEFINE(pthread_cancel, 1, pthread_t, thread); =20 +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_ASYNCHRON= OUS + * 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 =3D=3D PTHREAD_CANCELED, + "expected retval=3D%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/s= elftests/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; } =20 -static void cancel_join_vcpu_thread(pthread_t thread, struct kvm_vcpu *vcp= u) -{ - void *retval; - - kvm_pthread_cancel(thread); - kvm_pthread_join(thread, &retval); - TEST_ASSERT(retval =3D=3D PTHREAD_CANCELED, - "expected retval=3D%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[]) } =20 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); =20 return 0; diff --git a/tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c b/tools/tes= ting/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; } =20 -static void cancel_join_vcpu_thread(pthread_t thread, struct kvm_vcpu *vcp= u) -{ - void *retval; - - kvm_pthread_cancel(thread); - kvm_pthread_join(thread, &retval); - TEST_ASSERT(retval =3D=3D PTHREAD_CANCELED, - "expected retval=3D%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[]) } =20 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); =20 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); } =20 - kvm_pthread_cancel(thread); - kvm_pthread_join(thread, NULL); + kvm_pthread_cancel_join(thread); =20 kvm_vm_free(vm); =20 diff --git a/tools/testing/selftests/kvm/x86/sync_regs_test.c b/tools/testi= ng/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) } } =20 - kvm_pthread_cancel(thread); - kvm_pthread_join(thread, NULL); + kvm_pthread_cancel_join(thread); =20 kvm_x86_state_cleanup(state); } diff --git a/tools/testing/selftests/kvm/x86/xapic_ipi_test.c b/tools/testi= ng/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; } =20 -static void cancel_join_vcpu_thread(pthread_t thread, struct kvm_vcpu *vcp= u) -{ - void *retval; - - kvm_pthread_cancel(thread); - kvm_pthread_join(thread, &retval); - TEST_ASSERT(retval =3D=3D PTHREAD_CANCELED, - "expected retval=3D%p, got %p", PTHREAD_CANCELED, - retval); -} - void do_migrations(struct test_data_page *data, int run_secs, int delay_us= ecs, 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]); =20 /* * 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/test= ing/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"); =20 - kvm_pthread_cancel(thread); - kvm_pthread_join(thread, 0); + kvm_pthread_cancel_join(thread); goto done; =20 case TEST_GUEST_SAW_IRQ: --=20 2.55.0.508.g3f0d502094-goog From nobody Fri Oct 2 12:19:59 2026 Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) (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 559574582C1 for ; Fri, 31 Jul 2026 17:06:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.200 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785517598; cv=none; b=eqaTeIKp+40vunv5JQV+z+zJfBahz/ILIU+l4P81Il84s0wv23JT9OAQiE+WetZ0Y7O2l/QHRWo+lskAzjhGLR+9HSGHgO8ikz7ymGRTb5bkUFX+aaalamzJXAYSzfd/iyKnx0AG+w/hJT59xNKrPbiE7buggUWWtWXcibx4zq4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785517598; c=relaxed/simple; bh=D2cCds+Rmi8+J6lQPkFl0u/IOfzO+nxs2jcefDTat0Q=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Zn6WyjFrytPqIT6mI7wo8plPfjVYBEWy409OvKWNUNF9iacD91y2hjhjZXtiYuJ0pzBjuN3dEPzNgDFe+Rz5juldONZDoOetCwpTshzczycbZj3enyG24kzdhNzdFc5D7tp7Mn1fTe2TBeeDG1nRKGYnIN4Za8DbWpcAcxPCAhU= 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=OIU79DDf; arc=none smtp.client-ip=209.85.210.200 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="OIU79DDf" Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-84eccf9d899so1665182b3a.2 for ; Fri, 31 Jul 2026 10:06:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785517597; x=1786122397; 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=Hu2nzxTULIrNid+T0wW8lXLrPPrctqAZSUyi9Ewmd1M=; b=OIU79DDfBfL0DPE0VV39RH4MNrHqjd0dYgPrY4K82zMIzoLxeRVhENc9fC87yj38Lp 6Bxqz7HObCDmuQGptCWqlJRi0pk8tP9SUs+CKbBEQXIhoZyOVvL51PtHLkUKxim78GyZ Y/DEsp1OP7iXbA8k0C94S1hPSxja4S0tW6wsSm4Jg7Ae5j+ngEX1EOAbdm2kgIbUx16l oovr9hFi9pE074zBy3TTkZ4UPN8KyqVAAFTDkcwezaYR+IUrU3l3RQacHo6MkbsW+cWB z7hgY6lbmabUPaqxXXOHl1g9FG/9S7YpcooG3fsP9UnLfhUaeNZOkWWzg1OKDFKwu//J 6ymg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785517597; x=1786122397; 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=Hu2nzxTULIrNid+T0wW8lXLrPPrctqAZSUyi9Ewmd1M=; b=mysLBvSWwVrWK3YN6SaAJchK9zOMwWIDrR1raXNnT01kvVxyQvJ03R43X2WOZFwvdp E9w7wdf5gTbWVhylaKHEJNl63IRWoeegEGxMqjSnbGHMBZSBoFK/QdXo4xL5jnCGKT7I So96/nm1ExLYy+vwGvszCPusAQzFtLKMhPdUjv0dBhuVuE7N2Hp3ux/xAYRTDF2lexJG gbmIDBegH3iFxDF1rpaB1IDmhdqVoBTAlbuwYWqYmIDw7cc7BpLNg3i/Sly0Xz6mbWkJ ML2v8zU15NkUZmlSUJkOyJhsa6X4+yos8bGPOyUgakxuSL/cokLDGdZCr+5HGZu99AJ/ JzTw== X-Forwarded-Encrypted: i=1; AHgh+RoNzKT5GHNiZcHHlue0d8o3ya4hF0fAr3j/dq1aQYRvojDgRsYck8SQC/HJYwFUGKrHzitDoUuPbhNhjVQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzPah5Z71HyBk6NlzyKa+XPJK0fCrqcZnOa83KkR46rRYtxKffX IRAwcqU5BlmZywYJYRhJI2nik5ldRTefphCZquh0yE1f5xDMnSVjMBAcUGmVYDx/Nf/LUsfIXY3 H1xIEjQ== X-Received: from pgsb25.prod.google.com ([2002:a65:67d9:0:b0:c99:aff5:707d]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:484:b0:3c3:8c88:7b2a with SMTP id adf61e73a8af0-3c92a84bcf4mr591268637.58.1785517596388; Fri, 31 Jul 2026 10:06:36 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 31 Jul 2026 10:06:18 -0700 In-Reply-To: <20260731170619.2620845-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: <20260731170619.2620845-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.508.g3f0d502094-goog Message-ID: <20260731170619.2620845-12-seanjc@google.com> Subject: [PATCH v2 11/12] KVM: selftests: Add KVM syscall wrappers for pthread_{g,s}etaffinity_np() 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add and use KVM wrappers for pthread_{g,s}etaffinity_np() so that selftests don't need to manually assert that the syscalls succeeded, and so that they don't need to manually pass in sizeof(cpu_set_t) for the size. Note, the steal time test didn't assert success, but the TEST_ASSERT() one line later makes it quite clear the test relies on pthread_getaffinity_np() succeeding. Signed-off-by: Sean Christopherson --- .../testing/selftests/kvm/include/kvm_syscalls.h | 16 ++++++++++++++++ tools/testing/selftests/kvm/steal_time.c | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/kvm/include/kvm_syscalls.h b/tools/tes= ting/selftests/kvm/include/kvm_syscalls.h index c0657e54aee5..dc7461894aef 100644 --- a/tools/testing/selftests/kvm/include/kvm_syscalls.h +++ b/tools/testing/selftests/kvm/include/kvm_syscalls.h @@ -98,6 +98,22 @@ __KVM_SYSCALL_DEFINE(madvise, 3, void *, addr, size_t, l= ength, int, advice); __KVM_SYSCALL_DEFINE(sched_getaffinity, 3, pid_t, pid, size_t, cpusetsize,= cpu_set_t *, mask); __KVM_SYSCALL_DEFINE(sched_setaffinity, 3, pid_t, pid, size_t, cpusetsize,= cpu_set_t *, mask); =20 +__KVM_SYSCALL_DEFINE(pthread_getaffinity_np, 3, pthread_t, thread, + size_t, cpusetsize, cpu_set_t *, cpuset); +__KVM_SYSCALL_DEFINE(pthread_setaffinity_np, 3, pthread_t, thread, + size_t, cpusetsize, const cpu_set_t *, cpuset); + +static inline void kvm_pthread_getaffinity(pthread_t thread, cpu_set_t *cp= uset) +{ + kvm_pthread_getaffinity_np(thread, sizeof(cpu_set_t), cpuset); +} + +static inline void kvm_pthread_setaffinity(pthread_t thread, + const cpu_set_t *cpuset) +{ + kvm_pthread_setaffinity_np(thread, sizeof(cpu_set_t), cpuset); +} + typedef void *(*pthread_fn_t)(void *); __KVM_SYSCALL_DEFINE(pthread_create, 4, pthread_t *, thread, const pthread_attr_t *, attr, pthread_fn_t, fn, void *, arg); diff --git a/tools/testing/selftests/kvm/steal_time.c b/tools/testing/selft= ests/kvm/steal_time.c index 6cb1eb4c40c9..bc3c62b72c58 100644 --- a/tools/testing/selftests/kvm/steal_time.c +++ b/tools/testing/selftests/kvm/steal_time.c @@ -549,7 +549,7 @@ int main(int ac, char **av) /* Steal time from the VCPU. The steal time thread has the same CPU affi= nity as the VCPUs. */ run_delay =3D get_run_delay(); kvm_pthread_create(&thread, NULL, do_steal_time, NULL); - pthread_getaffinity_np(thread, sizeof(cpuset), &cpuset); + kvm_pthread_getaffinity(thread, &cpuset); TEST_ASSERT(CPU_COUNT(&cpuset) =3D=3D 1 && CPU_ISSET(cpu, &cpuset), "Worker failed to inherit parent's CPU affinity"); =20 --=20 2.55.0.508.g3f0d502094-goog From nobody Fri Oct 2 12:19:59 2026 Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) (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 6943B4582E2 for ; Fri, 31 Jul 2026 17:06:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.69 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785517600; cv=none; b=bGfQGa/3tMFWxQu6aiz48cJ9ujbf1D4IOs3wFkHyqf3G5L8l8Rx3+8DZZJbUFMtLRHt9iNiMLg2xCkPhjOeLas7q8r9KuHBvrVMeQ1THn8PoA5j0I0L2jFJq3FEz74BCO9cXtjxY9hIbXxOvPlbXaAdDyON60uviUfr9iNFlcSo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785517600; c=relaxed/simple; bh=3q//Tabf4H6D6g2+hq87aIi4ctizRMkEW/nlcxYiGYQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=R1bI7lMCdh7eC8W0Hf/f9GQqBPEcIzWvK/Q2iLxDL8ksAobiyBJs4KWdtIyLZXycufaUhX1PuxtXgP8uBWGqebDfLk4C5hveSFJQcHrTgGhcZCygR8ro3nPaDhG5X8UKMH4bmjk9YjxXR6GcNztpaiDaeywafVBNoTXuVbHk9Co= 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=h+wq1SuJ; arc=none smtp.client-ip=209.85.216.69 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="h+wq1SuJ" Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-38dc085b0a7so2185842a91.2 for ; Fri, 31 Jul 2026 10:06:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785517598; x=1786122398; 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=G1JBjopkc75BtNRKBSR+DchDeaVK0MN8H8Q6AmKvrIE=; b=h+wq1SuJN7NiJVF+DgoBM15g/BupBmZUb2JQugmDYEn037sK3FcjjgyCu5/fKs6+WC znNzrta/zjq0bw0WUHPKg+EUcyxXpuNCxu7lfpJddFIZ1NVormdpVe5sidXnniqQAYWq JhFL6WskJJ+Qh9xVxbMD+B6ikFoStOwlUsrGIMS+Ckf+nt8CrlflGKXbJ0tPIu4qR+Gm g40qN3b44WyOqDuNj3f/YoR/aZ/2obdKSGgSrQdLH8yoe03PMeUjrN8GknFiLOkU0KAv txcqwPmiBn0/SGGK676ZARVqpvh4mgGIyJXE45mnUhnMVhyFQAYYpJN0bMQsRK5SVpRA EkkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785517598; x=1786122398; 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=G1JBjopkc75BtNRKBSR+DchDeaVK0MN8H8Q6AmKvrIE=; b=BqJnbAVlNOvQM9AWxI7VxnWi3JzHwCnSAoxySsIdFX3XpcUbchyBxUM5YWIwrB3otW UMI2tRu756/3T8yYyAKjdwlFLzzJnVPxJ6oWxKhR925ibgEW/odjwBrgqBVVZwy/bKBC B46SIKdVz4bdWuUPUDHDtnZ1i2PPfnpujsISUHyMcSQEd5IcIS3lzsvbtciQ796zf44F FNC+s6TfqxDOiDsGFrTyUcnCZkMROiHR/TeBscTyv+wxOsPjdR6kzzwdtuG1BoJhI0Ks COJNZbo6ObB2+ZKfFs/+pWYXMTdlOsuUyDa+HMsWXnMnAZzn4he4HIXUQegJ89m4pEdl 6kxw== X-Forwarded-Encrypted: i=1; AHgh+RrY0kERfyeonD0JvAhjHIv99QD3xsbp5V7QGzkeAOkc9S+YC5VTyPE1fOHPq4UFvxF3X6xhi1nrMQq9gGQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyU6VCdw6u5UqeaOMHw8Jxf4Xsg6zLiiJ6d5+/CcuOl9Y1FiGiH asnixBkjJeksi9AFlguEugCkDD932ftbFwWxA2WnBtWzvTJjAo8rPxkWpdz29SVd8BdSZeXCLeN RUIW3CQ== X-Received: from pjbii5.prod.google.com ([2002:a17:90b:4885:b0:38d:ed16:8b30]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:53c3:b0:36a:5d1f:7b6 with SMTP id 98e67ed59e1d1-38fbc40e148mr607598a91.2.1785517597505; Fri, 31 Jul 2026 10:06:37 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 31 Jul 2026 10:06:19 -0700 In-Reply-To: <20260731170619.2620845-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: <20260731170619.2620845-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.508.g3f0d502094-goog Message-ID: <20260731170619.2620845-13-seanjc@google.com> Subject: [PATCH v2 12/12] KVM: selftests: Clean up global constants in hardware disable test 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename the global constants in the hardware disable test to better capture what they control, and open code the literal number of sleeping tasks and iterations instead of using power-of-2 math to express values that are 100% arbitrary. Opportunistically tag the global semaphore with "static". No functional change intended. Signed-off-by: Sean Christopherson --- .../selftests/kvm/hardware_disable_test.c | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/kvm/hardware_disable_test.c b/tools/te= sting/selftests/kvm/hardware_disable_test.c index 694d064e63f1..cf9306bbe970 100644 --- a/tools/testing/selftests/kvm/hardware_disable_test.c +++ b/tools/testing/selftests/kvm/hardware_disable_test.c @@ -17,13 +17,13 @@ #include "kvm_util.h" #include "ucall_common.h" =20 -#define VCPU_NUM 4 -#define SLEEPING_THREAD_NUM (1 << 4) -#define FORK_NUM (1ULL << 9) -#define DELAY_US_MAX 2000 +#define NR_VCPUS 4 +#define NR_SLEEPERS_PER_VCPU 16 +#define NR_ITERATIONS 512 +#define DELAY_US_MAX 2000 =20 static cpu_set_t threads_cpu_set; -sem_t *sem; +static sem_t *sem; =20 static void guest_code(void) { @@ -75,15 +75,15 @@ static void run_test(u32 run) pthread_attr_setaffinity_np(&attr, sizeof(cpu_set_t), &threads_cpu_set); #endif =20 - vm =3D vm_create(VCPU_NUM); + vm =3D vm_create(NR_VCPUS); =20 pr_debug("%s: [%d] start vcpus\n", __func__, run); - for (i =3D 0; i < VCPU_NUM; ++i) { + for (i =3D 0; i < NR_VCPUS; ++i) { vcpu =3D vm_vcpu_add(vm, i, guest_code); =20 kvm_pthread_create(&thread, &attr, run_vcpu, vcpu); =20 - for (j =3D 0; j < SLEEPING_THREAD_NUM; ++j) + for (j =3D 0; j < NR_SLEEPERS_PER_VCPU; ++j) kvm_pthread_create(&thread, &attr, sleeping_thread, (void *)NULL); } pr_debug("%s: [%d] all threads launched\n", __func__, run); @@ -133,13 +133,13 @@ int main(int argc, char **argv) =20 kvm_sched_getaffinity(0, sizeof(cpu_set_t), &allowed_cpu_set); =20 - for (i =3D 0; i < VCPU_NUM && CPU_COUNT(&allowed_cpu_set); i++) + for (i =3D 0; i < NR_VCPUS && CPU_COUNT(&allowed_cpu_set); i++) CPU_SET(kvm_pick_random_cpu(&allowed_cpu_set), &threads_cpu_set); =20 sem =3D sem_open("vm_sem", O_CREAT | O_EXCL, 0644, 0); sem_unlink("vm_sem"); =20 - for (i =3D 0; i < FORK_NUM; ++i) { + for (i =3D 0; i < NR_ITERATIONS; ++i) { pid =3D fork(); TEST_ASSERT(pid >=3D 0, "%s: unable to fork", __func__); if (pid =3D=3D 0) --=20 2.55.0.508.g3f0d502094-goog