* [PATCH] iommu/vt-d: Ratelimit fault handler
@ 2016-03-15 16:35 Alex Williamson
2016-03-15 17:10 ` Joe Perches
[not found] ` <20160315163503.2875.49980.stgit-GCcqpEzw8uZBDLzU/O5InQ@public.gmane.org>
0 siblings, 2 replies; 5+ messages in thread
From: Alex Williamson @ 2016-03-15 16:35 UTC (permalink / raw)
To: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
dwmw2-wEGCiKHe2LqWVfeAwA7xHQ
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA
Fault rates can easily overwhelm the console and make the system
unresponsive. Ratelimit to allow an opportunity for maintenance.
Signed-off-by: Alex Williamson <alex.williamson-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
drivers/iommu/dmar.c | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index 8ffd756..628987e 100644
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
@@ -1579,19 +1579,20 @@ static int dmar_fault_do_one(struct intel_iommu *iommu, int type,
reason = dmar_get_fault_reason(fault_reason, &fault_type);
if (fault_type == INTR_REMAP)
- pr_err("INTR-REMAP: Request device [[%02x:%02x.%d] "
- "fault index %llx\n"
- "INTR-REMAP:[fault reason %02d] %s\n",
- (source_id >> 8), PCI_SLOT(source_id & 0xFF),
- PCI_FUNC(source_id & 0xFF), addr >> 48,
- fault_reason, reason);
+ pr_err_ratelimited("INTR-REMAP: Request device [[%02x:%02x.%d] "
+ "fault index %llx\n"
+ "INTR-REMAP:[fault reason %02d] %s\n",
+ (source_id >> 8), PCI_SLOT(source_id & 0xFF),
+ PCI_FUNC(source_id & 0xFF), addr >> 48,
+ fault_reason, reason);
else
- pr_err("DMAR:[%s] Request device [%02x:%02x.%d] "
- "fault addr %llx \n"
- "DMAR:[fault reason %02d] %s\n",
- (type ? "DMA Read" : "DMA Write"),
- (source_id >> 8), PCI_SLOT(source_id & 0xFF),
- PCI_FUNC(source_id & 0xFF), addr, fault_reason, reason);
+ pr_err_ratelimited("DMAR:[%s] Request device [%02x:%02x.%d] "
+ "fault addr %llx \n"
+ "DMAR:[fault reason %02d] %s\n",
+ (type ? "DMA Read" : "DMA Write"),
+ (source_id >> 8), PCI_SLOT(source_id & 0xFF),
+ PCI_FUNC(source_id & 0xFF), addr,
+ fault_reason, reason);
return 0;
}
@@ -1606,7 +1607,8 @@ irqreturn_t dmar_fault(int irq, void *dev_id)
raw_spin_lock_irqsave(&iommu->register_lock, flag);
fault_status = readl(iommu->reg + DMAR_FSTS_REG);
if (fault_status)
- pr_err("DRHD: handling fault status reg %x\n", fault_status);
+ pr_err_ratelimited("DRHD: handling fault status reg %x\n",
+ fault_status);
/* TBD: ignore advanced fault log currently */
if (!(fault_status & DMA_FSTS_PPF))
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] iommu/vt-d: Ratelimit fault handler
2016-03-15 16:35 [PATCH] iommu/vt-d: Ratelimit fault handler Alex Williamson
@ 2016-03-15 17:10 ` Joe Perches
2016-03-15 18:01 ` Joe Perches
[not found] ` <20160315163503.2875.49980.stgit-GCcqpEzw8uZBDLzU/O5InQ@public.gmane.org>
1 sibling, 1 reply; 5+ messages in thread
From: Joe Perches @ 2016-03-15 17:10 UTC (permalink / raw)
To: Alex Williamson, iommu, dwmw2; +Cc: joro, linux-kernel
On Tue, 2016-03-15 at 10:35 -0600, Alex Williamson wrote:
> Fault rates can easily overwhelm the console and make the system
> unresponsive. Ratelimit to allow an opportunity for maintenance.
A few suggestions:
o Use a single ratelimit state.
o The multiple lines output are unnecessary and hard to grep
in the dmesg output because of inconsistent prefixing as
second and subsequent output lines are not prefixed by pr_fmt.
o The DMAR prefix on the second block is also unnecessary as
it's already prefixed by pr_fmt
o Coalesce the formats for easier grep.
so maybe:
---
drivers/iommu/dmar.c | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index 8ffd756..59dcaaa 100644
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
@@ -1575,23 +1575,27 @@ static int dmar_fault_do_one(struct intel_iommu *iommu, int type,
{
const char *reason;
int fault_type;
+ static DEFINE_RATELIMIT_STATE(rs,
+ DEFAULT_RATELIMIT_INTERVAL,
+ DEFAULT_RATELIMIT_BURST);
+
+ if (__ratelimit(&rs))
+ return 0;
reason = dmar_get_fault_reason(fault_reason, &fault_type);
if (fault_type == INTR_REMAP)
- pr_err("INTR-REMAP: Request device [[%02x:%02x.%d] "
- "fault index %llx\n"
- "INTR-REMAP:[fault reason %02d] %s\n",
- (source_id >> 8), PCI_SLOT(source_id & 0xFF),
- PCI_FUNC(source_id & 0xFF), addr >> 48,
- fault_reason, reason);
+ pr_err("[INTR-REMAP] Request device [%02x:%02x.%d] fault index %llx [fault reason %02d] %s\n",
+ source_id >> 8, PCI_SLOT(source_id & 0xFF),
+ PCI_FUNC(source_id & 0xFF), addr >> 48,
+ fault_reason, reason);
else
- pr_err("DMAR:[%s] Request device [%02x:%02x.%d] "
- "fault addr %llx \n"
- "DMAR:[fault reason %02d] %s\n",
- (type ? "DMA Read" : "DMA Write"),
- (source_id >> 8), PCI_SLOT(source_id & 0xFF),
- PCI_FUNC(source_id & 0xFF), addr, fault_reason, reason);
+ pr_err("[%s] Request device [%02x:%02x.%d] fault addr %llx [fault reason %02d] %s\n",
+ type ? "DMA Read" : "DMA Write",
+ source_id >> 8, PCI_SLOT(source_id & 0xFF),
+ PCI_FUNC(source_id & 0xFF), addr,
+ fault_reason, reason);
+
return 0;
}
^ permalink raw reply related [flat|nested] 5+ messages in thread[parent not found: <20160315163503.2875.49980.stgit-GCcqpEzw8uZBDLzU/O5InQ@public.gmane.org>]
end of thread, other threads:[~2016-03-17 16:53 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-15 16:35 [PATCH] iommu/vt-d: Ratelimit fault handler Alex Williamson
2016-03-15 17:10 ` Joe Perches
2016-03-15 18:01 ` Joe Perches
[not found] ` <20160315163503.2875.49980.stgit-GCcqpEzw8uZBDLzU/O5InQ@public.gmane.org>
2016-03-15 19:47 ` David Woodhouse
[not found] ` <1458071276.78634.124.camel-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2016-03-17 16:53 ` Alex Williamson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox