From nobody Sat Oct 11 02:55:11 2025 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 1C7C52E2F00 for ; Wed, 11 Jun 2025 22:47:53 +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=1749682075; cv=none; b=TDTRc9NyrKxxR5a4gXKTt/ARTkyUygkg1PItVaiqCrtf+s2nAobNb+KuFI+1L6nm8D/U++BSvNhYgIHkWWSC1j4H+mJHEmm+5PVZDNT7ZQepOiwYao3y89Me+CWCYifLRqWUykJ/dxlv4Poj9NWgjokTbaAebm5OXr7Ea2t3kFI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749682075; c=relaxed/simple; bh=wHrhMmAPxECbumBhisr6CeJaFww9/hh84HS6HonITio=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=KQ5DpOezXzov/pYCcZcVNDb97W8WrJklkTFYjx4OfOiTweYYGWyDs8GSgt2MsKXxTePZA/cxFU3h3AX6tuSF0xrjwh4s+3T1SEwyl3aR6C6A50CBDOsjvlOsMamdUtrUM1YZpCTZerGWq0h5xJyVezFI6sdEm5P88HvIu/YD2ko= 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=mkAkgHbe; 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="mkAkgHbe" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-747cebffd4eso233355b3a.2 for ; Wed, 11 Jun 2025 15:47:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749682072; x=1750286872; 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=eWPqxy/EcaIBVD9x6tvhc+E9e7T+tuW/T8x9vMu/aCc=; b=mkAkgHbep6A17bS0NYV3urBxTVMGbEUsX+q2XT3OJOnMZppXqsa5QT8G8LrlIzh0P6 P9HyNFynS4W6jp665iP5sxbzitVxrcaohDQ1+G8kppwwO8vFOx/Bq9z3j5DaFo/Ezh+4 X7me5b5ztbHskG3yklEuAFzzp/93J2a5y75V0WDG02vMPEWstZGDxZPd6+NJcgSqg8PZ r4RuD9OcDSdDgNvdm5/i6tSARtxgEhDTLRsrJZgUwpCryzqRzTxe2a+B3Zou7AUpUf1P bWsPGg58UM7DzbW074vX6kbE4m2ObvzXVzZnEKOIgvhT33kQrJ+cywTpah2w4abi6q+r WqbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749682072; x=1750286872; 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=eWPqxy/EcaIBVD9x6tvhc+E9e7T+tuW/T8x9vMu/aCc=; b=EJea5/U7FjWu+qQ3Hco/r1CRY2ck4KETcVZVk4luRCnSb744x1ID/pvjfblxB7t6jr JdGP5mujXuy9W7EMwes2PlKgn6IHhrGahs9Ds9ZN5xckYeLQjfgVugnWQlM0S0rP+ZBn 7l0cLuOZvQg0Jb1ofxoJvgoa+1tfm0kInnNorreNMY2g7cANeWAqMFT+lkQbJ46mEHjT eEkofidM9FsTajbisQNeBq52uH/aAJZBuInNDeAzD0PGRDn2HbAk97ml+FTAjmUjdrp5 uNtiRrLWq0nyjNFLDUP5XpVZdtHc1N49H2G4ZFt8L4Gi5cCv8NEp8J9MIZJqkM9yBzYg 97wA== X-Forwarded-Encrypted: i=1; AJvYcCU5frrmbGPtRGeSuJIhQAxbR+YzU9tW0AyZLR/r7iyUHQ+Uyi0UqU04yOPI8nnaY94XCQAabzOBbcbDYjo=@vger.kernel.org X-Gm-Message-State: AOJu0YyJbrnoKL4lUvar+cc+DJENWQ4vK5s24PooU4oPs5Yxg3Z96nsY DbGDI/WHGJR8Ktg+Cx9/o4Em1ZbKm43+WV+QikgnGZh+j0Fz4SAO9mmGe7PUyeKbQHQgkFshCvn +2zzhBQ== X-Google-Smtp-Source: AGHT+IGEG5h+XdvBZsfOP4WIVoU6EIbIQoZeJBB+YTLPLiy+efdbc+9aZGANnnVVnd62MBQByP1coVKnSpY= X-Received: from pfbhj8.prod.google.com ([2002:a05:6a00:8708:b0:746:2747:e782]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:22cf:b0:748:2ebf:7418 with SMTP id d2e1a72fcca58-7487e2dc74dmr987606b3a.24.1749682072521; Wed, 11 Jun 2025 15:47:52 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 11 Jun 2025 15:45:36 -0700 In-Reply-To: <20250611224604.313496-2-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250611224604.313496-2-seanjc@google.com> X-Mailer: git-send-email 2.50.0.rc1.591.g9c95f17f64-goog Message-ID: <20250611224604.313496-35-seanjc@google.com> Subject: [PATCH v3 33/62] KVM: Fold kvm_arch_irqfd_route_changed() into kvm_arch_update_irqfd_routing() From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Sean Christopherson , Paolo Bonzini , Joerg Roedel , David Woodhouse , Lu Baolu Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Sairaj Kodilkar , Vasant Hegde , Maxim Levitsky , Joao Martins , Francesco Lavra , David Matlack Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fold kvm_arch_irqfd_route_changed() into kvm_arch_update_irqfd_routing(). Calling arch code to know whether or not to call arch code is absurd. Signed-off-by: Sean Christopherson Reviewed-by: Oliver Upton --- arch/arm64/kvm/arm.c | 15 +++++---------- arch/x86/kvm/irq.c | 15 +++++---------- include/linux/kvm_host.h | 2 -- virt/kvm/eventfd.c | 10 +--------- 4 files changed, 11 insertions(+), 31 deletions(-) diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 94fb2f096a20..04f2116927b1 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -2761,20 +2761,15 @@ void kvm_arch_irq_bypass_del_producer(struct irq_by= pass_consumer *cons, kvm_vgic_v4_unset_forwarding(irqfd->kvm, prod->irq); } =20 -bool kvm_arch_irqfd_route_changed(struct kvm_kernel_irq_routing_entry *old, - struct kvm_kernel_irq_routing_entry *new) -{ - if (old->type !=3D KVM_IRQ_ROUTING_MSI || - new->type !=3D KVM_IRQ_ROUTING_MSI) - return true; - - return memcmp(&old->msi, &new->msi, sizeof(new->msi)); -} - void kvm_arch_update_irqfd_routing(struct kvm_kernel_irqfd *irqfd, struct kvm_kernel_irq_routing_entry *old, struct kvm_kernel_irq_routing_entry *new) { + if (old->type =3D=3D KVM_IRQ_ROUTING_MSI && + new->type =3D=3D KVM_IRQ_ROUTING_MSI && + !memcmp(&old->msi, &new->msi, sizeof(new->msi))) + return; + /* * Remapping the vLPI requires taking the its_lock mutex to resolve * the new translation. We're in spinlock land at this point, so no diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c index adc250ca1171..48134aebb541 100644 --- a/arch/x86/kvm/irq.c +++ b/arch/x86/kvm/irq.c @@ -610,19 +610,14 @@ void kvm_arch_update_irqfd_routing(struct kvm_kernel_= irqfd *irqfd, struct kvm_kernel_irq_routing_entry *old, struct kvm_kernel_irq_routing_entry *new) { + if (old->type =3D=3D KVM_IRQ_ROUTING_MSI && + new->type =3D=3D KVM_IRQ_ROUTING_MSI && + !memcmp(&old->msi, &new->msi, sizeof(new->msi))) + return; + kvm_pi_update_irte(irqfd, new); } =20 -bool kvm_arch_irqfd_route_changed(struct kvm_kernel_irq_routing_entry *old, - struct kvm_kernel_irq_routing_entry *new) -{ - if (old->type !=3D KVM_IRQ_ROUTING_MSI || - new->type !=3D KVM_IRQ_ROUTING_MSI) - return true; - - return !!memcmp(&old->msi, &new->msi, sizeof(new->msi)); -} - #ifdef CONFIG_KVM_IOAPIC #define IOAPIC_ROUTING_ENTRY(irq) \ { .gsi =3D irq, .type =3D KVM_IRQ_ROUTING_IRQCHIP, \ diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 8e74ac0f90b1..fb9ec06aa807 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -2413,8 +2413,6 @@ void kvm_arch_irq_bypass_start(struct irq_bypass_cons= umer *); void kvm_arch_update_irqfd_routing(struct kvm_kernel_irqfd *irqfd, struct kvm_kernel_irq_routing_entry *old, struct kvm_kernel_irq_routing_entry *new); -bool kvm_arch_irqfd_route_changed(struct kvm_kernel_irq_routing_entry *, - struct kvm_kernel_irq_routing_entry *); #endif /* CONFIG_HAVE_KVM_IRQ_BYPASS */ =20 #ifdef CONFIG_HAVE_KVM_INVALID_WAKEUPS diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c index a4f80fe8a5f3..defc2c04d241 100644 --- a/virt/kvm/eventfd.c +++ b/virt/kvm/eventfd.c @@ -291,13 +291,6 @@ void __weak kvm_arch_update_irqfd_routing(struct kvm_k= ernel_irqfd *irqfd, { =20 } - -bool __attribute__((weak)) kvm_arch_irqfd_route_changed( - struct kvm_kernel_irq_routing_entry *old, - struct kvm_kernel_irq_routing_entry *new) -{ - return true; -} #endif =20 static int @@ -617,8 +610,7 @@ void kvm_irq_routing_update(struct kvm *kvm) irqfd_update(kvm, irqfd); =20 #if IS_ENABLED(CONFIG_HAVE_KVM_IRQ_BYPASS) - if (irqfd->producer && - kvm_arch_irqfd_route_changed(&old, &irqfd->irq_entry)) + if (irqfd->producer) kvm_arch_update_irqfd_routing(irqfd, &old, &irqfd->irq_entry); #endif } --=20 2.50.0.rc1.591.g9c95f17f64-goog