From: Alex Belits <abelits@marvell.com>
To: "nitesh@redhat.com" <nitesh@redhat.com>,
"frederic@kernel.org" <frederic@kernel.org>
Cc: Prasun Kapoor <pkapoor@marvell.com>,
"linux-api@vger.kernel.org" <linux-api@vger.kernel.org>,
"davem@davemloft.net" <davem@davemloft.net>,
"trix@redhat.com" <trix@redhat.com>,
"mingo@kernel.org" <mingo@kernel.org>,
"catalin.marinas@arm.com" <catalin.marinas@arm.com>,
"rostedt@goodmis.org" <rostedt@goodmis.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"peterx@redhat.com" <peterx@redhat.com>,
"tglx@linutronix.de" <tglx@linutronix.de>,
"linux-arch@vger.kernel.org" <linux-arch@vger.kernel.org>,
"mtosatti@redhat.com" <mtosatti@redhat.com>,
"will@kernel.org" <will@kernel.org>,
"peterz@infradead.org" <peterz@infradead.org>,
"leon@sidebranch.com" <leon@sidebranch.com>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"pauld@redhat.com" <pauld@redhat.com>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: [PATCH v5 5/9] task_isolation: Add driver-specific hooks
Date: Mon, 23 Nov 2020 17:57:42 +0000 [thread overview]
Message-ID: <6e15fde56203f89ebab0565dc22177f42063ae7c.camel@marvell.com> (raw)
In-Reply-To: <8d887e59ca713726f4fcb25a316e1e932b02823e.camel@marvell.com>
Some drivers don't call functions that call
task_isolation_kernel_enter() in interrupt handlers. Call it
directly.
Signed-off-by: Alex Belits <abelits@marvell.com>
---
drivers/irqchip/irq-armada-370-xp.c | 6 ++++++
drivers/irqchip/irq-gic-v3.c | 3 +++
drivers/irqchip/irq-gic.c | 3 +++
drivers/s390/cio/cio.c | 3 +++
4 files changed, 15 insertions(+)
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
index d7eb2e93db8f..4ac7babe1abe 100644
--- a/drivers/irqchip/irq-armada-370-xp.c
+++ b/drivers/irqchip/irq-armada-370-xp.c
@@ -29,6 +29,7 @@
#include <linux/slab.h>
#include <linux/syscore_ops.h>
#include <linux/msi.h>
+#include <linux/isolation.h>
#include <asm/mach/arch.h>
#include <asm/exception.h>
#include <asm/smp_plat.h>
@@ -572,6 +573,7 @@ static const struct irq_domain_ops armada_370_xp_mpic_irq_ops = {
static void armada_370_xp_handle_msi_irq(struct pt_regs *regs, bool is_chained)
{
u32 msimask, msinr;
+ int isol_entered = 0;
msimask = readl_relaxed(per_cpu_int_base +
ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS)
@@ -588,6 +590,10 @@ static void armada_370_xp_handle_msi_irq(struct pt_regs *regs, bool is_chained)
continue;
if (is_chained) {
+ if (!isol_entered) {
+ task_isolation_kernel_enter();
+ isol_entered = 1;
+ }
irq = irq_find_mapping(armada_370_xp_msi_inner_domain,
msinr - PCI_MSI_DOORBELL_START);
generic_handle_irq(irq);
diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index 16fecc0febe8..ded26dd4da0f 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -18,6 +18,7 @@
#include <linux/percpu.h>
#include <linux/refcount.h>
#include <linux/slab.h>
+#include <linux/isolation.h>
#include <linux/irqchip.h>
#include <linux/irqchip/arm-gic-common.h>
@@ -646,6 +647,8 @@ static asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs
{
u32 irqnr;
+ task_isolation_kernel_enter();
+
irqnr = gic_read_iar();
if (gic_supports_nmi() &&
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index 6053245a4754..bb482b4ae218 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -35,6 +35,7 @@
#include <linux/interrupt.h>
#include <linux/percpu.h>
#include <linux/slab.h>
+#include <linux/isolation.h>
#include <linux/irqchip.h>
#include <linux/irqchip/chained_irq.h>
#include <linux/irqchip/arm-gic.h>
@@ -337,6 +338,8 @@ static void __exception_irq_entry gic_handle_irq(struct pt_regs *regs)
struct gic_chip_data *gic = &gic_data[0];
void __iomem *cpu_base = gic_data_cpu_base(gic);
+ task_isolation_kernel_enter();
+
do {
irqstat = readl_relaxed(cpu_base + GIC_CPU_INTACK);
irqnr = irqstat & GICC_IAR_INT_ID_MASK;
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 6d716db2a46a..beab88881b6d 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -20,6 +20,7 @@
#include <linux/kernel_stat.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
+#include <linux/isolation.h>
#include <asm/cio.h>
#include <asm/delay.h>
#include <asm/irq.h>
@@ -584,6 +585,8 @@ void cio_tsch(struct subchannel *sch)
struct irb *irb;
int irq_context;
+ task_isolation_kernel_enter();
+
irb = this_cpu_ptr(&cio_irb);
/* Store interrupt response block to lowcore. */
if (tsch(sch->schid, irb) != 0)
--
2.20.1
next prev parent reply other threads:[~2020-11-23 17:58 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-23 17:42 [PATCH v5 0/9] "Task_isolation" mode Alex Belits
2020-11-23 17:56 ` [PATCH v5 1/9] task_isolation: vmstat: add quiet_vmstat_sync function Alex Belits
2020-11-23 21:48 ` Thomas Gleixner
2020-11-23 17:56 ` [PATCH v5 2/9] task_isolation: vmstat: add vmstat_idle function Alex Belits
2020-11-23 21:49 ` Thomas Gleixner
2020-11-23 17:56 ` [PATCH v5 3/9] task_isolation: userspace hard isolation from kernel Alex Belits
2020-11-23 22:01 ` Thomas Gleixner
2020-11-23 17:57 ` [PATCH v5 4/9] task_isolation: Add task isolation hooks to arch-independent code Alex Belits
2020-11-23 22:31 ` Thomas Gleixner
2020-11-23 17:57 ` Alex Belits [this message]
2020-12-02 14:18 ` [PATCH v5 5/9] task_isolation: Add driver-specific hooks Mark Rutland
2020-12-04 0:43 ` [EXT] " Alex Belits
2020-11-23 17:58 ` [PATCH v5 6/9] task_isolation: arch/arm64: enable task isolation functionality Alex Belits
2020-12-02 13:59 ` Mark Rutland
2020-12-04 0:37 ` [EXT] " Alex Belits
2020-12-07 11:57 ` Mark Rutland
2020-11-23 17:58 ` [PATCH v5 7/9] task_isolation: don't interrupt CPUs with tick_nohz_full_kick_cpu() Alex Belits
2020-11-23 22:13 ` Frederic Weisbecker
2020-11-23 22:35 ` Alex Belits
2020-11-23 22:36 ` Thomas Gleixner
2020-12-02 14:20 ` Mark Rutland
2020-12-04 0:54 ` [EXT] " Alex Belits
2020-12-07 11:58 ` Mark Rutland
2020-11-23 17:58 ` [PATCH v5 8/9] task_isolation: ringbuffer: don't interrupt CPUs running isolated tasks on buffer resize Alex Belits
2020-11-23 17:58 ` [PATCH v5 9/9] task_isolation: kick_all_cpus_sync: don't kick isolated cpus Alex Belits
2020-11-23 22:29 ` Frederic Weisbecker
2020-11-23 22:39 ` [EXT] " Alex Belits
2020-11-23 23:21 ` Frederic Weisbecker
2020-11-25 3:20 ` Alex Belits
2021-01-22 15:00 ` Marcelo Tosatti
2020-11-24 16:36 ` [PATCH v5 0/9] "Task_isolation" mode Tom Rix
2020-11-24 17:40 ` [EXT] " Alex Belits
2020-12-02 14:02 ` Mark Rutland
2020-12-04 0:39 ` Alex Belits
2020-12-05 20:40 ` Pavel Machek
2020-12-05 23:25 ` Thomas Gleixner
2020-12-11 18:08 ` Yury Norov
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=6e15fde56203f89ebab0565dc22177f42063ae7c.camel@marvell.com \
--to=abelits@marvell.com \
--cc=catalin.marinas@arm.com \
--cc=davem@davemloft.net \
--cc=frederic@kernel.org \
--cc=leon@sidebranch.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mtosatti@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=nitesh@redhat.com \
--cc=pauld@redhat.com \
--cc=peterx@redhat.com \
--cc=peterz@infradead.org \
--cc=pkapoor@marvell.com \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=trix@redhat.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;
as well as URLs for NNTP newsgroup(s).