From: Marc Zyngier <maz@kernel.org>
To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org
Cc: Alexander Potapenko <glider@google.com>,
Joey Gouly <joey.gouly@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Oliver Upton <oliver.upton@linux.dev>,
Zenghui Yu <yuzenghui@huawei.com>
Subject: [PATCH 3/3] KVM: arm64: vgic: Gracefully handle resetting an unallocated interrupt
Date: Thu, 6 Feb 2025 15:21:00 +0000 [thread overview]
Message-ID: <20250206152100.1107909-4-maz@kernel.org> (raw)
In-Reply-To: <20250206152100.1107909-1-maz@kernel.org>
Playing with racing vcpu reset and vgic teardown makes it relatively
easy to trigger a case where, by the time we try to reset a mapped
interrupt such as a timer's, the vgic is gone and there is no
interrupt to play with.
Check for NULL upfront to avoid further embarassement.
Reported-by: Alexander Potapenko <glider@google.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
---
arch/arm64/kvm/vgic/vgic.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm64/kvm/vgic/vgic.c b/arch/arm64/kvm/vgic/vgic.c
index f454cef59e24b..2ea6d1d1d3091 100644
--- a/arch/arm64/kvm/vgic/vgic.c
+++ b/arch/arm64/kvm/vgic/vgic.c
@@ -542,6 +542,9 @@ void kvm_vgic_reset_mapped_irq(struct kvm_vcpu *vcpu, u32 vintid)
struct vgic_irq *irq = vgic_get_vcpu_irq(vcpu, vintid);
unsigned long flags;
+ if (!irq)
+ return;
+
if (!irq->hw)
goto out;
--
2.39.2
next prev parent reply other threads:[~2025-02-06 15:22 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-06 15:20 [PATCH 0/3] KVM: arm64: Assorted vgic fixes for 6.14 Marc Zyngier
2025-02-06 15:20 ` [PATCH 1/3] KVM: arm64: timer: Drop warning on failed interrupt signalling Marc Zyngier
2025-02-06 15:50 ` Alexander Potapenko
2025-02-06 15:20 ` [PATCH 2/3] KVM: arm64: vgic: Check for unallocated PPI/SPI arrays Marc Zyngier
2025-02-06 15:50 ` Alexander Potapenko
2025-02-06 15:21 ` Marc Zyngier [this message]
2025-02-06 15:50 ` [PATCH 3/3] KVM: arm64: vgic: Gracefully handle resetting an unallocated interrupt Alexander Potapenko
2025-02-07 18:03 ` [PATCH 0/3] KVM: arm64: Assorted vgic fixes for 6.14 Oliver Upton
2025-02-07 18:10 ` Marc Zyngier
2025-02-07 18:50 ` Oliver Upton
2025-02-08 15:15 ` Marc Zyngier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250206152100.1107909-4-maz@kernel.org \
--to=maz@kernel.org \
--cc=glider@google.com \
--cc=joey.gouly@arm.com \
--cc=kvmarm@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=oliver.upton@linux.dev \
--cc=suzuki.poulose@arm.com \
--cc=yuzenghui@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).