Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 345563CF034 for ; Fri, 26 Jun 2026 21:36:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782509762; cv=none; b=kfBSh7bDh0HiiVBHQnR02VgNOceUDd6DsbEBC/yVozBOwSdvWsaqvlbAeAPbOQo9Yv/RO7nrVJXAZVYERC0hSGx6eIWSkYSMQBQkgiKyijO5rVNZlnKM9aWHJZ9pzhC6Fkkb2kb4ofsA/DwcayHEdewmcau5oaxb1a5RSFEdNwc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782509762; c=relaxed/simple; bh=lPLty6nGrS4VH1t2tuC4QXIh85FGwa4BJF1hWv7uCr0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=HJqLwLS01M8kIe7yYZ0Omk52wa2e+PfD2uyfwerDf0NmySytGdtvMqydr5Fi6PauJGuIp+phf6eqGAVlOJ6LkmPyhEjP5SiNffGUbs79XmgRl3RsQGlvAyL6igQewvJUUQN2hX6cza3RYT82EmPWtvrZXo5nc9C6VESYmVl5dPs= 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=VMKBok6s; arc=none smtp.client-ip=209.85.216.74 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="VMKBok6s" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-37e00ef16d9so1262928a91.2 for ; Fri, 26 Jun 2026 14:36:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782509759; x=1783114559; 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=4C+wq0VK0ghddVns1kN4nyVNDsu3kjVzVymKqfTzcVg=; b=VMKBok6soVoXCazGhr3SHsLbboWb3QPzcuJ2U+na/olheOkxPaefXg5YeYtxeHf8kQ 2jvhqV6pBUlGRn+VzDPHSmawEZVT5q/GrYShGm/4MmyD7lwxQqcnlaTYibOdaw79oHW/ bOEWEFOvhFcmrpMYgLOiyNvfY2GTKHMAJDvN0QL7D24pYiMv00tlKGZBbabxObcmgcRJ VYb7jVd2cPAXx2+vx3F7ZWLLWiyOo+/GXtSpUwYbnw+mC8ySnwuaIr9yvjfjySpvERw2 Llh3Kt54U0KIK+EYNnBUGAbA+8kf/y8APFTRWouLx1RuTUm/iqKqaMipY4W6FJnsx82s YH8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782509759; x=1783114559; 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=4C+wq0VK0ghddVns1kN4nyVNDsu3kjVzVymKqfTzcVg=; b=cr9QKe15c2DhsEr0YvJ461SSM0mODWNT6VLiqDvD4rweb4qTBuuE6O0XSFyEvxog5z EWIqOBPQUPDE1RCu6TlKO916Z0jDBPlnetnnD3w+68S8YQfVlEjiyDtcakEY55AVgQIo C5zy4vuq6yUJv1S1uy6DL6KacsTuF2y0wObtKbdtdTbyBOa4ldkAvf2Fnx+KgjTAkGQ+ rpRwwSsUnMFZv4eZ2T/i5TcfuvLkHoR1c1YnxRW+d8VEsH6pB3yV1snAk8PwzlviEJXn litW52JOSrxH7PxWtPW0tTHYbgp6a73tdU8BumjoJGdO8iu04atUYU558RdaP8P5TTqU +y0w== X-Forwarded-Encrypted: i=1; AFNElJ9Pv9t6zRSyhZcwU/mWmo+B1SIB/HViiXD1TOQktuLJxha86WjfAC3WWUAqOwHfvF5OFoQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yy1Z7CeRQOrzJX0aOaVKe+HbhuIGgwt+OElZ6j2wyij/61u6yr6 2NyuceW+rXvwZpZndJXbYiEzIbix4pEJLiq4ldnHMIzkHkU7T9Kzqc4KD3lGtg7/PWRTqX6myJO fO4EM+w== X-Received: from pgdr9.prod.google.com ([2002:a63:9b09:0:b0:c86:1628:53b3]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:d81b:b0:3bf:6c08:2b30 with SMTP id adf61e73a8af0-3bf6c084b2fmr1584091637.56.1782509759266; Fri, 26 Jun 2026 14:35:59 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 26 Jun 2026 14:35:32 -0700 In-Reply-To: <20260626213534.3866178-1-seanjc@google.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260626213534.3866178-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.rc0.799.gd6f94ed593-goog Message-ID: <20260626213534.3866178-20-seanjc@google.com> Subject: [PATCH v8 19/20] KVM: selftests: Make number of vCPUs configurable in IRQ test 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: David Matlack Extend the eventfd IRQ test with a '-v' flag to allow the user to configure the number of vCPUs to create and run (versus only ever using a single vCPU). Update the routing logic to play nice with 32 bit IDs, enable x2APIC format in KVM (to enable 32-bit ID routing), and disable KVM's x2APIC broadcast quirk so that targeting vCPU 255 doesn't blast the interrupt to all vCPUs when in x2APIC mode. Signed-off-by: David Matlack Co-developed-by: Josh Hilke Signed-off-by: Josh Hilke Co-developed-by: Sean Christopherson Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/irq_test.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/kvm/irq_test.c b/tools/testing/selftests/kvm/irq_test.c index c0ff6e60b167..d2c745c54960 100644 --- a/tools/testing/selftests/kvm/irq_test.c +++ b/tools/testing/selftests/kvm/irq_test.c @@ -124,7 +124,8 @@ static void kvm_route_msi(struct kvm_vm *vm, u32 gsi, struct kvm_vcpu *vcpu, .entry = { .gsi = gsi, .type = KVM_IRQ_ROUTING_MSI, - .u.msi.address_lo = 0xFEE00000 | (vcpu->id << 12), + .u.msi.address_lo = 0xFEE00000 | (vcpu->id & GENMASK(7, 0)) << 12, + .u.msi.address_hi = vcpu->id & GENMASK(31, 8), .u.msi.data = use_nmi ? NMI_VECTOR | (4 << 8) : vector, }, }; @@ -157,7 +158,7 @@ static const char *probe_iommu_type(void) static void help(const char *name) { - printf("Usage: %s [-a] [-d ] [-e] [-h] [-i nr_irqs] [-m] [-n] [-t iommu_type]\n", name); + printf("Usage: %s [-a] [-d ] [-e] [-h] [-i nr_irqs] [-m] [-n] [-t iommu_type] [-v nr_vcpus]\n", name); printf("\n"); printf("Tests KVM interrupt routing and delivery via irqfd.\n"); printf("-a Affine the device's host IRQ to a random physical CPU\n"); @@ -167,6 +168,7 @@ static void help(const char *name) printf("-m Pin target vCPU to random physical CPU before triggering interrupt\n"); printf("-n Deliver 50 percent of IRQs as non-maskable interrupts\n"); printf("-t Override the IOMMU type to use (vfio_type1_iommu or iommufd)\n"); + printf("-v Number of vCPUS to run\n"); printf("\n"); exit(KSFT_FAIL); } @@ -203,7 +205,7 @@ int main(int argc, char **argv) struct kvm_vm *vm; int irq, irq_cpu; - while ((c = getopt(argc, argv, "ad:ehi:mnt:")) != -1) { + while ((c = getopt(argc, argv, "ad:ehi:mnt:v:")) != -1) { switch (c) { case 'a': irq_affinity = true; @@ -226,6 +228,11 @@ int main(int argc, char **argv) case 't': iommu_type = optarg; break; + case 'v': + nr_vcpus = atoi_positive("Number of vCPUS", optarg); + TEST_ASSERT(nr_vcpus <= KVM_MAX_VCPUS, + "KVM selftests support at most %u vCPUs", KVM_MAX_VCPUS); + break; case 'h': default: help(argv[0]); @@ -235,6 +242,9 @@ int main(int argc, char **argv) TEST_REQUIRE(kvm_arch_has_default_irqchip()); vm = vm_create_with_vcpus(nr_vcpus, guest_code, vcpus); + vm_enable_cap(vm, KVM_CAP_X2APIC_API, KVM_X2APIC_API_USE_32BIT_IDS | + KVM_X2APIC_API_DISABLE_BROADCAST_QUIRK); + vm_install_exception_handler(vm, vector, guest_irq_handler); vm_install_exception_handler(vm, NMI_VECTOR, guest_nmi_handler); -- 2.55.0.rc0.799.gd6f94ed593-goog