diff options
author | Oliver Upton <oliver.upton@linux.dev> | 2024-02-13 21:20:56 +0000 |
---|---|---|
committer | Oliver Upton <oliver.upton@linux.dev> | 2024-04-15 10:00:09 -0700 |
commit | dc4c9630f90db480c58f810a19e06c9788278191 (patch) | |
tree | ae0de52ce9942cac2b283f9c3ad544ba057f11a5 | |
parent | b2077c684fc66cfc410c93f2284fc2242bf45775 (diff) | |
download | linux-dc4c9630f90db480c58f810a19e06c9788278191.tar.gz |
KVM: arm64: vgic-its: Use the per-ITS translation cache for injection
Everything is in place to switch to per-ITS translation caches. Start
using the per-ITS cache to avoid the lock serialization related to the
global translation cache.
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
-rw-r--r-- | arch/arm64/kvm/vgic/vgic-its.c | 40 |
1 files changed, 13 insertions, 27 deletions
diff --git a/arch/arm64/kvm/vgic/vgic-its.c b/arch/arm64/kvm/vgic/vgic-its.c index fd576377c084f3..7fb942f4f105a6 100644 --- a/arch/arm64/kvm/vgic/vgic-its.c +++ b/arch/arm64/kvm/vgic/vgic-its.c @@ -535,35 +535,17 @@ static unsigned long vgic_its_cache_key(u32 devid, u32 eventid) return (((unsigned long)devid) << 32) | eventid; } -static struct vgic_irq *__vgic_its_check_cache(struct vgic_dist *dist, - phys_addr_t db, +static struct vgic_irq *__vgic_its_check_cache(struct kvm *kvm, phys_addr_t db, u32 devid, u32 eventid) { - struct vgic_translation_cache_entry *cte; - - list_for_each_entry(cte, &dist->lpi_translation_cache, entry) { - /* - * If we hit a NULL entry, there is nothing after this - * point. - */ - if (!cte->irq) - break; - - if (cte->db != db || cte->devid != devid || - cte->eventid != eventid) - continue; - - /* - * Move this entry to the head, as it is the most - * recently used. - */ - if (!list_is_first(&cte->entry, &dist->lpi_translation_cache)) - list_move(&cte->entry, &dist->lpi_translation_cache); + unsigned long cache_key = vgic_its_cache_key(devid, eventid); + struct vgic_its *its; - return cte->irq; - } + its = __vgic_doorbell_to_its(kvm, db); + if (IS_ERR(its)) + return NULL; - return NULL; + return xa_load(&its->translation_cache, cache_key); } static struct vgic_irq *vgic_its_check_cache(struct kvm *kvm, phys_addr_t db, @@ -574,11 +556,13 @@ static struct vgic_irq *vgic_its_check_cache(struct kvm *kvm, phys_addr_t db, unsigned long flags; raw_spin_lock_irqsave(&dist->lpi_list_lock, flags); + rcu_read_lock(); - irq = __vgic_its_check_cache(dist, db, devid, eventid); + irq = __vgic_its_check_cache(kvm, db, devid, eventid); if (!vgic_try_get_irq_kref(irq)) irq = NULL; + rcu_read_unlock(); raw_spin_unlock_irqrestore(&dist->lpi_list_lock, flags); return irq; @@ -602,6 +586,7 @@ static void vgic_its_cache_translation(struct kvm *kvm, struct vgic_its *its, return; raw_spin_lock_irqsave(&dist->lpi_list_lock, flags); + rcu_read_lock(); if (unlikely(list_empty(&dist->lpi_translation_cache))) goto out; @@ -612,7 +597,7 @@ static void vgic_its_cache_translation(struct kvm *kvm, struct vgic_its *its, * already */ db = its->vgic_its_base + GITS_TRANSLATER; - if (__vgic_its_check_cache(dist, db, devid, eventid)) + if (__vgic_its_check_cache(kvm, db, devid, eventid)) goto out; /* Always reuse the last entry (LRU policy) */ @@ -649,6 +634,7 @@ static void vgic_its_cache_translation(struct kvm *kvm, struct vgic_its *its, xa_store(&its->translation_cache, cache_key, irq, 0); out: + rcu_read_unlock(); raw_spin_unlock_irqrestore(&dist->lpi_list_lock, flags); } |