From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.8bytes.org (mail.8bytes.org [85.214.250.239]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 71AA53F4859; Mon, 8 Jun 2026 14:43:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=85.214.250.239 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780929809; cv=none; b=i61w7Nd0zshFcSwHDJICmEmsb6jJLh8T/ibZ7EfeocB1YrEYNfJQD+N6t2Dr2g5YUmzuD8TVlLszCtW9std1VD1ddFzRT4RGmi+c8wzJSTxHFK41j4ptaGAvt8mcOIIBz6Cps0RLkzb6Tt7rU2Jgxls0k5SHgt75caWSOEnf9bg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780929809; c=relaxed/simple; bh=Le/G0vQ0/TnbqWe2dBxWLFgIozxJJ/jsvXKWfnBsbj8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MO+NdmJcdrh1VeNWgRF8IpjCaV1b2Buz7rF8n/X2tuu7LgVk1nLAs+yygS+Q4msqD4MI5kskR8y9j2TiJzFzMSp/i7x1tlHU+Z3SyUcDSFkeG6R6pe8sJAAojlupyJrfN9V6gP+ugQj56ZjYH7atuD7+PH5u1eLqJGKzStKYhLY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=8bytes.org; spf=pass smtp.mailfrom=8bytes.org; arc=none smtp.client-ip=85.214.250.239 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=8bytes.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=8bytes.org Received: from io.home.8bytes.org (p4ffe1d30.dip0.t-ipconnect.de [79.254.29.48]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.8bytes.org (Postfix) with ESMTPSA id 3F1722028C9; Mon, 8 Jun 2026 16:43:13 +0200 (CEST) From: =?UTF-8?q?J=C3=B6rg=20R=C3=B6del?= To: Paolo Bonzini , Sean Christopherson Cc: Tom Lendacky , ashish.kalra@amd.com, michael.roth@amd.com, nsaenz@amazon.com, anelkz@amazon.de, James.Bottomley@HansenPartnership.com, Melody Wang , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, x86@kernel.org, coconut-svsm@lists.linux.dev, joerg.roedel@amd.com Subject: [PATCH 38/60] kvm: Make KVM_SIGNAL_MSI per plane Date: Mon, 8 Jun 2026 16:42:30 +0200 Message-ID: <20260608144252.351443-39-joro@8bytes.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260608144252.351443-1-joro@8bytes.org> References: <20260608144252.351443-1-joro@8bytes.org> Precedence: bulk X-Mailing-List: linux-mips@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Paolo Bonzini Allow the KVM_SIGNAL_MSI ioctl for every plane instead of per VM. Signed-off-by: Paolo Bonzini Co-developed-by: Joerg Roedel Signed-off-by: Joerg Roedel --- include/linux/kvm_host.h | 2 +- virt/kvm/irqchip.c | 4 ++-- virt/kvm/kvm_main.c | 25 ++++++++++++++----------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index cfb6911d6771..05a10836d92d 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -2370,7 +2370,7 @@ static inline int kvm_init_irq_routing(struct kvm *kvm) #endif -int kvm_send_userspace_msi(struct kvm *kvm, struct kvm_msi *msi); +int kvm_send_userspace_msi(struct kvm *kvm, struct kvm_msi *msi, unsigned plane_level); void kvm_eventfd_init(struct kvm *kvm); int kvm_ioeventfd(struct kvm *kvm, struct kvm_ioeventfd *args); diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c index 14480d1df4f9..a4fea7d8dde6 100644 --- a/virt/kvm/irqchip.c +++ b/virt/kvm/irqchip.c @@ -45,7 +45,7 @@ int kvm_irq_map_chip_pin(struct kvm *kvm, unsigned irqchip, unsigned pin) return irq_rt->chip[irqchip][pin]; } -int kvm_send_userspace_msi(struct kvm *kvm, struct kvm_msi *msi) +int kvm_send_userspace_msi(struct kvm *kvm, struct kvm_msi *msi, unsigned plane_level) { struct kvm_kernel_irq_routing_entry route; @@ -57,7 +57,7 @@ int kvm_send_userspace_msi(struct kvm *kvm, struct kvm_msi *msi) route.msi.data = msi->data; route.msi.flags = msi->flags; route.msi.devid = msi->devid; - route.msi.plane_level = 0; + route.msi.plane_level = plane_level; return kvm_set_msi(&route, kvm, KVM_USERSPACE_IRQ_SOURCE_ID, 1, false); } diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index a30123b77112..dc59f2f9d405 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -4907,6 +4907,17 @@ static long __kvm_plane_ioctl(struct kvm_plane *plane, unsigned int ioctl, unsig case KVM_CREATE_VCPU: r = kvm_plane_ioctl_create_vcpu(plane, arg); break; +#ifdef CONFIG_HAVE_KVM_MSI + case KVM_SIGNAL_MSI: { + void __user *argp = (void __user *)arg; + struct kvm_msi msi; + + if (copy_from_user(&msi, argp, sizeof(msi))) + return -EFAULT; + r = kvm_send_userspace_msi(plane->kvm, &msi, plane->level); + break; + } +#endif default: r = -ENOTTY; } @@ -5493,6 +5504,9 @@ static long kvm_vm_ioctl(struct file *filp, r = kvm_vm_ioctl_create_plane(kvm, arg); break; case KVM_CREATE_VCPU: +#ifdef CONFIG_HAVE_KVM_MSI + case KVM_SIGNAL_MSI: +#endif r = __kvm_plane_ioctl(kvm->planes[0], ioctl, arg); break; case KVM_ENABLE_CAP: { @@ -5597,17 +5611,6 @@ static long kvm_vm_ioctl(struct file *filp, r = kvm_ioeventfd(kvm, &data); break; } -#ifdef CONFIG_HAVE_KVM_MSI - case KVM_SIGNAL_MSI: { - struct kvm_msi msi; - - r = -EFAULT; - if (copy_from_user(&msi, argp, sizeof(msi))) - goto out; - r = kvm_send_userspace_msi(kvm, &msi); - break; - } -#endif #ifdef __KVM_HAVE_IRQ_LINE case KVM_IRQ_LINE_STATUS: case KVM_IRQ_LINE: { -- 2.53.0