Skip to content

Commit 2bbc395

Browse files
V4belgregkh
authored andcommitted
KVM: arm64: vgic-its: Drop the translation cache reference only for the erased entry
commit 13031fb upstream. vgic_its_invalidate_cache() walks the per-ITS translation cache with xa_for_each() and drops the cache's reference on each entry with vgic_put_irq(). It puts the iterated pointer, though, rather than the value returned by xa_erase(). The function is called from contexts that do not exclude one another: the ITS command handlers hold its_lock, the GITS_CTLR write path holds cmd_lock, and the path that clears EnableLPIs in a redistributor's GICR_CTLR holds neither. Two or more of them can drain the same cache concurrently, and if each one observes the same entry, erases it and then puts it, the single reference the cache holds on that entry is dropped more than once. The entry can then be freed while an ITE still maps it. xa_erase() is atomic and returns the previous entry, so put only the entry that this context actually removed. The cache reference is then dropped exactly once per entry even when the invalidations run concurrently, and the behavior is unchanged when only one context runs. Fixes: 8201d10 ("KVM: arm64: vgic-its: Maintain a translation cache per ITS") Signed-off-by: Hyunwoo Kim <imv4bel@gmail.com> Reviewed-by: Oliver Upton <oupton@kernel.org> Link: https://patch.msgid.link/ah2c5lu4JbUg7dj-@v4bel Signed-off-by: Marc Zyngier <maz@kernel.org> Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent adc6fc2 commit 2bbc395

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -597,8 +597,10 @@ static void vgic_its_invalidate_cache(struct vgic_its *its)
597597
unsigned long idx;
598598

599599
xa_for_each(&its->translation_cache, idx, irq) {
600-
xa_erase(&its->translation_cache, idx);
601-
vgic_put_irq(kvm, irq);
600+
/* Only the context that erases the entry drops its cache ref. */
601+
irq = xa_erase(&its->translation_cache, idx);
602+
if (irq)
603+
vgic_put_irq(kvm, irq);
602604
}
603605
}
604606

0 commit comments

Comments
 (0)