From: Valentin Schneider <valentin.schneider@arm.com>
To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc: Marc Zyngier <maz@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Vincenzo Frascino <vincenzo.frascino@arm.com>
Subject: [PATCH v3 06/13] genirq: Don't mask IRQ within flow handler if IRQ is flow-masked
Date: Tue, 29 Jun 2021 13:50:03 +0100 [thread overview]
Message-ID: <20210629125010.458872-7-valentin.schneider@arm.com> (raw)
In-Reply-To: <20210629125010.458872-1-valentin.schneider@arm.com>
mask_irq() lets an IRQ with IRQD_IRQ_FLOW_MASKED set be further masked via
chip->irq_mask(). This is necessary for unhandled IRQs as we want to keep
them masked beyond eoi_irq() (which clears IRQD_IRQ_FLOW_MASKED).
This is however not necessary in paths that do end up handling the IRQ and
are bounded by a final eoi_irq() - this is the case for chips with
IRQCHIP_AUTOMASKS_FLOW and IRQCHIP_EOI_THREADED.
Make handle_strict_flow_irq() leverage IRQCHIP_AUTOMASKS_FLOW and issue an
ack_irq() rather than a mask_ack_irq() when possible.
Signed-off-by: Valentin Schneider <valentin.schneider@arm.com>
---
kernel/irq/chip.c | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 699e70b51aae..c2ca6b748987 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -896,6 +896,12 @@ void handle_edge_eoi_irq(struct irq_desc *desc)
}
#endif
+/*
+ * AUTOMASKS_FLOW tells us ack/eoi handle the masking, EOI_THREADED tells us
+ * that masking will persist until irq_finalize_oneshot()
+ */
+#define ONESHOT_AUTOMASK_FLAGS (IRQCHIP_AUTOMASKS_FLOW | IRQCHIP_EOI_THREADED)
+
/**
* handle_strict_flow_irq - irq handler for strict controllers
* @desc: the interrupt description structure for this irq
@@ -909,10 +915,9 @@ void handle_strict_flow_irq(struct irq_desc *desc)
struct irq_chip *chip = desc->irq_data.chip;
raw_spin_lock(&desc->lock);
- mask_ack_irq(desc);
if (!irq_may_run(desc))
- goto out;
+ goto out_mask;
desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
@@ -922,10 +927,20 @@ void handle_strict_flow_irq(struct irq_desc *desc)
*/
if (unlikely(!desc->action || irqd_irq_disabled(&desc->irq_data))) {
desc->istate |= IRQS_PENDING;
- goto out;
+ goto out_mask;
}
kstat_incr_irqs_this_cpu(desc);
+ /*
+ * Masking is required if IRQ is ONESHOT and we can't rely on the
+ * flow-masking persisting down to irq_finalize_oneshot()
+ * (in the IRQ thread).
+ */
+ if ((desc->istate & IRQS_ONESHOT) &&
+ ((chip->flags & ONESHOT_AUTOMASK_FLAGS) != ONESHOT_AUTOMASK_FLAGS))
+ mask_ack_irq(desc);
+ else
+ ack_irq(desc);
handle_irq_event(desc);
@@ -933,7 +948,8 @@ void handle_strict_flow_irq(struct irq_desc *desc)
raw_spin_unlock(&desc->lock);
return;
-out:
+out_mask:
+ mask_ack_irq(desc);
/*
* XXX: this is where IRQCHIP_EOI_IF_HANDLED would be checked, but
* it's conceptually incompatible with this handler (it breaks the
--
2.25.1
next prev parent reply other threads:[~2021-06-29 12:51 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-29 12:49 [PATCH v3 00/13] irqchip/irq-gic: Optimize masking by leveraging EOImode=1 Valentin Schneider
2021-06-29 12:49 ` [PATCH v3 01/13] genirq: Add chip flag to denote automatic IRQ (un)masking Valentin Schneider
2021-08-12 15:13 ` [irqchip: irq/irqchip-next] " irqchip-bot for Valentin Schneider
2021-06-29 12:49 ` [PATCH v3 02/13] genirq: Define ack_irq() and eoi_irq() helpers Valentin Schneider
2021-08-12 7:49 ` Marc Zyngier
2021-08-12 13:36 ` Valentin Schneider
2021-08-12 14:45 ` Marc Zyngier
2021-08-12 15:13 ` [irqchip: irq/irqchip-next] " irqchip-bot for Valentin Schneider
2021-06-29 12:50 ` [PATCH v3 03/13] genirq: Employ ack_irq() and eoi_irq() where relevant Valentin Schneider
2021-08-12 15:13 ` [irqchip: irq/irqchip-next] " irqchip-bot for Valentin Schneider
2021-06-29 12:50 ` [PATCH v3 04/13] genirq: Add handle_strict_flow_irq() flow handler Valentin Schneider
2021-08-12 15:13 ` [irqchip: irq/irqchip-next] " irqchip-bot for Valentin Schneider
2021-06-29 12:50 ` [PATCH v3 05/13] genirq: Let purely flow-masked ONESHOT irqs through unmask_threaded_irq() Valentin Schneider
2021-08-12 7:26 ` Marc Zyngier
2021-08-12 13:36 ` Valentin Schneider
2021-08-12 14:45 ` Marc Zyngier
2021-08-12 21:38 ` Valentin Schneider
2021-08-12 15:13 ` [irqchip: irq/irqchip-next] " irqchip-bot for Valentin Schneider
2021-06-29 12:50 ` Valentin Schneider [this message]
2021-08-12 15:13 ` [irqchip: irq/irqchip-next] genirq: Don't mask IRQ within flow handler if IRQ is flow-masked irqchip-bot for Valentin Schneider
2021-06-29 12:50 ` [PATCH v3 07/13] genirq, irq-gic-v3: Make NMI flow handlers use ->irq_ack() if available Valentin Schneider
2021-08-12 15:13 ` [irqchip: irq/irqchip-next] " irqchip-bot for Valentin Schneider
2021-06-29 12:50 ` [PATCH v3 08/13] genirq/msi: Provide default .irq_eoi() for MSI chips Valentin Schneider
2021-08-12 15:13 ` [irqchip: irq/irqchip-next] " irqchip-bot for Valentin Schneider
2021-06-29 12:50 ` [PATCH v3 09/13] irqchip/gic: Rely on MSI default .irq_eoi() Valentin Schneider
2021-08-12 15:12 ` [irqchip: irq/irqchip-next] " irqchip-bot for Valentin Schneider
2021-06-29 12:50 ` [PATCH v3 10/13] genirq/msi: Provide default .irq_ack() for MSI chips Valentin Schneider
2021-08-12 15:12 ` [irqchip: irq/irqchip-next] " irqchip-bot for Valentin Schneider
2021-06-29 12:50 ` [PATCH v3 11/13] irqchip/gic: Add .irq_ack() to GIC-based irqchips Valentin Schneider
2021-08-12 15:12 ` [irqchip: irq/irqchip-next] " irqchip-bot for Valentin Schneider
2021-06-29 12:50 ` [PATCH v3 12/13] irqchip/gic: Convert to handle_strict_flow_irq() Valentin Schneider
2021-08-12 15:12 ` [irqchip: irq/irqchip-next] " irqchip-bot for Valentin Schneider
2021-06-29 12:50 ` [PATCH v3 13/13] irqchip/gic-v3: " Valentin Schneider
2021-08-12 15:12 ` [irqchip: irq/irqchip-next] " irqchip-bot for Valentin Schneider
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=20210629125010.458872-7-valentin.schneider@arm.com \
--to=valentin.schneider@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=maz@kernel.org \
--cc=tglx@linutronix.de \
--cc=vincenzo.frascino@arm.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).