KVM: arm64: vgic: Fix locking comment

jpbrucker · Marc Zyngier · commit c38b8400aef9 · 2023-05-19T10:20:00.000+01:00
It is now config_lock that must be held, not kvm lock. Replace the comment with a lockdep annotation. Fixes: f003277 ("KVM: arm64: Use config_lock to protect vgic state") Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org> Reviewed-by: Oliver Upton <oliver.upton@linux.dev> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20230518100914.2837292-4-jean-philippe@linaro.org
diff --git a/arch/arm64/kvm/vgic/vgic-v4.c b/arch/arm64/kvm/vgic/vgic-v4.c
@@ -184,13 +184,14 @@ static void vgic_v4_disable_vsgis(struct kvm_vcpu *vcpu)
 	}
 }
 
-/* Must be called with the kvm lock held */
 void vgic_v4_configure_vsgis(struct kvm *kvm)
 {
 	struct vgic_dist *dist = &kvm->arch.vgic;
 	struct kvm_vcpu *vcpu;
 	unsigned long i;
 
+	lockdep_assert_held(&kvm->arch.config_lock);
+
 	kvm_arm_halt_guest(kvm);
 
 	kvm_for_each_vcpu(i, vcpu, kvm) {

Original file line number	Diff line number	Diff line change
`@@ -184,13 +184,14 @@ static void vgic_v4_disable_vsgis(struct kvm_vcpu *vcpu)`
`184`	`184`	`}`
`185`	`185`	`}`
`186`	`186`
`187`		`-/* Must be called with the kvm lock held */`
`188`	`187`	`void vgic_v4_configure_vsgis(struct kvm *kvm)`
`189`	`188`	`{`
`190`	`189`	`struct vgic_dist *dist = &kvm->arch.vgic;`
`191`	`190`	`struct kvm_vcpu *vcpu;`
`192`	`191`	`unsigned long i;`
`193`	`192`
	`193`	`+ lockdep_assert_held(&kvm->arch.config_lock);`
	`194`	`+`
`194`	`195`	`kvm_arm_halt_guest(kvm);`
`195`	`196`
`196`	`197`	`kvm_for_each_vcpu(i, vcpu, kvm) {`