Merge tag 'kvm-arm-for-4.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm

rkrcmar · rkrcmar · commit 0f4828a1da33 · 2016-12-01T14:56:34.000+01:00
KVM/ARM updates for v4.9-rc7

- Do not call kvm_notify_acked for PPIs
diff --git a/virt/kvm/arm/vgic/vgic-v2.c b/virt/kvm/arm/vgic/vgic-v2.c
@@ -50,8 +50,10 @@ void vgic_v2_process_maintenance(struct kvm_vcpu *vcpu)
 
 			WARN_ON(cpuif->vgic_lr[lr] & GICH_LR_STATE);
 
-			kvm_notify_acked_irq(vcpu->kvm, 0,
-					     intid - VGIC_NR_PRIVATE_IRQS);
+			/* Only SPIs require notification */
+			if (vgic_valid_spi(vcpu->kvm, intid))
+				kvm_notify_acked_irq(vcpu->kvm, 0,
+						     intid - VGIC_NR_PRIVATE_IRQS);
 		}
 	}
 
diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c
@@ -41,8 +41,10 @@ void vgic_v3_process_maintenance(struct kvm_vcpu *vcpu)
 
 			WARN_ON(cpuif->vgic_lr[lr] & ICH_LR_STATE);
 
-			kvm_notify_acked_irq(vcpu->kvm, 0,
-					     intid - VGIC_NR_PRIVATE_IRQS);
+			/* Only SPIs require notification */
+			if (vgic_valid_spi(vcpu->kvm, intid))
+				kvm_notify_acked_irq(vcpu->kvm, 0,
+						     intid - VGIC_NR_PRIVATE_IRQS);
 		}
 
 		/*

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,10 @@ void vgic_v2_process_maintenance(struct kvm_vcpu *vcpu)`
`50`	`50`
`51`	`51`	`WARN_ON(cpuif->vgic_lr[lr] & GICH_LR_STATE);`
`52`	`52`
`53`		`- kvm_notify_acked_irq(vcpu->kvm, 0,`
`54`		`- intid - VGIC_NR_PRIVATE_IRQS);`
	`53`	`+ /* Only SPIs require notification */`
	`54`	`+ if (vgic_valid_spi(vcpu->kvm, intid))`
	`55`	`+ kvm_notify_acked_irq(vcpu->kvm, 0,`
	`56`	`+ intid - VGIC_NR_PRIVATE_IRQS);`
`55`	`57`	`}`
`56`	`58`	`}`
`57`	`59`