diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2013-01-21 19:36:15 -0500 |
---|---|---|
committer | Marc Zyngier <marc.zyngier@arm.com> | 2013-02-11 13:59:55 -0500 |
commit | 5863c2ce7269a7b24d60006430aa79a750b226ec (patch) | |
tree | 21f8d572c873dc4922a92939870de6987eb47cf7 | |
parent | a1fcb44e26b0d98ebe53e8299462bf84c5aff178 (diff) |
ARM: KVM: VGIC interrupt injection
Plug the interrupt injection code. Interrupts can now be generated
from user space.
Reviewed-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Christoffer Dall <c.dall@virtualopensystems.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-rw-r--r-- | arch/arm/include/asm/kvm_vgic.h | 8 | ||||
-rw-r--r-- | arch/arm/kvm/arm.c | 55 | ||||
-rw-r--r-- | arch/arm/kvm/vgic.c | 117 |
3 files changed, 170 insertions, 10 deletions
diff --git a/arch/arm/include/asm/kvm_vgic.h b/arch/arm/include/asm/kvm_vgic.h index c2dc8574ea3a..11a6d90899f7 100644 --- a/arch/arm/include/asm/kvm_vgic.h +++ b/arch/arm/include/asm/kvm_vgic.h | |||
@@ -147,6 +147,8 @@ struct kvm_exit_mmio; | |||
147 | int kvm_vgic_set_addr(struct kvm *kvm, unsigned long type, u64 addr); | 147 | int kvm_vgic_set_addr(struct kvm *kvm, unsigned long type, u64 addr); |
148 | void kvm_vgic_flush_hwstate(struct kvm_vcpu *vcpu); | 148 | void kvm_vgic_flush_hwstate(struct kvm_vcpu *vcpu); |
149 | void kvm_vgic_sync_hwstate(struct kvm_vcpu *vcpu); | 149 | void kvm_vgic_sync_hwstate(struct kvm_vcpu *vcpu); |
150 | int kvm_vgic_inject_irq(struct kvm *kvm, int cpuid, unsigned int irq_num, | ||
151 | bool level); | ||
150 | int kvm_vgic_vcpu_pending_irq(struct kvm_vcpu *vcpu); | 152 | int kvm_vgic_vcpu_pending_irq(struct kvm_vcpu *vcpu); |
151 | bool vgic_handle_mmio(struct kvm_vcpu *vcpu, struct kvm_run *run, | 153 | bool vgic_handle_mmio(struct kvm_vcpu *vcpu, struct kvm_run *run, |
152 | struct kvm_exit_mmio *mmio); | 154 | struct kvm_exit_mmio *mmio); |
@@ -182,6 +184,12 @@ static inline int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu) | |||
182 | static inline void kvm_vgic_flush_hwstate(struct kvm_vcpu *vcpu) {} | 184 | static inline void kvm_vgic_flush_hwstate(struct kvm_vcpu *vcpu) {} |
183 | static inline void kvm_vgic_sync_hwstate(struct kvm_vcpu *vcpu) {} | 185 | static inline void kvm_vgic_sync_hwstate(struct kvm_vcpu *vcpu) {} |
184 | 186 | ||
187 | static inline int kvm_vgic_inject_irq(struct kvm *kvm, int cpuid, | ||
188 | unsigned int irq_num, bool level) | ||
189 | { | ||
190 | return 0; | ||
191 | } | ||
192 | |||
185 | static inline int kvm_vgic_vcpu_pending_irq(struct kvm_vcpu *vcpu) | 193 | static inline int kvm_vgic_vcpu_pending_irq(struct kvm_vcpu *vcpu) |
186 | { | 194 | { |
187 | return 0; | 195 | return 0; |
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index c327fd9d8ec3..3c8d6a9be123 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c | |||
@@ -810,20 +810,49 @@ int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_level) | |||
810 | 810 | ||
811 | trace_kvm_irq_line(irq_type, vcpu_idx, irq_num, irq_level->level); | 811 | trace_kvm_irq_line(irq_type, vcpu_idx, irq_num, irq_level->level); |
812 | 812 | ||
813 | if (irq_type != KVM_ARM_IRQ_TYPE_CPU) | 813 | switch (irq_type) { |
814 | return -EINVAL; | 814 | case KVM_ARM_IRQ_TYPE_CPU: |
815 | if (irqchip_in_kernel(kvm)) | ||
816 | return -ENXIO; | ||
815 | 817 | ||
816 | if (vcpu_idx >= nrcpus) | 818 | if (vcpu_idx >= nrcpus) |
817 | return -EINVAL; | 819 | return -EINVAL; |
818 | 820 | ||
819 | vcpu = kvm_get_vcpu(kvm, vcpu_idx); | 821 | vcpu = kvm_get_vcpu(kvm, vcpu_idx); |
820 | if (!vcpu) | 822 | if (!vcpu) |
821 | return -EINVAL; | 823 | return -EINVAL; |
822 | 824 | ||
823 | if (irq_num > KVM_ARM_IRQ_CPU_FIQ) | 825 | if (irq_num > KVM_ARM_IRQ_CPU_FIQ) |
824 | return -EINVAL; | 826 | return -EINVAL; |
827 | |||
828 | return vcpu_interrupt_line(vcpu, irq_num, level); | ||
829 | case KVM_ARM_IRQ_TYPE_PPI: | ||
830 | if (!irqchip_in_kernel(kvm)) | ||
831 | return -ENXIO; | ||
832 | |||
833 | if (vcpu_idx >= nrcpus) | ||
834 | return -EINVAL; | ||
835 | |||
836 | vcpu = kvm_get_vcpu(kvm, vcpu_idx); | ||
837 | if (!vcpu) | ||
838 | return -EINVAL; | ||
839 | |||
840 | if (irq_num < VGIC_NR_SGIS || irq_num >= VGIC_NR_PRIVATE_IRQS) | ||
841 | return -EINVAL; | ||
825 | 842 | ||
826 | return vcpu_interrupt_line(vcpu, irq_num, level); | 843 | return kvm_vgic_inject_irq(kvm, vcpu->vcpu_id, irq_num, level); |
844 | case KVM_ARM_IRQ_TYPE_SPI: | ||
845 | if (!irqchip_in_kernel(kvm)) | ||
846 | return -ENXIO; | ||
847 | |||
848 | if (irq_num < VGIC_NR_PRIVATE_IRQS || | ||
849 | irq_num > KVM_ARM_IRQ_GIC_MAX) | ||
850 | return -EINVAL; | ||
851 | |||
852 | return kvm_vgic_inject_irq(kvm, 0, irq_num, level); | ||
853 | } | ||
854 | |||
855 | return -EINVAL; | ||
827 | } | 856 | } |
828 | 857 | ||
829 | long kvm_arch_vcpu_ioctl(struct file *filp, | 858 | long kvm_arch_vcpu_ioctl(struct file *filp, |
@@ -904,6 +933,12 @@ long kvm_arch_vm_ioctl(struct file *filp, | |||
904 | void __user *argp = (void __user *)arg; | 933 | void __user *argp = (void __user *)arg; |
905 | 934 | ||
906 | switch (ioctl) { | 935 | switch (ioctl) { |
936 | case KVM_CREATE_IRQCHIP: { | ||
937 | if (vgic_present) | ||
938 | return kvm_vgic_create(kvm); | ||
939 | else | ||
940 | return -ENXIO; | ||
941 | } | ||
907 | case KVM_ARM_SET_DEVICE_ADDR: { | 942 | case KVM_ARM_SET_DEVICE_ADDR: { |
908 | struct kvm_arm_device_addr dev_addr; | 943 | struct kvm_arm_device_addr dev_addr; |
909 | 944 | ||
diff --git a/arch/arm/kvm/vgic.c b/arch/arm/kvm/vgic.c index 2d5e29f1c28f..2e6a585c23e5 100644 --- a/arch/arm/kvm/vgic.c +++ b/arch/arm/kvm/vgic.c | |||
@@ -73,6 +73,7 @@ | |||
73 | 73 | ||
74 | static void vgic_retire_disabled_irqs(struct kvm_vcpu *vcpu); | 74 | static void vgic_retire_disabled_irqs(struct kvm_vcpu *vcpu); |
75 | static void vgic_update_state(struct kvm *kvm); | 75 | static void vgic_update_state(struct kvm *kvm); |
76 | static void vgic_kick_vcpus(struct kvm *kvm); | ||
76 | static void vgic_dispatch_sgi(struct kvm_vcpu *vcpu, u32 reg); | 77 | static void vgic_dispatch_sgi(struct kvm_vcpu *vcpu, u32 reg); |
77 | 78 | ||
78 | static u32 *vgic_bitmap_get_reg(struct vgic_bitmap *x, | 79 | static u32 *vgic_bitmap_get_reg(struct vgic_bitmap *x, |
@@ -708,6 +709,9 @@ bool vgic_handle_mmio(struct kvm_vcpu *vcpu, struct kvm_run *run, | |||
708 | kvm_prepare_mmio(run, mmio); | 709 | kvm_prepare_mmio(run, mmio); |
709 | kvm_handle_mmio_return(vcpu, run); | 710 | kvm_handle_mmio_return(vcpu, run); |
710 | 711 | ||
712 | if (updated_state) | ||
713 | vgic_kick_vcpus(vcpu->kvm); | ||
714 | |||
711 | return true; | 715 | return true; |
712 | } | 716 | } |
713 | 717 | ||
@@ -1104,6 +1108,119 @@ int kvm_vgic_vcpu_pending_irq(struct kvm_vcpu *vcpu) | |||
1104 | return test_bit(vcpu->vcpu_id, &dist->irq_pending_on_cpu); | 1108 | return test_bit(vcpu->vcpu_id, &dist->irq_pending_on_cpu); |
1105 | } | 1109 | } |
1106 | 1110 | ||
1111 | static void vgic_kick_vcpus(struct kvm *kvm) | ||
1112 | { | ||
1113 | struct kvm_vcpu *vcpu; | ||
1114 | int c; | ||
1115 | |||
1116 | /* | ||
1117 | * We've injected an interrupt, time to find out who deserves | ||
1118 | * a good kick... | ||
1119 | */ | ||
1120 | kvm_for_each_vcpu(c, vcpu, kvm) { | ||
1121 | if (kvm_vgic_vcpu_pending_irq(vcpu)) | ||
1122 | kvm_vcpu_kick(vcpu); | ||
1123 | } | ||
1124 | } | ||
1125 | |||
1126 | static int vgic_validate_injection(struct kvm_vcpu *vcpu, int irq, int level) | ||
1127 | { | ||
1128 | int is_edge = vgic_irq_is_edge(vcpu, irq); | ||
1129 | int state = vgic_dist_irq_is_pending(vcpu, irq); | ||
1130 | |||
1131 | /* | ||
1132 | * Only inject an interrupt if: | ||
1133 | * - edge triggered and we have a rising edge | ||
1134 | * - level triggered and we change level | ||
1135 | */ | ||
1136 | if (is_edge) | ||
1137 | return level > state; | ||
1138 | else | ||
1139 | return level != state; | ||
1140 | } | ||
1141 | |||
1142 | static bool vgic_update_irq_state(struct kvm *kvm, int cpuid, | ||
1143 | unsigned int irq_num, bool level) | ||
1144 | { | ||
1145 | struct vgic_dist *dist = &kvm->arch.vgic; | ||
1146 | struct kvm_vcpu *vcpu; | ||
1147 | int is_edge, is_level; | ||
1148 | int enabled; | ||
1149 | bool ret = true; | ||
1150 | |||
1151 | spin_lock(&dist->lock); | ||
1152 | |||
1153 | vcpu = kvm_get_vcpu(kvm, cpuid); | ||
1154 | is_edge = vgic_irq_is_edge(vcpu, irq_num); | ||
1155 | is_level = !is_edge; | ||
1156 | |||
1157 | if (!vgic_validate_injection(vcpu, irq_num, level)) { | ||
1158 | ret = false; | ||
1159 | goto out; | ||
1160 | } | ||
1161 | |||
1162 | if (irq_num >= VGIC_NR_PRIVATE_IRQS) { | ||
1163 | cpuid = dist->irq_spi_cpu[irq_num - VGIC_NR_PRIVATE_IRQS]; | ||
1164 | vcpu = kvm_get_vcpu(kvm, cpuid); | ||
1165 | } | ||
1166 | |||
1167 | kvm_debug("Inject IRQ%d level %d CPU%d\n", irq_num, level, cpuid); | ||
1168 | |||
1169 | if (level) | ||
1170 | vgic_dist_irq_set(vcpu, irq_num); | ||
1171 | else | ||
1172 | vgic_dist_irq_clear(vcpu, irq_num); | ||
1173 | |||
1174 | enabled = vgic_irq_is_enabled(vcpu, irq_num); | ||
1175 | |||
1176 | if (!enabled) { | ||
1177 | ret = false; | ||
1178 | goto out; | ||
1179 | } | ||
1180 | |||
1181 | if (is_level && vgic_irq_is_active(vcpu, irq_num)) { | ||
1182 | /* | ||
1183 | * Level interrupt in progress, will be picked up | ||
1184 | * when EOId. | ||
1185 | */ | ||
1186 | ret = false; | ||
1187 | goto out; | ||
1188 | } | ||
1189 | |||
1190 | if (level) { | ||
1191 | vgic_cpu_irq_set(vcpu, irq_num); | ||
1192 | set_bit(cpuid, &dist->irq_pending_on_cpu); | ||
1193 | } | ||
1194 | |||
1195 | out: | ||
1196 | spin_unlock(&dist->lock); | ||
1197 | |||
1198 | return ret; | ||
1199 | } | ||
1200 | |||
1201 | /** | ||
1202 | * kvm_vgic_inject_irq - Inject an IRQ from a device to the vgic | ||
1203 | * @kvm: The VM structure pointer | ||
1204 | * @cpuid: The CPU for PPIs | ||
1205 | * @irq_num: The IRQ number that is assigned to the device | ||
1206 | * @level: Edge-triggered: true: to trigger the interrupt | ||
1207 | * false: to ignore the call | ||
1208 | * Level-sensitive true: activates an interrupt | ||
1209 | * false: deactivates an interrupt | ||
1210 | * | ||
1211 | * The GIC is not concerned with devices being active-LOW or active-HIGH for | ||
1212 | * level-sensitive interrupts. You can think of the level parameter as 1 | ||
1213 | * being HIGH and 0 being LOW and all devices being active-HIGH. | ||
1214 | */ | ||
1215 | int kvm_vgic_inject_irq(struct kvm *kvm, int cpuid, unsigned int irq_num, | ||
1216 | bool level) | ||
1217 | { | ||
1218 | if (vgic_update_irq_state(kvm, cpuid, irq_num, level)) | ||
1219 | vgic_kick_vcpus(kvm); | ||
1220 | |||
1221 | return 0; | ||
1222 | } | ||
1223 | |||
1107 | static bool vgic_ioaddr_overlap(struct kvm *kvm) | 1224 | static bool vgic_ioaddr_overlap(struct kvm *kvm) |
1108 | { | 1225 | { |
1109 | phys_addr_t dist = kvm->arch.vgic.vgic_dist_base; | 1226 | phys_addr_t dist = kvm->arch.vgic.vgic_dist_base; |