PCI/AER: Trace error event before ratelimiting

As with the AER statistics, we always want to emit trace events, even if
the actual dmesg logging is rate limited.

Call trace_aer_event() immediately after pci_dev_aer_stats_incr() so both
happen before ratelimiting.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Tested-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Link: https://patch.msgid.link/20250522232339.1525671-12-helgaas@kernel.org

diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
index 53f460bb7e6cfc6e95ab75458477edc0b1468848..636bcd92afa15ec44fed536b258cd2eb9a05c8a9 100644 (file)
--- a/drivers/pci/pcie/aer.c
+++ b/drivers/pci/pcie/aer.c
@@ -715,6 +715,8 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info)
        const char *level;
 
        pci_dev_aer_stats_incr(dev, info);
+       trace_aer_event(pci_name(dev), (info->status & ~info->mask),
+                       info->severity, info->tlp_header_valid, &info->tlp);
 
        if (!info->status) {
                pci_err(dev, "PCIe Bus Error: severity=%s, type=Inaccessible, (Unregistered Agent ID)\n",
@@ -742,9 +744,6 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info)
 out:
        if (info->id && info->error_dev_num > 1 && info->id == id)
                pci_err(dev, "  Error of this Agent is reported first\n");
-
-       trace_aer_event(dev_name(&dev->dev), (info->status & ~info->mask),
-                       info->severity, info->tlp_header_valid, &info->tlp);
 }
 
 #ifdef CONFIG_ACPI_APEI_PCIEAER
@@ -785,6 +784,8 @@ void pci_print_aer(struct pci_dev *dev, int aer_severity,
        info.mask = mask;
 
        pci_dev_aer_stats_incr(dev, &info);
+       trace_aer_event(pci_name(dev), (status & ~mask),
+                       aer_severity, tlp_header_valid, &aer->header_log);
 
        layer = AER_GET_LAYER_ERROR(aer_severity, status);
        agent = AER_GET_AGENT(aer_severity, status);
@@ -800,9 +801,6 @@ void pci_print_aer(struct pci_dev *dev, int aer_severity,
 
        if (tlp_header_valid)
                pcie_print_tlp_log(dev, &aer->header_log, dev_fmt("  "));
-
-       trace_aer_event(pci_name(dev), (status & ~mask),
-                       aer_severity, tlp_header_valid, &aer->header_log);
 }
 EXPORT_SYMBOL_NS_GPL(pci_print_aer, "CXL");