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 ECEDC25DB0D for ; Sat, 13 Jun 2026 00:21:01 +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=1781310065; cv=none; b=eeq1bjlTGzHJqIfkpnTeQtz4fvLxK0GjnhomWWlRFsQEZJyhwiqy1lR6yf0mEZ/cD1azCO2TeHLV1U7lUqR/idkVzglP9QsAOmMszgTR0jRf/oZxlrWYXz8DayHF1J4aiQt6z74gIIMZfR5bk5jfOaf9c4rs3W4kW/lY8Nb9upg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781310065; c=relaxed/simple; bh=qRB1TlhzR03MlmYRqqLITndd9esgDX7rdlg7Z5QSiQU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Ak+Suj9EwDCpYWQASxgVeFG5KjPDQM9XgLpfSF3Vr9HyeSLcHZZNtDNMmTWsUokjksB83JKU8IpV8ztpu5r1Q8Ze55n/uD3lBeiRjFlf/qTNN4dNNQs1IOqy1rpIooy2z+FwYQ0TELkyWf2ulqOBeAMow0YH9EfJt4lKseFRudA= 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=vrUFzdia; 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="vrUFzdia" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-8424aac207eso1624503b3a.0 for ; Fri, 12 Jun 2026 17:21:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781310061; x=1781914861; 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=5oHTfXMBdClQrZ4tUCiIh2PRbirp3RVnp/XkqMdpO/4=; b=vrUFzdiaPPRW/lL6IycnfA+Q9cdK62D+yjG1tB2J12/d3eM429v6pUFKambSneYNT6 H8msamMzgQPaVJudm6iiT0iHIBpx/v+H2/nEGYSJqf6sEc2cHFPE8veVfCdr38yPLUhQ YIxp3RUFI3IzCz1CfNGpgT0dVfwdkcnww1CI5VCUedpB4rvu/dPacToGzS3if12M7COF iW3Mj0IkC3dypjF8M+jc5D1MOS2joeNYrNxW5rE+duhKt27jHdAF2yipBfpeL8sv4h1J 8zwUUNc8MLVMelMMb3EAbu1Z9GyHJ6FPD3MG/XzesjVHSef7x2W3H1aD9xWT+OBgMhQM aq4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781310061; x=1781914861; 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=5oHTfXMBdClQrZ4tUCiIh2PRbirp3RVnp/XkqMdpO/4=; b=SwEMGibCJBBDaj/oi4KfLoLYEWnckvZnThD7neAhtHTf6cwl7FWJdcSk/uFzgUmgId f5tNqfFZaUTSVUPE8N99ODSMyH7Hzkz8QviAJbcxlhqo3EBoG+VurmpN2EfE4eVfYVD6 G+sdaJEg2ISLOrzjLr0gX+m+Ohw8Z4+UYlbjlgYnJGE+DFVAhBDhxWTW0saCFCI2q9We ++HjABIjPu4wlp+SDsWXTLjGEWM0wejTgEFUOeIM5jcs1o4IUuA3zgCMoyGsgsWshmZG Q3Ig7aUDF5UkUMRFt++ijY8fkJpFn0BMIKZCQhLDNt3esQWeSdEnxrJiAUHbM+Wa/lcL Hl0A== X-Forwarded-Encrypted: i=1; AFNElJ+lALbsW50HF869yZtqLizs26G/kO9nOBFXUtRmeOme5UAF4DCdocN+M7TD0AVAMvDJRbJqOANYzv5wx8A=@vger.kernel.org X-Gm-Message-State: AOJu0Ywy0jPWo0N/VoIxlRIhSZE4DBA2IW+FTXZ4Li6bp0qrxBYSQHKl osyQov02IzTKoxXCgbFhU7VjB1i38i6lcgnAOIKSbky+lqxmZHP1crlwpU5n3MFRKKTNKjs99yv lFV+OFQ== X-Received: from pfnz25.prod.google.com ([2002:aa7:85d9:0:b0:83f:1851:35f1]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:399f:b0:842:2382:a0ea with SMTP id d2e1a72fcca58-8434cd2592cmr5324202b3a.14.1781310060965; Fri, 12 Jun 2026 17:21:00 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 12 Jun 2026 17:20:31 -0700 In-Reply-To: <20260613002031.745413-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: <20260613002031.745413-1-seanjc@google.com> X-Mailer: git-send-email 2.54.0.1136.gdb2ca164c4-goog Message-ID: <20260613002031.745413-21-seanjc@google.com> Subject: [PATCH v7 20/20] KVM: selftests: Add xAPIC support in eventfd 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 '-x' flag to let the user run the test in xAPIC mode instead of the default x2APIC mode. When using xAPIC mode, sanity check user input to ensure the test is being run with at most 255 vCPUs, as xAPIC can only address IDs 0-254 (255, i.e. 0xff, broadcasts to all CPUs). Signed-off-by: David Matlack Co-developed-by: Josh Hilke Signed-off-by: Josh Hilke [sean: add sanity check on number of vCPUs] Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/irq_test.c | 31 +++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/kvm/irq_test.c b/tools/testing/selftests/kvm/irq_test.c index dfdb9f8e398c..a17e274c9b4a 100644 --- a/tools/testing/selftests/kvm/irq_test.c +++ b/tools/testing/selftests/kvm/irq_test.c @@ -18,6 +18,7 @@ static u64 timeout_ns = 2ULL * 1000 * 1000 * 1000; static bool guest_ready_for_irqs[KVM_MAX_VCPUS]; static bool guest_received_irq[KVM_MAX_VCPUS]; static bool guest_received_nmi[KVM_MAX_VCPUS]; +static bool x2apic = true; static bool irq_affinity; static bool done; @@ -31,14 +32,20 @@ static bool done; static u32 guest_get_vcpu_id(void) { - return x2apic_read_reg(APIC_ID); + if (x2apic) + return x2apic_read_reg(APIC_ID); + else + return xapic_read_reg(APIC_ID) >> 24; } static void guest_irq_handler(struct ex_regs *regs) { WRITE_ONCE(guest_received_irq[guest_get_vcpu_id()], true); - x2apic_write_reg(APIC_EOI, 0); + if (x2apic) + x2apic_write_reg(APIC_EOI, 0); + else + xapic_write_reg(APIC_EOI, 0); } static void guest_nmi_handler(struct ex_regs *regs) @@ -48,7 +55,10 @@ static void guest_nmi_handler(struct ex_regs *regs) static void guest_code(void) { - x2apic_enable(); + if (x2apic) + x2apic_enable(); + else + xapic_enable(); sti_nop(); @@ -146,7 +156,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] [-v nr_vcpus]\n", name); + printf("Usage: %s [-a] [-d ] [-e] [-h] [-i nr_irqs] [-m] [-n] [-t iommu_type] [-v nr_vcpus] [-x]\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"); @@ -157,6 +167,7 @@ static void help(const char *name) 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("-x Use xAPIC mode instead of x2APIC mode in the guest\n"); printf("\n"); exit(KSFT_FAIL); } @@ -193,7 +204,7 @@ int main(int argc, char **argv) struct kvm_vm *vm; int irq, irq_cpu; - while ((c = getopt(argc, argv, "ad:ehi:mnt:v:")) != -1) { + while ((c = getopt(argc, argv, "ad:ehi:mnt:v:x")) != -1) { switch (c) { case 'a': irq_affinity = true; @@ -221,6 +232,9 @@ int main(int argc, char **argv) TEST_ASSERT(nr_vcpus <= KVM_MAX_VCPUS, "KVM selftests support at most %u vCPUs", KVM_MAX_VCPUS); break; + case 'x': + x2apic = false; + break; case 'h': default: help(argv[0]); @@ -236,6 +250,11 @@ int main(int argc, char **argv) vm_install_exception_handler(vm, vector, guest_irq_handler); vm_install_exception_handler(vm, NMI_VECTOR, guest_nmi_handler); + if (!x2apic) { + TEST_ASSERT(nr_vcpus < 256, "xAPIC can only target IDs [0-254] (255 vCPUs)"); + virt_pg_map(vm, APIC_DEFAULT_GPA, APIC_DEFAULT_GPA); + } + if (device_bdf) { if (!iommu_type) iommu_type = probe_iommu_type(); @@ -259,6 +278,8 @@ int main(int argc, char **argv) kvm_assign_irqfd(vm, gsi, eventfd); + sync_global_to_guest(vm, x2apic); + if (migrate_vcpus) kvm_sched_getaffinity(0, sizeof(available_cpus), &available_cpus); -- 2.54.0.1136.gdb2ca164c4-goog