Skip to content

Commit c8a11a9

Browse files
committed
Merge tag 'kvmarm-fixes-6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
KVM/arm64 fixes for 6.7, take #1 - Avoid mapping vLPIs that have already been mapped
2 parents 33cc938 + 8e4ece6 commit c8a11a9

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

arch/arm64/kvm/vgic/vgic-v4.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,10 @@ int kvm_vgic_v4_set_forwarding(struct kvm *kvm, int virq,
436436
if (ret)
437437
goto out;
438438

439+
/* Silently exit if the vLPI is already mapped */
440+
if (irq->hw)
441+
goto out;
442+
439443
/*
440444
* Emit the mapping request. If it fails, the ITS probably
441445
* isn't v4 compatible, so let's silently bail out. Holding

0 commit comments

Comments
 (0)