KVM: arm64: vgic: Fix racy LPI release and re-registration handling
v6 cover KVM: arm64: vgic: Fix racy LPI release and re-registration handling
Fix a couple of potential issues that could arise from racy LPI release and re-registration for the same INTID.
The issue fixed in patch 1 can manifest itself through either a leaked LPI structure, or a prematurely deleted LPI. The issue fixed in patch 2 could materialize as a spurious -ENOMEM failure when registering an LPI.
v6:
* Remove pending_release in patch 1, preventing use-after-free and/or spurious WARNs.
* Avoid lock inversion via xa_release() (Sashiko).
v5:
* Make sure evicted IRQs on the registration path are pending release (Oliver Upton).
v4:
* Add __GFP_ACCOUNT to patch 2 (Sashiko).
v3:
* Use refcount_dec_and_lock_irqsave() instead of unconditionally grabbing the xarray lock in patch 1.
* Add patch 2.
v2:
* Address Sashiko's review. Fix the direct release path by decrementing the refcount under the xarray spinlock, preventing a UAF that would have been introduced in v1.
Carlos López (2):
KVM: arm64: vgic: Fix race between LPI release and re-registration
KVM: arm64: vgic: Mitigate potential LPI registration failure
arch/arm64/kvm/vgic/vgic-its.c | 25 +++++++++++++++++-------- arch/arm64/kvm/vgic/vgic.c | 18 ++++++++---------- include/kvm/arm_vgic.h | 3 --- 3 files changed, 25 insertions(+), 21 deletions(-)
base-commit: 1ee27dacbe5dc4def481794d899d67b0d4570094
Signature · 1 line
2.51.0
PATCH v6 1/2 KVM: arm64: vgic: Fix race between LPI release and re-registration
Fix a potential race between decrementing an LPI's reference count and evicting that structure from the LPI xarray.
LPI structures are maintained in the VGIC LPI xarray (dist->lpi_xa). When the reference count of an LPI structure drops to zero, vgic_release_lpi_locked() removes the structure from the xarray and frees it under the xarray lock.
However, the release of an LPI can race with a concurrent LPI re-registration with the same INTID via vgic_add_lpi() on another CPU, since the reference count drop and the xarray eviction are not performed in a single atomic step. This can happen e.g. if the guest issues a DISCARD while the LPI is still referenced from a vCPU's active-pending list (ap_list), and the same INTID is re-mapped via MAPTI.
Particularly, vgic_release_lpi_locked() is called from two distinct
paths: direct release via vgic_put_irq(), and deferred release via vgic_release_deleted_lpis(). During direct release, the issue can result in deleting a newly registered LPI from the xarray:
CPU0 (Releasing LPI) CPU1 (Adding new LPI)
==================== =====================
vgic_put_irq()
__vgic_put_irq()
refcount_dec_and_test()
vgic_add_lpi()
xa_lock_irqsave()
old_irq = xa_load(.., intid)
vgic_try_get_irq_ref(old_irq) == false
new IRQ inserted --> __xa_store(.., intid, ..)
xa_unlock_irqrestore()
xa_lock_irqsave();
vgic_release_lpi_locked()
__xa_erase(.., irq->intid) <-- BUG: new IRQ is erased
kfree_rcu(old_irq)During the deferred release path, the old IRQ can be leaked:
CPU0 (Releasing LPI) CPU1 (Adding new LPI)
==================== =====================
vgic_put_irq_norelease()
__vgic_put_irq()
refcount_dec_and_test()
irq->pending_release = true
vgic_add_lpi()
xa_lock_irqsave()
old_irq = xa_load(.., intid)
vgic_try_get_irq_ref(oldirq) == false
BUG: old IRQ overwritten --> __xa_store(.., intid, ..)
xa_unlock_irqrestore() vgic_release_deleted_lpis()
xa_lock_irqsave()
xa_for_each() { .. } <-- old IRQ with pending_release = true
is gone, so it cannot be released
To fix the direct release path, move the reference count drop inside the xarray lock, making sure that vgic_add_lpi() never encounters the to-be-released LPI.
In the deferred release path, the refcount drop must happen under a raw spinlock, so the xarray lock cannot be grabbed, and the same solution does not work. Instead, update vgic_add_lpi(), so that if it evicts an LPI from the xarray, it takes on the responsibility of freeing it. Consequently, an LPI may now be freed concurrently after a deferred release drops the refcount, so accessing the pending_release field is no longer safe from use-after-free. Delete all uses of the flag, and update vgic_release_deleted_lpis() to identify orphaned LPIs purely based on their refcount.
--- arch/arm64/kvm/vgic/vgic-its.c | 24 ++++++++++++++++-------- arch/arm64/kvm/vgic/vgic.c | 18 ++++++++---------- include/kvm/arm_vgic.h | 3 --- 3 files changed, 24 insertions(+), 21 deletions(-)
arch/arm64/kvm/vgic/vgic-its.c +16 -8
@@ -116,18 +116,26 @@ static struct vgic_irq *vgic_add_lpi(struct kvm *kvm, u32 intid,kfree (irq); irq = oldirq; }else { - ret =xa_err (__xa_store (&dist->lpi_xa, intid, irq,0 )); - } - -xa_unlock_irqrestore (&dist->lpi_xa, flags); +/* +* The entry is either empty or contains a dead LPI (refcount=0) +* from the deferred release path, pending cleanup by +* vgic_release_deleted_lpis(). Evict and free it if present. +*/ + oldirq =__xa_store (&dist->lpi_xa, intid, irq,0 ); + ret =xa_err (oldirq); +if (ret) { +xa_unlock_irqrestore (&dist->lpi_xa, flags); +kfree (irq); -if (ret) { -xa_release (&dist->lpi_xa, intid); -kfree (irq); +return ERR_PTR (ret); + } -return ERR_PTR (ret); +if (oldirq && !WARN_ON_ONCE (refcount_read (&oldirq->refcount))) +kfree_rcu (oldirq, rcu); } +xa_unlock_irqrestore (&dist->lpi_xa, flags); +/* * We "cache" the configuration table entries in our struct vgic_irq's. * However we only have those structs for mapped IRQs, so we read in
arch/arm64/kvm/vgic/vgic.c +8 -10
@@ -146,11 +146,7 @@ static __must_check bool __vgic_put_irq(struct kvm *kvm, struct vgic_irq *irq)static __must_check bool vgic_put_irq_norelease (struct kvm *kvm,struct vgic_irq *irq) { -if (!__vgic_put_irq (kvm, irq)) -return false; - - irq->pending_release = true; -return true; +return __vgic_put_irq (kvm, irq); }void vgic_put_irq (struct kvm *kvm,struct vgic_irq *irq)
@@ -167,12 +163,14 @@ void vgic_put_irq(struct kvm *kvm, struct vgic_irq *irq)guard (spinlock_irqsave)(&dist->lpi_xa.xa_lock); } -if (!__vgic_put_irq (kvm, irq)) +if (!irq_is_lpi (kvm, irq->intid))return ; -xa_lock_irqsave (&dist->lpi_xa, flags); -vgic_release_lpi_locked (dist, irq); -xa_unlock_irqrestore (&dist->lpi_xa, flags); +if (refcount_dec_and_lock_irqsave (&irq->refcount, + &dist->lpi_xa.xa_lock, &flags)) { +vgic_release_lpi_locked (dist, irq); +xa_unlock_irqrestore (&dist->lpi_xa, flags); + } }static void vgic_release_deleted_lpis (struct kvm *kvm)
@@ -184,7 +182,7 @@ static void vgic_release_deleted_lpis(struct kvm *kvm)xa_lock_irqsave (&dist->lpi_xa, flags);xa_for_each (&dist->lpi_xa, intid, irq) { -if (irq->pending_release) +if (!refcount_read (&irq->refcount))vgic_release_lpi_locked (dist, irq); }
include/kvm/arm_vgic.h +0 -3
@@ -247,9 +247,6 @@ struct vgic_irq {* affinity reg (v3). */ - bool pending_release:1; /* Used for LPIs only, unreferenced IRQ -* pending a release */ - bool pending_latch:1; /* The pending latch state used to calculate* the pending state for both level * and edge triggered IRQs. */
Signature · 1 line
2.51.0
PATCH v6 2/2 KVM: arm64: vgic: Mitigate potential LPI registration failure
In reply to Carlos LópezMitigate a potential failure when inserting a new LPI into the VGIC LPI xarray.
When vgic_add_lpi() is preparing to register a new LPI, it pre-allocates an xarray entry using xa_reserve_irq(), so that it can later perform the insertion under the xarray lock without allocating.
However, since xa_reserve_irq() is called before acquiring such lock, there is a potential race where xa_reserve_irq() observes a populated entry, thus not performing the allocation, and another CPU removes that entry before the xarray lock is grabbed to perform the insertion.
CPU0 (Adding new LPI) CPU1 (Releasing LPI)
===================== ===================
vgic_add_lpi()
/* Entry populated, does not allocate */
xa_reserve_irq(.., intid, ..)
vgic_release_deleted_lpis()
xa_lock_irqsave()
vgic_release_lpi_locked()
xarray node freed --> __xa_erase(.., intid)
xa_unlock_irqrestore()
xa_lock_irqsave()
xa_load(.., intid) == NULL
vgic_try_get_irq_ref(NULL) == false
__xa_store(.., intid, irq, 0) <-- xarray node was freed, gfp=0
cannot allocate, returns -ENOMEMThis can happen e.g. if the guest issues a DISCARD while the LPI is still referenced from a vCPU's active-pending list (ap_list), and the same INTID is re-mapped via MAPTI.
Mitigate this by passing GFP_NOWAIT to __xa_store(), so that the allocation can happen under the lock in the rare case that this condition is hit. Add __GFP_ACCOUNT as well to match xa_reserve_irq()'s flags.
--- arch/arm64/kvm/vgic/vgic-its.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/kvm/vgic/vgic-its.c +2 -1
@@ -121,7 +121,8 @@ static struct vgic_irq *vgic_add_lpi(struct kvm *kvm, u32 intid,* from the deferred release path, pending cleanup by * vgic_release_deleted_lpis(). Evict and free it if present. */ - oldirq =__xa_store (&dist->lpi_xa, intid, irq,0 ); + oldirq =__xa_store (&dist->lpi_xa, intid, irq, +GFP_NOWAIT | __GFP_ACCOUNT); ret =xa_err (oldirq);if (ret) {xa_unlock_irqrestore (&dist->lpi_xa, flags);
Signature · 1 line
2.51.0
[email protected]
AI reviewRe: [PATCH v6 2/2] KVM: arm64: vgic: Mitigate potential LPI registration failure
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Pre-existing issues:
- [High] Silent guest failure due to unhandled -ENOMEM from __xa_store() during LPI registration. --
--- Patch [2]: [PATCH v6 2/2] KVM: arm64: vgic: Mitigate potential LPI registration failure --- commit 9b522d02e94ea5f2dfcbdf1fe73fdeacbe285ee9
Author: Carlos López <[email protected]>
KVM: arm64: vgic: Mitigate potential LPI registration failure
This commit changes vgic_add_lpi() to pass GFP_NOWAIT | __GFP_ACCOUNT to __xa_store() when adding a new LPI. This mitigates a race condition where the xarray entry might have been freed between xa_reserve_irq() and __xa_store(). However, if the GFP_NOWAIT allocation fails, it still returns an error.
Quoted 5 lines
arch/arm64/kvm/vgic/vgic-its.c +0
-0
arch/arm64/kvm/vgic/vgic-its.c static struct vgic_irq *vgic_add_lpi(struct kvm *kvm, u32 intid, · line 128
Quoted 9 lines
arch/arm64/kvm/vgic/vgic-its.c +2
-1@@ -121,7 +121,8 @@ static struct vgic_irq *vgic_add_lpi(struct kvm *kvm, u32 intid,* from the deferred release path, pending cleanup by * vgic_release_deleted_lpis(). Evict and free it if present. */ - oldirq =__xa_store (&dist->lpi_xa, intid, irq,0 ); + oldirq =__xa_store (&dist->lpi_xa, intid, irq, +GFP_NOWAIT | __GFP_ACCOUNT); ret =xa_err (oldirq);if (ret) {xa_unlock_irqrestore (&dist->lpi_xa, flags);
[Severity: High]
This is a pre-existing issue, but does this error path lead to a silent guest failure?
If the GFP_NOWAIT allocation fails due to host memory pressure, __xa_store() returns -ENOMEM which is propagated back:
vgic_add_lpi() {
oldirq = __xa_store(..., GFP_NOWAIT | __GFP_ACCOUNT);
ret = xa_err(oldirq);
if (ret) {
xa_unlock_irqrestore(&dist->lpi_xa, flags);
kfree(irq);
return ERR_PTR(ret);
...
}Since vgic_its_process_commands() ignores the return value of vgic_its_handle_command(), the guest's ITS MAPTI command is silently dropped and the device interrupts are permanently lost.
Could this be handled by dropping the lock, performing a blocking xa_reserve_irq() with GFP_KERNEL_ACCOUNT, and retrying the insertion instead of returning the allocation error?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2
Quoted 9 lines · Carlos López
Fix a couple of potential issues that could arise from racy LPI release and re-registration for the same INTID.
The issue fixed in patch 1 can manifest itself through either a leaked LPI structure, or a prematurely deleted LPI. The issue fixed in patch 2 could materialize as a spurious
-ENOMEMfailure when registering an LPI.[...]
Applied to fixes, thanks!
[1/2] KVM: arm64: vgic: Fix race between LPI release and re-registration
commit: cbfe2b24a1ea9de35032dbdd100fdc700f5be92d
[2/2] KVM: arm64: vgic: Mitigate potential LPI registration failure
commit: 21f12496fdd357ad4e1fcdd07dc80ab7378f7d24Cheers,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.