LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] amd/iommu: fix logic bug in amd_iommu_report_page_fault()
@ 2021-07-31 19:26 Luigi Rizzo
  2021-08-02  3:52 ` David Rientjes
  2021-08-02 14:13 ` Joerg Roedel
  0 siblings, 2 replies; 6+ messages in thread
From: Luigi Rizzo @ 2021-07-31 19:26 UTC (permalink / raw)
  To: Will Deacon, linux-kernel, Joerg Roedel, David Rientjes,
	rizzo.unipi, Suravee Suthikulpanit
  Cc: Luigi Rizzo

amd_iommu_report_page_fault() has two print paths, depending on whether or
not it can find a pci device. But the code erroneously enters the second
path if the rate limiter in the first path triggers:
  if (dev_data && ratelimit(A)) { A; } else if (ratelimit(B)) { B; }
The correct code should be
  if (dev_data) { if (ratelimit(A)) { A;} } else if (ratelimit(B)) { B; }

Signed-off-by: Luigi Rizzo <lrizzo@google.com>
---
 drivers/iommu/amd/iommu.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 811a49a95d04..38b4aff70800 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -480,9 +480,11 @@ static void amd_iommu_report_page_fault(u16 devid, u16 domain_id,
 	if (pdev)
 		dev_data = dev_iommu_priv_get(&pdev->dev);
 
-	if (dev_data && __ratelimit(&dev_data->rs)) {
-		pci_err(pdev, "Event logged [IO_PAGE_FAULT domain=0x%04x address=0x%llx flags=0x%04x]\n",
-			domain_id, address, flags);
+	if (dev_data) {
+		if (__ratelimit(&dev_data->rs)) {
+			pci_err(pdev, "Event logged [IO_PAGE_FAULT domain=0x%04x address=0x%llx flags=0x%04x]\n",
+				domain_id, address, flags);
+		}
 	} else if (printk_ratelimit()) {
 		pr_err("Event logged [IO_PAGE_FAULT device=%02x:%02x.%x domain=0x%04x address=0x%llx flags=0x%04x]\n",
 			PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
-- 
2.32.0.554.ge1b32706d8-goog


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-08-02 15:27 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-31 19:26 [PATCH] amd/iommu: fix logic bug in amd_iommu_report_page_fault() Luigi Rizzo
2021-08-02  3:52 ` David Rientjes
2021-08-02 14:13 ` Joerg Roedel
2021-08-02 14:30   ` Luigi Rizzo
2021-08-02 14:38     ` Joerg Roedel
2021-08-02 15:26       ` Luigi Rizzo

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).