From: Andre Przywara <andre.przywara@arm.com>
To: Lorenzo Pieralisi <lpieralisi@kernel.org>,
Hanjun Guo <guohanjun@huawei.com>,
Sudeep Holla <sudeep.holla@kernel.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
"Rafael J . Wysocki" <rafael@kernel.org>,
Len Brown <lenb@kernel.org>, James Morse <james.morse@arm.com>,
Ben Horgan <ben.horgan@arm.com>,
Reinette Chatre <reinette.chatre@intel.com>,
Fenghua Yu <fenghuay@nvidia.com>
Cc: Jonathan Cameron <jic23@kernel.org>,
Srivathsa L Rao <srivathsa.rao@oss.qualcomm.com>,
Ganapatrao Kulkarni <ganapatrao.kulkarni@oss.qualcomm.com>,
Trilok Soni <tsoni@quicinc.com>,
Srinivas Ramana <sramana@qti.qualcomm.com>,
Niyas Sait <niyas.sait@arm.com>, Lee Trager <lee@trager.us>,
Ritwick Sharma <ritwick.sharma@arm.com>,
Gavin Shan <gshan@redhat.com>,
linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v9 11/12] arm_mpam: change MPAM-Fb error IRQ to use a threaded IRQ handler
Date: Fri, 7 Aug 2026 12:54:50 +0200 [thread overview]
Message-ID: <20260807105451.3728284-12-andre.przywara@arm.com> (raw)
In-Reply-To: <20260807105451.3728284-1-andre.przywara@arm.com>
When an MPAM MSC gets into an error condition, it can trigger an error
IRQ. We cannot really do much about those errors, but we at least query
and log the error, then disable MPAM functionality.
This error report relies on reading the MSC's error status register
(ESR) in the current hard-IRQ handler, which is not possible for MPAM-Fb
based MSC accesses, since they involve mailbox routines that might sleep.
The same is true for clearing the interrupt at the source, which requires
a (potentially sleeping) MSC access as well.
Change the error IRQ handler to be a threaded interrupt, but keep the
handling in the hard-IRQ part for MMIO MSCs. This is needed since the
CPU affinity check in the MSC accessors requires a non-preemptible
context.
When the MSC is using an MPAM-Fb based access, we push the work into the
threaded part of the handler, where the accessors are allowed to sleep.
Also forbid per-CPU interrupts (PPIs) for MPAM-Fb, as we cannot use a
threaded IRQ here.
The actual IRQ handler learns how to deal with errors. We cannot really
handle them, but we can try our best to disable the IRQ anyway.
Should the level IRQ line deactivation fail on the device side, we mask
the IRQ on the irqchip level, to prevent an interrupt storm.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
drivers/resctrl/mpam_devices.c | 77 ++++++++++++++++++++++++++++------
1 file changed, 65 insertions(+), 12 deletions(-)
diff --git a/drivers/resctrl/mpam_devices.c b/drivers/resctrl/mpam_devices.c
index fb2fba5ba96d..4b1382fce2be 100644
--- a/drivers/resctrl/mpam_devices.c
+++ b/drivers/resctrl/mpam_devices.c
@@ -2713,24 +2713,42 @@ static int mpam_disable_msc_ecr(void *_msc)
return __mpam_write_reg(msc, MPAMF_ECR, 0);
}
+/*
+ * This will run as the threaded IRQ handler part when using MPAM-Fb, but
+ * as the sole hard-IRQ handler for MMIO based accesses.
+ */
static irqreturn_t __mpam_irq_handler(int irq, struct mpam_msc *msc)
{
u64 reg;
+ int ret;
u16 partid;
u8 errcode, pmg, ris;
- if (WARN_ON_ONCE(!msc) ||
+ if (WARN_ON_ONCE(!msc))
+ return IRQ_NONE;
+
+ if (msc->iface == MPAM_IFACE_MMIO &&
WARN_ON_ONCE(!cpumask_test_cpu(smp_processor_id(),
&msc->accessibility)))
return IRQ_NONE;
- mpam_msc_read_esr(msc, ®);
+ ret = mpam_msc_read_esr(msc, ®);
+ if (ret) {
+ pr_err_ratelimited("unknown error irq from msc:%u\n", msc->id);
+
+ /* Try out best here ... */
+ goto out_disable;
+ }
errcode = FIELD_GET(MPAMF_ESR_ERRCODE, reg);
if (!errcode)
return IRQ_NONE;
- /* Clear level triggered irq */
+ /*
+ * Clear the level triggered IRQ. If that fails, we cannot do anything
+ * about it, so ignore any errors. We will disable the IRQ either on
+ * the device side or on the irqchip level next anyway.
+ */
mpam_msc_clear_esr(msc);
partid = FIELD_GET(MPAMF_ESR_PARTID_MON, reg);
@@ -2741,16 +2759,24 @@ static irqreturn_t __mpam_irq_handler(int irq, struct mpam_msc *msc)
msc->id, mpam_errcode_names[errcode], partid, pmg,
ris);
- /* Disable this interrupt. */
- mpam_disable_msc_ecr(msc);
+out_disable:
+ /*
+ * Disable this interrupt on the device side. If that fails, disable
+ * the IRQ on the irqchip level, as we must prevent further handler
+ * invocations. We only take the interrupt once anyway, as we
+ * are going to free the IRQ next, in mpam_disable().
+ */
+ ret = mpam_disable_msc_ecr(msc);
+ if (ret)
+ disable_irq_nosync(irq);
- /* Are we racing with the thread disabling MPAM? */
+ /* Check whether we are racing with the thread disabling MPAM. */
if (!mpam_is_enabled())
return IRQ_HANDLED;
/*
- * Schedule the teardown work. Don't use a threaded IRQ as we can't
- * unregister the interrupt from the threaded part of the handler.
+ * Schedule the teardown work. We have to defer it as we can't
+ * unregister the interrupt from the threaded part of a handler.
*/
mpam_disable_reason = "hardware error interrupt";
schedule_work(&mpam_broken_work);
@@ -2765,10 +2791,30 @@ static irqreturn_t mpam_ppi_handler(int irq, void *dev_id)
return __mpam_irq_handler(irq, msc);
}
-static irqreturn_t mpam_spi_handler(int irq, void *dev_id)
+/*
+ * MMIO based MSC accesses must run in non-preemptible context, as they
+ * might have affinity requirements to check.
+ * MPAM-Fb based MSC accesses must NOT run in hard-IRQ context, as they
+ * can sleep.
+ * So split the IRQ handling up, depending on the MSC access type.
+ */
+static irqreturn_t mpam_shared_hard_irq(int irq, void *dev_id)
{
struct mpam_msc *msc = dev_id;
+ if (msc->iface == MPAM_IFACE_MMIO)
+ return __mpam_irq_handler(irq, msc);
+
+ return IRQ_WAKE_THREAD;
+}
+
+static irqreturn_t mpam_shared_thread_irq(int irq, void *dev_id)
+{
+ struct mpam_msc *msc = dev_id;
+
+ if (msc->iface == MPAM_IFACE_MMIO)
+ return IRQ_HANDLED;
+
return __mpam_irq_handler(irq, msc);
}
@@ -2789,6 +2835,11 @@ static int mpam_register_irqs(void)
/* The MPAM spec says the interrupt can be SPI, PPI or LPI */
/* We anticipate sharing the interrupt with other MSCs */
if (irq_is_percpu(irq)) {
+ if (msc->iface != MPAM_IFACE_MMIO) {
+ dev_err(&msc->pdev->dev,
+ "Only MMIO MSCs can use per-CPU interrupts\n");
+ return -EINVAL;
+ }
err = request_percpu_irq(irq, &mpam_ppi_handler,
"mpam:msc:error",
msc->error_dev_id);
@@ -2800,9 +2851,11 @@ static int mpam_register_irqs(void)
&_enable_percpu_irq, &irq,
true);
} else {
- err = devm_request_irq(&msc->pdev->dev, irq,
- &mpam_spi_handler, IRQF_SHARED,
- "mpam:msc:error", msc);
+ err = devm_request_threaded_irq(&msc->pdev->dev, irq,
+ &mpam_shared_hard_irq,
+ &mpam_shared_thread_irq,
+ IRQF_SHARED | IRQF_ONESHOT,
+ "mpam:msc:error", msc);
if (err)
return err;
}
--
2.43.0
next prev parent reply other threads:[~2026-08-07 10:55 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-07 10:54 [PATCH v9 00/12] arm_mpam: Add MPAM-Fb firmware support Andre Przywara
2026-08-07 10:54 ` [PATCH v9 01/12] arm_mpam: let low level MSC accessors return an error Andre Przywara
2026-08-07 10:54 ` [PATCH v9 02/12] arm_mpam: propagate MSC access errors for hw_probe functions Andre Przywara
2026-08-07 10:54 ` [PATCH v9 03/12] arm_mpam: propagate MSC access errors for MBWU counters Andre Przywara
2026-08-07 10:54 ` [PATCH v9 04/12] arm_mpam: propagate MSC access errors for msmon helpers Andre Przywara
2026-08-07 10:54 ` [PATCH v9 05/12] arm_mpam: propagate MSC access errors for __ris_msmon_read() Andre Przywara
2026-08-07 10:54 ` [PATCH v9 06/12] arm_mpam: propagate MSC access errors for state saving function Andre Przywara
2026-08-07 10:54 ` [PATCH v9 07/12] arm_mpam: propagate MSC access errors for mpam_reprogram_ris_partid() Andre Przywara
2026-08-26 17:41 ` Srivathsa L Rao
2026-08-07 10:54 ` [PATCH v9 08/12] arm_mpam: propagate MSC access errors for interrupt control Andre Przywara
2026-08-26 17:37 ` Srivathsa L Rao
2026-08-07 10:54 ` [PATCH v9 09/12] arm_mpam: prepare mon_sel locking for MPAM-Fb Andre Przywara
2026-08-07 10:54 ` [PATCH v9 10/12] arm_mpam: add MPAM-Fb MSC firmware access support Andre Przywara
2026-08-26 17:39 ` Srivathsa L Rao
2026-08-07 10:54 ` Andre Przywara [this message]
2026-08-26 17:38 ` [PATCH v9 11/12] arm_mpam: change MPAM-Fb error IRQ to use a threaded IRQ handler Srivathsa L Rao
2026-08-27 0:09 ` Gavin Shan
2026-08-07 10:54 ` [PATCH v9 12/12] arm_mpam: detect and enable MPAM-Fb PCC support Andre Przywara
2026-08-26 17:43 ` Srivathsa L Rao
2026-08-27 0:10 ` Gavin Shan
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=20260807105451.3728284-12-andre.przywara@arm.com \
--to=andre.przywara@arm.com \
--cc=ben.horgan@arm.com \
--cc=catalin.marinas@arm.com \
--cc=fenghuay@nvidia.com \
--cc=ganapatrao.kulkarni@oss.qualcomm.com \
--cc=gshan@redhat.com \
--cc=guohanjun@huawei.com \
--cc=james.morse@arm.com \
--cc=jic23@kernel.org \
--cc=lee@trager.us \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=niyas.sait@arm.com \
--cc=rafael@kernel.org \
--cc=reinette.chatre@intel.com \
--cc=ritwick.sharma@arm.com \
--cc=sramana@qti.qualcomm.com \
--cc=srivathsa.rao@oss.qualcomm.com \
--cc=sudeep.holla@kernel.org \
--cc=tsoni@quicinc.com \
--cc=will@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®