On Tue, 20 May 2025 16:50:27 -0500
Bjorn Helgaas <helg...@kernel.org> wrote:
> From: Bjorn Helgaas <bhelg...@google.com>
>
> There are two AER logging entry points:
>
> - aer_print_error() is used by DPC (dpc_process_error()) and native AER
> handling (aer_process_err_devices()).
>
> - pci_print_aer() is used by GHES (aer_recover_work_func()) and CXL
> (cxl_handle_rdport_errors())
>
> Both use __aer_print_error() to print the AER error bits. Previously
> __aer_print_error() also incremented the AER statistics via
> pci_dev_aer_stats_incr().
>
> Call pci_dev_aer_stats_incr() early in the entry points instead of in
> __aer_print_error() so we update the statistics even if the actual printing
> of error bits is rate limited by a future change.
>
> Signed-off-by: Bjorn Helgaas <bhelg...@google.com>
> Tested-by: Krzysztof Wilczyński <kwilczyn...@kernel.org>
> Reviewed-by: Ilpo Järvinen <ilpo.jarvi...@linux.intel.com>
> Reviewed-by: Kuppuswamy Sathyanarayanan
> <sathyanarayanan.kuppusw...@linux.intel.com>
Always felt odd that a stat got updated in a _print_ function
so even without the other reasoning this is a good change.
Reviewed-by: Jonathan Cameron <jonathan.came...@huawei.com>
> ---
> drivers/pci/pcie/aer.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
> index d845079429f0..53b7559564a9 100644
> --- a/drivers/pci/pcie/aer.c
> +++ b/drivers/pci/pcie/aer.c
> @@ -693,7 +693,6 @@ static void __aer_print_error(struct pci_dev *dev,
> aer_printk(level, dev, " [%2d] %-22s%s\n", i, errmsg,
> info->first_error == i ? " (First)" : "");
> }
> - pci_dev_aer_stats_incr(dev, info);
> }
>
> static void aer_print_source(struct pci_dev *dev, struct aer_err_info *info,
> @@ -714,6 +713,8 @@ void aer_print_error(struct pci_dev *dev, struct
> aer_err_info *info)
> int id = pci_dev_id(dev);
> const char *level;
>
> + pci_dev_aer_stats_incr(dev, info);
> +
> if (!info->status) {
> pci_err(dev, "PCIe Bus Error: severity=%s, type=Inaccessible,
> (Unregistered Agent ID)\n",
> aer_error_severity_string[info->severity]);
> @@ -782,6 +783,8 @@ void pci_print_aer(struct pci_dev *dev, int aer_severity,
> info.status = status;
> info.mask = mask;
>
> + pci_dev_aer_stats_incr(dev, &info);
> +
> layer = AER_GET_LAYER_ERROR(aer_severity, status);
> agent = AER_GET_AGENT(aer_severity, status);
>
