From: Joerg Roedel <[email protected]> Track the target plane-level of MSI irqs in struct kvm_kernel_irq_routing_entry. This will be used to send MSI IRQs to the right plane-level once planes are supported.
Signed-off-by: Joerg Roedel <[email protected]> --- arch/arm64/kvm/vgic/vgic-irqfd.c | 1 + arch/loongarch/kvm/irqfd.c | 1 + arch/powerpc/kvm/mpic.c | 1 + arch/riscv/kvm/vm.c | 1 + arch/x86/kvm/irq.c | 1 + include/linux/kvm_host.h | 1 + virt/kvm/irqchip.c | 1 + 7 files changed, 7 insertions(+) diff --git a/arch/arm64/kvm/vgic/vgic-irqfd.c b/arch/arm64/kvm/vgic/vgic-irqfd.c index b9b86e3a6c86..479b896c8954 100644 --- a/arch/arm64/kvm/vgic/vgic-irqfd.c +++ b/arch/arm64/kvm/vgic/vgic-irqfd.c @@ -57,6 +57,7 @@ int kvm_set_routing_entry(struct kvm *kvm, e->msi.data = ue->u.msi.data; e->msi.flags = ue->flags; e->msi.devid = ue->u.msi.devid; + e->msi.plane_level = 0; break; default: goto out; diff --git a/arch/loongarch/kvm/irqfd.c b/arch/loongarch/kvm/irqfd.c index f4f953b22419..50f0c32df46c 100644 --- a/arch/loongarch/kvm/irqfd.c +++ b/arch/loongarch/kvm/irqfd.c @@ -60,6 +60,7 @@ int kvm_set_routing_entry(struct kvm *kvm, e->msi.address_lo = ue->u.msi.address_lo; e->msi.address_hi = ue->u.msi.address_hi; e->msi.data = ue->u.msi.data; + e->msi.plane_level = 0; return 0; default: return -EINVAL; diff --git a/arch/powerpc/kvm/mpic.c b/arch/powerpc/kvm/mpic.c index 3070f36d9fb8..0f568f5fff8b 100644 --- a/arch/powerpc/kvm/mpic.c +++ b/arch/powerpc/kvm/mpic.c @@ -1841,6 +1841,7 @@ int kvm_set_routing_entry(struct kvm *kvm, e->msi.address_lo = ue->u.msi.address_lo; e->msi.address_hi = ue->u.msi.address_hi; e->msi.data = ue->u.msi.data; + e->msi.plane_level = 0; break; default: goto out; diff --git a/arch/riscv/kvm/vm.c b/arch/riscv/kvm/vm.c index a9f083feeb76..f518247e699b 100644 --- a/arch/riscv/kvm/vm.c +++ b/arch/riscv/kvm/vm.c @@ -138,6 +138,7 @@ int kvm_set_routing_entry(struct kvm *kvm, e->msi.data = ue->u.msi.data; e->msi.flags = ue->flags; e->msi.devid = ue->u.msi.devid; + e->msi.plane_level = 0; break; default: goto out; diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c index 9519fec09ee6..b7e08eddb765 100644 --- a/arch/x86/kvm/irq.c +++ b/arch/x86/kvm/irq.c @@ -332,6 +332,7 @@ int kvm_set_routing_entry(struct kvm *kvm, e->msi.address_lo = ue->u.msi.address_lo; e->msi.address_hi = ue->u.msi.address_hi; e->msi.data = ue->u.msi.data; + e->msi.plane_level = 0; if (kvm_msi_route_invalid(kvm, e)) return -EINVAL; diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index e3611e6cc3e4..16dcca3132d3 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -782,6 +782,7 @@ struct kvm_kernel_irq_routing_entry { u32 data; u32 flags; u32 devid; + unsigned plane_level; } msi; struct kvm_s390_adapter_int adapter; struct kvm_hv_sint hv_sint; diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c index 462c70621247..ae47e56176f1 100644 --- a/virt/kvm/irqchip.c +++ b/virt/kvm/irqchip.c @@ -57,6 +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; return kvm_set_msi(&route, kvm, KVM_USERSPACE_IRQ_SOURCE_ID, 1, false); } -- 2.53.0
