From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (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 2D3212F3600 for ; Wed, 10 Jun 2026 00:54:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781052842; cv=none; b=ASm0Po1zWNYS7GwRJH7r8iHMZGXOq5uc5eM2WXntoCajXJKXO1N6KRWGpyUzGtN70eYqCE25BZzia3I1966+syrjElSyvU+waxY7kaSsWj8WdlZA6B04I6c//UzWyr27ABt9EwQ7IT0BXrDT3ZcrI9Jo2FI4dQ3lyn4geX698fg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781052842; c=relaxed/simple; bh=TF/7f1GoTDJgtPk44yqwmW7J2ephny2Ec/VMEg4h/4o=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ty27aL51ubb52MNz3W2iNaUXrqrc+yvnO0/la75JZyiT9yNQSqPvUKr4GSDsrjcg2MeYS9B7xdge9vLoExAgUSOgr0Pql8xeIoj4BLtVyQlLxgNXMKwohC1UKdsh2gPmwR64CAh1aVRRSuOyGV6cWqa/sikwhxxzgIHgcPsLvu8= 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=TzEtMNEw; arc=none smtp.client-ip=209.85.210.201 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="TzEtMNEw" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-84233efcaadso4106403b3a.1 for ; Tue, 09 Jun 2026 17:54:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781052839; x=1781657639; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=8ZpcWMnVr5/m3HbsHebdKOhGRYEoJTay0WQIxFsC+10=; b=TzEtMNEw0P5oQSJUyrguYAGFLoFgUTycn3J9Ff4CobtGp55DTZFVR//77G1XcSxXzN bKMTqKQchJFfSq8LE3N4M6qXpj/h0BiOlJTvm9Fw1BhMK+qx1exWtsOP2ImzXW1WD+sV 5apRyOmu18R5iGlunWD8E6C7Qcq5F8zebOn1YX17bkXQOS6+ORFAMrqZeQ2YlW0wE8C5 xU7GkNSO34DxvvLXysY3aLwektvq8/V5DjpHm8w8bLQPVfI3+SXQg298+25cUGBHCvN0 9gpdj/oEpjsIzZZ2Oktlc+zvCgUcJjr/R9o6r5KWxT7TB2FkPtinbrAwBe2dntBunVML gTdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781052839; x=1781657639; h=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; bh=8ZpcWMnVr5/m3HbsHebdKOhGRYEoJTay0WQIxFsC+10=; b=QRtTawN3VGGhseAkiJLCCHd/ghpeFaa3fCP0159mE8WU3dvTjQOvdhkPDAvog3lqWx JqoPKRl86yxJ/BxQifVimCVfBgyu9Jfn9LTyuhIMYzP8tv9Cppf7Z7MPuM1IaUFVxscd mUFncMk+rwFnTBWMN7yU+sCs7778Jq8k6bsiXBhEZCD2q+LbqzDOOOlpdibyOuwO0yxj NavhnjfxU0U1pzmWrcHahYMOw3aKCxyX5EYtFnIXlxi++Y6RpLU+roZszt8ymQHaokup pvKXw4DK1DR6S+93glMn9qGb8jbzgYgfDmqidSWoT3IstfurnGA72/Lzgs8+3Pat/21i u06w== X-Forwarded-Encrypted: i=1; AFNElJ8vo6ECxXx1y8HrHmfkOx5UMt6oBFJ8oI3+K8Epu5o3iO5fqVapMEpbxMU1T8dhbDYBuvfDPKO1yOM+Q10=@vger.kernel.org X-Gm-Message-State: AOJu0Yxj6/VJeYe34qv1N2U67At4al3w47R33bGZskz5EMML33WhMutF 2oWsunkMzg8BLD2F//4juXnvqXHFXl9GBegCJMxemrhOftRzPg49gy6tP22AUcXWW7UVGh7Jeaj yQg5fZQ== X-Received: from pfuj3.prod.google.com ([2002:a05:6a00:1303:b0:842:35ec:5b49]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:2ea9:b0:842:7a78:8f14 with SMTP id d2e1a72fcca58-842b0f1f235mr20890818b3a.6.1781052839177; Tue, 09 Jun 2026 17:53:59 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 9 Jun 2026 17:53:34 -0700 In-Reply-To: <20260610005338.2967132-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: <20260610005338.2967132-1-seanjc@google.com> X-Mailer: git-send-email 2.54.0.1099.g489fc7bff1-goog Message-ID: <20260610005338.2967132-15-seanjc@google.com> Subject: [PATCH v6 14/18] KVM: selftests: Add kvm_sched_getaffinity() wrapper and convert users From: Sean Christopherson To: Paolo Bonzini , Marc Zyngier , Oliver Upton , Sean Christopherson Cc: Joey Gouly , Steffen Eiden , Suzuki K Poulose , Zenghui Yu , kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, David Matlack , Josh Hilke Content-Type: text/plain; charset="UTF-8" From: Josh Hilke Add and use a KVM wrapper for the sched_getaffinity() syscall so that selftests don't need to manually assert that the syscall succeeded. Note, some tests didn't actually assert success, but they all obviously rely on the syscall to succeed. Suggested-by: Sean Christopherson Signed-off-by: Josh Hilke [sean: massage changelog] Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/arch_timer.c | 2 +- tools/testing/selftests/kvm/arm64/arch_timer_edge_cases.c | 2 +- tools/testing/selftests/kvm/include/kvm_syscalls.h | 2 ++ tools/testing/selftests/kvm/lib/kvm_util.c | 5 ++--- tools/testing/selftests/kvm/mmu_stress_test.c | 6 +----- tools/testing/selftests/kvm/rseq_test.c | 4 +--- 6 files changed, 8 insertions(+), 13 deletions(-) diff --git a/tools/testing/selftests/kvm/arch_timer.c b/tools/testing/selftests/kvm/arch_timer.c index 90c475a61b22..f8b02597897b 100644 --- a/tools/testing/selftests/kvm/arch_timer.c +++ b/tools/testing/selftests/kvm/arch_timer.c @@ -85,7 +85,7 @@ static u32 test_get_pcpu(void) cpu_set_t online_cpuset; nproc_conf = get_nprocs_conf(); - sched_getaffinity(0, sizeof(cpu_set_t), &online_cpuset); + kvm_sched_getaffinity(0, sizeof(cpu_set_t), &online_cpuset); /* Randomly find an available pCPU to place a vCPU on */ do { diff --git a/tools/testing/selftests/kvm/arm64/arch_timer_edge_cases.c b/tools/testing/selftests/kvm/arm64/arch_timer_edge_cases.c index f7625eb711d6..d9c9377a6325 100644 --- a/tools/testing/selftests/kvm/arm64/arch_timer_edge_cases.c +++ b/tools/testing/selftests/kvm/arm64/arch_timer_edge_cases.c @@ -1039,7 +1039,7 @@ int main(int argc, char *argv[]) if (!parse_args(argc, argv)) exit(KSFT_SKIP); - sched_getaffinity(0, sizeof(default_cpuset), &default_cpuset); + kvm_sched_getaffinity(0, sizeof(default_cpuset), &default_cpuset); set_counter_defaults(); if (test_args.test_virtual) { diff --git a/tools/testing/selftests/kvm/include/kvm_syscalls.h b/tools/testing/selftests/kvm/include/kvm_syscalls.h index dc4fb97aef8d..5dae6143ddb0 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 +#include #include #define MAP_ARGS0(m,...) @@ -93,6 +94,7 @@ __KVM_SYSCALL_DEFINE(close, 1, int, fd); __KVM_SYSCALL_DEFINE(fallocate, 4, int, fd, int, mode, loff_t, offset, loff_t, len); __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); #define kvm_free_fd(fd) \ do { \ diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index 875030c22d07..92013883f35b 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -668,13 +668,12 @@ void kvm_parse_vcpu_pinning(const char *pcpus_string, u32 vcpu_to_pcpu[], cpu_set_t allowed_mask; char *cpu, *cpu_list; char delim[2] = ","; - int i, r; + int i; cpu_list = strdup(pcpus_string); TEST_ASSERT(cpu_list, "strdup() allocation failed."); - r = sched_getaffinity(0, sizeof(allowed_mask), &allowed_mask); - TEST_ASSERT(!r, "sched_getaffinity() failed"); + kvm_sched_getaffinity(0, sizeof(allowed_mask), &allowed_mask); cpu = strtok(cpu_list, delim); diff --git a/tools/testing/selftests/kvm/mmu_stress_test.c b/tools/testing/selftests/kvm/mmu_stress_test.c index 473ef4c0ea9f..3d5f33a63b2b 100644 --- a/tools/testing/selftests/kvm/mmu_stress_test.c +++ b/tools/testing/selftests/kvm/mmu_stress_test.c @@ -255,11 +255,7 @@ static void rendezvous_with_vcpus(struct timespec *time, const char *name) static void calc_default_nr_vcpus(void) { cpu_set_t possible_mask; - int r; - - r = sched_getaffinity(0, sizeof(possible_mask), &possible_mask); - TEST_ASSERT(!r, "sched_getaffinity failed, errno = %d (%s)", - errno, strerror(errno)); + kvm_sched_getaffinity(0, sizeof(possible_mask), &possible_mask); nr_vcpus = CPU_COUNT(&possible_mask); TEST_ASSERT(nr_vcpus > 0, "Uh, no CPUs?"); diff --git a/tools/testing/selftests/kvm/rseq_test.c b/tools/testing/selftests/kvm/rseq_test.c index 6510fbfd64f1..557e393c223b 100644 --- a/tools/testing/selftests/kvm/rseq_test.c +++ b/tools/testing/selftests/kvm/rseq_test.c @@ -226,9 +226,7 @@ int main(int argc, char *argv[]) } } - r = sched_getaffinity(0, sizeof(possible_mask), &possible_mask); - TEST_ASSERT(!r, "sched_getaffinity failed, errno = %d (%s)", errno, - strerror(errno)); + kvm_sched_getaffinity(0, sizeof(possible_mask), &possible_mask); calc_min_max_cpu(); -- 2.54.0.1099.g489fc7bff1-goog