From: "tip-bot2 for Oliver Upton" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: George Cherian <gcherian@marvell.com>,
Marc Zyngier <maz@kernel.org>,
Oliver Upton <oliver.upton@linux.dev>,
Thomas Gleixner <tglx@linutronix.de>,
stable@vger.kernel.org, x86@kernel.org,
linux-kernel@vger.kernel.org
Subject: [tip: irq/urgent] irqchip/gic-v3-its: Do not assume vPE tables are preallocated
Date: Wed, 21 Feb 2024 20:21:55 -0000 [thread overview]
Message-ID: <170854691584.398.7536977527591129636.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20240219185809.286724-2-oliver.upton@linux.dev>
The following commit has been merged into the irq/urgent branch of tip:
Commit-ID: ec4308ecfc887128a468f03fb66b767559c57c23
Gitweb: https://git.kernel.org/tip/ec4308ecfc887128a468f03fb66b767559c57c23
Author: Oliver Upton <oliver.upton@linux.dev>
AuthorDate: Mon, 19 Feb 2024 18:58:06
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Wed, 21 Feb 2024 21:11:20 +01:00
irqchip/gic-v3-its: Do not assume vPE tables are preallocated
The GIC/ITS code is designed to ensure to pick up any preallocated LPI
tables on the redistributors, as enabling LPIs is a one-way switch. There
is no such restriction for vLPIs, and for GICv4.1 it is expected to
allocate a new vPE table at boot.
This works as intended when initializing an ITS, however when setting up a
redistributor in cpu_init_lpis() the early return for preallocated RD
tables skips straight past the GICv4 setup. This all comes to a head when
trying to kexec() into a new kernel, as the new kernel silently fails to
set up GICv4, leading to a complete loss of SGIs and LPIs for KVM VMs.
Slap a band-aid on the problem by ensuring its_cpu_init_lpis() always
initializes GICv4 on the way out, even if the other RD tables were
preallocated.
Fixes: 6479450f72c1 ("irqchip/gic-v4: Fix occasional VLPI drop")
Reported-by: George Cherian <gcherian@marvell.com>
Co-developed-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20240219185809.286724-2-oliver.upton@linux.dev
---
drivers/irqchip/irq-gic-v3-its.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index 53abd47..b822752 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -3181,6 +3181,7 @@ static void its_cpu_init_lpis(void)
val |= GICR_CTLR_ENABLE_LPIS;
writel_relaxed(val, rbase + GICR_CTLR);
+out:
if (gic_rdists->has_vlpis && !gic_rdists->has_rvpeid) {
void __iomem *vlpi_base = gic_data_rdist_vlpi_base();
@@ -3216,7 +3217,6 @@ static void its_cpu_init_lpis(void)
/* Make sure the GIC has seen the above */
dsb(sy);
-out:
gic_data_rdist()->flags |= RD_LOCAL_LPI_ENABLED;
pr_info("GICv3: CPU%d: using %s LPI pending table @%pa\n",
smp_processor_id(),
next prev parent reply other threads:[~2024-02-21 20:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-19 18:58 [PATCH 0/3] irqchip/gic-v3-its: Fix GICv4.1 initialization after kexec Oliver Upton
2024-02-19 18:58 ` [PATCH 1/3] irqchip/gic-v3-its: Do not assume vPE tables are preallocated Oliver Upton
2024-02-21 20:21 ` tip-bot2 for Oliver Upton [this message]
2024-02-19 18:58 ` [PATCH 2/3] irqchip/gic-v3-its: Spin off GICv4 init into a separate function Oliver Upton
2024-02-24 10:30 ` Marc Zyngier
2024-02-24 11:02 ` Oliver Upton
2024-02-24 11:10 ` Marc Zyngier
2024-02-19 18:58 ` [PATCH 3/3] irqchip/gic-v3-its: Print the vPE table installed in redistributor Oliver Upton
2024-02-24 10:41 ` Marc Zyngier
2024-02-24 11:11 ` Oliver Upton
2024-02-24 11:31 ` 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=170854691584.398.7536977527591129636.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=gcherian@marvell.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=maz@kernel.org \
--cc=oliver.upton@linux.dev \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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
all inboxes | Powered by JetHome®